Ticket #471: dateTimeFix.patch

source/appModules/_default.py

@@ -93 +93 @@
 
         def script_dateTime(self,keyPress):
                 if scriptHandler.getLastScriptRepeatCount()==0:
-                        text=winKernel.GetTimeFormat(winKernel.getThreadLocale(), winKernel.TIME_NOSECONDS, None, None)
+                        text=winKernel.GetTimeFormat(winKernel.LOCALE_USER_DEFAULT, winKernel.TIME_NOSECONDS, None, None)
                 else:
-                        text=winKernel.GetDateFormat(winKernel.getThreadLocale(), winKernel.DATE_LONGDATE, None, None)
+                        text=winKernel.GetDateFormat(winKernel.LOCALE_USER_DEFAULT, winKernel.DATE_LONGDATE, None, None)
                 ui.message(text)
         script_dateTime.__doc__=_("If pressed once, reports the current time. If pressed twice, reports the current date")
 

source/winKernel.py

@@ -70 +70 @@
 
 def GetSystemPowerStatus(sps):
         return kernel32.GetSystemPowerStatus(ctypes.byref(sps))
+
 def getThreadLocale():
         return kernel32.GetThreadLocale()
 
 def GetDateFormat(Locale,dwFlags,lpDate,lpFormat):
-        buf=ctypes.create_unicode_buffer("", 32)
-        kernel32.GetDateFormatW(Locale, dwFlags, lpDate, lpFormat, buf, ctypes.sizeof(buf))
+        bufferLength=kernel32.GetDateFormatW(Locale, dwFlags, lpDate, lpFormat, None, 0)
+        buf=ctypes.create_unicode_buffer("", bufferLength)
+        kernel32.GetDateFormatW(Locale, dwFlags, lpDate, lpFormat, buf, bufferLength)
         return buf.value
 
 def GetTimeFormat(Locale,dwFlags,lpTime,lpFormat):
-        buf=ctypes.create_unicode_buffer("", 32)
-        kernel32.GetTimeFormatW(Locale,dwFlags,lpTime,lpFormat, buf, ctypes.sizeof(buf))
+        bufferLength=kernel32.GetTimeFormatW(Locale,dwFlags,lpTime,lpFormat, None, 0)
+        buf=ctypes.create_unicode_buffer("", bufferLength)
+        kernel32.GetTimeFormatW(Locale,dwFlags,lpTime,lpFormat, buf, bufferLength)
         return buf.value
 
 def openProcess(*args):