October 2012 - Wine-Commits

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

Oct. 29, 2012

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

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

Oct. 29, 2012

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

Nikolay Sivov : dwrite: Support itemization up to codepoint 0x2ff ( Latin range).
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: df2c73a195e0af2896e41f23baf4ac82581bb623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df2c73a195e0af2896e41f23b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 29 11:15:43 2012 -0400 dwrite: Support itemization up to codepoint 0x2ff (Latin range). --- dlls/dwrite/analyzer.c | 9 +++++++++ dlls/dwrite/tests/analyzer.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 6fa8354..3e22f84 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -29,6 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); enum scriptcode { Script_Arabic = 0, + Script_C1Controls = 12, Script_Latin = 38, Script_Latin_Symb = 77, Script_Unknown = (UINT16)-1 @@ -54,6 +55,14 @@ static const struct script_range script_ranges[] = { { Script_Latin, 0x61, 0x7a }, /* ASCII punctuation and symbols, control char DEL: U+007B–U+007F */ { Script_Latin_Symb, 0x7b, 0x7f }, + /* C1 Controls: U+0080–U+009F */ + { Script_C1Controls, 0x80, 0x9f }, + /* Latin-1 Supplement: U+00A0–U+00FF */ + /* Latin Extended-A: U+0100–U+017F */ + /* Latin Extended-B: U+0180–U+024F */ + /* IPA Extensions: U+0250–U+02AF */ + /* Spacing Modifier Letters: U+02B0–U+02FF */ + { Script_Latin, 0xa0, 0x2ff }, /* Arabic: U+0600–U+06FF */ { Script_Arabic, 0x600, 0x6ef }, /* unsuppoted range */ diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 70b3703..d68cbcd 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -398,6 +398,7 @@ struct sa_test { enum scriptcode { Script_Arabic = 0, + Script_C1Controls = 12, Script_Latin = 38, Script_Latin_Symb = 77 }; @@ -433,7 +434,7 @@ static struct sa_test sa_tests[] = { { /* Arabic, Latin */ {'1','2','3','-','5','2',0x064a,0x064f,0x0633,0x0627,0x0648,0x0650,0x064a,'7','1','.',0}, 1, - { { 0, 16, { 0, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + { { 0, 16, { Script_Arabic, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, { /* Arabic, English */ @@ -456,6 +457,33 @@ static struct sa_test sa_tests[] = { { 7, 4, { Script_Arabic, DWRITE_SCRIPT_SHAPES_DEFAULT } }, } }, + { + /* C1 Controls, Latin-1 Supplement */ + {0x80,0x90,0x9f,0xa0,0xc0,0xb8,0xbf,0xc0,0xff,0}, 2, + { { 0, 3, { Script_C1Controls, DWRITE_SCRIPT_SHAPES_DEFAULT } }, + { 3, 6, { Script_Latin, DWRITE_SCRIPT_SHAPES_DEFAULT } }, + } + }, + { + /* Latin Extended-A */ + {0x100,0x120,0x130,0x140,0x150,0x160,0x170,0x17f,0}, 1, + { { 0, 8, { Script_Latin, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Latin Extended-B */ + {0x180,0x190,0x1bf,0x1c0,0x1c3,0x1c4,0x1cc,0x1dc,0x1ff,0x217,0x21b,0x24f,0}, 1, + { { 0, 12, { Script_Latin, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* IPA Extensions */ + {0x250,0x260,0x270,0x290,0x2af,0}, 1, + { { 0, 5, { Script_Latin, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Spacing Modifier Letters */ + {0x2b0,0x2ba,0x2d7,0x2dd,0x2ef,0x2ff,0}, 1, + { { 0, 6, { Script_Latin, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, /* keep this as end marker */ { {0} } };

1 0

Nikolay Sivov : dwrite: Added a stub for IDWriteTextAnalyzer.
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

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

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

Oct. 29, 2012

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: Pass string length to msi_set_property in ACTION_CustomAction.
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

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: Don't create a copy of deferred custom action data.
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

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: Store string length in the record structure.
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: 9aa23c6c77766558093df4e28e6070ccfdea236b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa23c6c77766558093df4e28… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:13:12 2012 +0100 msi: Store string length in the record structure. --- dlls/msi/msipriv.h | 2 ++ dlls/msi/record.c | 39 +++++++++++++++++++++++++++------------ 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 4757da4..56c9340 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -118,6 +118,7 @@ typedef struct tagMSIFIELD LPWSTR szwVal; IStream *stream; } u; + int len; } MSIFIELD; typedef struct tagMSIRECORD @@ -821,6 +822,7 @@ extern UINT MSI_RecordCopyField( MSIRECORD *, UINT, MSIRECORD *, UINT ) DECLSPEC 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; /* stream internals */ extern void enum_stream_names( IStorage *stg ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 1dace78..3bf1ee5 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -616,32 +616,47 @@ UINT WINAPI MsiRecordSetStringA( MSIHANDLE handle, UINT iField, LPCSTR szValue ) return ret; } -UINT MSI_RecordSetStringW( MSIRECORD *rec, UINT iField, LPCWSTR szValue ) +static WCHAR *msi_strdupW( const WCHAR *value, int len ) { - LPWSTR str; + WCHAR *ret; - TRACE("%p %d %s\n", rec, iField, debugstr_w(szValue)); + if (!(ret = msi_alloc( (len + 1) * sizeof(WCHAR) ))) return NULL; + memcpy( ret, value, len * sizeof(WCHAR) ); + ret[len] = 0; + return ret; +} - if( iField > rec->count ) +UINT msi_record_set_string( MSIRECORD *rec, UINT field, const WCHAR *value, int len ) +{ + if (field > rec->count) return ERROR_INVALID_FIELD; - MSI_FreeField( &rec->fields[iField] ); + MSI_FreeField( &rec->fields[field] ); - if( szValue && szValue[0] ) + if (value && len < 0) len = strlenW( value ); + + if (value && len) { - str = strdupW( szValue ); - rec->fields[iField].type = MSIFIELD_WSTR; - rec->fields[iField].u.szwVal = str; + rec->fields[field].type = MSIFIELD_WSTR; + rec->fields[field].u.szwVal = msi_strdupW( value, len ); + rec->fields[field].len = len; } else { - rec->fields[iField].type = MSIFIELD_NULL; - rec->fields[iField].u.szwVal = NULL; + rec->fields[field].type = MSIFIELD_NULL; + rec->fields[field].u.szwVal = NULL; + rec->fields[field].len = 0; } - return 0; } +UINT MSI_RecordSetStringW( MSIRECORD *rec, UINT iField, LPCWSTR szValue ) +{ + TRACE("%p %d %s\n", rec, iField, debugstr_w(szValue)); + + return msi_record_set_string( rec, iField, szValue, -1 ); +} + UINT WINAPI MsiRecordSetStringW( MSIHANDLE handle, UINT iField, LPCWSTR szValue ) { MSIRECORD *rec;

1 0

Maarten Lankhorst : ws2_32: Define IP_UNICAST_IF if not found on linux.
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: 7ce6a2dfd434d8c61d5bd1525a555c19706ac5a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ce6a2dfd434d8c61d5bd1525… Author: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> Date: Sat Oct 27 12:39:59 2012 +0200 ws2_32: Define IP_UNICAST_IF if not found on linux. --- dlls/ws2_32/socket.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 792ab1c..5c69d21 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -157,6 +157,9 @@ # include "wsnwlink.h" #endif +#if defined(linux) && !defined(IP_UNICAST_IF) +#define IP_UNICAST_IF 50 +#endif #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) # define sipx_network sipx_addr.x_net

1 0

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

Oct. 29, 2012

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