Alexandre Julliard : shell32: Use Win32 functions instead of Unix ones to retrieve the current time.

Alexandre Julliard julliard at winehq.org
Mon Dec 22 10:19:42 CST 2008


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Dec 22 11:45:20 2008 +0100

shell32: Use Win32 functions instead of Unix ones to retrieve the current time.

---

 dlls/shell32/trash.c |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c
index a366f62..568c557 100644
--- a/dlls/shell32/trash.c
+++ b/dlls/shell32/trash.c
@@ -171,8 +171,7 @@ BOOL TRASH_CanTrashFile(LPCWSTR wszPath)
 static BOOL try_create_trashinfo_file(const char *info_dir, const char *file_name,
     const char *original_file_name)
 {
-    struct tm curr_time;
-    time_t curr_time_secs;
+    SYSTEMTIME curr_time;
     char datebuf[200];
     char *path = SHAlloc(strlen(info_dir)+strlen(file_name)+strlen(trashinfo_suffix)+1);
     int writer = -1;
@@ -186,16 +185,11 @@ static BOOL try_create_trashinfo_file(const char *info_dir, const char *file_nam
     write(writer, trashinfo_header, strlen(trashinfo_header));
     if (!XDG_WriteDesktopStringEntry(writer, "Path", XDG_URLENCODE, original_file_name))
         goto error;
-    
-    time(&curr_time_secs);
-    localtime_r(&curr_time_secs, &curr_time);
+
+    GetLocalTime( &curr_time );
     wnsprintfA(datebuf, 200, "%04d-%02d-%02dT%02d:%02d:%02d",
-        curr_time.tm_year+1900,
-        curr_time.tm_mon+1,
-        curr_time.tm_mday,
-        curr_time.tm_hour,
-        curr_time.tm_min,
-        curr_time.tm_sec);
+               curr_time.wYear, curr_time.wMonth, curr_time.wDay,
+               curr_time.wHour, curr_time.wMinute, curr_time.wSecond);
     if (!XDG_WriteDesktopStringEntry(writer, "DeletionDate", 0, datebuf))
         goto error;
     close(writer);




More information about the wine-cvs mailing list