Nikolay Sivov : comctl32/datetime: Use MCM_GETRANGE result directly in DTM_GETRANGE.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 617528893a4148483975c33743189d34eb36098a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=617528893a4148483975c33743...

Author: Nikolay Sivov 
Date:   Mon Mar 14 20:19:26 2016 +0300

comctl32/datetime: Use MCM_GETRANGE result directly in DTM_GETRANGE.

Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard 
(cherry picked from commit a62d17874423a13eb7a39edf71b9fcd549b85e4a)
Signed-off-by: Michael Stefaniuc

---

dlls/comctl32/datetime.c       | 4 +---
 dlls/comctl32/tests/datetime.c | 7 +++++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c
index 5c73a90..83db50e 100644
--- a/dlls/comctl32/datetime.c
+++ b/dlls/comctl32/datetime.c
@@ -1555,7 +1555,6 @@ static LRESULT WINAPI
 DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     DATETIME_INFO *infoPtr = ((DATETIME_INFO *)GetWindowLongPtrW (hwnd, 0));
-    LRESULT ret;

TRACE ("%x, %lx, %lx\n", uMsg, wParam, lParam);

@@ -1571,8 +1570,7 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
    return DATETIME_SetSystemTime (infoPtr, wParam, (SYSTEMTIME *) lParam);

case DTM_GETRANGE:
-	ret = SendMessageW (infoPtr->hMonthCal, MCM_GETRANGE, wParam, lParam);
-	return ret ? ret : 1; /* bug emulation */
+	return SendMessageW (infoPtr->hMonthCal, MCM_GETRANGE, wParam, lParam);

case DTM_SETRANGE:
    return SendMessageW (infoPtr->hMonthCal, MCM_SETRANGE, wParam, lParam);
diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c
index 195c719..3701750 100644
--- a/dlls/comctl32/tests/datetime.c
+++ b/dlls/comctl32/tests/datetime.c
@@ -406,6 +406,13 @@ static void test_dtm_set_and_get_range(void)

ok_sequence(sequences, DATETIME_SEQ_INDEX, test_dtm_set_and_get_range_seq, "test_dtm_set_and_get_range", FALSE);

+    /* DTM_SETRANGE with 0 flags */
+    r = SendMessageA(hWnd, DTM_SETRANGE, 0, (LPARAM)st);
+    ok(r, "got %lu\n", r);
+    r = SendMessageA(hWnd, DTM_GETRANGE, 0, (LPARAM)getSt);
+    ok(r == 0, "got %lu\n", r);
+    ok(getSt[0].wYear == 0 && getSt[1].wYear == 0, "got %u, %u\n", getSt[0].wYear, getSt[1].wYear);
+
     DestroyWindow(hWnd);
 }