2004-05-15 Filip Navara <xnavara@volny.cz>

	* include/ddk/kbdmou.h: New file.
	* lib/ddk/videoprt.def (VideoPortMapBankedMemory,
	VideoPortMapDmaMemory, VideoPortMapMemory): Correct suffix.
	* lib/ddk/ntoskrnl.def (_snprintf, _snwprintf, _vsnprintf,
	_vsnwprintf, sprintf, swprintf): Export.

4 files changed, 108 insertions, 9 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 19054a2c8..d8e8804c2 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,5 +1,13 @@
 2004-05-15  Filip Navara  <xnavara@volny.cz>
 
+	* include/ddk/kbdmou.h: New file.
+	* lib/ddk/videoprt.def (VideoPortMapBankedMemory,
+	VideoPortMapDmaMemory, VideoPortMapMemory): Correct suffix.
+	* lib/ddk/ntoskrnl.def (_snprintf, _snwprintf, _vsnprintf,
+	_vsnwprintf, sprintf, swprintf): Export.
+
+2004-05-15  Filip Navara  <xnavara@volny.cz>
+
 	* include/ddk/ntddk.h: Don't set 4-byte alignment on included
 	headers.
 
diff --git a/winsup/w32api/include/ddk/kbdmou.h b/winsup/w32api/include/ddk/kbdmou.h
new file mode 100644
index 000000000..da4c37f51
--- /dev/null
+++ b/winsup/w32api/include/ddk/kbdmou.h
@@ -0,0 +1,91 @@
+/*
+ * kbdmou.h
+ *
+ * Structures and definitions for Keyboard/Mouse class and port drivers.
+ *
+ * This file is part of the w32api package.
+ *
+ * Contributors:
+ *   Created by Filip Navara <xnavara@volny.cz>
+ *
+ * THIS SOFTWARE IS NOT COPYRIGHTED
+ *
+ * This source code is offered for use in the public domain. You may
+ * use, modify or distribute it freely.
+ *
+ * This code is distributed in the hope that it will be useful but
+ * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+ * DISCLAIMED. This includes but is not limited to warranties of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ */
+
+#ifndef __KBDMOU_H
+#define __KBDMOU_H
+
+#include <ddk/ntddkbd.h>
+#include <ddk/ntddmou.h>
+
+#define DD_KEYBOARD_PORT_DEVICE_NAME      "\\Device\\KeyboardPort"
+#define DD_KEYBOARD_PORT_DEVICE_NAME_U    L"\\Device\\KeyboardPort"
+#define DD_KEYBOARD_PORT_BASE_NAME_U      L"KeyboardPort"
+#define DD_POINTER_PORT_DEVICE_NAME       "\\Device\\PointerPort"
+#define DD_POINTER_PORT_DEVICE_NAME_U     L"\\Device\\PointerPort"
+#define DD_POINTER_PORT_BASE_NAME_U       L"PointerPort"
+
+#define DD_KEYBOARD_CLASS_BASE_NAME_U     L"KeyboardClass"
+#define DD_POINTER_CLASS_BASE_NAME_U      L"PointerClass"
+
+#define DD_KEYBOARD_RESOURCE_CLASS_NAME_U             L"Keyboard"
+#define DD_POINTER_RESOURCE_CLASS_NAME_U              L"Pointer"
+#define DD_KEYBOARD_MOUSE_COMBO_RESOURCE_CLASS_NAME_U L"Keyboard/Pointer"
+
+#define POINTER_PORTS_MAXIMUM             8
+#define KEYBOARD_PORTS_MAXIMUM            8
+
+#define KBDMOU_COULD_NOT_SEND_COMMAND     0x0000
+#define KBDMOU_COULD_NOT_SEND_PARAM       0x0001
+#define KBDMOU_NO_RESPONSE                0x0002
+#define KBDMOU_INCORRECT_RESPONSE         0x0004
+
+#define I8042_ERROR_VALUE_BASE            1000
+#define INPORT_ERROR_VALUE_BASE           2000
+#define SERIAL_MOUSE_ERROR_VALUE_BASE     3000
+
+#define IOCTL_INTERNAL_KEYBOARD_CONNECT \
+  CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0080, METHOD_NEITHER, FILE_ANY_ACCESS)
+
+#define IOCTL_INTERNAL_KEYBOARD_DISCONNECT \
+  CTL_CODE(FILE_DEVICE_KEYBOARD,0x0100, METHOD_NEITHER, FILE_ANY_ACCESS)
+
+#define IOCTL_INTERNAL_KEYBOARD_ENABLE \
+  CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0200, METHOD_NEITHER, FILE_ANY_ACCESS)
+
+#define IOCTL_INTERNAL_KEYBOARD_DISABLE \
+  CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0400, METHOD_NEITHER, FILE_ANY_ACCESS)
+
+#define IOCTL_INTERNAL_MOUSE_CONNECT \
+  CTL_CODE(FILE_DEVICE_MOUSE, 0x0080, METHOD_NEITHER, FILE_ANY_ACCESS)
+
+#define IOCTL_INTERNAL_MOUSE_DISCONNECT \
+  CTL_CODE(FILE_DEVICE_MOUSE, 0x0100, METHOD_NEITHER, FILE_ANY_ACCESS)
+
+#define IOCTL_INTERNAL_MOUSE_ENABLE \
+  CTL_CODE(FILE_DEVICE_MOUSE, 0x0200, METHOD_NEITHER, FILE_ANY_ACCESS)
+
+#define IOCTL_INTERNAL_MOUSE_DISABLE \
+  CTL_CODE(FILE_DEVICE_MOUSE, 0x0400, METHOD_NEITHER, FILE_ANY_ACCESS)
+
+typedef struct _CONNECT_DATA {
+	PDEVICE_OBJECT  ClassDeviceObject;
+	PVOID  ClassService;
+} CONNECT_DATA, *PCONNECT_DATA;
+
+typedef VOID
+(STDAPICALLTYPE *PSERVICE_CALLBACK_ROUTINE)(
+	IN PVOID NormalContext,
+	IN PVOID SystemArgument1,
+	IN PVOID SystemArgument2,
+	IN OUT PVOID SystemArgument3);
+
+#endif /* __KBDMOU_H */
diff --git a/winsup/w32api/lib/ddk/ntoskrnl.def b/winsup/w32api/lib/ddk/ntoskrnl.def
index e2e8810c3..aeea6984e 100644
--- a/winsup/w32api/lib/ddk/ntoskrnl.def
+++ b/winsup/w32api/lib/ddk/ntoskrnl.def
@@ -1390,8 +1390,8 @@ ZwYieldExecution@0
 ;_itow
 ;_local_unwind2
 ;_purecall
-;_snprintf
-;_snwprintf
+_snprintf
+_snwprintf
 _stricmp
 _strlwr
 _strnicmp
@@ -1399,8 +1399,8 @@ _strnset
 _strrev
 _strset
 _strupr
-;_vsnprintf
-;_vsnwprintf
+_vsnprintf
+_vsnwprintf
 _wcsicmp@8
 _wcslwr@4
 _wcsnicmp@12
@@ -1423,7 +1423,7 @@ memmove
 memset
 ;qsort
 ;rand
-;sprintf
+sprintf
 ;srand
 strcat
 strchr
@@ -1436,7 +1436,7 @@ strncpy
 strrchr
 strspn
 strstr
-;swprintf
+swprintf
 ;tolower
 ;toupper
 ;towlower
diff --git a/winsup/w32api/lib/ddk/videoprt.def b/winsup/w32api/lib/ddk/videoprt.def
index 2082d4caa..a8b9057c6 100644
--- a/winsup/w32api/lib/ddk/videoprt.def
+++ b/winsup/w32api/lib/ddk/videoprt.def
@@ -53,9 +53,9 @@ VideoPortInt10@8
 VideoPortLockBuffer@16
 VideoPortLockPages@20
 VideoPortLogError@16
-VideoPortMapBankedMemory@36
-VideoPortMapDmaMemory@32
-VideoPortMapMemory@20
+VideoPortMapBankedMemory@40
+VideoPortMapDmaMemory@36
+VideoPortMapMemory@24
 VideoPortMoveMemory@12
 VideoPortPutDmaAdapter@8
 VideoPortQueryPerformanceCounter@8