3 files changed, 53 insertions, 8 deletions
diff --git a/erts/emulator/drivers/win32/win_efile.c b/erts/emulator/drivers/win32/win_efile.c
index 630d2b4df8..0d3d334154 100644
--- a/erts/emulator/drivers/win32/win_efile.c
+++ b/erts/emulator/drivers/win32/win_efile.c
@@ -59,7 +59,7 @@
 #define EPOCH_TO_FILETIME(ft, epoch) \
     do { \
 	ULARGE_INTEGER ull; \
-	ull.QuadPart = (((epoch) + EPOCH_DIFFERENCE) + TICKS_PER_SECOND); \
+	ull.QuadPart = (((epoch) + EPOCH_DIFFERENCE) * TICKS_PER_SECOND); \
 	(ft).dwLowDateTime = ull.LowPart; \
 	(ft).dwHighDateTime = ull.HighPart; \
     } while(0)
diff --git a/erts/emulator/sys/win32/erl_win_sys.h b/erts/emulator/sys/win32/erl_win_sys.h
index d770691026..4ed0b94e2d 100644
--- a/erts/emulator/sys/win32/erl_win_sys.h
+++ b/erts/emulator/sys/win32/erl_win_sys.h
@@ -117,6 +117,11 @@ int erts_check_io_debug(void);
 #define SYS_CLK_TCK 1000
 #define SYS_CLOCK_RESOLUTION 1
 
+struct tm *sys_localtime_r(time_t *epochs, struct tm *ptm);
+
+#define localtime_r sys_localtime_r
+#define HAVE_LOCALTIME_R 1
+
 typedef struct {
     long tv_sec;
     long tv_usec;
diff --git a/erts/emulator/sys/win32/sys_time.c b/erts/emulator/sys/win32/sys_time.c
index fc868507cb..af903aacfd 100644
--- a/erts/emulator/sys/win32/sys_time.c
+++ b/erts/emulator/sys/win32/sys_time.c
@@ -35,7 +35,24 @@
 /******************* Routines for time measurement *********************/
 
 #define EPOCH_JULIAN_DIFF LL_LITERAL(11644473600)
-
+#define TICKS_PER_SECOND (10000000LL)
+
+#define EPOCH_TO_FILETIME(ft, epoch) \
+    do { \
+	ULARGE_INTEGER ull; \
+	ull.QuadPart = (((epoch) + EPOCH_JULIAN_DIFF) * TICKS_PER_SECOND); \
+	(ft).dwLowDateTime = ull.LowPart; \
+	(ft).dwHighDateTime = ull.HighPart; \
+    } while(0)
+
+#define FILETIME_TO_EPOCH(epoch, ft) \
+    do { \
+	ULARGE_INTEGER ull; \
+	ull.LowPart  = (ft).dwLowDateTime; \
+	ull.HighPart = (ft).dwHighDateTime; \
+	(epoch) = ((ull.QuadPart / TICKS_PER_SECOND) - EPOCH_JULIAN_DIFF); \
+    } while(0)
+ 
 static SysHrTime wrap = 0;
 static DWORD last_tick_count = 0;
 
@@ -45,6 +62,35 @@ sys_init_time(void)
     return 1;
 }
 
+struct tm * sys_localtime_r(time_t *epochs, struct tm *ptm)
+{
+    FILETIME ft,lft;
+    SYSTEMTIME st;
+    
+    if ((((*epochs) + EPOCH_JULIAN_DIFF) * TICKS_PER_SECOND) < 0LL) {
+	return NULL;
+    }
+    
+    EPOCH_TO_FILETIME(ft,*epochs);
+    
+    if (!FileTimeToLocalFileTime(&ft,&lft)) {
+	return NULL;
+    }
+    
+    if (!FileTimeToSystemTime(&lft,&st)) {
+	return NULL;
+    }
+    
+    ptm->tm_year = (int) st.wYear - 1900;
+    ptm->tm_mon  = (int) st.wMonth - 1;
+    ptm->tm_mday = (int) st.wDay;
+    ptm->tm_hour = (int) st.wHour;
+    ptm->tm_min  = (int) st.wMinute;
+    ptm->tm_sec  = (int) st.wSecond;
+
+    return ptm;
+}
+
 void 
 sys_gettimeofday(SysTimeval *tv)
 {
@@ -91,9 +137,3 @@ sys_times(SysTimes *buffer) {
     buffer->tms_stime = (clock_t) (system & LL_LITERAL(0x7FFFFFFF));
     return kernel_ticks;
 }
-
-
-
-
-
-