Release 980301
Sun Mar 1 10:45:23 1998 Andreas Mohr <100.30936@germany.net>
* [loader/ne_image.c]
Fixed problem with weird DLLs (NE_FFLAGS_SINGLEDATA && DGROUP = 0).
* [msdos/dosmem.c]
Export address for __0000H, too.
* [msdos/dpmi.c]
Changed MemAlloc functions to return less fragmented addresses.
Sat Feb 28 18:50:12 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [scheduler/process.c] [scheduler/sysdeps.c]
Don't use %fs register before threading initialization.
Sat Feb 28 14:04:56 1998 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [configure.in] [include/acconfig.h]
Autoconf macro to check for non-reentrant X libraries.
* [windows/winpos.c]
In SetWindowPos32(), do not cause WM_SIZE messages when the
SWP_NOSIZE flag is specified. This fixes the division-by-zero in
Borland C++ 4.0 "Open Project" menu item.
Sat Feb 28 13:11:26 1998 James Moody <013263m@dragon.acadiau.ca>
* [ole/ole2nls.c]
Changed "English" values from German to English.
* [files/dos_fs.c]
Fixed off-by-one month bug.
Fri Feb 27 22:12:01 1998 Douglas Ridgway <ridgway@winehq.com>
* [windows/win.c]
Fix winelib class menu loading bug.
* [include/module.h] [loader/module.c]
LoadModule32 should be implemented in terms of CreateProcess.
* [programs/view/*]
Metafile viewer sample program.
* [documentation/wine.texinfo] [documentation/Makefile.in]
Improvements and additions, HTML target.
Fri Feb 27 04:27:48 1998 Dimitrie O. Paun <dimi@cs.toronto.edu>
* [*/*]
Switched to the new debug messages interface. For more information
please refer to documentation/debug-msgs. Because the new scheme
introduces a new semantic level, I had to manually do through
about 530 dprintf_xxx! The rest of about 2400 where transformed
via a script. Because of the large number of changes that I had
to do, some may have not come out as nicely as I wanted them. If
this is the case, please let me know. There is a lot of work left
to do: -- a few hundred printf's to be converted -- about 2300
fprintf's to be converted -- about 600 FIXME's to be transformed
The problem is that in the above mentioned cases, a lot of manual
intervention is required because a lot of the information is
missing. There are also a lot of other things to be done to the
interface and so forth. I have now ideas for a at least a month
worth of full time work :) I will proceed with many changes in the
next few releases, so please do not start modifing things because
there will be a hell of a lot of conflicts. If you have ideas that
you want to integrate or you want to work on different things,
please coordinate with me.
Thu Feb 26 13:04:29 1998 David Lee Lambert <lamber45@egr.msu.edu>
* [ole/ole2nls.c] [include/windows.h]
First try at OLE date- and time-formatting functions.
Wed Feb 25 11:20:35 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [files/*.c]
Changed dos device handling, added 'CON' devicehandling.
* [graphics/ddraw.c]
Bug fixes, some additions.
* [if1632/builtin.c][loader/module.c][library/winestub.c]
Small hack so we don't need a dummy BUILTIN_LoadModule
in winestub.c.
* [ole/*][relay32/ole32.spec][if1632/storage.spec]
storage.dll started. winword loads documents (saving
doesn't work yet, dunno why).
Several ole additions, some cleanups and bugfixes.
IMalloc16 implemented.
* [loader/pe_image.c]
Added some comments, fixed circular dll references,
fixed modref ordering, fixed tls allocation.
* [memory/global.c]
Added validity checks before every GET_ARENA_PTR.
(several functions rely on Global* return values
on invalid handles, like IsTask).
Implemented GlobalUnlockFree16.
* [memory/virtual.c]
Replaced dprintf_virtual by fprintf, so we can
do 'info map' again in the debugger. Increase read
linesize for Linux2.1 cases.
* [misc/cpu.c][misc/registry.c]
Moved cpu registry initialization to misc/cpu.c.
* [multimedia/dsound.c]
Enhanced, replaced GETOSPACE bufferingcheck by SETFRAGMENT.
* [relay32/crtdll.spec][relay32/ntdll.spec]
Replaced some ptr by respective 'str' and 'wstr' arguments
for libc functions.
* [scheduler/thread.c]
Added some sanity checks to stackallocation, tlshandling fixed.
* [tools/build.c]
Fixed cdecl argumenttype order (was reversed).
* [win32/ordinals.c]
Implemented KERNEL_449.
* [windows/dinput.c]
Some fixes, needs much more work. Tomb Raider2 works with keyboard ;)
Tue Feb 24 20:46:37 1998 James Juran <jrj120@psu.edu>
* [windows/win.c]
Fixed USER32 ordinal numbers in documentation.
Sat Feb 21 12:30:38 1998 John Richardson <jrichard@zko.dec.com>
* [files/file.c] [include/k32obj.h] [memory/virtual.c]
[scheduler/critsection.c] [scheduler/event.c] [scheduler/handle.c]
[scheduler/k32obj.c] [scheduler/mutex.c] [scheduler/process.c]
[scheduler/semaphore.c] [scheduler/thread.c]
Added generic k32obj read and write routines for k32objs that
support I/O.
* [documentation/console]
Updated console docs.
* [win32/console.c]
Make console work like a k32obj that supports I/O.
* [include/windows.h]
Make WriteFile and ReadFile take HANDLE32 for handle.
Sun Feb 15 14:07:07 1998 Dimitrie O. Paun <dimi@mail.cs.toronto.edu>
* [controls/menu.c] [misc/ver.c] [multimedia/dsound.c]
[multimedia/joystick.c] [windows/dialog.c]
Modified some dprintf_xxx's to prepare them for a new
dprintf_ scheme. Basically, I changed the dprintf's that
outputed a line with many dprintf calls to do just one
dprintf call.
diff --git a/windows/dinput.c b/windows/dinput.c
index 5f510cd..101435f 100644
--- a/windows/dinput.c
+++ b/windows/dinput.c
@@ -5,9 +5,13 @@
/* Status:
*
* - Tomb Raider 2 Demo:
- * Doesn't accept input yet. Although I am sure I've done everything right...
+ * Playable using keyboard only.
* - WingCommander Prophecy Demo:
- * dito.
+ * Doesn't get Input Focus.
+ *
+ * FIXME: The keyboard handling needs to (and will) be merged into keyboard.c
+ * (The current implementation is currently only a proof of concept and
+ * an utter mess.)
*/
#include "config.h"
@@ -28,9 +32,11 @@
#include "heap.h"
#include "win.h"
#include "dinput.h"
-#include "stddebug.h"
#include "debug.h"
+extern BYTE InputKeyStateTable[256];
+extern BYTE vkey2scode[512];
+
static IDirectInputA_VTable ddiavt;
static IDirectInputDeviceA_VTable SysKeyboardAvt;
static IDirectInputDeviceA_VTable SysMouseAvt;
@@ -73,13 +79,14 @@
) {
char xbuf[50];
- StringFromCLSID(rguid,xbuf);
+ WINE_StringFromCLSID(rguid,xbuf);
fprintf(stderr,"IDirectInputA(%p)->CreateDevice(%s,%p,%p),stub!\n",this,xbuf,pdev,punk);
if (!memcmp(&GUID_SysKeyboard,rguid,sizeof(GUID_SysKeyboard))) {
- *pdev = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDirectInputDevice32A));
+ *pdev = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(SysKeyboard32A));
(*pdev)->ref = 1;
(*pdev)->lpvtbl = &SysKeyboardAvt;
memcpy(&((*pdev)->guid),rguid,sizeof(*rguid));
+ memset(((LPSYSKEYBOARD32A)(*pdev))->keystate,0,256);
return 0;
}
if (!memcmp(&GUID_SysMouse,rguid,sizeof(GUID_SysMouse))) {
@@ -97,7 +104,7 @@
) {
char xbuf[50];
- StringFromCLSID(riid,xbuf);
+ WINE_StringFromCLSID(riid,xbuf);
fprintf(stderr,"IDirectInputA(%p)->QueryInterface(%s,%p)\n",this,xbuf,ppobj);
if (!memcmp(&IID_IUnknown,riid,sizeof(*riid))) {
this->lpvtbl->fnAddRef(this);
@@ -112,6 +119,12 @@
return E_FAIL;
}
+static HRESULT WINAPI IDirectInputA_Initialize(
+ LPDIRECTINPUT32A this,HINSTANCE32 hinst,DWORD x
+) {
+ return DIERR_ALREADYINITIALIZED;
+}
+
static IDirectInputA_VTable ddiavt= {
IDirectInputA_QueryInterface,
IDirectInputA_AddRef,
@@ -120,7 +133,7 @@
IDirectInputA_EnumDevices,
(void*)6,
(void*)7,
- (void*)8
+ IDirectInputA_Initialize
};
/******************************************************************************
@@ -143,7 +156,7 @@
char xbuf[50];
if (df->rgodf[i].pguid)
- StringFromCLSID(df->rgodf[i].pguid,xbuf);
+ WINE_StringFromCLSID(df->rgodf[i].pguid,xbuf);
else
strcpy(xbuf,"<no guid>");
fprintf(stderr,"df.rgodf[%d].guid %s\n",i,xbuf);
@@ -168,10 +181,23 @@
char xbuf[50];
if (HIWORD(rguid))
- StringFromCLSID(rguid,xbuf);
+ WINE_StringFromCLSID(rguid,xbuf);
else
- strcpy(xbuf,"<no guid>");
+ sprintf(xbuf,"<special guid %ld>",(DWORD)rguid);
fprintf(stderr,"IDirectInputDeviceA(%p)->SetProperty(%s,%p)\n",this,xbuf,ph);
+ if (!HIWORD(rguid)) {
+ switch ((DWORD)rguid) {
+ case DIPROP_BUFFERSIZE: {
+ LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph;
+
+ fprintf(stderr," buffersize = %ld\n",pd->dwData);
+ break;
+ }
+ default:
+ fprintf(stderr," unknown type %ld\n",(DWORD)rguid);
+ break;
+ }
+ }
return 0;
}
@@ -183,15 +209,14 @@
}
static HRESULT WINAPI IDirectInputDeviceA_GetDeviceData(
- LPDIRECTINPUTDEVICE32A this,DWORD x,LPDIDEVICEOBJECTDATA dod,
- LPDWORD y,DWORD z
+ LPDIRECTINPUTDEVICE32A this,DWORD dodsize,LPDIDEVICEOBJECTDATA dod,
+ LPDWORD entries,DWORD flags
) {
-/*
- fprintf(stderr,"IDirectInputDeviceA(%p)->GetDeviceData(0x%08lx,%p,%p,0x%08lx)\n",this,x,dod,y,z);
- */
+/* fprintf(stderr,"IDirectInputDeviceA(%p)->GetDeviceData(%ld,%p,%p(0x%08lx),0x%08lx)\n",this,dodsize,dod,entries,*entries,flags);*/
return 0;
}
+
static HRESULT WINAPI IDirectInputDeviceA_Acquire(LPDIRECTINPUTDEVICE32A this) {
fprintf(stderr,"IDirectInputDeviceA(%p)->Aquire()\n",this);
return 0;
@@ -210,29 +235,100 @@
return 0;
}
+static HRESULT WINAPI SysKeyboardA_SetProperty(
+ LPDIRECTINPUTDEVICE32A this,REFGUID rguid,LPCDIPROPHEADER ph
+) {
+ LPSYSKEYBOARD32A kthis = (LPSYSKEYBOARD32A)this;
+ char xbuf[50];
-extern BYTE InputKeyStateTable[256];
-extern BYTE vkey2scode[512];
+ if (HIWORD(rguid))
+ WINE_StringFromCLSID(rguid,xbuf);
+ else
+ sprintf(xbuf,"<special guid %ld>",(DWORD)rguid);
+ fprintf(stderr,"SysKeyboardA(%p)->SetProperty(%s,%p)\n",this,xbuf,ph);
+ fprintf(stderr," size is %ld, headersize is %ld,obj is %ld,how is %ld\n",ph->dwSize,ph->dwHeaderSize,ph->dwObj,ph->dwHow);
+ if (!HIWORD(rguid)) {
+ switch ((DWORD)rguid) {
+ case DIPROP_BUFFERSIZE: {
+ LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph;
+
+ fprintf(stderr," buffersize = %ld\n",pd->dwData);
+ break;
+ }
+ default:
+ fprintf(stderr," unknown type %ld\n",(DWORD)rguid);
+ break;
+ }
+ }
+ return 0;
+}
+
+static HRESULT WINAPI SysKeyboardA_GetDeviceState(
+ LPDIRECTINPUTDEVICE32A this,DWORD len,LPVOID ptr
+) {
+ if (len==256) {
+ int i;
+
+ memset(ptr,0,256);
+ for (i=0;i<256;i++)
+ if (InputKeyStateTable[i]&0x80) {
+ ((LPBYTE)ptr)[vkey2scode[i] ]=0x80;
+ ((LPBYTE)ptr)[vkey2scode[i]|0x80]=0x80;
+ }
+ return 0;
+ }
+ fprintf(stderr,"whoops, SysKeyboardA_GetDeviceState got len %ld?\n",len);
+ return 0;
+}
+
+static HRESULT WINAPI SysKeyboardA_GetDeviceData(
+ LPDIRECTINPUTDEVICE32A this,DWORD dodsize,LPDIDEVICEOBJECTDATA dod,
+ LPDWORD entries,DWORD flags
+) {
+ int i,n,xentries;
+ LPSYSKEYBOARD32A kthis = (LPSYSKEYBOARD32A)this;
+
+/* fprintf(stderr,"SysKeyboardA(%p)->GetDeviceData(%ld,%p,%p(%ld),0x%08lx)\n",this,dodsize,dod,entries,entries?*entries:0,flags);*/
+ if (entries)
+ xentries = *entries;
+ else
+ xentries = 1;
+
+ for (n=i=0;(i<256) && (n<*entries);i++) {
+ if (kthis->keystate[i] == (InputKeyStateTable[i]&0x80))
+ continue;
+ if (dod) {
+ /* add an entry */
+ dod[n].dwOfs = vkey2scode[i];
+ dod[n].dwData = InputKeyStateTable[i]&0x80;
+ dod[n].dwTimeStamp = 0; /* umm */
+ dod[n].dwSequence = 0; /* umm */
+ n++;
+ }
+ if (!(flags & DIGDD_PEEK))
+ kthis->keystate[i] = InputKeyStateTable[i]&0x80;
+ }
+ *entries = n;
+ return 0;
+}
+
+static HRESULT WINAPI SysKeyboardA_Acquire(LPDIRECTINPUTDEVICE32A this) {
+ fprintf(stderr,"SysKeyboardA(%p)->Aquire()\n",this);
+ return 0;
+}
+
+static HRESULT WINAPI SysKeyboardA_Unacquire(LPDIRECTINPUTDEVICE32A this) {
+ fprintf(stderr,"SysKeyboardA(%p)->Unaquire()\n",this);
+ return 0;
+}
+
static HRESULT WINAPI IDirectInputDeviceA_GetDeviceState(
LPDIRECTINPUTDEVICE32A this,DWORD len,LPVOID ptr
) {
-/*
fprintf(stderr,"IDirectInputDeviceA(%p)->GetDeviceState(0x%08lx,%p)\n",
this,len,ptr
);
- */
- if (len==256) {/* && this_is_a_keyboard */
- int i;
-
- memset(ptr,0,256);
- for (i=0;i<256;i++) {
- if (InputKeyStateTable[i]&0x80)
- fprintf(stderr,"VKEY %d pressed (DIK 0x%02x\n",i,vkey2scode[i]);
- ((LPBYTE)ptr)[i]=vkey2scode[InputKeyStateTable[i]]&0x80;
- }
- return 0;
- }
return 0;
}
@@ -241,7 +337,7 @@
) {
char xbuf[50];
- StringFromCLSID(riid,xbuf);
+ WINE_StringFromCLSID(riid,xbuf);
fprintf(stderr,"IDirectInputA(%p)->QueryInterface(%s,%p)\n",this,xbuf,ppobj);
if (!memcmp(&IID_IUnknown,riid,sizeof(*riid))) {
this->lpvtbl->fnAddRef(this);
@@ -263,11 +359,11 @@
(void*)4,
(void*)5,
(void*)6,
- IDirectInputDeviceA_SetProperty,
- IDirectInputDeviceA_Acquire,
- IDirectInputDeviceA_Unacquire,
- IDirectInputDeviceA_GetDeviceState,
- IDirectInputDeviceA_GetDeviceData,
+ SysKeyboardA_SetProperty,
+ SysKeyboardA_Acquire,
+ SysKeyboardA_Unacquire,
+ SysKeyboardA_GetDeviceState,
+ SysKeyboardA_GetDeviceData,
IDirectInputDeviceA_SetDataFormat,
IDirectInputDeviceA_SetEventNotification,
IDirectInputDeviceA_SetCooperativeLevel,
