ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Setting a record to an empty string is the same as making it null.

This commit is contained in:
Aric Stewart 2005-01-31 11:30:59 +00:00 committed by Alexandre Julliard
parent 026b786ee9
commit e495e7e34c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/msi/record.c
View File

@ -455,7 +455,7 @@ UINT MSI_RecordSetStringA( MSIRECORD *rec, unsigned int iField, LPCSTR szValue )
return ERROR_INVALID_FIELD; return ERROR_INVALID_FIELD;
MSI_FreeField( &rec->fields[iField] ); MSI_FreeField( &rec->fields[iField] );
if( szValue ) if( szValue && szValue[0] )
{ {
len = MultiByteToWideChar( CP_ACP, 0, szValue, -1, NULL, 0 ); len = MultiByteToWideChar( CP_ACP, 0, szValue, -1, NULL, 0 );
str = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); str = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) );
@ -501,7 +501,7 @@ UINT MSI_RecordSetStringW( MSIRECORD *rec, unsigned int iField, LPCWSTR szValue
MSI_FreeField( &rec->fields[iField] ); MSI_FreeField( &rec->fields[iField] );
if( szValue ) if( szValue && szValue[0] )
{ {
len = lstrlenW(szValue) + 1; len = lstrlenW(szValue) + 1;
str = HeapAlloc( GetProcessHeap(), 0, len*sizeof (WCHAR)); str = HeapAlloc( GetProcessHeap(), 0, len*sizeof (WCHAR));

4
dlls/msi/tests/record.c
View File

@ -123,6 +123,10 @@ void test_msirecord(void)
ok(r == ERROR_SUCCESS, "Failed to set null string at 0\n"); ok(r == ERROR_SUCCESS, "Failed to set null string at 0\n");
r = MsiRecordIsNull(h, 0); r = MsiRecordIsNull(h, 0);
ok(r == TRUE, "null string not null field\n"); ok(r == TRUE, "null string not null field\n");
r = MsiRecordSetString(h, 0, "");
ok(r == ERROR_SUCCESS, "Failed to set empty string at 0\n");
r = MsiRecordIsNull(h, 0);
ok(r == TRUE, "null string not null field\n");
r = MsiRecordSetString(h,0,str); r = MsiRecordSetString(h,0,str);
ok(r == ERROR_SUCCESS, "Failed to set string at 0\n"); ok(r == ERROR_SUCCESS, "Failed to set string at 0\n");
r = MsiRecordGetInteger(h, 0); r = MsiRecordGetInteger(h, 0);