Make the msistring_makehash return something other than just 1 or

0. Also handle the case where the string or stored string is null.

Make the msistring_makehash return something other than just 1 or
8d81d671 · Aric Stewart · Alexandre Julliard · 06e9945f · 8d81d671
Commit 8d81d671 authored Jul 29, 2004 by Aric Stewart Committed by Alexandre Julliard Jul 29, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

string.c dlls/msi/string.c +7 -3

No files found.
--- a/dlls/msi/string.c
+++ b/dlls/msi/string.c
@@ -56,11 +56,14 @@ static int msistring_makehash( const WCHAR *str )
 {
    int hash = 0;

+    if (str==NULL)
+        return hash;
+
    while( *str )
    {
        hash ^= *str++;
        hash *= 53;
-        hash = (hash<<5) || (hash>>27);
+        hash = (hash<<5) | (hash>>27);
    }
    return hash;
 }
@@ -354,8 +357,9 @@ UINT msi_string2idW( string_table *st, LPCWSTR str, UINT *id )
    hash = msistring_makehash( str );
    for( i=0; i<st->maxcount; i++ )
    {
-        if( ( st->strings[i].hash == hash ) &&
-            !strcmpW( st->strings[i].str, str ) )
+        if ( (str == NULL && st->strings[i].str == NULL) || 
+            ( ( st->strings[i].hash == hash ) &&
+            !strcmpW( st->strings[i].str, str ) ))
        {
            r = ERROR_SUCCESS;
            *id = i;