1 files changed, 21 insertions, 13 deletions
diff --git a/msgpack/unpack.h b/msgpack/unpack.h
index debdf71..868b96e 100644
--- a/msgpack/unpack.h
+++ b/msgpack/unpack.h
@@ -341,7 +341,26 @@ static int unpack_callback_ext(unpack_user* u, const char* base, const char* pos
         else if (u->timestamp == 0) {  // Timestamp
             py = PyObject_CallFunction(u->timestamp_t, "(Lk)", ts.tv_sec, ts.tv_nsec);
         }
-        else { // float or datetime
+        else if (u->timestamp == 3) {  // datetime
+            // Calculate datetime using epoch + delta 
+            // due to limitations PyDateTime_FromTimestamp on Windows with negative timestamps
+            PyObject *epoch = PyDateTimeAPI->DateTime_FromDateAndTime(1970, 1, 1, 0, 0, 0, 0, u->utc, PyDateTimeAPI->DateTimeType);
+            if (epoch == NULL) {
+                return -1;
+            }
+
+            PyObject* d = PyDelta_FromDSU(0, ts.tv_sec, ts.tv_nsec / 1000);
+            if (d == NULL) {
+                Py_DECREF(epoch);
+                return -1;
+            }
+
+            py = PyNumber_Add(epoch, d);
+            
+            Py_DECREF(epoch);
+            Py_DECREF(d);
+        }
+        else { // float
             PyObject *a = PyFloat_FromDouble((double)ts.tv_nsec);
             if (a == NULL) return -1;
 
@@ -358,18 +377,7 @@ static int unpack_callback_ext(unpack_user* u, const char* base, const char* pos
             a = PyNumber_Add(b, c);
             Py_DECREF(b);
             Py_DECREF(c);
-
-            if (u->timestamp == 3) {  // datetime
-                PyObject *t = PyTuple_Pack(2, a, u->utc);
-                Py_DECREF(a);
-                if (t == NULL) {
-                    return -1;
-                }
-                py = PyDateTime_FromTimestamp(t);
-                Py_DECREF(t);
-            } else { // float
-                py = a;
-            }
+            py = a;
         }
     } else {
         py = PyObject_CallFunction(u->ext_hook, "(iy#)", (int)typecode, pos, (Py_ssize_t)length-1);