Changeset 8346 for trunk/src

Timestamp:

Apr 30, 2002, 4:52:04 PM (24 years ago)

Author:

sandervl

Message:

Resync with last X11 licensed Wine

Location:

trunk/src/dinput

Files:

• device.c (added)
• device_private.h (added)
• dinput.cpp (deleted)
• dinput.def (modified) (2 diffs)
• dinput_main.c (added)
• dinput_private.h (added)
• initdinput.cpp (added)
• initterm.cpp (added)
• keyboard.c (added)
• makefile (modified) (3 diffs)
• mouse.c (added)
• oslibinput.cpp (deleted)
• oslibinput.h (deleted)

trunk/src/dinput/dinput.def

@@ -1 @@
-;$Id: dinput.def,v 1.4 2000-12-16 22:53:20 bird Exp $
+;$Id: dinput.def,v 1.5 2002-04-30 14:52:02 sandervl Exp $
 
 ;
@@ -13 +13 @@
 
 EXPORTS
- DirectInputCreateA = _DirectInputCreateA@16        @1
-; DirectInputCreateEx                   @2
-; DirectInputCreateW = _DirectInputCreateW@16       @3
-; DllCanUnloadNow                   @4
-; DllGetClassObject                 @5
-; DllRegisterServer                 @6
-; DllUnregisterServer                   @7
+ DirectInputCreateA  = _DirectInputCreateA@16        @1
+; DirectInputCreateW = _DirectInputCreateW@16       @2
+ DirectInputCreateEx = _DirectInputCreateEx@20       @3
+ DllCanUnloadNow     = _DINPUT_DllCanUnloadNow@0     @4
+ DllGetClassObject   = _DINPUT_DllGetClassObject@12  @5
+ DllRegisterServer   = _DINPUT_DllRegisterServer@0   @6
+ DllUnregisterServer = _DINPUT_DllUnregisterServer@0 @7
 

trunk/src/dinput/makefile

@@ -1 @@
-# $Id: makefile,v 1.10 2001-12-06 10:13:59 sandervl Exp $
+# $Id: makefile,v 1.11 2002-04-30 14:52:03 sandervl Exp $
 
 #
@@ -7 +7 @@
 #
 
+WRC_PREFIX_RESOURCE=1
 
 #
@@ -18 +19 @@
 #
 OBJS = \
-$(OBJDIR)\dinput.obj \
-$(OBJDIR)\oslibinput.obj \
-$(OBJDIR)\dinputrsrc.obj \
-$(DLLENTRY)
+$(OBJDIR)\device.obj \
+$(OBJDIR)\keyboard.obj \
+$(OBJDIR)\mouse.obj \
+$(OBJDIR)\dinput_main.obj \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\initdinput.obj \
+$(OBJDIR)\dinputrsrc.obj