[ros-diffs] [akhaldi] 58978: [CRT] * Fix some copy pasta (incorrect checks) in the locale code. By Samuel Serapion. CORE-7176 #resolve

Author: akhaldi
Date: Thu May  9 20:46:54 2013
New Revision: 58978

URL: http://svn.reactos.org/svn/reactos?rev=58978&view=rev
Log:
[CRT]
* Fix some copy pasta (incorrect checks) in the locale code. By Samuel Serapion.
CORE-7176 #resolve

Modified:
    trunk/reactos/lib/sdk/crt/locale/locale.c

Modified: trunk/reactos/lib/sdk/crt/locale/locale.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/locale/locale.…
==============================================================================
--- trunk/reactos/lib/sdk/crt/locale/locale.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/locale/locale.c	[iso-8859-1] Thu May  9 20:46:54 2013
@@ -1207,7 +1207,7 @@
     for(i=0; i<sizeof(time_data)/sizeof(time_data[0]); i++) {
         if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) {
             size += sizeof(cloc_short_date) + sizeof(cloc_short_dateW);
-        }else if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) {
+        }else if(time_data[i]==LOCALE_SLONGDATE && !lcid[MSVCRT_LC_TIME]) {
             size += sizeof(cloc_long_date) + sizeof(cloc_long_dateW);
         }else {
             ret = GetLocaleInfoA(lcid_tmp, time_data[i]
@@ -1240,7 +1240,7 @@
         if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) {
             memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_short_date,
sizeof(cloc_short_date));
             ret += sizeof(cloc_short_date);
-        }else if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) {
+        }else if(time_data[i]==LOCALE_SLONGDATE && !lcid[MSVCRT_LC_TIME]) {
             memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_long_date,
sizeof(cloc_long_date));
             ret += sizeof(cloc_long_date);
         }else if(time_data[i]==LOCALE_STIMEFORMAT && !lcid[MSVCRT_LC_TIME]) {
@@ -1256,11 +1256,10 @@
         if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) {
             memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_short_dateW,
sizeof(cloc_short_dateW));
             ret += sizeof(cloc_short_dateW);
-        }else if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) {
+        }else if(time_data[i]==LOCALE_SLONGDATE && !lcid[MSVCRT_LC_TIME]) {
             memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_long_dateW,
sizeof(cloc_long_dateW));
             ret += sizeof(cloc_long_dateW);
-        }else if(time_data[i]==LOCALE_STIMEFORMAT && !lcid[MSVCRT_LC_TIME]) {
-            memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_timeW,
sizeof(cloc_timeW));
+        }else if(time_data[i]==LOCALE_STIMEFORMAT && !lcid[MSVCRT_LC_TIME]) {    
       memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_timeW,
sizeof(cloc_timeW));
             ret += sizeof(cloc_timeW);
         }else {
             ret += GetLocaleInfoW(lcid_tmp, time_data[i]|LOCALE_NOUSEROVERRIDE,