Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sync to Wine-20050211

Browse source 
Carlos Lozano <clozano@andago.com>
- Fix regression in Fallout game.
Remi Assailly <remi.assailly@free.fr>
- char -> const char fixes.
Robert Reif <reif@earthlink.net>
- Copy data structures one at a time using supplied size.

svn path=/trunk/; revision=13515
This commit is contained in:
Gé van Geldorp 2005-02-12 21:07:16 +00:00
parent b0c3deb666
commit a8037e241c
4 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/lib/dinput/device.c
View file

@ -316,7 +316,7 @@ DataFormat *create_DataFormat(const DIDATAFORMAT *wine_format, LPCDIDATAFORMAT a
* instance id. * instance id.
*/ */
((asked_format->rgodf[j].dwType & 0x00FFFF00) == DIDFT_ANYINSTANCE) || ((asked_format->rgodf[j].dwType & 0x00FFFF00) == DIDFT_ANYINSTANCE) ||
(DIDFT_GETINSTANCE(wine_format->rgodf[i].dwType) == DIDFT_GETINSTANCE(asked_format->rgodf[j].dwType)))) { (wine_format->rgodf[i].dwType & asked_format->rgodf[j].dwType))) {
done[j] = 1; done[j] = 1;

2
reactos/lib/dinput/dinput_main.c
View file

@ -198,7 +198,7 @@ HRESULT WINAPI DirectInputCreateW(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPU
return 0; return 0;
} }
static char *_dump_DIDEVTYPE_value(DWORD dwDevType) { static const char *_dump_DIDEVTYPE_value(DWORD dwDevType) {
switch (dwDevType) { switch (dwDevType) {
case 0: return "All devices"; case 0: return "All devices";
case DIDEVTYPE_MOUSE: return "DIDEVTYPE_MOUSE"; case DIDEVTYPE_MOUSE: return "DIDEVTYPE_MOUSE";

14
reactos/lib/dinput/joystick_linux.c
View file

@ -304,7 +304,7 @@ static HRESULT setup_dinput_options(JoystickImpl * device)
int tokens = 0; int tokens = 0;
int axis = 0; int axis = 0;
int pov = 0; int pov = 0;
char *delim = ","; const char *delim = ",";
char * ptr; char * ptr;
TRACE("\"%s\" = \"%s\"\n", device->name, buffer); TRACE("\"%s\" = \"%s\"\n", device->name, buffer);
@ -1062,18 +1062,14 @@ static HRESULT WINAPI JoystickAImpl_GetDeviceData(
*entries = 0; *entries = 0;
nqtail = This->queue_tail; nqtail = This->queue_tail;
while (len) { while (len) {
DWORD span = ((This->queue_head < nqtail) ? This->queue_len : This->queue_head) - nqtail;
if (span > len)
span = len;
/* Copy the buffered data into the application queue */ /* Copy the buffered data into the application queue */
memcpy(dod + *entries, This->data_queue + nqtail, span * dodsize); memcpy((char *)dod + *entries * dodsize, This->data_queue + nqtail, dodsize);
/* Advance position */ /* Advance position */
nqtail += span; nqtail++;
if (nqtail >= This->queue_len) if (nqtail >= This->queue_len)
nqtail -= This->queue_len; nqtail -= This->queue_len;
*entries += span; (*entries)++;
len -= span; len--;
} }
} }

15
reactos/lib/dinput/mouse.c
View file

@ -951,18 +951,15 @@ getmousesvalue(iface);
*entries = 0; *entries = 0;
nqtail = This->queue_tail; nqtail = This->queue_tail;
while (len) { while (len) {
DWORD span = ((This->queue_head < nqtail) ? This->queue_len : This->queue_head) - nqtail;
if (span > len)
span = len;
/* Copy the buffered data into the application queue */ /* Copy the buffered data into the application queue */
memcpy(dod + *entries, This->data_queue + nqtail, span * dodsize); memcpy((char *)dod + *entries * dodsize, This->data_queue + nqtail, dodsize);
/* Advance position */ /* Advance position */
nqtail += span; nqtail++;
if (nqtail >= This->queue_len) nqtail -= This->queue_len; if (nqtail >= This->queue_len)
*entries += span; nqtail -= This->queue_len;
len -= span; (*entries)++;
len--;
} }
} }
if (!(flags & DIGDD_PEEK)) if (!(flags & DIGDD_PEEK))