diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-10-23 11:25:34 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-06 20:26:29 +0100 |
| commit | 30557984c4dac095c98ba7ba25afa6948d6f9934 (patch) | |
| tree | 4e490c92fbeb44efef0e53fbbe10f938e7822425 /libmsi/string.c | |
| parent | b19defc32740225273c7efa63a784de18cde3dd1 (diff) | |
| download | msitools-30557984c4dac095c98ba7ba25afa6948d6f9934.tar.gz msitools-30557984c4dac095c98ba7ba25afa6948d6f9934.tar.xz msitools-30557984c4dac095c98ba7ba25afa6948d6f9934.zip | |
get rid of the stupid Win32 CHAR type
Diffstat (limited to 'libmsi/string.c')
| -rw-r--r-- | libmsi/string.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmsi/string.c b/libmsi/string.c index 26ce375..875fcee 100644 --- a/libmsi/string.c +++ b/libmsi/string.c @@ -213,7 +213,7 @@ static void set_st_entry( string_table *st, unsigned n, WCHAR *str, uint16_t ref st->freeslot = n + 1; } -static unsigned msi_string2idA( const string_table *st, const CHAR *buffer, unsigned *id ) +static unsigned msi_string2idA( const string_table *st, const char *buffer, unsigned *id ) { unsigned sz; unsigned r = ERROR_INVALID_PARAMETER; @@ -241,7 +241,7 @@ static unsigned msi_string2idA( const string_table *st, const CHAR *buffer, unsi return r; } -static int msi_addstring( string_table *st, unsigned n, const CHAR *data, int len, uint16_t refcount, enum StringPersistence persistence ) +static int msi_addstring( string_table *st, unsigned n, const char *data, int len, uint16_t refcount, enum StringPersistence persistence ) { WCHAR *str; int sz; @@ -357,7 +357,7 @@ const WCHAR *msi_string_lookup_id( const string_table *st, unsigned id ) * * Returned string is not nul terminated. */ -static unsigned msi_id2stringA( const string_table *st, unsigned id, CHAR *buffer, unsigned *sz ) +static unsigned msi_id2stringA( const string_table *st, unsigned id, char *buffer, unsigned *sz ) { unsigned len, lenW; const WCHAR *str; @@ -466,7 +466,7 @@ HRESULT msi_init_string_table( IStorage *stg ) string_table *msi_load_string_table( IStorage *stg, unsigned *bytes_per_strref ) { string_table *st = NULL; - CHAR *data = NULL; + char *data = NULL; uint16_t *pool = NULL; unsigned r, datasize = 0, poolsize = 0, codepage; unsigned i, count, offset, len, n, refs; @@ -553,7 +553,7 @@ unsigned msi_save_string_table( const string_table *st, IStorage *storage, unsig { unsigned i, datasize = 0, poolsize = 0, sz, used, r, codepage, n; unsigned ret = ERROR_FUNCTION_FAILED; - CHAR *data = NULL; + char *data = NULL; uint16_t *pool = NULL; TRACE("\n"); |