Dmitry Timoshkov : kernel32: Restore check for StandardDate.wMonth being 0.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Aug 21 15:22:19 CDT 2007


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

Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date:   Tue Aug 21 21:44:50 2007 +0900

kernel32: Restore check for StandardDate.wMonth being 0.

---

 dlls/kernel32/time.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c
index 9aa9c69..eab7635 100644
--- a/dlls/kernel32/time.c
+++ b/dlls/kernel32/time.c
@@ -166,11 +166,12 @@ static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo,
         /* if year is 0 then date is in day-of-week format, otherwise
          * it's absolute date.
          */
-        if (pTZinfo->StandardDate.wYear == 0 &&
+        if (pTZinfo->StandardDate.wMonth == 0 ||
+            (pTZinfo->StandardDate.wYear == 0 &&
             (pTZinfo->StandardDate.wDay<1 ||
             pTZinfo->StandardDate.wDay>5 ||
             pTZinfo->DaylightDate.wDay<1 ||
-            pTZinfo->DaylightDate.wDay>5))
+            pTZinfo->DaylightDate.wDay>5)))
         {
             SetLastError(ERROR_INVALID_PARAMETER);
             return TIME_ZONE_ID_INVALID;




More information about the wine-cvs mailing list