Zhiyi Zhang : comctl32/datetime: Fix wrong format for DTS_SHORTDATECENTURYFORMAT.

Alexandre Julliard julliard at winehq.org
Mon Mar 19 18:32:50 CDT 2018


Module: wine
Branch: master
Commit: 46dcf0c7cb35a2d7cb46eae722a9e5d161fc5aee
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=46dcf0c7cb35a2d7cb46eae722a9e5d161fc5aee

Author: Zhiyi Zhang <zzhang at codeweavers.com>
Date:   Mon Mar 19 16:16:24 2018 +0800

comctl32/datetime: Fix wrong format for DTS_SHORTDATECENTURYFORMAT.

DTS_SHORTDATECENTURYFORMAT should use short date format

Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/comctl32/datetime.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c
index 97f8226..aa02357 100644
--- a/dlls/comctl32/datetime.c
+++ b/dlls/comctl32/datetime.c
@@ -322,10 +322,12 @@ DATETIME_SetFormatW (DATETIME_INFO *infoPtr, LPCWSTR format)
     if (!format) {
 	DWORD format_item;
 
-	if (infoPtr->dwStyle & DTS_LONGDATEFORMAT)
-	    format_item = LOCALE_SLONGDATE;
-	else if ((infoPtr->dwStyle & DTS_TIMEFORMAT) == DTS_TIMEFORMAT)
-	    format_item = LOCALE_STIMEFORMAT;
+        if ((infoPtr->dwStyle & DTS_SHORTDATECENTURYFORMAT) == DTS_SHORTDATECENTURYFORMAT)
+            format_item = LOCALE_SSHORTDATE;
+        else if ((infoPtr->dwStyle & DTS_LONGDATEFORMAT) == DTS_LONGDATEFORMAT)
+            format_item = LOCALE_SLONGDATE;
+        else if ((infoPtr->dwStyle & DTS_TIMEFORMAT) == DTS_TIMEFORMAT)
+            format_item = LOCALE_STIMEFORMAT;
         else /* DTS_SHORTDATEFORMAT */
 	    format_item = LOCALE_SSHORTDATE;
 	GetLocaleInfoW(LOCALE_USER_DEFAULT, format_item, format_buf, ARRAY_SIZE(format_buf));




More information about the wine-cvs mailing list