wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Nikolay Sivov : dwrite: Added a stub for IDWriteTextAnalyzer.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 45c7798c36cfcccb41eeea5dadb1422c9012f9e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c7798c36cfcccb41eeea5da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 28 17:58:10 2012 -0400 dwrite: Added a stub for IDWriteTextAnalyzer. --- dlls/dwrite/Makefile.in | 1 + dlls/dwrite/analyzer.c | 144 ++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/dwrite_private.h | 3 +- dlls/dwrite/gdiinterop.c | 2 +- dlls/dwrite/main.c | 6 +- dlls/dwrite/tests/analyzer.c | 60 ++++++++++++++++- 6 files changed, 207 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45c7798c36cfcccb41eee…

1 0

Nikolay Sivov : dwrite: Added initial test code for text analyzer tests.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 419a1f45f9b043f11a1a9a38e4e1714b50eb6a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=419a1f45f9b043f11a1a9a38e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 28 13:21:13 2012 -0400 dwrite: Added initial test code for text analyzer tests. --- dlls/dwrite/tests/Makefile.in | 1 + dlls/dwrite/tests/analyzer.c | 472 +++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 2 - 3 files changed, 473 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=419a1f45f9b043f11a1a9…

1 0

Hans Leidekker : msi: Pass string length to msi_set_property in ACTION_CustomAction.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: af08a2f6ba2fb0d65f1a1d3b7720216860fc9456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af08a2f6ba2fb0d65f1a1d3b7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:18:50 2012 +0100 msi: Pass string length to msi_set_property in ACTION_CustomAction. --- dlls/msi/custom.c | 5 +++-- dlls/msi/tests/format.c | 4 ++-- dlls/msi/tests/package.c | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index a4e6998..a33f19d 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1227,6 +1227,7 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL UINT type; const WCHAR *source, *target, *ptr, *deferred_data = NULL; WCHAR *deformated = NULL; + int len; /* deferred action: [properties]Action */ if ((ptr = strrchrW(action, ']'))) @@ -1326,8 +1327,8 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL if (!source) break; - deformat_string(package,target,&deformated); - rc = msi_set_property( package->db, source, deformated, -1 ); + len = deformat_string( package, target, &deformated ); + rc = msi_set_property( package->db, source, deformated, len ); if (rc == ERROR_SUCCESS && !strcmpW( source, szSourceDir )) msi_reset_folders( package, TRUE ); msi_free(deformated); diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index d91241d..c181037 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -2697,8 +2697,8 @@ static void test_formatrecord_tables(void) memset( buf, 'a', sizeof(buf) ); r = MsiGetProperty( hpkg, "prop", buf, &size ); ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); - todo_wine ok( !memcmp( buf, "\0np", sizeof("\0np") ), "wrong value\n"); - todo_wine ok( size == sizeof("\0np") - 1, "got %u\n", size ); + ok( !memcmp( buf, "\0np", sizeof("\0np") ), "wrong value\n"); + ok( size == sizeof("\0np") - 1, "got %u\n", size ); r = MsiSetProperty( hpkg, "prop", "[~]np" ); ok( r == ERROR_SUCCESS, "cannot set property: %d\n", r); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 85f0d86..4bac512 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2316,11 +2316,11 @@ static void test_property_table(void) memset( buffer, 'a', sizeof(buffer) ); r = MsiGetProperty( hpkg, "prop2", buffer, &sz ); ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); - todo_wine ok( !memcmp( buffer, "\0np", sizeof("\0np") ), "wrong value\n"); - todo_wine ok( sz == sizeof("\0np") - 1, "got %u\n", sz ); + ok( !memcmp( buffer, "\0np", sizeof("\0np") ), "wrong value\n"); + ok( sz == sizeof("\0np") - 1, "got %u\n", sz ); found = find_prop_in_property(hdb, "prop2", "\0np", 3); - todo_wine ok(found == TRUE, "prop2 should be in the _Property table\n"); + ok(found == TRUE, "prop2 should be in the _Property table\n"); MsiCloseHandle(hdb); MsiCloseHandle(hpkg);

1 0

Hans Leidekker : msi: Add a length parameter to msi_strcpy_to_awstring and use it where appropriate .
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 52a87c9054e02faf513ccb8ab625092038f66d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52a87c9054e02faf513ccb8ab… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:16:42 2012 +0100 msi: Add a length parameter to msi_strcpy_to_awstring and use it where appropriate. --- dlls/msi/format.c | 2 +- dlls/msi/install.c | 39 +++++++++++++++++---------------------- dlls/msi/msi.c | 33 ++++++++++++++------------------- dlls/msi/msipriv.h | 2 +- dlls/msi/package.c | 9 ++++----- dlls/msi/registry.c | 7 +++---- 6 files changed, 40 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52a87c9054e02faf513cc…

1 0

Hans Leidekker : msi: Don't create a copy of deferred custom action data.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 2a31a3c05714eadc2c378847817a597429182ad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a31a3c05714eadc2c3788478… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:16:10 2012 +0100 msi: Don't create a copy of deferred custom action data. --- dlls/msi/custom.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index a3c253a..a4e6998 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1225,23 +1225,19 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL UINT rc = ERROR_SUCCESS; MSIRECORD *row; UINT type; - LPCWSTR source, target; - LPWSTR ptr, deferred_data = NULL; - LPWSTR deformated = NULL, action_copy = strdupW(action); + const WCHAR *source, *target, *ptr, *deferred_data = NULL; + WCHAR *deformated = NULL; /* deferred action: [properties]Action */ - if ((ptr = strrchrW(action_copy, ']'))) + if ((ptr = strrchrW(action, ']'))) { - deferred_data = action_copy; + deferred_data = action; action = ptr + 1; } row = MSI_QueryGetRecord( package->db, query, action ); if (!row) - { - msi_free(action_copy); return ERROR_CALL_NOT_IMPLEMENTED; - } type = MSI_RecordGetInteger(row,2); source = MSI_RecordGetString(row,3); @@ -1361,7 +1357,6 @@ end: package->scheduled_action_running = FALSE; package->commit_action_running = FALSE; package->rollback_action_running = FALSE; - msi_free(action_copy); msiobj_release(&row->hdr); return rc; }

1 0

Hans Leidekker : msi: Return length instead of size from deformat_string.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 929d234072e53755ea54ead840b223dbefd75bcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=929d234072e53755ea54ead84… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:15:47 2012 +0100 msi: Return length instead of size from deformat_string. --- dlls/msi/action.c | 4 ++-- dlls/msi/format.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0017de7..ffcc003 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2549,7 +2549,7 @@ static LPSTR parse_value(MSIPACKAGE *package, LPCWSTR value, DWORD *type, DWORD if (!strncmpW(value, szMulti, 3)) ptr = value + 3; - *size = deformat_string(package, ptr,(LPWSTR*)&data); + *size = deformat_string( package, ptr, (LPWSTR *)&data ) * sizeof(WCHAR); /* add double NULL terminator */ if (*type == REG_MULTI_SZ) @@ -4943,7 +4943,7 @@ static UINT msi_publish_install_properties(MSIPACKAGE *package, HKEY hkey) { msi_reg_set_val_dword( hkey, szSystemComponent, 1 ); } - size = deformat_string(package, modpath_fmt, &buffer); + size = deformat_string(package, modpath_fmt, &buffer) * sizeof(WCHAR); RegSetValueExW(hkey, szModifyPath, 0, REG_EXPAND_SZ, (LPBYTE)buffer, size); RegSetValueExW(hkey, szUninstallString, 0, REG_EXPAND_SZ, (LPBYTE)buffer, size); msi_free(buffer); diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 8188f13..08522a0 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -1026,19 +1026,19 @@ DWORD deformat_string( MSIPACKAGE *package, const WCHAR *ptr, WCHAR **data ) { if (ptr) { - DWORD size = 0; + DWORD len = 0; MSIRECORD *rec = MSI_CreateRecord( 1 ); MSI_RecordSetStringW( rec, 0, ptr ); - MSI_FormatRecordW( package, rec, NULL, &size ); + MSI_FormatRecordW( package, rec, NULL, &len ); - size++; - *data = msi_alloc( size * sizeof(WCHAR) ); - if (size > 1) MSI_FormatRecordW( package, rec, *data, &size ); + len++; + *data = msi_alloc( len * sizeof(WCHAR) ); + if (len > 1) MSI_FormatRecordW( package, rec, *data, &len ); else *data[0] = 0; msiobj_release( &rec->hdr ); - return size * sizeof(WCHAR); + return len; } *data = NULL; return 0;

1 0

Hans Leidekker : msi: Add a length parameter to msi_set_property and use it where appropriate.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 0f1d3474a820875268c99c4985cc702d9124abe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f1d3474a820875268c99c498… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:15:21 2012 +0100 msi: Add a length parameter to msi_set_property and use it where appropriate. --- dlls/msi/action.c | 32 ++++---- dlls/msi/appsearch.c | 4 +- dlls/msi/custom.c | 20 ++--- dlls/msi/dialog.c | 4 +- dlls/msi/events.c | 10 +- dlls/msi/install.c | 7 +- dlls/msi/msipriv.h | 2 +- dlls/msi/package.c | 208 +++++++++++++++++++++++++------------------------- dlls/msi/patch.c | 2 +- dlls/msi/upgrade.c | 2 +- 10 files changed, 144 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f1d3474a820875268c99…

1 0

Hans Leidekker : msi: Preserve strings with embedded nulls when copying from a record to the string table .
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: a7ff2818feaa33c84c19105b8a0b01f9a66644a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7ff2818feaa33c84c19105b8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:14:44 2012 +0100 msi: Preserve strings with embedded nulls when copying from a record to the string table. --- dlls/msi/table.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 78c00b1..a7798e5 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1273,10 +1273,11 @@ static UINT get_table_value_from_record( MSITABLEVIEW *tv, MSIRECORD *rec, UINT } else if ( columninfo.type & MSITYPE_STRING ) { - LPCWSTR sval = MSI_RecordGetString( rec, iField ); + int len; + const WCHAR *sval = msi_record_get_string( rec, iField, &len ); if (sval) { - r = msi_string2id(tv->db->strings, sval, -1, pvalue); + r = msi_string2id( tv->db->strings, sval, len, pvalue ); if (r != ERROR_SUCCESS) return ERROR_NOT_FOUND; } @@ -1360,8 +1361,9 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI if ( r != ERROR_SUCCESS ) { - LPCWSTR sval = MSI_RecordGetString( rec, i + 1 ); - val = msi_addstringW( tv->db->strings, sval, -1, 1, + int len; + const WCHAR *sval = msi_record_get_string( rec, i + 1, &len ); + val = msi_addstringW( tv->db->strings, sval, len, 1, persistent ? StringPersistent : StringNonPersistent ); } else @@ -1530,10 +1532,10 @@ static UINT table_validate_new( MSITABLEVIEW *tv, MSIRECORD *rec, UINT *column ) TRACE("skipping binary column\n"); else if ( tv->columns[i].type & MSITYPE_STRING ) { - LPCWSTR str; + int len; + const WCHAR *str = msi_record_get_string( rec, i+1, &len ); - str = MSI_RecordGetString( rec, i+1 ); - if (str == NULL || str[0] == 0) + if (!str || (!str[0] && !len)) { if (column) *column = i; return ERROR_INVALID_DATA; @@ -2383,12 +2385,13 @@ static void dump_record( MSIRECORD *rec ) n = MSI_RecordGetFieldCount( rec ); for( i=1; i<=n; i++ ) { - LPCWSTR sval; + int len; + const WCHAR *sval; if( MSI_RecordIsNull( rec, i ) ) TRACE("row -> []\n"); - else if( (sval = MSI_RecordGetString( rec, i )) ) - TRACE("row -> [%s]\n", debugstr_w(sval)); + else if( (sval = msi_record_get_string( rec, i, &len )) ) + TRACE("row -> [%s]\n", debugstr_wn(sval, len)); else TRACE("row -> [0x%08x]\n", MSI_RecordGetInteger( rec, i ) ); } @@ -2407,7 +2410,6 @@ static void dump_table( const string_table *st, const USHORT *rawdata, UINT raws static UINT* msi_record_to_row( const MSITABLEVIEW *tv, MSIRECORD *rec ) { - LPCWSTR str; UINT i, r, *data; data = msi_alloc( tv->num_cols *sizeof (UINT) ); @@ -2422,10 +2424,11 @@ static UINT* msi_record_to_row( const MSITABLEVIEW *tv, MSIRECORD *rec ) if ( ( tv->columns[i].type & MSITYPE_STRING ) && ! MSITYPE_IS_BINARY(tv->columns[i].type) ) { - str = MSI_RecordGetString( rec, i+1 ); + int len; + const WCHAR *str = msi_record_get_string( rec, i+1, &len ); if (str) { - r = msi_string2id( tv->db->strings, str, -1, &data[i] ); + r = msi_string2id( tv->db->strings, str, len, &data[i] ); /* if there's no matching string in the string table, these keys can't match any record, so fail now. */

1 0

Hans Leidekker : msi: Preserve strings with embedded nulls when copying from the string table to a record .
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 9588deb54c08ac1f9a858f700608476ab331afa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9588deb54c08ac1f9a858f700… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:14:19 2012 +0100 msi: Preserve strings with embedded nulls when copying from the string table to a record. --- dlls/msi/msiquery.c | 7 +++---- dlls/msi/package.c | 2 +- dlls/msi/select.c | 5 +++-- dlls/msi/table.c | 9 +++++---- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 4b826f8..451fddd 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -345,10 +345,9 @@ UINT msi_view_get_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD **rec) if (type & MSITYPE_STRING) { - LPCWSTR sval; - - sval = msi_string_lookup(db->strings, ival, NULL); - MSI_RecordSetStringW(*rec, i, sval); + int len; + const WCHAR *sval = msi_string_lookup( db->strings, ival, &len ); + msi_record_set_string( *rec, i, sval, len ); } else { diff --git a/dlls/msi/package.c b/dlls/msi/package.c index a050b2e..6528b85 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2181,7 +2181,7 @@ UINT msi_get_property( MSIDATABASE *db, LPCWSTR szName, } if (rc == ERROR_SUCCESS) - TRACE("returning %s for property %s\n", debugstr_w(szValueBuf), + TRACE("returning %s for property %s\n", debugstr_wn(szValueBuf, *pchValueBuf), debugstr_w(szName)); else if (rc == ERROR_MORE_DATA) TRACE("need %d sized buffer for %s\n", *pchValueBuf, diff --git a/dlls/msi/select.c b/dlls/msi/select.c index 982cf6a..ada4eed 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -276,8 +276,9 @@ static UINT msi_select_update(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row) } else if (type & MSITYPE_STRING) { - str = MSI_RecordGetString(rec, i + 1); - r = MSI_RecordSetStringW(mod, col, str); + int len; + str = msi_record_get_string( rec, i + 1, &len ); + r = msi_record_set_string( mod, col, str, len ); } else { diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 3276259..78c00b1 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2340,12 +2340,13 @@ static MSIRECORD *msi_get_transform_record( const MSITABLEVIEW *tv, const string } else if( columns[i].type & MSITYPE_STRING ) { - LPCWSTR sval; + int len; + const WCHAR *sval; val = read_raw_int(rawdata, ofs, bytes_per_strref); - sval = msi_string_lookup( st, val, NULL ); - MSI_RecordSetStringW( rec, i+1, sval ); - TRACE(" field %d [%s]\n", i+1, debugstr_w(sval)); + sval = msi_string_lookup( st, val, &len ); + msi_record_set_string( rec, i+1, sval, len ); + TRACE(" field %d [%s]\n", i+1, debugstr_wn(sval, len)); ofs += bytes_per_strref; } else

1 0

Hans Leidekker : msi: Preserve strings with embedded nulls in the record implementation.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 32aed6078680bc322fd8a9f34d2a5fae7a791d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=32aed6078680bc322fd8a9f34… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:13:54 2012 +0100 msi: Preserve strings with embedded nulls in the record implementation. --- dlls/msi/msipriv.h | 1 + dlls/msi/record.c | 73 ++++++++++++++++++++++++++++----------------------- 2 files changed, 41 insertions(+), 33 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 56c9340..897353e 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -823,6 +823,7 @@ extern MSIRECORD *MSI_CloneRecord( MSIRECORD * ) DECLSPEC_HIDDEN; extern BOOL MSI_RecordsAreEqual( MSIRECORD *, MSIRECORD * ) DECLSPEC_HIDDEN; extern BOOL MSI_RecordsAreFieldsEqual(MSIRECORD *a, MSIRECORD *b, UINT field) DECLSPEC_HIDDEN; extern UINT msi_record_set_string(MSIRECORD *, UINT, const WCHAR *, int) DECLSPEC_HIDDEN; +extern const WCHAR *msi_record_get_string(const MSIRECORD *, UINT, int *) DECLSPEC_HIDDEN; /* stream internals */ extern void enum_stream_names( IStorage *stg ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 263ea2c..d42dd81 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -156,6 +156,17 @@ static BOOL string2intW( LPCWSTR str, int *out ) return TRUE; } +static WCHAR *msi_strdupW( const WCHAR *value, int len ) +{ + WCHAR *ret; + + if (!value) return NULL; + if (!(ret = msi_alloc( (len + 1) * sizeof(WCHAR) ))) return NULL; + memcpy( ret, value, len * sizeof(WCHAR) ); + ret[len] = 0; + return ret; +} + UINT MSI_RecordCopyField( MSIRECORD *in_rec, UINT in_n, MSIRECORD *out_rec, UINT out_n ) { @@ -184,11 +195,12 @@ UINT MSI_RecordCopyField( MSIRECORD *in_rec, UINT in_n, out->u.pVal = in->u.pVal; break; case MSIFIELD_WSTR: - str = strdupW( in->u.szwVal ); - if ( !str ) - r = ERROR_OUTOFMEMORY; - else + if ((str = msi_strdupW( in->u.szwVal, in->len ))) + { out->u.szwVal = str; + out->len = in->len; + } + else r = ERROR_OUTOFMEMORY; break; case MSIFIELD_STREAM: IStream_AddRef( in->u.stream ); @@ -202,7 +214,6 @@ UINT MSI_RecordCopyField( MSIRECORD *in_rec, UINT in_n, } msiobj_unlock( &in_rec->hdr ); - return r; } @@ -380,7 +391,7 @@ BOOL WINAPI MsiRecordIsNull( MSIHANDLE handle, UINT iField ) UINT MSI_RecordGetStringA(MSIRECORD *rec, UINT iField, LPSTR szValue, LPDWORD pcchValue) { - UINT len=0, ret; + UINT len = 0, ret = ERROR_SUCCESS; CHAR buffer[16]; TRACE("%p %d %p %p\n", rec, iField, szValue, pcchValue); @@ -394,7 +405,6 @@ UINT MSI_RecordGetStringA(MSIRECORD *rec, UINT iField, return ERROR_SUCCESS; } - ret = ERROR_SUCCESS; switch( rec->fields[iField].type ) { case MSIFIELD_INT: @@ -404,11 +414,11 @@ UINT MSI_RecordGetStringA(MSIRECORD *rec, UINT iField, lstrcpynA(szValue, buffer, *pcchValue); break; case MSIFIELD_WSTR: - len = WideCharToMultiByte( CP_ACP, 0, rec->fields[iField].u.szwVal, -1, - NULL, 0 , NULL, NULL); + len = WideCharToMultiByte( CP_ACP, 0, rec->fields[iField].u.szwVal, + rec->fields[iField].len + 1, NULL, 0 , NULL, NULL ); if (szValue) - WideCharToMultiByte( CP_ACP, 0, rec->fields[iField].u.szwVal, -1, - szValue, *pcchValue, NULL, NULL); + WideCharToMultiByte( CP_ACP, 0, rec->fields[iField].u.szwVal, + rec->fields[iField].len + 1, szValue, *pcchValue, NULL, NULL ); if( szValue && *pcchValue && len>*pcchValue ) szValue[*pcchValue-1] = 0; if( len ) @@ -448,23 +458,30 @@ UINT WINAPI MsiRecordGetStringA(MSIHANDLE handle, UINT iField, return ret; } -const WCHAR *MSI_RecordGetString( const MSIRECORD *rec, UINT iField ) +const WCHAR *msi_record_get_string( const MSIRECORD *rec, UINT field, int *len ) { - if( iField > rec->count ) + if (field > rec->count) return NULL; - if( rec->fields[iField].type != MSIFIELD_WSTR ) + if (rec->fields[field].type != MSIFIELD_WSTR) return NULL; - return rec->fields[iField].u.szwVal; + if (len) *len = rec->fields[field].len; + + return rec->fields[field].u.szwVal; +} + +const WCHAR *MSI_RecordGetString( const MSIRECORD *rec, UINT iField ) +{ + return msi_record_get_string( rec, iField, NULL ); } UINT MSI_RecordGetStringW(MSIRECORD *rec, UINT iField, LPWSTR szValue, LPDWORD pcchValue) { - UINT len=0, ret; + static const WCHAR szFormat[] = {'%','d',0}; + UINT len = 0, ret = ERROR_SUCCESS; WCHAR buffer[16]; - static const WCHAR szFormat[] = { '%','d',0 }; TRACE("%p %d %p %p\n", rec, iField, szValue, pcchValue); @@ -477,7 +494,6 @@ UINT MSI_RecordGetStringW(MSIRECORD *rec, UINT iField, return ERROR_SUCCESS; } - ret = ERROR_SUCCESS; switch( rec->fields[iField].type ) { case MSIFIELD_INT: @@ -487,9 +503,9 @@ UINT MSI_RecordGetStringW(MSIRECORD *rec, UINT iField, lstrcpynW(szValue, buffer, *pcchValue); break; case MSIFIELD_WSTR: - len = lstrlenW( rec->fields[iField].u.szwVal ); + len = rec->fields[iField].len; if (szValue) - lstrcpynW(szValue, rec->fields[iField].u.szwVal, *pcchValue); + memcpy( szValue, rec->fields[iField].u.szwVal, min(len + 1, *pcchValue) * sizeof(WCHAR) ); break; case MSIFIELD_NULL: if( szValue && *pcchValue > 0 ) @@ -548,7 +564,7 @@ static UINT MSI_RecordDataSize(MSIRECORD *rec, UINT iField) case MSIFIELD_INT: return sizeof (INT); case MSIFIELD_WSTR: - return lstrlenW( rec->fields[iField].u.szwVal ); + return rec->fields[iField].len; case MSIFIELD_NULL: break; case MSIFIELD_STREAM: @@ -598,16 +614,6 @@ UINT WINAPI MsiRecordSetStringA( MSIHANDLE handle, UINT iField, LPCSTR szValue ) return ret; } -static WCHAR *msi_strdupW( const WCHAR *value, int len ) -{ - WCHAR *ret; - - if (!(ret = msi_alloc( (len + 1) * sizeof(WCHAR) ))) return NULL; - memcpy( ret, value, len * sizeof(WCHAR) ); - ret[len] = 0; - return ret; -} - UINT msi_record_set_string( MSIRECORD *rec, UINT field, const WCHAR *value, int len ) { if (field > rec->count) @@ -1008,8 +1014,9 @@ BOOL MSI_RecordsAreFieldsEqual(MSIRECORD *a, MSIRECORD *b, UINT field) break; case MSIFIELD_WSTR: - if (strcmpW(a->fields[field].u.szwVal, b->fields[field].u.szwVal)) - return FALSE; + if (a->fields[field].len != b->fields[field].len) return FALSE; + if (memcmp( a->fields[field].u.szwVal, b->fields[field].u.szwVal, + a->fields[field].len * sizeof(WCHAR) )) return FALSE; break; case MSIFIELD_STREAM:

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
96
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 October 2012