James Hawkins : msi: Return ERROR_FUNCTION_FAILED if a matching row is not found.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 26f86c55c92105770bcb43601e50ec3f54f8bee6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=26f86c55c92105770bcb43601e...

Author: James Hawkins 
Date:   Wed Oct 17 22:54:39 2007 -0500

msi: Return ERROR_FUNCTION_FAILED if a matching row is not found.

---

dlls/msi/table.c    |    2 +-
 dlls/msi/tests/db.c |   10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/dlls/msi/table.c b/dlls/msi/table.c
index 692f4a5..a817098 100644
--- a/dlls/msi/table.c
+++ b/dlls/msi/table.c
@@ -1560,7 +1560,7 @@ static UINT msi_table_update(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row)
     if (r != ERROR_SUCCESS)
     {
         ERR("can't find row to modify\n");
-        return ERROR_SUCCESS;
+        return ERROR_FUNCTION_FAILED;
     }

/* the row cannot be changed */
diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c
index 8887954..76d1617 100644
--- a/dlls/msi/tests/db.c
+++ b/dlls/msi/tests/db.c
@@ -841,10 +841,7 @@ static void test_viewmodify(void)
     ok(r == ERROR_SUCCESS, "MsiRecordSetInteger failed\n");

r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec);
-    todo_wine
-    {
-        ok(r == ERROR_FUNCTION_FAILED, "MsiViewModify failed\n");
-    }
+    ok(r == ERROR_FUNCTION_FAILED, "MsiViewModify failed\n");

r = MsiCloseHandle(hrec);
     ok(r == ERROR_SUCCESS, "failed to close record\n");
@@ -892,10 +889,7 @@ static void test_viewmodify(void)
     ok(r == ERROR_SUCCESS, "failed to set string\n");

r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec);
-    todo_wine
-    {
-        ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_FUNCTION_FAILED, got %d\n", r);
-    }
+    ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_FUNCTION_FAILED, got %d\n", r);

r = MsiCloseHandle(hrec);
     ok(r == ERROR_SUCCESS, "failed to close record\n");