reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-14 17:49:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

msi: Test MsiRecordGetString on an integer record fields with a NULL output buffer.

Browse Source
This commit is contained in:
Mike McCormack 2006-11-21 15:21:27 +09:00 committed by Alexandre Julliard
parent 99129d20a6
commit 8f20756068
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/msi/record.c
View File

@ -273,7 +273,7 @@ UINT MSI_RecordSetInteger( MSIRECORD *rec, unsigned int iField, int iVal )
if( iField > rec->count ) if( iField > rec->count )
return ERROR_INVALID_PARAMETER; return ERROR_INVALID_PARAMETER;
MSI_FreeField( &rec->fields[iField] ); MSI_FreeField( &rec->fields[iField] );
rec->fields[iField].type = MSIFIELD_INT; rec->fields[iField].type = MSIFIELD_INT;
rec->fields[iField].u.iVal = iVal; rec->fields[iField].u.iVal = iVal;
@ -346,7 +346,8 @@ UINT MSI_RecordGetStringA(MSIRECORD *rec, unsigned int iField,
case MSIFIELD_INT: case MSIFIELD_INT:
wsprintfA(buffer, "%d", rec->fields[iField].u.iVal); wsprintfA(buffer, "%d", rec->fields[iField].u.iVal);
len = lstrlenA( buffer ); len = lstrlenA( buffer );
lstrcpynA(szValue, buffer, *pcchValue); if (szValue)
lstrcpynA(szValue, buffer, *pcchValue);
break; break;
case MSIFIELD_WSTR: case MSIFIELD_WSTR:
len = WideCharToMultiByte( CP_ACP, 0, rec->fields[iField].u.szwVal, -1, len = WideCharToMultiByte( CP_ACP, 0, rec->fields[iField].u.szwVal, -1,
@ -421,11 +422,13 @@ UINT MSI_RecordGetStringW(MSIRECORD *rec, unsigned int iField,
case MSIFIELD_INT: case MSIFIELD_INT:
wsprintfW(buffer, szFormat, rec->fields[iField].u.iVal); wsprintfW(buffer, szFormat, rec->fields[iField].u.iVal);
len = lstrlenW( buffer ); len = lstrlenW( buffer );
lstrcpynW(szValue, buffer, *pcchValue); if (szValue)
lstrcpynW(szValue, buffer, *pcchValue);
break; break;
case MSIFIELD_WSTR: case MSIFIELD_WSTR:
len = lstrlenW( rec->fields[iField].u.szwVal ); len = lstrlenW( rec->fields[iField].u.szwVal );
lstrcpynW(szValue, rec->fields[iField].u.szwVal, *pcchValue); if (szValue)
lstrcpynW(szValue, rec->fields[iField].u.szwVal, *pcchValue);
break; break;
case MSIFIELD_NULL: case MSIFIELD_NULL:
len = 1; len = 1;

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

@ -250,6 +250,10 @@ static void test_msirecord(void)
/* same record, try converting integers to strings */ /* same record, try converting integers to strings */
r = MsiRecordSetInteger(h, 0, 32); r = MsiRecordSetInteger(h, 0, 32);
ok(r == ERROR_SUCCESS, "Failed to set integer at 0 to 32\n"); ok(r == ERROR_SUCCESS, "Failed to set integer at 0 to 32\n");
sz = 1;
r = MsiRecordGetString(h, 0, NULL, &sz);
ok(r == ERROR_SUCCESS, "failed to get string from integer\n");
ok(sz == 2, "length wrong\n");
buf[0]=0; buf[0]=0;
sz = sizeof buf; sz = sizeof buf;
r = MsiRecordGetString(h, 0, buf, &sz); r = MsiRecordGetString(h, 0, buf, &sz);
@ -258,10 +262,15 @@ static void test_msirecord(void)
r = MsiRecordSetInteger(h, 0, -32); r = MsiRecordSetInteger(h, 0, -32);
ok(r == ERROR_SUCCESS, "Failed to set integer at 0 to 32\n"); ok(r == ERROR_SUCCESS, "Failed to set integer at 0 to 32\n");
buf[0]=0; buf[0]=0;
sz = 1;
r = MsiRecordGetString(h, 0, NULL, &sz);
ok(r == ERROR_SUCCESS, "failed to get string from integer\n");
ok(sz == 3, "length wrong\n");
sz = sizeof buf; sz = sizeof buf;
r = MsiRecordGetString(h, 0, buf, &sz); r = MsiRecordGetString(h, 0, buf, &sz);
ok(r == ERROR_SUCCESS, "failed to get string from integer\n"); ok(r == ERROR_SUCCESS, "failed to get string from integer\n");
ok(0==strcmp(buf,"-32"), "failed to get string from integer\n"); ok(0==strcmp(buf,"-32"), "failed to get string from integer\n");
buf[0]=0;
/* same record, now try streams */ /* same record, now try streams */
r = MsiRecordSetStream(h, 0, NULL); r = MsiRecordSetStream(h, 0, NULL);