Release 980614

Sun Jun 15 10:30:35 1998  Andreas Mohr <100.30936@germany.net>

	* [files/dos_fs.c] [files/file.c] [if1632/wprocs.spec]
	  [misc/aspi.c]
	Added support for scanners that need Adaptec's ASPI2DOS.

	* [graphics/env.c] [misc/printerdrv.c] [graphics/win16drv/init.c]
	  [if1632/gdi.spec] [include/gdi.h]
	Enhanced printer support (especially Win95):
	Drv[GS]etPrinterData, [GS]etEnvironment; added AbortProc handling.

	* [misc/tapi32.c] [relay32/tapi32.spec]
	Added some stubs.

	* [configure.in] [graphics/fontengine.c] [include/windows.h]
	  [misc/comm.c] [misc/w32skrnl.c] [misc/win32s16.c]
	Made Wine compile on HP-UX (just for fun ;)

	* [controls/menu.c] [include/windows.h]
	Complete rewrite of EnableMenuItem32.
	Free Agent 32 still doesn't work :(

	* [misc/version.c] [if1632/kernel.spec] [include/winbase.h]
	Implemented GetVersionEx16.

	* [misc/network.c] [if1632/user.spec]
	Fixed arguments of WNetGetPropertyText.

	* [misc/version.c] [relay32/comctl32.spec] [relay32/oleaut32.spec]
	Implemented COMCTL32_DllGetVersion, OaBuildVersion.

	* [win32/file.c]
	Fixed UNC handling of CreateFile32.

Sat Jun 13 22:35:12 1998  Douglas Ridgway  <ridgway@winehq.com>

	* [Makefile.in] [Make.rules.in]
	Added pattern for CVS merge files to 'make clean'

	* [ole/olecli.c] [windows/scroll.c] [windows/grahics.c]
	Add some DC handle unlocking. (When hdc's are always unlocked,
	they can be made moveable.)

	* [documentation/wine.texinfo] 
	Started a Wine Design chapter with discussion of 
	graphics driver model.

Sat Jun 13 11:19:25 1998  David Luyer <luyer@ucs.uwa.edu.au>

	* [misc/main.c] [relay32/relay386.c]
	Added new option -debugmsg +relay=.... or -debugmsg -relay=...

Fri Jun 12 22:56:09 1998  Marcus Meissner <marcus@jet.franken.de>

	* [relay32/snoop.c][relay32/builtin.c][loader/pe_image.c]
	Added inter win32 dll snooping. Use -debugmsg +snoop.
	Number of arguments and string references are autodetected.
	Some small bugfixes in the PE loader.

	* [misc/system.c]
	Disabled SystemTimers. They do not work with the current
	%fs handling in the 32->16 relaycode. (helps labview)

	* [msdos/dpmi.c][msdos/int2f.c][files/drive.c]
	Added a monoton linear increasing memory allocator for DPMI (required
	for LabView, HAFAS, ...)
	mscdex handling in emulated realmode interrupts (for mcicda.drv)
	allocate logical drives only once. (helps Myst)

	* [files/profile.c]
	Handle ^Z as space. Found on CDROMS (helps Myst Installer).

	* [multimedia/mmio.c]
	mmio* partially updated to win32. No funny additions.

	* [windows/driver.c]
	Added win32 driver handling (will be used for win32 multimedia/
	msvideo drivers).

	* [win32/device.c]
	Added device handling (K32OBJ_DEVICE_IOCTL). Implemented 
	VTDAPI.5 (used by win95' WINMM.timeGetTime())

Fri Jun 12 18:01:18 1998 Rein Klazes <rklazes@casema.net>

	* [ole/compobj.c relay32/ole32.spec]
	Add a stub for CoLockObjectExternal32.

	* [objects/clipping.c]
	Fix in IntersectClipRect(), when there is no initial clipping
	region.

	* [graphics/x11drv/graphics.c]
	Corrected several "one-off" errors for the Ellipse, Rectangle
	and RoundRectangle (especially small ones) draw routines. 
	Arc and friends still have to be done.

Fri Jun 12 06:23:19 1998  Matthew Becker <mbecker@glasscity.net>

	* [misc/ntdll.c]
	Fixed some of the parameter counts.

	* [misc/registry.c]
	General cleanup, documentation.
	Standard keys are allowed to be 'closed' and succeed.

	* [misc/shell.c]
	Check for correct return values from Reg* functions.

	* [win32/newfns.c]
	Added stubs for OpenDesktopA, SetThreadDesktop, and
	SetUserObjectInformationA.

Wed Jun 10  20:28:08 1998  James Juran  <jrj120@psu.edu>

	* [debugger/break.c]
	Fixed bug introduced in 980503 that broke the -debug command 
	line option for PE executable files.

	* [configure.in] [include/acconfig.h] [include/debugtools.h]
	  [documentation/debug-msgs]
	Added 'configure' options to compile out debugging messages.
	Use --disable-debug to disable all debugging messages, and
	--disable-trace to just disable TRACE messages.  This results
	in a stripped executable that is 15-20% smaller.  This option
	is very much untested--don't expect it to work.

	* [documentation/debug-msgs] [documentation/debugging]
	Minor updates.

	* [*/*.c]
	Fixed some compile warnings.  This also includes the
	compile_warnings_trivial patch from WineHQ.

Tue Jun 10 22:00:18 1998  Eric Kohl <ekohl@abo.rhein-zeitung.de>

	* [windows/sysmetrics.c][include/sysmetrics.h]
	Fixed some Win95 values.

	* [windows/nonclient.c][include/windows.h]
	Fixed some Win95 drawing bugs.
	Added extended window style flags (WS_EX_xxx).

	* [misc/printdrv.c][relay32/winspool.spec]
	Added stubs for DeletePrinterDriver32A, DeleteMonitor32A
	and DeletePort32A.

	* [windows/mdi.c][include/windows.h][relay32/user32.spec]
	Added stubs for CascadeWindows and TileWindows.

	* [controls/toolbar.c][include/toolbar.h]
	Fixed a few bugs and implemented new features.

	* [misc/shellord.c][relay32/shell32.spec]
	Added stubs for SHELL32_60, SHELL32_61 and SHELL32_184.

	* [controls/comctl32undoc.c][relay32/comctl32.spec]
	New file comctl32undoc.c. Contains undocumented functions
	of COMCTL32.DLL. These functions are needed to run EXPLORER.EXE
	IEXPLORE.EXE and TASKMAN.EXE.

	* [controls/status.c]
	Added text alignment.

Tue Jun  8 22:00:00 1998  Bertho Stultiens <bertho@akhphd.au.dk>

	* [programs/*/Makefile.in]
	Changed the rules to use wrc as resource compiler but
	passing the source through gcc first for macro expansion.

	* [programs/*/*.rc]
	Added #include "windows.h" for the resource compiler in the
	appropriate files.

	* [tools/wrc/wrc.[ch]] [tools/wrc/writeres.c]
	Added commandline option -A for autoregister code.
	Corrected the underscore problem by checking the proper define
	from config.h.

Sun Jun  7 22:09:29 1998  Pascal Cuoq <pcuoq@ens-lyon.fr>

	* [ole/ole2nls.c] [memory/string.c]
	Improved LCMapString32A, and changed CompareString32A,
	lstrcmp, lstrcmpi to use it.

Sat Jun  6 19:00:50 1998  Martin Strömberg <ams@ludd.luth.se>

	* [include/winnt.h]
	Added typedefs for security and tokens.

Sat Jun  6 12:26:31 1998  Morten Welinder  <terra@diku.dk>

	* [objects/text.c]
	Use debugstr_an in DrawText16.

	* [loader/resource.c]
	Use debugres_w in FindResourceEx32W.  Avoid crashing during
	debug when wm is NULL.

	* [if1632/relay.c]
	In RELAY_DebugCallTo16, send output to the right place and
	avoid side effects in macro arguments.

Wed Jun  3 20:56:03 1998  Huw D M Davies <daviesh@abacus.physics.ox.ac.uk>

	* [controls/scroll.c] [windows/nonclient.c]
	Fix several off by one errors in scrollbar painting.

Tue Jun  2 23:58:59 1998  Insomnia (Stea Greene) <insomnia@core.binghamton.edu>

	* [graphics/dsound.c]
	Rewrote mixer code to handle panning and volume for 16->16, 16->8,
	8->16, and 8->8 bit mixes.  Conforms to DirectX's "logarithmic
	hearing scale" as specified in M$VC docs.  Still does not handle
	mixing of different frequencies (I am still working on that). 
	Tested 16->16 extensively with StarCraft.  Other mixing combinations
	untested but should work fine.  Still kind of a work in progress,
	so be warned.

Tue Jun  2 03:31:33 1998  Alexander V. Lukyanov <lav@long.yar.ru>

	* [tools/wrc/utils.c]
	dup_basename: fix to strip directory.

Mon Jun  1 20:00:00 1998  Juergen Schmied <juergen.schmied@metronet.de>

	* [include/windows.h] [objects/cursoricon.c] [relay32/user32.spec]
	Added stubs LoadCursorFromFileW and LoadCursorFromFileA.
diff --git a/win32/Makefile.in b/win32/Makefile.in
index bebf632..39798aa 100644
--- a/win32/Makefile.in
+++ b/win32/Makefile.in
@@ -9,6 +9,7 @@
 	advapi.c \
 	code_page.c \
 	console.c \
+	device.c \
 	error.c \
 	except.c \
 	file.c \
diff --git a/win32/advapi.c b/win32/advapi.c
index 0b39d0a..368642e 100644
--- a/win32/advapi.c
+++ b/win32/advapi.c
@@ -212,6 +212,40 @@
 
 
 /******************************************************************************
+ * GetFileSecurityA [32.45]
+ * Obtains Specified information about the security of a file or directory
+ * The information obtained is constrained by the callers acces rights and
+ * priviliges
+ */
+
+BOOL32 WINAPI GetFileSecurity32A( LPCSTR lpFileName,
+                                SECURITY_INFORMATION RequestedInformation,
+                                LPSECURITY_DESCRIPTOR pSecurityDescriptor,
+                                DWORD nLength,
+                                LPDWORD lpnLengthNeeded)
+{
+  FIXME(advapi, "(%s) : stub\n", debugstr_a(lpFileName));
+  return TRUE;
+}
+
+/******************************************************************************
+ * GetFileSecurityiW [32.46]
+ * Obtains Specified information about the security of a file or directory
+ * The information obtained is constrained by the callers acces rights and
+ * priviliges
+ */
+
+BOOL32 WINAPI GetFileSecurity32W( LPCWSTR lpFileName,
+                                SECURITY_INFORMATION RequestedInformation,
+                                LPSECURITY_DESCRIPTOR pSecurityDescriptor,
+                                DWORD nLength,
+                                LPDWORD lpnLengthNeeded)
+{
+  FIXME(advapi, "(%s) : stub\n", debugstr_w(lpFileName) ); 
+  return TRUE;
+}
+
+/******************************************************************************
  * OpenService32A [ADVAPI32.112]
  */
 HANDLE32 WINAPI OpenService32A( HANDLE32 hSCManager, LPCSTR lpServiceName,
diff --git a/win32/device.c b/win32/device.c
new file mode 100644
index 0000000..528d36a
--- /dev/null
+++ b/win32/device.c
@@ -0,0 +1,105 @@
+/*
+ * Win32 device functions
+ *
+ * Copyright 1998 Marcus Meissner
+ */
+
+#include <errno.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <string.h>
+#include <time.h>
+#include "windows.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "file.h"
+#include "process.h"
+#include "mmsystem.h"
+#include "heap.h"
+#include "debug.h"
+
+void DEVICE_Destroy(K32OBJ *dev);
+const K32OBJ_OPS DEVICE_Ops =
+{
+    NULL,		/* signaled */
+    NULL,		/* satisfied */
+    NULL,		/* add_wait */
+    NULL,		/* remove_wait */
+    NULL,		/* read */
+    NULL,		/* write */
+    DEVICE_Destroy	/* destroy */
+};
+
+/* The device object */
+typedef struct
+{
+    K32OBJ    header;
+    int       mode;
+    char     *devname;
+} DEVICE_OBJECT;
+
+HANDLE32
+DEVICE_Open(LPCSTR filename, DWORD access) {
+	DEVICE_OBJECT	*dev;
+	HANDLE32 handle;
+
+	dev = HeapAlloc( SystemHeap, 0, sizeof(FILE_OBJECT) );
+	if (!dev)
+	    return INVALID_HANDLE_VALUE32;
+	dev->header.type = K32OBJ_DEVICE_IOCTL;
+	dev->header.refcount = 0;
+	dev->mode	= access;
+	dev->devname	= HEAP_strdupA(SystemHeap,0,filename);
+
+	handle = HANDLE_Alloc( PROCESS_Current(), &(dev->header),
+			       FILE_ALL_ACCESS | GENERIC_READ |
+			       GENERIC_WRITE | GENERIC_EXECUTE /*FIXME*/, TRUE );
+	/* If the allocation failed, the object is already destroyed */
+	if (handle == INVALID_HANDLE_VALUE32) dev = NULL;
+	return handle;
+}
+
+void
+DEVICE_Destroy(K32OBJ *dev) {
+	assert(dev->type == K32OBJ_DEVICE_IOCTL);
+}
+
+/****************************************************************************
+ *		DeviceIoControl (KERNEL32.188)
+ */
+BOOL32 WINAPI DeviceIoControl(HANDLE32 hDevice, DWORD dwIoControlCode, 
+			      LPVOID lpvlnBuffer, DWORD cblnBuffer,
+			      LPVOID lpvOutBuffer, DWORD cbOutBuffer,
+			      LPDWORD lpcbBytesReturned,
+			      LPOVERLAPPED lpOverlapped)
+{
+	DEVICE_OBJECT	*dev = (DEVICE_OBJECT *)HANDLE_GetObjPtr(
+		PROCESS_Current(), hDevice, K32OBJ_DEVICE_IOCTL, 0 /*FIXME*/ );
+
+        FIXME(win32, "(%ld,%ld,%p,%ld,%p,%ld,%p,%p), stub\n",
+		hDevice,dwIoControlCode,lpvlnBuffer,cblnBuffer,
+		lpvOutBuffer,cbOutBuffer,lpcbBytesReturned,lpOverlapped
+	);
+	if (!dev)
+		return FALSE;
+	/* FIXME: Set appropriate error */
+	FIXME(win32,"	device %s\n",dev->devname);
+	if (!strcmp(dev->devname,"VTDAPI")) {
+		switch (dwIoControlCode) {
+		case 5:	if (lpvOutBuffer && (cbOutBuffer>=4))
+				*(DWORD*)lpvOutBuffer = timeGetTime();
+			if (lpcbBytesReturned)
+				*lpcbBytesReturned = 4;
+			return TRUE;
+		default:
+			break;
+		}
+	}
+	FIXME(win32,"	(unhandled)\n");
+	return FALSE;
+}
diff --git a/win32/file.c b/win32/file.c
index 49a2d77..cba870f 100644
--- a/win32/file.c
+++ b/win32/file.c
@@ -17,6 +17,7 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "file.h"
+#include "device.h"
 #include "process.h"
 #include "heap.h"
 #include "debug.h"
@@ -115,10 +116,24 @@
     if(template)
         FIXME(file, "template handles not supported.\n");
 
-    /* If the name starts with '\\?' or '\\.', ignore the first 3 chars.
+    /* If the name starts with '\\?\' or '\\.\', ignore the first 4 chars.
      */
-    if(!strncmp(filename, "\\\\?", 3) || !strncmp(filename, "\\\\.", 3))
-        filename += 3;
+    if(!strncmp(filename, "\\\\?\\", 4) || !strncmp(filename, "\\\\.\\", 4))
+    {
+        if (filename[2] == '.')
+        {
+            FIXME(file,"device name? %s\n",filename);
+            /* device? */
+            return DEVICE_Open( filename+4, access_flags | create_flags );
+        }
+        filename += 4;
+	if (!strncmp(filename, "UNC", 3))
+	{
+            FIXME(file, "UNC names not supported.\n");
+            SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+            return HFILE_ERROR32;
+	}	
+    }
 
     /* If the name still starts with '\\', it's a UNC name.
      */
diff --git a/win32/newfns.c b/win32/newfns.c
index 376f4a1..08faf01 100644
--- a/win32/newfns.c
+++ b/win32/newfns.c
@@ -15,6 +15,7 @@
 #include "winerror.h"
 #include "heap.h"
 #include "debug.h"
+#include "debugstr.h"
 
 /****************************************************************************
  *		UTRegister (KERNEL32.697)
@@ -60,6 +61,12 @@
 	return 0xcafebabe;
 }
 
+HANDLE32 WINAPI FindFirstChangeNotification32W(LPCWSTR lpPathName,BOOL32 bWatchSubtree,DWORD dwNotifyFilter) {
+	FIXME(file,"(%s,%d,%08lx): stub\n",
+	      debugstr_w(lpPathName),bWatchSubtree,dwNotifyFilter);
+	return 0xcafebabe;
+}
+
 BOOL32 WINAPI FindNextChangeNotification(HANDLE32 fcnhandle) {
 	FIXME(file,"(%08x): stub!\n",fcnhandle);
 	return FALSE;
@@ -81,22 +88,6 @@
 }
 
 /****************************************************************************
- *		DeviceIoControl (KERNEL32.188)
- */
-BOOL32 WINAPI DeviceIoControl(HANDLE32 hDevice, DWORD dwIoControlCode, 
-			      LPVOID lpvlnBuffer, DWORD cblnBuffer,
-			      LPVOID lpvOutBuffer, DWORD cbOutBuffer,
-			      LPDWORD lpcbBytesReturned,
-			      LPOVERLAPPED lpoPverlapped)
-{
-
-        FIXME(comm, "(...): stub!\n");
-	/* FIXME: Set appropriate error */
-	return FALSE;
-
-}
-
-/****************************************************************************
  *		FlushInstructionCache (KERNEL32.261)
  */
 BOOL32 WINAPI FlushInstructionCache(DWORD x,DWORD y,DWORD z) {
@@ -110,12 +101,12 @@
 HANDLE32 WINAPI CreateNamedPipeA (LPCSTR lpName, DWORD dwOpenMode,
 				  DWORD dwPipeMode, DWORD nMaxInstances,
 				  DWORD nOutBufferSize, DWORD nInBufferSize,
-				  DWORD nDafaultTimeOut,
+				  DWORD nDefaultTimeOut,
 				  LPSECURITY_ATTRIBUTES lpSecurityAttributes)
 {
   FIXME (win32, "(Name=%s, OpenMode=%#08lx, dwPipeMode=%#08lx, MaxInst=%ld, OutBSize=%ld, InBuffSize=%ld, DefTimeOut=%ld, SecAttr=%p): stub\n",
 	 debugstr_a(lpName), dwOpenMode, dwPipeMode, nMaxInstances,
-	 nOutBufferSize, nInBufferSize, nDafaultTimeOut, 
+	 nOutBufferSize, nInBufferSize, nDefaultTimeOut, 
 	 lpSecurityAttributes);
   /* if (nMaxInstances > PIPE_UNLIMITED_INSTANCES) {
     SetLastError (ERROR_INVALID_PARAMETER);
@@ -132,12 +123,12 @@
 HANDLE32 WINAPI CreateNamedPipeW (LPCWSTR lpName, DWORD dwOpenMode,
 				  DWORD dwPipeMode, DWORD nMaxInstances,
 				  DWORD nOutBufferSize, DWORD nInBufferSize,
-				  DWORD nDafaultTimeOut,
+				  DWORD nDefaultTimeOut,
 				  LPSECURITY_ATTRIBUTES lpSecurityAttributes)
 {
   FIXME (win32, "(Name=%s, OpenMode=%#08lx, dwPipeMode=%#08lx, MaxInst=%ld, OutBSize=%ld, InBuffSize=%ld, DefTimeOut=%ld, SecAttr=%p): stub\n",
 	 debugstr_w(lpName), dwOpenMode, dwPipeMode, nMaxInstances,
-	 nOutBufferSize, nInBufferSize, nDafaultTimeOut, 
+	 nOutBufferSize, nInBufferSize, nDefaultTimeOut, 
 	 lpSecurityAttributes);
 
   SetLastError (ERROR_UNKNOWN);
@@ -145,6 +136,21 @@
 }
 
 /***********************************************************************
+ *	CreatePipe (KERNEL32.170)
+ */
+
+BOOL32 WINAPI CreatePipe(PHANDLE hReadPipe,
+                         PHANDLE hWritePipe,
+                         LPSECURITY_ATTRIBUTES lpPipeAttributes,
+                         DWORD nSize)
+{
+  FIXME (win32,"ReadPipe=%p WritePipe=%p SecAttr=%p Size=%ld",
+               hReadPipe,hWritePipe,lpPipeAttributes,nSize);
+  SetLastError(ERROR_UNKNOWN);
+  return FALSE;
+}
+
+/***********************************************************************
  *           GetSystemPowerStatus      (KERNEL32.621)
  */
 BOOL32 WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS sps_ptr)
@@ -299,7 +305,7 @@
  */
 DWORD WINAPI GetThreadDesktop( DWORD dwThreadId )
 {
-    FIXME(win32, "(%ld): stub\n",dwThreadId);
+    FIXME(win32, "(%lx): stub\n",dwThreadId);
     return 1;
 }
 
@@ -363,6 +369,46 @@
 
 
 BOOL32 WINAPI EnumPorts32A(LPSTR name,DWORD level,LPBYTE ports,DWORD bufsize,LPDWORD bufneeded,LPDWORD bufreturned) {
-	FIXME(win32,"(%s,%d,%p,%d,%p,%p), stub!\n",name,level,ports,bufsize,bufneeded,bufreturned);
+	FIXME(win32,"(%s,%ld,%p,%ld,%p,%p), stub!\n",name,level,ports,bufsize,bufneeded,bufreturned);
 	return FALSE;
 }
+
+/******************************************************************************
+ * IsDebuggerPresent [KERNEL32.827]
+ *
+ */
+BOOL32 WINAPI IsDebuggerPresent() {
+	FIXME(win32," ... no debuggers yet, returning FALSE.\n");
+	return FALSE; 
+}
+
+
+/******************************************************************************
+ * OpenDesktop32A [USER32.408]
+ *
+ * NOTES
+ *    Return type should be HDESK
+ */
+HANDLE32 WINAPI OpenDesktop32A( LPCSTR lpszDesktop, DWORD dwFlags, 
+                                BOOL32 fInherit, DWORD dwDesiredAccess )
+{
+    FIXME(win32,"(%s,%lx,%i,%lx): stub\n",debugstr_a(lpszDesktop),dwFlags,
+          fInherit,dwDesiredAccess);
+    return 1;
+}
+
+
+BOOL32 WINAPI SetUserObjectInformation32A( HANDLE32 hObj, int nIndex, 
+                                           LPVOID pvInfo, DWORD nLength )
+{
+    FIXME(win32,"(%x,%d,%p,%lx): stub\n",hObj,nIndex,pvInfo,nLength);
+    return TRUE;
+}
+
+
+BOOL32 WINAPI SetThreadDesktop( HANDLE32 hDesktop )
+{
+    FIXME(win32,"(%x): stub\n",hDesktop);
+    return TRUE;
+}
+
diff --git a/win32/ordinals.c b/win32/ordinals.c
index e0e08f7..481fa08 100644
--- a/win32/ordinals.c
+++ b/win32/ordinals.c
@@ -17,7 +17,7 @@
 #include "debug.h"
 
 static CRITICAL_SECTION Win16Mutex;
-static SEGPTR segWin16Mutex = NULL;
+static SEGPTR segWin16Mutex = (SEGPTR)NULL;
 
 
 /***********************************************
@@ -33,7 +33,7 @@
 /***********************************************
  *           _ConfirmWin16Lock    (KERNEL32.96)
  */
-DWORD _ConfirmWin16Lock(void)
+DWORD WINAPI _ConfirmWin16Lock(void)
 {
     FIXME(win32, "()\n");
     return 1;
@@ -42,7 +42,7 @@
 /***********************************************
  *           _EnterSysLevel    (KERNEL32.97)
  */
-VOID _EnterSysLevel(CRITICAL_SECTION *lock)
+VOID WINAPI _EnterSysLevel(CRITICAL_SECTION *lock)
 {
     FIXME(win32, "(%p)\n", lock);
 }
@@ -50,7 +50,7 @@
 /***********************************************
  *           _EnterSysLevel    (KERNEL32.98)
  */
-VOID _LeaveSysLevel(CRITICAL_SECTION *lock)
+VOID WINAPI _LeaveSysLevel(CRITICAL_SECTION *lock)
 {
     FIXME(win32, "(%p)\n", lock);
 }
@@ -58,7 +58,7 @@
 /***********************************************
  *           ReleaseThunkLock    (KERNEL32.48)
  */
-VOID ReleaseThunkLock(DWORD *mutex_count)
+VOID WINAPI ReleaseThunkLock(DWORD *mutex_count)
 {
     _LeaveSysLevel(&Win16Mutex);
 
@@ -69,7 +69,7 @@
 /***********************************************
  *           RestoreThunkLock    (KERNEL32.49)
  */
-VOID RestoreThunkLock(DWORD mutex_count)
+VOID WINAPI RestoreThunkLock(DWORD mutex_count)
 {
     NtCurrentTeb()->mutex_count = (WORD)mutex_count;
 
diff --git a/win32/time.c b/win32/time.c
index bfa2765..9dc1e4c 100644
--- a/win32/time.c
+++ b/win32/time.c
@@ -146,5 +146,5 @@
  *              GetSystemTimeAsFileTime  (KERNEL32)
  */
 VOID WINAPI GetSystemTimeAsFileTime(LPFILETIME systemtimeAsfiletime) {
-	DOSFS_UnixTimeToFileTime(time(NULL),systemtimeAsfiletime,NULL);
+	DOSFS_UnixTimeToFileTime(time(NULL),systemtimeAsfiletime,0);
 }