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

Chris Robinson : wined3d: Add missing table entry value.
by Alexandre Julliard June 8, 2007

June 8, 2007

Module: wine Branch: master Commit: 11a6646102acf511d2edc40a140602e772ea6db8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11a6646102acf511d2edc40a1… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Fri Jun 8 00:48:15 2007 -0700 wined3d: Add missing table entry value. --- dlls/wined3d/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 36ef8cb..04a15a4 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -93,7 +93,7 @@ static const PixelFormatDesc formats[] = { {WINED3DFMT_D16_LOCKABLE,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT ,GL_UNSIGNED_SHORT }, {WINED3DFMT_D32 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_DEPTH_COMPONENT32_ARB ,GL_DEPTH_COMPONENT32_ARB ,GL_DEPTH_COMPONENT ,GL_UNSIGNED_INT }, {WINED3DFMT_D15S1 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT ,GL_UNSIGNED_SHORT }, - {WINED3DFMT_D24S8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT ,GL_UNSIGNED_INT }, + {WINED3DFMT_D24S8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT ,GL_UNSIGNED_INT }, {WINED3DFMT_D24X8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT,GL_UNSIGNED_INT }, {WINED3DFMT_D24X4S4 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT,GL_UNSIGNED_INT }, {WINED3DFMT_D16 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT,GL_UNSIGNED_SHORT },

1 0

James Hawkins : msi: Add support for large string tables.
by Alexandre Julliard June 8, 2007

June 8, 2007

Module: wine Branch: master Commit: a05613a9f29914b0df425d2592f35efd8343b517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a05613a9f29914b0df425d259… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jun 7 16:41:51 2007 -0700 msi: Add support for large string tables. --- dlls/msi/database.c | 3 ++- dlls/msi/msipriv.h | 4 +++- dlls/msi/string.c | 13 +++++++++++-- dlls/msi/table.c | 28 +++++++++++++++++++--------- 4 files changed, 35 insertions(+), 13 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 875f440..7adb362 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -188,10 +188,11 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) list_init( &db->tables ); list_init( &db->transforms ); - db->strings = msi_load_string_table( stg ); + db->strings = msi_load_string_table( stg, &db->bytes_per_strref ); if( !db->strings ) goto end; + msi_table_set_strref( db->bytes_per_strref ); ret = ERROR_SUCCESS; msiobj_addref( &db->hdr ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index c43f484..bc0a3f0 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -75,6 +75,7 @@ typedef struct tagMSIDATABASE MSIOBJECTHDR hdr; IStorage *storage; string_table *strings; + UINT bytes_per_strref; LPWSTR path; LPWSTR deletefile; LPCWSTR mode; @@ -556,10 +557,11 @@ extern VOID msi_destroy_stringtable( string_table *st ); extern UINT msi_strcmp( string_table *st, UINT lval, UINT rval, UINT *res ); extern const WCHAR *msi_string_lookup_id( string_table *st, UINT id ); extern HRESULT msi_init_string_table( IStorage *stg ); -extern string_table *msi_load_string_table( IStorage *stg ); +extern string_table *msi_load_string_table( IStorage *stg, UINT *bytes_per_strref ); extern UINT msi_save_string_table( string_table *st, IStorage *storage ); +extern void msi_table_set_strref(UINT bytes_per_strref); extern BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name ); extern MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, LPCWSTR table ); diff --git a/dlls/msi/string.c b/dlls/msi/string.c index b773a35..e816ffa 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); #define HASH_SIZE 0x101 +#define LONG_STR_BYTES 3 typedef struct _msistring { @@ -507,7 +508,7 @@ HRESULT msi_init_string_table( IStorage *stg ) return S_OK; } -string_table *msi_load_string_table( IStorage *stg ) +string_table *msi_load_string_table( IStorage *stg, UINT *bytes_per_strref ) { string_table *st = NULL; CHAR *data = NULL; @@ -515,6 +516,8 @@ string_table *msi_load_string_table( IStorage *stg ) UINT r, datasize = 0, poolsize = 0, codepage; DWORD i, count, offset, len, n, refs; + static const USHORT large_str_sig[] = { 0x0000, 0x8000 }; + r = read_stream_data( stg, szStringPool, &pool, &poolsize ); if( r != ERROR_SUCCESS) goto end; @@ -522,8 +525,14 @@ string_table *msi_load_string_table( IStorage *stg ) if( r != ERROR_SUCCESS) goto end; + if ( !memcmp(pool, large_str_sig, sizeof(large_str_sig)) ) + *bytes_per_strref = LONG_STR_BYTES; + else + *bytes_per_strref = sizeof(USHORT); + + /* FIXME: don't know where the codepage is in large str tables */ count = poolsize/4; - if( poolsize > 4 ) + if( poolsize > 4 && *bytes_per_strref != LONG_STR_BYTES ) codepage = pool[0] | ( pool[1] << 16 ); else codepage = CP_ACP; diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 2076201..9c78743 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -42,6 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); #define MSITABLE_HASH_TABLE_SIZE 37 +#define LONG_STR_BYTES 3 typedef struct tagMSICOLUMNHASHENTRY { @@ -113,10 +114,19 @@ static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINFO *colinfo, UINT *sz); static void msi_free_colinfo( MSICOLUMNINFO *colinfo, UINT count ); + +void msi_table_set_strref(UINT bytes_per_strref) +{ + _Columns_cols[0].offset = 0; + _Columns_cols[1].offset = bytes_per_strref; + _Columns_cols[2].offset = _Columns_cols[1].offset + sizeof(USHORT); + _Columns_cols[3].offset = _Columns_cols[2].offset + bytes_per_strref; +} + static inline UINT bytes_per_column( const MSICOLUMNINFO *col ) { if( col->type & MSITYPE_STRING ) - return 2; + return _Columns_cols[1].offset; if( (col->type & 0xff) > 4 ) ERR("Invalid column size!\n"); return col->type & 0xff; @@ -525,7 +535,7 @@ static UINT read_table_from_storage( MSITABLE *t, IStorage *stg ) UINT n = bytes_per_column( &t->colinfo[j] ); UINT k; - if ( n != 2 && n != 4 ) + if ( n != 2 && n != 3 && n != 4 ) { ERR("oops - unknown column width %d\n", n); goto err; @@ -975,12 +985,12 @@ static UINT get_tablecolumns( MSIDATABASE *db, count = table->row_count; for( i=0; i<count; i++ ) { - if( table->data[ i ][ 0 ] != table_id ) + if( read_table_int(table->data, i, 0, db->bytes_per_strref) != table_id ) continue; if( colinfo ) { - UINT id = read_table_int(table->data, i, 4, sizeof(USHORT)); - UINT col = read_table_int(table->data, i, 2, sizeof(USHORT)) - (1<<15); + UINT id = read_table_int(table->data, i, _Columns_cols[2].offset, db->bytes_per_strref); + UINT col = read_table_int(table->data, i, _Columns_cols[1].offset, sizeof(USHORT)) - (1<<15); /* check the column number is in range */ if (col<1 || col>maxcount) @@ -999,7 +1009,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, colinfo[ col - 1 ].tablename = msi_makestring( db, table_id ); colinfo[ col - 1 ].number = col; colinfo[ col - 1 ].colname = msi_makestring( db, id ); - colinfo[ col - 1 ].type = read_table_int(table->data, i, 6, sizeof(USHORT)) - (1<<15); + colinfo[ col - 1 ].type = read_table_int(table->data, i, _Columns_cols[3].offset, sizeof(USHORT)) - (1<<15); colinfo[ col - 1 ].offset = 0; colinfo[ col - 1 ].hash_table = NULL; } @@ -1112,7 +1122,7 @@ static UINT TABLE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT * data = tv->table->data; n = bytes_per_column( &tv->columns[col-1] ); - if (n != 2 && n != 4) + if (n != 2 && n != 3 && n != 4) { ERR("oops! what is %d bytes per column?\n", n ); return ERROR_FUNCTION_FAILED; @@ -1227,7 +1237,7 @@ static UINT TABLE_set_int( MSITABLEVIEW *tv, UINT row, UINT col, UINT val ) data = tv->table->data; n = bytes_per_column( &tv->columns[col-1] ); - if ( n != 2 && n != 4 ) + if ( n != 2 && n != 3 && n != 4 ) { ERR("oops! what is %d bytes per column?\n", n ); return ERROR_FUNCTION_FAILED; @@ -2053,7 +2063,7 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg ) TRACE("%p %p\n", db, stg ); - strings = msi_load_string_table( stg ); + strings = msi_load_string_table( stg, &db->bytes_per_strref ); if( !strings ) goto end;

1 0

James Hawkins : msi: Represent table data as bytes instead of shorts.
by Alexandre Julliard June 8, 2007

June 8, 2007

Module: wine Branch: master Commit: 8568e0a4a8f9d6b7cc391fa0041b61389c2d1f45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8568e0a4a8f9d6b7cc391fa00… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jun 7 16:41:15 2007 -0700 msi: Represent table data as bytes instead of shorts. --- dlls/msi/table.c | 54 +++++++++++++++++++++++++++++------------------------- 1 files changed, 29 insertions(+), 25 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 83b1da1..2076201 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -62,9 +62,9 @@ typedef struct tagMSICOLUMNINFO struct tagMSITABLE { - USHORT **data; + BYTE **data; UINT row_count; - USHORT **nonpersistent_data; + BYTE **nonpersistent_data; UINT nonpersistent_row_count; struct list entry; MSICOLUMNINFO *colinfo; @@ -486,7 +486,7 @@ static UINT msi_table_get_row_size( const MSICOLUMNINFO *cols, UINT count ) /* add this table to the list of cached tables in the database */ static UINT read_table_from_storage( MSITABLE *t, IStorage *stg ) { - USHORT *rawdata = NULL; + BYTE *rawdata = NULL; UINT rawsize = 0, i, j, row_size = 0; TRACE("%s\n",debugstr_w(t->name)); @@ -494,7 +494,7 @@ static UINT read_table_from_storage( MSITABLE *t, IStorage *stg ) row_size = msi_table_get_row_size( t->colinfo, t->col_count ); /* if we can't read the table, just assume that it's empty */ - read_stream_data( stg, t->name, &rawdata, &rawsize ); + read_stream_data( stg, t->name, (USHORT **)&rawdata, &rawsize ); if( !rawdata ) return ERROR_SUCCESS; @@ -521,7 +521,7 @@ static UINT read_table_from_storage( MSITABLE *t, IStorage *stg ) for( j=0; j<t->col_count; j++ ) { - UINT ofs = t->colinfo[j].offset/2; + UINT ofs = t->colinfo[j].offset; UINT n = bytes_per_column( &t->colinfo[j] ); UINT k; @@ -531,8 +531,8 @@ static UINT read_table_from_storage( MSITABLE *t, IStorage *stg ) goto err; } - for ( k = 0; k < n / 2; k++ ) - t->data[i][ofs + k] = rawdata[ofs*t->row_count + i * n / 2 + k]; + for ( k = 0; k < n; k++ ) + t->data[i][ofs + k] = rawdata[ofs*t->row_count + i * n + k]; } } @@ -811,7 +811,7 @@ static UINT get_table( MSIDATABASE *db, LPCWSTR name, MSITABLE **table_ret ) static UINT save_table( MSIDATABASE *db, MSITABLE *t ) { - USHORT *rawdata = NULL, *p; + BYTE *rawdata = NULL, *p; UINT rawsize, r, i, j, row_size; /* Nothing to do for non-persistent tables */ @@ -837,9 +837,13 @@ static UINT save_table( MSIDATABASE *db, MSITABLE *t ) { UINT offset = t->colinfo[i].offset; - *p++ = t->data[j][offset/2]; + *p++ = t->data[j][offset]; + *p++ = t->data[j][offset + 1]; if( 4 == bytes_per_column( &t->colinfo[i] ) ) - *p++ = t->data[j][offset/2+1]; + { + *p++ = t->data[j][offset + 2]; + *p++ = t->data[j][offset + 3]; + } } } @@ -924,12 +928,12 @@ static LPWSTR msi_makestring( MSIDATABASE *db, UINT stringid) return strdupW(msi_string_lookup_id( db->strings, stringid )); } -static UINT read_table_int(USHORT **data, UINT row, UINT col, UINT bytes) +static UINT read_table_int(BYTE **data, UINT row, UINT col, UINT bytes) { UINT ret = 0, i; - for (i = 0; i < bytes / 2; i++) - ret += (data[row][col + i] << i * 16); + for (i = 0; i < bytes; i++) + ret += (data[row][col + i] << i * 8); return ret; } @@ -975,8 +979,8 @@ static UINT get_tablecolumns( MSIDATABASE *db, continue; if( colinfo ) { - UINT id = table->data[ i ] [ 2 ]; - UINT col = table->data[ i ][ 1 ] - (1<<15); + UINT id = read_table_int(table->data, i, 4, sizeof(USHORT)); + UINT col = read_table_int(table->data, i, 2, sizeof(USHORT)) - (1<<15); /* check the column number is in range */ if (col<1 || col>maxcount) @@ -995,7 +999,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, colinfo[ col - 1 ].tablename = msi_makestring( db, table_id ); colinfo[ col - 1 ].number = col; colinfo[ col - 1 ].colname = msi_makestring( db, id ); - colinfo[ col - 1 ].type = table->data[ i ] [ 3 ] - (1<<15); + colinfo[ col - 1 ].type = read_table_int(table->data, i, 6, sizeof(USHORT)) - (1<<15); colinfo[ col - 1 ].offset = 0; colinfo[ col - 1 ].hash_table = NULL; } @@ -1080,7 +1084,7 @@ static UINT TABLE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT * { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; UINT offset, n; - USHORT **data; + BYTE **data; if( !tv->table ) return ERROR_INVALID_PARAMETER; @@ -1114,7 +1118,7 @@ static UINT TABLE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT * return ERROR_FUNCTION_FAILED; } - offset = tv->columns[col-1].offset / 2; + offset = tv->columns[col-1].offset; *val = read_table_int(data, row, offset, n); /* TRACE("Data [%d][%d] = %d\n", row, col, *val ); */ @@ -1193,7 +1197,7 @@ static UINT TABLE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt static UINT TABLE_set_int( MSITABLEVIEW *tv, UINT row, UINT col, UINT val ) { UINT offset, n, i; - USHORT **data; + BYTE **data; if( !tv->table ) return ERROR_INVALID_PARAMETER; @@ -1229,9 +1233,9 @@ static UINT TABLE_set_int( MSITABLEVIEW *tv, UINT row, UINT col, UINT val ) return ERROR_FUNCTION_FAILED; } - offset = tv->columns[col-1].offset / 2; - for ( i = 0; i < n / 2; i++ ) - data[row][offset + i] = (val >> i * 16) & 0xffff; + offset = tv->columns[col-1].offset; + for ( i = 0; i < n; i++ ) + data[row][offset + i] = (val >> i * 8) & 0xff; return ERROR_SUCCESS; } @@ -1299,9 +1303,9 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI static UINT table_create_new_row( struct tagMSIVIEW *view, UINT *num, BOOL temporary ) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; - USHORT **p, *row; + BYTE **p, *row; UINT sz; - USHORT ***data_ptr; + BYTE ***data_ptr; UINT *row_count; TRACE("%p %s\n", view, temporary ? "TRUE" : "FALSE"); @@ -1326,7 +1330,7 @@ static UINT table_create_new_row( struct tagMSIVIEW *view, UINT *num, BOOL tempo *num = tv->table->row_count; } - sz = (*row_count + 1) * sizeof (UINT*); + sz = (*row_count + 1) * sizeof (BYTE*); if( *data_ptr ) p = msi_realloc( *data_ptr, sz ); else

1 0

H. Verbeet : wined3d: For ps_2_0 and higher, call shader_get_registers_used () in IWineD3DPixelShaderImpl_SetFunction.
by Alexandre Julliard June 8, 2007

June 8, 2007

Module: wine Branch: master Commit: 4e27a7d81c6a21f61d6d3b9df351807c10382561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e27a7d81c6a21f61d6d3b9df… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jun 7 23:52:48 2007 +0200 wined3d: For ps_2_0 and higher, call shader_get_registers_used() in IWineD3DPixelShaderImpl_SetFunction. --- dlls/wined3d/pixelshader.c | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 1cab706..a8bc50b 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -501,6 +501,18 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *i list_init(&This->baseShader.constantsB); list_init(&This->baseShader.constantsI); + if (WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) > 1) { + shader_reg_maps *reg_maps = &This->baseShader.reg_maps; + HRESULT hr; + + /* Second pass: figure out which registers are used, what the semantics are, etc.. */ + memset(reg_maps, 0, sizeof(shader_reg_maps)); + hr = shader_get_registers_used((IWineD3DBaseShader*) This, reg_maps, + This->semantics_in, NULL, pFunction, NULL); + if (FAILED(hr)) return hr; + /* FIXME: validate reg_maps against OpenGL */ + } + This->baseShader.shader_mode = deviceImpl->ps_selected_mode; TRACE("(%p) : Copying the function\n", This); @@ -523,8 +535,6 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_CompileShader(IWineD3DPixelShader IWineD3DPixelShaderImpl *This =(IWineD3DPixelShaderImpl *)iface; IWineD3DDeviceImpl *deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; CONST DWORD *function = This->baseShader.function; - shader_reg_maps *reg_maps = &This->baseShader.reg_maps; - HRESULT hr; TRACE("(%p) : function %p\n", iface, function); @@ -537,12 +547,17 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_CompileShader(IWineD3DPixelShader return WINED3D_OK; } - /* Second pass: figure out which registers are used, what the semantics are, etc.. */ - memset(reg_maps, 0, sizeof(shader_reg_maps)); - hr = shader_get_registers_used((IWineD3DBaseShader*) This, reg_maps, - This->semantics_in, NULL, This->baseShader.function, deviceImpl->stateBlock); - if (hr != WINED3D_OK) return hr; - /* FIXME: validate reg_maps against OpenGL */ + if (WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) == 1) { + shader_reg_maps *reg_maps = &This->baseShader.reg_maps; + HRESULT hr; + + /* Second pass: figure out which registers are used, what the semantics are, etc.. */ + memset(reg_maps, 0, sizeof(shader_reg_maps)); + hr = shader_get_registers_used((IWineD3DBaseShader*)This, reg_maps, + This->semantics_in, NULL, This->baseShader.function, deviceImpl->stateBlock); + if (FAILED(hr)) return hr; + /* FIXME: validate reg_maps against OpenGL */ + } /* Generate the HW shader */ TRACE("(%p) : Generating hardware program\n", This);

1 0

H. Verbeet : wined3d: Pass NULL for the stateBlock parameter to shader_get_registers_used() in IWineD3DVertexShaderImpl_SetFunction.
by Alexandre Julliard June 8, 2007

June 8, 2007

Module: wine Branch: master Commit: 7a9bb1db28a566f2567b74df3d8cac0e88db663e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a9bb1db28a566f2567b74df3… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jun 7 23:52:43 2007 +0200 wined3d: Pass NULL for the stateBlock parameter to shader_get_registers_used() in IWineD3DVertexShaderImpl_SetFunction. --- dlls/wined3d/vertexshader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 0b9d4cf..fbad6fb 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -562,7 +562,7 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader /* Second pass: figure out registers used, semantics, etc.. */ memset(reg_maps, 0, sizeof(shader_reg_maps)); hr = shader_get_registers_used((IWineD3DBaseShader*) This, reg_maps, - This->semantics_in, This->semantics_out, pFunction, deviceImpl->stateBlock); + This->semantics_in, This->semantics_out, pFunction, NULL); if (hr != WINED3D_OK) return hr; This->baseShader.shader_mode = deviceImpl->vs_selected_mode;

1 0

Lei Zhang : shell32: Start implementing BIF_USENEWUI.
by Alexandre Julliard June 8, 2007

June 8, 2007

Module: wine Branch: master Commit: 7318ae2411eea8e43aa931bbbe676dc2fb7fa233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7318ae2411eea8e43aa931bbb… Author: Lei Zhang <thestig(a)google.com> Date: Thu Jun 7 14:55:09 2007 -0700 shell32: Start implementing BIF_USENEWUI. --- dlls/shell32/brsfolder.c | 48 ++++++++++++++++++++++++++++++++++++++++++- dlls/shell32/shell32_En.rc | 20 ++++++++++++++++++ dlls/shell32/shresdef.h | 3 ++ 3 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index e478078..ff5c1f0 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -18,6 +18,9 @@ * FIXME: * - many memory leaks * - many flags unimplemented + * - implement new dialog style "make new folder" button + * - implement editbox + * - implement new dialog style resizing */ #include <stdlib.h> @@ -56,6 +59,8 @@ typedef struct tagTV_ITEMDATA BIF_BROWSEFORCOMPUTER | \ BIF_RETURNFSANCESTORS | \ BIF_RETURNONLYFSDIRS | \ + BIF_NONEWFOLDERBUTTON | \ + BIF_NEWDIALOGSTYLE | \ BIF_BROWSEINCLUDEFILES) static void FillTreeView(browse_info*, LPSHELLFOLDER, @@ -494,6 +499,8 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) info->hWnd = hWnd; SetPropW( hWnd, szBrowseFolderInfo, info ); + if (lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE) + FIXME("flags BIF_NEWDIALOGSTYLE partially implemented\n"); if (lpBrowseInfo->ulFlags & ~SUPPORTEDFLAGS) FIXME("flags %x not implemented\n", lpBrowseInfo->ulFlags & ~SUPPORTEDFLAGS); @@ -502,12 +509,37 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) else ShowWindow( GetDlgItem(hWnd, IDD_TITLE), SW_HIDE ); - if (!(lpBrowseInfo->ulFlags & BIF_STATUSTEXT)) + if (!(lpBrowseInfo->ulFlags & BIF_STATUSTEXT) + || (lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE)) ShowWindow( GetDlgItem(hWnd, IDD_STATUS), SW_HIDE ); + /* Hide "Make New Folder" Button? */ + if ((lpBrowseInfo->ulFlags & BIF_NONEWFOLDERBUTTON) + || !(lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE)) + ShowWindow( GetDlgItem(hWnd, IDD_MAKENEWFOLDER), SW_HIDE ); + + /* Hide the editbox? */ + if (!(lpBrowseInfo->ulFlags & BIF_EDITBOX)) + { + ShowWindow( GetDlgItem(hWnd, IDD_FOLDER), SW_HIDE ); + ShowWindow( GetDlgItem(hWnd, IDD_FOLDERTEXT), SW_HIDE ); + } + info->hwndTreeView = GetDlgItem( hWnd, IDD_TREEVIEW ); if (info->hwndTreeView) + { InitializeTreeView( info ); + + /* Resize the treeview if there's not editbox */ + if ((lpBrowseInfo->ulFlags & BIF_NEWDIALOGSTYLE) + && !(lpBrowseInfo->ulFlags & BIF_EDITBOX)) + { + RECT rc; + GetClientRect(info->hwndTreeView, &rc); + SetWindowPos(info->hwndTreeView, HWND_TOP, 0, 0, + rc.right, rc.bottom + 40, SWP_NOMOVE); + } + } else ERR("treeview control missing!\n"); @@ -536,6 +568,10 @@ static BOOL BrsFolder_OnCommand( browse_info *info, UINT id ) case IDCANCEL: EndDialog( info->hWnd, 0 ); return TRUE; + + case IDD_MAKENEWFOLDER: + FIXME("make new folder not implemented\n"); + return TRUE; } return FALSE; } @@ -703,6 +739,8 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, static const WCHAR swBrowseTemplateName[] = { 'S','H','B','R','S','F','O','R','F','O','L','D','E','R','_','M','S','G','B','O','X',0}; +static const WCHAR swNewBrowseTemplateName[] = { + 'S','H','N','E','W','B','R','S','F','O','R','F','O','L','D','E','R','_','M','S','G','B','O','X',0}; /************************************************************************* * SHBrowseForFolderA [SHELL32.@] @@ -765,6 +803,7 @@ LPITEMIDLIST WINAPI SHBrowseForFolderW (LPBROWSEINFOW lpbi) browse_info info; DWORD r; HRESULT hr; + const WCHAR * templateName; info.hWnd = 0; info.pidlRet = NULL; @@ -772,7 +811,12 @@ LPITEMIDLIST WINAPI SHBrowseForFolderW (LPBROWSEINFOW lpbi) info.hwndTreeView = NULL; hr = OleInitialize(NULL); - r = DialogBoxParamW( shell32_hInstance, swBrowseTemplateName, lpbi->hwndOwner, + + if (lpbi->ulFlags & BIF_NEWDIALOGSTYLE) + templateName = swNewBrowseTemplateName; + else + templateName = swBrowseTemplateName; + r = DialogBoxParamW( shell32_hInstance, templateName, lpbi->hwndOwner, BrsFolderDlgProc, (LPARAM)&info ); if (SUCCEEDED(hr)) OleUninitialize(); diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc index 0613b41..ca902c8 100644 --- a/dlls/shell32/shell32_En.rc +++ b/dlls/shell32/shell32_En.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "shresdef.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT MENU_001 MENU DISCARDABLE @@ -104,6 +106,24 @@ FONT 8, "MS Shell Dlg" 4, 40, 180, 120 } +SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Browse for Folder" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDD_TITLE, 10, 8, 198, 24 + LTEXT "", IDD_STATUS, 10, 25, 198, 12 + LTEXT "Folder:", IDD_FOLDER, 10, 156, 40, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 12, 38, 194, 105 + EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Make New Folder", IDD_MAKENEWFOLDER, 12, 174, 70, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP +} + SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Message" diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 3619353..1e5c76f 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -103,6 +103,9 @@ /* these IDs are the same as on native */ #define IDD_YESTOALL 0x3207 /* browse for folder dialog box */ +#define IDD_MAKENEWFOLDER 0x3746 +#define IDD_FOLDERTEXT 0x3745 +#define IDD_FOLDER 0x3744 #define IDD_STATUS 0x3743 #define IDD_TITLE 0x3742 #define IDD_TREEVIEW 0x3741

1 0

James Hawkins : msi: Use fetch_int to reduce code duplication and access to table data.
by Alexandre Julliard June 8, 2007

June 8, 2007

Module: wine Branch: master Commit: 298699e2426e2e2687d5d655e73ccd9ecd3db2fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=298699e2426e2e2687d5d655e… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jun 7 16:37:48 2007 -0700 msi: Use fetch_int to reduce code duplication and access to table data. --- dlls/msi/table.c | 29 +++-------------------------- 1 files changed, 3 insertions(+), 26 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 64ddcab..bba93dc 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1565,33 +1565,10 @@ static UINT TABLE_find_matching_rows( struct tagMSIVIEW *view, UINT col, for (i = 0; i < num_rows; i++, new_entry++) { - UINT row_value, n; - UINT offset; - USHORT **data; - UINT row = i; - if( row >= tv->table->row_count ) - { - row -= tv->table->row_count; - data = tv->table->nonpersistent_data; - } - else - data = tv->table->data; - n = bytes_per_column( &tv->columns[col-1] ); - switch( n ) - { - case 4: - offset = tv->columns[col-1].offset/2; - row_value = data[row][offset] + - (data[row][offset + 1] << 16); - break; - case 2: - offset = tv->columns[col-1].offset/2; - row_value = data[row][offset]; - break; - default: - ERR("oops! what is %d bytes per column?\n", n ); + UINT row_value; + + if (view->ops->fetch_int( view, i, col, &row_value ) != ERROR_SUCCESS) continue; - } new_entry->next = NULL; new_entry->value = row_value;

1 0

James Hawkins : msi: Reduce the amount of code that directly accesses table data.
by Alexandre Julliard June 8, 2007

June 8, 2007

Module: wine Branch: master Commit: 65f23343ee86fea1f7001684658bf12be1c5a43f URL: http://source.winehq.org/git/wine.git/?a=commit;h=65f23343ee86fea1f70016846… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jun 7 16:40:31 2007 -0700 msi: Reduce the amount of code that directly accesses table data. --- dlls/msi/table.c | 60 +++++++++++++++++++++++++---------------------------- 1 files changed, 28 insertions(+), 32 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index bba93dc..83b1da1 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -523,20 +523,16 @@ static UINT read_table_from_storage( MSITABLE *t, IStorage *stg ) { UINT ofs = t->colinfo[j].offset/2; UINT n = bytes_per_column( &t->colinfo[j] ); + UINT k; - switch( n ) + if ( n != 2 && n != 4 ) { - case 2: - t->data[i][ofs] = rawdata[ofs*t->row_count + i ]; - break; - case 4: - t->data[i][ofs] = rawdata[ofs*t->row_count + i*2 ]; - t->data[i][ofs+1] = rawdata[ofs*t->row_count + i*2 + 1]; - break; - default: ERR("oops - unknown column width %d\n", n); goto err; } + + for ( k = 0; k < n / 2; k++ ) + t->data[i][ofs + k] = rawdata[ofs*t->row_count + i * n / 2 + k]; } } @@ -928,6 +924,16 @@ static LPWSTR msi_makestring( MSIDATABASE *db, UINT stringid) return strdupW(msi_string_lookup_id( db->strings, stringid )); } +static UINT read_table_int(USHORT **data, UINT row, UINT col, UINT bytes) +{ + UINT ret = 0, i; + + for (i = 0; i < bytes / 2; i++) + ret += (data[row][col + i] << i * 16); + + return ret; +} + static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINFO *colinfo, UINT *sz) { @@ -1100,23 +1106,17 @@ static UINT TABLE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT * } else data = tv->table->data; + n = bytes_per_column( &tv->columns[col-1] ); - switch( n ) + if (n != 2 && n != 4) { - case 4: - offset = tv->columns[col-1].offset/2; - *val = data[row][offset] + - (data[row][offset + 1] << 16); - break; - case 2: - offset = tv->columns[col-1].offset/2; - *val = data[row][offset]; - break; - default: ERR("oops! what is %d bytes per column?\n", n ); return ERROR_FUNCTION_FAILED; } + offset = tv->columns[col-1].offset / 2; + *val = read_table_int(data, row, offset, n); + /* TRACE("Data [%d][%d] = %d\n", row, col, *val ); */ return ERROR_SUCCESS; @@ -1192,7 +1192,7 @@ static UINT TABLE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt static UINT TABLE_set_int( MSITABLEVIEW *tv, UINT row, UINT col, UINT val ) { - UINT offset, n; + UINT offset, n, i; USHORT **data; if( !tv->table ) @@ -1221,22 +1221,18 @@ static UINT TABLE_set_int( MSITABLEVIEW *tv, UINT row, UINT col, UINT val ) } else data = tv->table->data; + n = bytes_per_column( &tv->columns[col-1] ); - switch( n ) + if ( n != 2 && n != 4 ) { - case 4: - offset = tv->columns[col-1].offset/2; - data[row][offset] = val & 0xffff; - data[row][offset + 1] = (val>>16)&0xffff; - break; - case 2: - offset = tv->columns[col-1].offset/2; - data[row][offset] = val; - break; - default: ERR("oops! what is %d bytes per column?\n", n ); return ERROR_FUNCTION_FAILED; } + + offset = tv->columns[col-1].offset / 2; + for ( i = 0; i < n / 2; i++ ) + data[row][offset + i] = (val >> i * 16) & 0xffff; + return ERROR_SUCCESS; }

1 0

Dan Hipschman : widl: Fix incomplete struct/union typedef bug.
by Alexandre Julliard June 8, 2007

June 8, 2007

Module: wine Branch: master Commit: 4e22899e1316e86e2fc812d2540c7aff04925044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e22899e1316e86e2fc812d25… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Jun 7 17:43:58 2007 -0700 widl: Fix incomplete struct/union typedef bug. --- tools/widl/parser.y | 51 +++++++++++++++++++++++++++++++++++++++++++++++- tools/widl/typegen.c | 4 +- tools/widl/widltypes.h | 2 + 3 files changed, 54 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 00d3b4d..b5c1865 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -65,6 +65,17 @@ # endif #endif +typedef struct list typelist_t; +struct typenode { + type_t *type; + struct list entry; +}; + +typelist_t incomplete_types = LIST_INIT(incomplete_types); + +static void add_incomplete(type_t *t); +static void fix_incomplete(void); + static str_list_t *append_str(str_list_t *list, char *str); static attr_list_t *append_attr(attr_list_t *list, attr_t *attr); static attr_t *make_attr(enum attr_type type); @@ -263,7 +274,11 @@ static void check_arg(var_t *arg); %% -input: gbl_statements { write_proxies($1); write_client($1); write_server($1); } +input: gbl_statements { fix_incomplete(); + write_proxies($1); + write_client($1); + write_server($1); + } ; gbl_statements: { $$ = NULL; } @@ -1475,6 +1490,38 @@ static type_t *reg_type(type_t *type, const char *name, int t) return type; } +static int is_incomplete(const type_t *t) +{ + return !t->defined && (is_struct(t->type) || is_union(t->type)); +} + +static void add_incomplete(type_t *t) +{ + struct typenode *tn = xmalloc(sizeof *tn); + tn->type = t; + list_add_tail(&incomplete_types, &tn->entry); +} + +static void fix_type(type_t *t) +{ + if (t->kind == TKIND_ALIAS && is_incomplete(t)) { + type_t *ot = t->orig; + fix_type(ot); + t->fields = ot->fields; + t->defined = ot->defined; + } +} + +static void fix_incomplete(void) +{ + struct typenode *tn, *next; + + LIST_FOR_EACH_ENTRY_SAFE(tn, next, &incomplete_types, struct typenode, entry) { + fix_type(tn->type); + free(tn); + } +} + static type_t *reg_typedefs(type_t *type, pident_list_t *pidents, attr_list_t *attrs) { type_t *ptr = type; @@ -1544,6 +1591,8 @@ static type_t *reg_typedefs(type_t *type, pident_list_t *pidents, attr_list_t *a yyerror("'%s': [string] attribute applied to non-pointer type", cur->name); + if (is_incomplete(cur)) + add_incomplete(cur); reg_type(cur, cur->name, 0); } } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 7c0921e..8f4c926 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -109,7 +109,7 @@ const char *string_of_type(unsigned char type) } } -static int is_struct(unsigned char type) +int is_struct(unsigned char type) { switch (type) { @@ -125,7 +125,7 @@ static int is_struct(unsigned char type) } } -static int is_union(unsigned char type) +int is_union(unsigned char type) { switch (type) { diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index fb8e5fb..0c8acad 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -305,5 +305,7 @@ int is_ptr(const type_t *t); int is_array(const type_t *t); int is_var_ptr(const var_t *v); int cant_be_null(const var_t *v); +int is_struct(unsigned char tc); +int is_union(unsigned char tc); #endif

1 0

Dan Hipschman : widl: Check for NULL in set_tfswrite.
by Alexandre Julliard June 8, 2007

June 8, 2007

Module: wine Branch: master Commit: b186c4dd0e7bcb92f147fc00e473e495deaef62b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b186c4dd0e7bcb92f147fc00e… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Jun 7 17:43:06 2007 -0700 widl: Check for NULL in set_tfswrite. --- tools/widl/typegen.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 2327e21..7c0921e 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1457,7 +1457,7 @@ static void set_tfswrite(type_t *type, int val) if (type->kind == TKIND_ALIAS) type = type->orig; - else if (is_ptr(type)) + else if (is_ptr(type) || is_array(type)) type = type->ref; else { @@ -1465,7 +1465,8 @@ static void set_tfswrite(type_t *type, int val) { var_t *v; LIST_FOR_EACH_ENTRY( v, type->fields, var_t, entry ) - set_tfswrite(v->type, val); + if (v->type) + set_tfswrite(v->type, val); } return;

1 0