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

msi: Fixed bogus A -> W conversion.

This commit is contained in:
Eric Pouech 2006-11-08 21:47:04 +01:00 committed by Alexandre Julliard
parent 91bb29ca4d
commit f2ee10aed7
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/msi/registry.c
View File

@ -618,13 +618,8 @@ UINT WINAPI MsiDecomposeDescriptorW( LPCWSTR szDescriptor, LPWSTR szProduct,
len = (p - &szDescriptor[20]); len = (p - &szDescriptor[20]);
if( len > MAX_FEATURE_CHARS ) if( len > MAX_FEATURE_CHARS )
return ERROR_INVALID_PARAMETER; return ERROR_INVALID_PARAMETER;
if (szFeature)
{
memcpy( szFeature, &szDescriptor[20], len*sizeof(WCHAR) );
szFeature[len] = 0;
}
TRACE("feature %s\n", debugstr_w( &szDescriptor[20] )); TRACE("feature %s\n", debugstr_wn( &szDescriptor[20], len ));
r = decode_base85_guid( p+1, &component ); r = decode_base85_guid( p+1, &component );
if( !r ) if( !r )
@ -636,6 +631,11 @@ UINT WINAPI MsiDecomposeDescriptorW( LPCWSTR szDescriptor, LPWSTR szProduct,
StringFromGUID2( &product, szProduct, MAX_FEATURE_CHARS+1 ); StringFromGUID2( &product, szProduct, MAX_FEATURE_CHARS+1 );
if (szComponent) if (szComponent)
StringFromGUID2( &component, szComponent, MAX_FEATURE_CHARS+1 ); StringFromGUID2( &component, szComponent, MAX_FEATURE_CHARS+1 );
if (szFeature)
{
memcpy( szFeature, &szDescriptor[20], len*sizeof(WCHAR) );
szFeature[len] = 0;
}
len = ( &p[21] - szDescriptor ); len = ( &p[21] - szDescriptor );
TRACE("length = %d\n", len); TRACE("length = %d\n", len);
@ -669,12 +669,15 @@ UINT WINAPI MsiDecomposeDescriptorA( LPCSTR szDescriptor, LPSTR szProduct,
r = MsiDecomposeDescriptorW( str, p, f, c, pUsed ); r = MsiDecomposeDescriptorW( str, p, f, c, pUsed );
WideCharToMultiByte( CP_ACP, 0, p, MAX_FEATURE_CHARS+1, if (r == ERROR_SUCCESS)
szProduct, MAX_FEATURE_CHARS+1, NULL, NULL ); {
WideCharToMultiByte( CP_ACP, 0, f, MAX_FEATURE_CHARS+1, WideCharToMultiByte( CP_ACP, 0, p, -1,
szFeature, MAX_FEATURE_CHARS+1, NULL, NULL ); szProduct, MAX_FEATURE_CHARS+1, NULL, NULL );
WideCharToMultiByte( CP_ACP, 0, c, MAX_FEATURE_CHARS+1, WideCharToMultiByte( CP_ACP, 0, f, -1,
szComponent, MAX_FEATURE_CHARS+1, NULL, NULL ); szFeature, MAX_FEATURE_CHARS+1, NULL, NULL );
WideCharToMultiByte( CP_ACP, 0, c, -1,
szComponent, MAX_FEATURE_CHARS+1, NULL, NULL );
}
msi_free( str ); msi_free( str );