- Merge from trunk

[reactos.git] / dll / win32 / msi / join.c

diff --git a/dll/win32/msi/join.c b/dll/win32/msi/join.c
index f787c30..7fe7f1c 100644 (file)
--- a/dll/win32/msi/join.c
+++ b/dll/win32/msi/join.c
@@ -60,8 +60,6 @@ static UINT JOIN_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *v
     UINT cols = 0;
     UINT prev_rows = 1;
 
-    TRACE("%d, %d\n", row, col);
-
     if (col == 0 || col > jv->columns)
          return ERROR_FUNCTION_FAILED;
 
@@ -225,10 +223,12 @@ static UINT JOIN_get_column_info( struct tagMSIVIEW *view,
 static UINT join_find_row( MSIJOINVIEW *jv, MSIRECORD *rec, UINT *row )
 {
     LPCWSTR str;
-    UINT i, id, data;
+    UINT r, i, id, data;
 
     str = MSI_RecordGetString( rec, 1 );
-    msi_string2idW( jv->db->strings, str, &id );
+    r = msi_string2idW( jv->db->strings, str, &id );
+    if (r != ERROR_SUCCESS)
+        return r;
 
     for (i = 0; i < jv->rows; i++)
     {