Kanit Therdsteerasukdi : comctl32: datetime: Return 1 in DTM_SETFORMAT when successful.

[Alexandre Julliard]

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

Author: Kanit Therdsteerasukdi <therdste(a)ucla.edu>
Date:   Thu Mar 15 09:47:48 2007 -0700

comctl32: datetime: Return 1 in DTM_SETFORMAT when successful.

---

 dlls/comctl32/datetime.c       |    2 +-
 dlls/comctl32/tests/datetime.c |   12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c
index 08e0d58..c495666 100644
--- a/dlls/comctl32/datetime.c
+++ b/dlls/comctl32/datetime.c
@@ -279,7 +279,7 @@ DATETIME_SetFormatW (DATETIME_INFO *infoPtr, LPCWSTR lpszFormat)
     DATETIME_UseFormat (infoPtr, lpszFormat);
     InvalidateRect (infoPtr->hwndSelf, NULL, TRUE);
 
-    return infoPtr->nrFields;
+    return 1;
 }
 
 
diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c
index 3751862..a338e7f 100644
--- a/dlls/comctl32/tests/datetime.c
+++ b/dlls/comctl32/tests/datetime.c
@@ -190,14 +190,12 @@ static void test_dtm_set_format(HWND hWndDateTime)
 {
     LRESULT r;
 
-    todo_wine {
-        r = SendMessage(hWndDateTime, DTM_SETFORMAT, 0, (LPARAM)NULL);
-        expect(1, r);
+    r = SendMessage(hWndDateTime, DTM_SETFORMAT, 0, (LPARAM)NULL);
+    expect(1, r);
 
-        r = SendMessage(hWndDateTime, DTM_SETFORMAT, 0,
-            (LPARAM)"'Today is: 'hh':'m':'s dddd MMM dd', 'yyyy");
-        expect(1, r);
-    }
+    r = SendMessage(hWndDateTime, DTM_SETFORMAT, 0,
+		    (LPARAM)"'Today is: 'hh':'m':'s dddd MMM dd', 'yyyy");
+    expect(1, r);
 
     ok_sequence(sequences, DATETIME_SEQ_INDEX, test_dtm_set_format_seq, "test_dtm_set_format", FALSE);
     flush_sequences(sequences, NUM_MSG_SEQUENCES);