Release 970720
Sat Jul 19 13:03:01 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [tools/build.c] [include/stackframe.h]
Save the complete %ebp register in CallFrom16; fixes a crash with
LabView reported by Andreas Mohr.
* [loader/main.c]
Avoid executing a built-in DLL.
* [controls/static.c]
Converted static window procedure to Win32.
* [windows/message.c] [windows/queue.c] [include/queue.h]
Hacked SendMessage functions to support inter-task messages with
SendMessage32A/W.
Sun Jul 13 16:55:35 1997 Bernhard Rosenkraenzer <bero@bero-online.ml.org>
* [ipc/bit_array.c]
Don't use bitops.h in Linux 2.1.x (these versions do not return
the previous state for clear_bit and set_bit)
* [ipc/shm_main_blk.c]
Adapt to GLIBC's ipc_perm structure.
* [memory/ldt.c]
Include <asm/unistd.h> on Linux/GLIBC systems (required for
_syscall3).
Wed Jul 9 23:53:19 1997 David A. Cuthbert <dacut@henry.ece.cmu.edu>
* [include/options.h] [files/profile.c]
Added PROFILE_GetWineIniBool and PROFILE_EnumerateWineIniSection.
* [include/sysmetrics.h] [include/windows.h] [windows/sysmetrics.c]
All sysmetrics moved to array (no more constant macros). Added
MOUSEWHEELPRESENT metric.
* [include/bitmap.h] [objects/oembitmap.c]
Added OBM_Init() (see also loader/main.c) and more support for Win95
bitmaps; added size info to OEM bitmaps.
* [include/graphics.h] [windows/graphics.h]
Added GRAPH_DrawGenericReliefRect.
* [loader/main.c]
Added TWEAK_Init() and TWEAK_CheckConfiguration() calls (the
latter checks for invalid entries in wine.conf).
* [include/debug.h] [include/stddebug.h] [include/nonclient.h]
[include/tweak.h] [controls/menu.c] [misc/tweak.c]
[objects/gdiobj.c] [windows/syscolor.c] [windows/nonclient.c]
[BUGS] [documentation/win95look]
Added tweaks for Windows 95 interface support. See
documentation/win95look for more information.
* [controls/edit.c]
Fixed EDIT_MoveHome bug.
* [misc/ver.c]
Changed name of dprintf_ver_string to ver_dstring to fix
problem with tools/make_debug utility.
Wed Jul 9 21:31:54 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [objects/dib.c]
Don't use palettes with dibs with biBitCount > 8.
* [misc/ole2nls.c][misc/ver.c]
IsValidLocale, EnumSystemLocales fixed (winhlp32.exe works)
Some VerLanguage coded moved to ole2nls.c, some cleanups.
* [multimedia/mcistring.c]
Fixed "capabilities <dev> device type" crash (cool.exe).
* [misc/main.c]
SystemParametersInfo*: added stub option 41
(GETNONCLIENTMETRICS), duplicated some stuff away from SPI16
that writes 32bit vars.(one COMCTL32.DLL crash, freecell.exe)
Tue Jul 8 22:40:53 1997 Morten Welinder <terra@diku.dk>
* [if1632/shell32.spec]
Use Windows 95's ordinals. Help wanted, inquire within.
Mon Jul 7 11:20:36 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [if1632/relay.c] [if1632/user.spec] [if1632/kernel.spec]
[tools/build-spec.txt] [tools/build.c]
Added type 'segstr' (segmented pointer to null-terminated string)
to .spec files.
* [windows/user.c] [if1632/user.spec]
ExitWindowsExec stub function added.
Mon Jul 7 01:18:25 1997 U. Bonnes <bon@elektron.ikp.physik.th-darmstadt.de>
* [files/file.c] [include/winbase.h] [if1632/kernel32.spec]
Implement MoveFileEx32, some enhancement for Movefile32.
Sat Jul 5 18:13:48 1997 Bruce Milner <Bruce.Milner@genetics.utah.edu.
* [files/file.c] [if1632/kernel32.spec] [include/winerror.h]
[msdos/int21.c] [win32/file.c]
Add LockFile/UnlockFile implementation.
Add back in int21 func(0x5c) Record locking functions.
* [files/file.c]
Fixed bug with OF_REOPEN in FILE_DoOpenFile.
Fri Jul 4 12:00:00 1997 Henrik Olsen <Henrik.Olsen@iaeste.dk>
* [misc/ole2nls.c] [programs/progman/Da.rc] [programs/winhelp/Da.rc]
[resources/sysres_Da.rc]
Added/updated Danish language support.
Thu Jul 3 13:04:20 1997 Claus Fischer <fischer@iue.tuwien.ac.at>
* [files/dos_fs.c]
Properly implemented DOSFS_UnixTimeToFileTime and
DOSFS_FileTimeToUnixTime.
* [documentation/wine.texinfo]
First version of texinfo documentation.
diff --git a/files/dos_fs.c b/files/dos_fs.c
index 5bb8b35..014b41e 100644
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -1202,16 +1202,121 @@
*
* Convert a Unix time to FILETIME format.
* The FILETIME structure is a 64-bit value representing the number of
- * 100-nanosecond intervals since January 1, 1601.
- * 'remainder' is the fraction of 100-ns intervals smaller than 1 second
- * that couldn't be stored in the time_t value.
+ * 100-nanosecond intervals since January 1, 1601, 0:00.
+ * 'remainder' is the nonnegative number of 100-ns intervals
+ * corresponding to the time fraction smaller than 1 second that
+ * couldn't be stored in the time_t value.
*/
void DOSFS_UnixTimeToFileTime( time_t unix_time, FILETIME *filetime,
DWORD remainder )
{
- /* FIXME :-) */
- filetime->dwLowDateTime = unix_time;
- filetime->dwHighDateTime = 0;
+ /* NOTES:
+
+ CONSTANTS:
+ The time difference between 1 January 1601, 00:00:00 and
+ 1 January 1970, 00:00:00 is 369 years, plus the leap years
+ from 1604 to 1968, excluding 1700, 1800, 1900.
+ This makes (1968 - 1600) / 4 - 3 = 89 leap days, and a total
+ of 134774 days.
+
+ Any day in that period had 24 * 60 * 60 = 86400 seconds.
+
+ The time difference is 134774 * 86400 * 10000000, which can be written
+ 116444736000000000
+ 27111902 * 2^32 + 3577643008
+ 413 * 2^48 + 45534 * 2^32 + 54590 * 2^16 + 32768
+
+ If you find that these constants are buggy, please change them in all
+ instances in both conversion functions.
+
+ VERSIONS:
+ There are two versions, one of them uses long long variables and
+ is presumably faster but not ISO C. The other one uses standard C
+ data types and operations but relies on the assumption that negative
+ numbers are stored as 2's complement (-1 is 0xffff....). If this
+ assumption is violated, dates before 1970 will not convert correctly.
+ This should however work on any reasonable architecture where WINE
+ will run.
+
+ DETAILS:
+
+ Take care not to remove the casts. I have tested these functions
+ (in both versions) for a lot of numbers. I would be interested in
+ results on other compilers than GCC.
+
+ The operations have been designed to account for the possibility
+ of 64-bit time_t in future UNICES. Even the versions without
+ internal long long numbers will work if time_t only is 64 bit.
+ A 32-bit shift, which was necessary for that operation, turned out
+ not to work correctly in GCC, besides giving the warning. So I
+ used a double 16-bit shift instead. Numbers are in the ISO version
+ represented by three limbs, the most significant with 32 bit, the
+ other two with 16 bit each.
+
+ As the modulo-operator % is not well-defined for negative numbers,
+ negative divisors have been avoided in DOSFS_FileTimeToUnixTime.
+
+ There might be quicker ways to do this in C. Certainly so in
+ assembler.
+
+ Claus Fischer, fischer@iue.tuwien.ac.at
+ */
+
+#if __GNUC__
+# define USE_LONG_LONG 1
+#else
+# define USE_LONG_LONG 0
+#endif
+
+#if USE_LONG_LONG /* gcc supports long long type */
+
+ long long int t = unix_time;
+ t *= 10000000;
+ t += 116444736000000000LL;
+ t += remainder;
+ filetime->dwLowDateTime = (UINT32)t;
+ filetime->dwHighDateTime = (UINT32)(t >> 32);
+
+#else /* ISO version */
+
+ UINT32 a0; /* 16 bit, low bits */
+ UINT32 a1; /* 16 bit, medium bits */
+ UINT32 a2; /* 32 bit, high bits */
+
+ /* Copy the unix time to a2/a1/a0 */
+ a0 = unix_time & 0xffff;
+ a1 = (unix_time >> 16) & 0xffff;
+ /* This is obsolete if unix_time is only 32 bits, but it does not hurt.
+ Do not replace this by >> 32, it gives a compiler warning and it does
+ not work. */
+ a2 = (unix_time >= 0 ? (unix_time >> 16) >> 16 :
+ ~((~unix_time >> 16) >> 16));
+
+ /* Multiply a by 10000000 (a = a2/a1/a0)
+ Split the factor into 10000 * 1000 which are both less than 0xffff. */
+ a0 *= 10000;
+ a1 = a1 * 10000 + (a0 >> 16);
+ a2 = a2 * 10000 + (a1 >> 16);
+ a0 &= 0xffff;
+ a1 &= 0xffff;
+
+ a0 *= 1000;
+ a1 = a1 * 1000 + (a0 >> 16);
+ a2 = a2 * 1000 + (a1 >> 16);
+ a0 &= 0xffff;
+ a1 &= 0xffff;
+
+ /* Add the time difference and the remainder */
+ a0 += 32768 + (remainder & 0xffff);
+ a1 += 54590 + (remainder >> 16 ) + (a0 >> 16);
+ a2 += 27111902 + (a1 >> 16);
+ a0 &= 0xffff;
+ a1 &= 0xffff;
+
+ /* Set filetime */
+ filetime->dwLowDateTime = (a1 << 16) + a0;
+ filetime->dwHighDateTime = a2;
+#endif
}
@@ -1219,13 +1324,95 @@
* DOSFS_FileTimeToUnixTime
*
* Convert a FILETIME format to Unix time.
- * If not NULL, 'remainder' contains the fractional part of the filetime.
+ * If not NULL, 'remainder' contains the fractional part of the filetime,
+ * in the range of [0..9999999] (even if time_t is negative).
*/
time_t DOSFS_FileTimeToUnixTime( const FILETIME *filetime, DWORD *remainder )
{
- /* FIXME :-) */
- if (remainder) *remainder = 0;
- return filetime->dwLowDateTime;
+ /* Read the comment in the function DOSFS_UnixTimeToFileTime. */
+#if USE_LONG_LONG
+
+ long long int t = filetime->dwHighDateTime;
+ t <<= 32;
+ t += (UINT32)filetime->dwLowDateTime;
+ t -= 116444736000000000LL;
+ if (t < 0)
+ {
+ if (remainder) *remainder = 9999999 - (-t - 1) % 10000000;
+ return -1 - ((-t - 1) / 10000000);
+ }
+ else
+ {
+ if (remainder) *remainder = t % 10000000;
+ return t / 10000000;
+ }
+
+#else /* ISO version */
+
+ UINT32 a0; /* 16 bit, low bits */
+ UINT32 a1; /* 16 bit, medium bits */
+ UINT32 a2; /* 32 bit, high bits */
+ UINT32 r; /* remainder of division */
+ unsigned int carry; /* carry bit for subtraction */
+ int negative; /* whether a represents a negative value */
+
+ /* Copy the time values to a2/a1/a0 */
+ a2 = (UINT32)filetime->dwHighDateTime;
+ a1 = ((UINT32)filetime->dwLowDateTime ) >> 16;
+ a0 = ((UINT32)filetime->dwLowDateTime ) & 0xffff;
+
+ /* Subtract the time difference */
+ if (a0 >= 32768 ) a0 -= 32768 , carry = 0;
+ else a0 += (1 << 16) - 32768 , carry = 1;
+
+ if (a1 >= 54590 + carry) a1 -= 54590 + carry, carry = 0;
+ else a1 += (1 << 16) - 54590 - carry, carry = 1;
+
+ a2 -= 27111902 + carry;
+
+ /* If a is negative, replace a by (-1-a) */
+ negative = (a2 >= ((UINT32)1) << 31);
+ if (negative)
+ {
+ /* Set a to -a - 1 (a is a2/a1/a0) */
+ a0 = 0xffff - a0;
+ a1 = 0xffff - a1;
+ a2 = ~a2;
+ }
+
+ /* Divide a by 10000000 (a = a2/a1/a0), put the rest into r.
+ Split the divisor into 10000 * 1000 which are both less than 0xffff. */
+ a1 += (a2 % 10000) << 16;
+ a2 /= 10000;
+ a0 += (a1 % 10000) << 16;
+ a1 /= 10000;
+ r = a0 % 10000;
+ a0 /= 10000;
+
+ a1 += (a2 % 1000) << 16;
+ a2 /= 1000;
+ a0 += (a1 % 1000) << 16;
+ a1 /= 1000;
+ r += (a0 % 1000) * 10000;
+ a0 /= 1000;
+
+ /* If a was negative, replace a by (-1-a) and r by (9999999 - r) */
+ if (negative)
+ {
+ /* Set a to -a - 1 (a is a2/a1/a0) */
+ a0 = 0xffff - a0;
+ a1 = 0xffff - a1;
+ a2 = ~a2;
+
+ r = 9999999 - r;
+ }
+
+ if (remainder) *remainder = r;
+
+ /* Do not replace this by << 32, it gives a compiler warning and it does
+ not work. */
+ return ((((time_t)a2) << 16) << 16) + (a1 << 16) + a0;
+#endif
}
