msi: Remove an extraneous safety check and simplify deformat_string().

739152ce · Gerald Pfeifer · Alexandre Julliard · e169bb0a · 739152ce
Commit 739152ce authored Jan 01, 2008 by Gerald Pfeifer Committed by Alexandre Julliard Jan 02, 2008
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

helpers.c dlls/msi/helpers.c +2 -4

No files found.
--- a/dlls/msi/helpers.c
+++ b/dlls/msi/helpers.c
@@ -368,19 +368,17 @@ DWORD deformat_string(MSIPACKAGE *package, LPCWSTR ptr, WCHAR** data )

        MSI_RecordSetStringW(rec,0,ptr);
        MSI_FormatRecordW(package,rec,NULL,&size);
-        if (size >= 0)
-        {
+
        size++;
        *data = msi_alloc(size*sizeof(WCHAR));
        if (size > 1)
            MSI_FormatRecordW(package,rec,*data,&size);
        else
            *data[0] = 0;
+
        msiobj_release( &rec->hdr );
        return sizeof(WCHAR)*size;
    }
-        msiobj_release( &rec->hdr );
-    }

    *data = NULL;
    return 0;