From fed00cb82e03a7ecb52f683a69bfbb48dd8bc413 Mon Sep 17 00:00:00 2001 From: Kanit Therdsteerasukdi Date: Thu, 15 Mar 2007 09:47:48 -0700 Subject: [PATCH] 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 08e0d5814c9..c4956665baf 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 375186293f6..a338e7f3991 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);