Misc small cleanups.
diff --git a/graphics/psdrv/escape.c b/graphics/psdrv/escape.c
index 829b27f..97a029c 100644
--- a/graphics/psdrv/escape.c
+++ b/graphics/psdrv/escape.c
@@ -25,13 +25,18 @@
RECT16 *r = (RECT16 *)PTR_SEG_TO_LIN(lpOutData);
if(!physDev->job.banding) {
physDev->job.banding = TRUE;
- SetRect16( r, 0, 0, dc->w.devCaps->horzRes,
- dc->w.devCaps->vertRes );
+ r->left = 0;
+ r->top = 0;
+ r->right = dc->w.devCaps->horzRes;
+ r->bottom = dc->w.devCaps->vertRes;
TRACE("NEXTBAND returning %d,%d - %d,%d\n", r->left,
r->top, r->right, r->bottom );
return 1;
}
- SetRect16( r, 0, 0, 0, 0 );
+ r->left = 0;
+ r->top = 0;
+ r->right = 0;
+ r->bottom = 0;
TRACE("NEXTBAND rect to 0,0 - 0,0\n" );
physDev->job.banding = FALSE;
} /* Fall through */
diff --git a/include/dinput.h b/include/dinput.h
index a12a2aa..8d27085 100644
--- a/include/dinput.h
+++ b/include/dinput.h
@@ -402,7 +402,7 @@
#define DIGDD_PEEK 0x00000001
-typedef struct {
+typedef struct DIDEVICEOBJECTDATA {
DWORD dwOfs;
DWORD dwData;
DWORD dwTimeStamp;
diff --git a/include/keyboard.h b/include/keyboard.h
index f6ac7df..189ded2 100644
--- a/include/keyboard.h
+++ b/include/keyboard.h
@@ -7,9 +7,10 @@
#ifndef __WINE_KEYBOARD_H
#define __WINE_KEYBOARD_H
-#include "dinput.h"
#include "windef.h"
+struct DIDEVICEOBJECTDATA;
+
#include "pshpack1.h"
typedef struct _KBINFO
{
@@ -45,7 +46,7 @@
void (*pSetBeepActive)(BOOL);
void (*pBeep)(void);
BOOL (*pGetDIState)(DWORD, LPVOID);
- BOOL (*pGetDIData)(BYTE *, DWORD, LPDIDEVICEOBJECTDATA, LPDWORD, DWORD);
+ BOOL (*pGetDIData)(BYTE *, DWORD, struct DIDEVICEOBJECTDATA *, LPDWORD, DWORD);
void (*pGetKeyboardConfig)(KEYBOARD_CONFIG *);
void (*pSetKeyboardConfig)(KEYBOARD_CONFIG *, DWORD);
} KEYBOARD_DRIVER;
diff --git a/include/ttydrv.h b/include/ttydrv.h
index f172b6b..35a0f1a 100644
--- a/include/ttydrv.h
+++ b/include/ttydrv.h
@@ -16,12 +16,9 @@
#include "windef.h"
#include "wingdi.h"
-#include "dinput.h"
#include "wine/winuser16.h"
#include "wine/wingdi16.h"
-#include "keyboard.h"
-
struct tagBITMAPOBJ;
struct tagCLASS;
struct tagDC;
@@ -31,6 +28,8 @@
struct tagCURSORICONINFO;
struct tagCREATESTRUCTA;
struct tagWINDOWPOS;
+struct tagKEYBOARD_CONFIG;
+struct DIDEVICEOBJECTDATA;
/**************************************************************************
* TTY GDI driver
@@ -119,8 +118,6 @@
extern BOOL TTYDRV_USER_Initialize(void);
extern void TTYDRV_USER_Finalize(void);
-extern void TTYDRV_USER_BeginDebugging(void);
-extern void TTYDRV_USER_EndDebugging(void);
/* TTY clipboard driver */
@@ -171,9 +168,9 @@
extern void TTYDRV_KEYBOARD_SetBeepActive(BOOL bActivate);
extern void TTYDRV_KEYBOARD_Beep(void);
extern BOOL TTYDRV_KEYBOARD_GetDIState(DWORD len, LPVOID ptr);
-extern BOOL TTYDRV_KEYBOARD_GetDIData(BYTE *keystate, DWORD dodsize, LPDIDEVICEOBJECTDATA dod, LPDWORD entries, DWORD flags);
-extern void TTYDRV_KEYBOARD_GetKeyboardConfig(KEYBOARD_CONFIG *cfg);
-extern void TTYDRV_KEYBOARD_SetKeyboardConfig(KEYBOARD_CONFIG *cfg, DWORD mask);
+extern BOOL TTYDRV_KEYBOARD_GetDIData(BYTE *keystate, DWORD dodsize, struct DIDEVICEOBJECTDATA *dod, LPDWORD entries, DWORD flags);
+extern void TTYDRV_KEYBOARD_GetKeyboardConfig(struct tagKEYBOARD_CONFIG *cfg);
+extern void TTYDRV_KEYBOARD_SetKeyboardConfig(struct tagKEYBOARD_CONFIG *cfg, DWORD mask);
/* TTY monitor driver */
diff --git a/include/tweak.h b/include/tweak.h
index 906ac3a..7eab50e 100644
--- a/include/tweak.h
+++ b/include/tweak.h
@@ -20,7 +20,6 @@
int TWEAK_Init(void);
-int TWEAK_CheckConfiguration(void);
extern WINE_LOOK TWEAK_WineLook;
diff --git a/include/user.h b/include/user.h
index d74db21..cc175bb 100644
--- a/include/user.h
+++ b/include/user.h
@@ -32,8 +32,6 @@
typedef struct tagUSER_DRIVER {
BOOL (*pInitialize)(void);
void (*pFinalize)(void);
- void (*pBeginDebugging)(void);
- void (*pEndDebugging)(void);
} USER_DRIVER;
extern USER_DRIVER *USER_Driver;
diff --git a/include/x11drv.h b/include/x11drv.h
index 207747d..5a8aa03 100644
--- a/include/x11drv.h
+++ b/include/x11drv.h
@@ -14,13 +14,10 @@
#include <X11/Xatom.h>
#endif /* !defined(X_DISPLAY_MISSING) */
-#include "dinput.h"
#include "gdi.h"
#include "winbase.h"
#include "windef.h"
-#include "keyboard.h"
-
#include <X11/extensions/XShm.h>
struct tagBITMAPOBJ;
@@ -32,6 +29,8 @@
struct tagPALETTEOBJ;
struct tagWND;
struct tagWINDOWPOS;
+struct tagKEYBOARD_CONFIG;
+struct DIDEVICEOBJECTDATA;
/* X physical pen */
typedef struct
@@ -85,7 +84,6 @@
/* Wine driver X11 functions */
-extern BOOL X11DRV_Init(void);
extern BOOL X11DRV_BitBlt( struct tagDC *dcDst, INT xDst, INT yDst,
INT width, INT height, struct tagDC *dcSrc,
INT xSrc, INT ySrc, DWORD rop );
@@ -323,8 +321,6 @@
extern BOOL X11DRV_USER_Initialize(void);
extern void X11DRV_USER_Finalize(void);
-extern void X11DRV_USER_BeginDebugging(void);
-extern void X11DRV_USER_EndDebugging(void);
/* X11 clipboard driver */
@@ -400,9 +396,9 @@
extern void X11DRV_KEYBOARD_SetBeepActive(BOOL bActivate);
extern void X11DRV_KEYBOARD_Beep(void);
extern BOOL X11DRV_KEYBOARD_GetDIState(DWORD len, LPVOID ptr);
-extern BOOL X11DRV_KEYBOARD_GetDIData(BYTE *keystate, DWORD dodsize, LPDIDEVICEOBJECTDATA dod, LPDWORD entries, DWORD flags);
-extern void X11DRV_KEYBOARD_GetKeyboardConfig(KEYBOARD_CONFIG *cfg);
-extern void X11DRV_KEYBOARD_SetKeyboardConfig(KEYBOARD_CONFIG *cfg, DWORD mask);
+extern BOOL X11DRV_KEYBOARD_GetDIData(BYTE *keystate, DWORD dodsize, struct DIDEVICEOBJECTDATA *dod, LPDWORD entries, DWORD flags);
+extern void X11DRV_KEYBOARD_GetKeyboardConfig(struct tagKEYBOARD_CONFIG *cfg);
+extern void X11DRV_KEYBOARD_SetKeyboardConfig(struct tagKEYBOARD_CONFIG *cfg, DWORD mask);
extern void X11DRV_KEYBOARD_HandleEvent(struct tagWND *pWnd, XKeyEvent *event);
diff --git a/loader/main.c b/loader/main.c
index f525c19..3ee01d4 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -261,9 +261,6 @@
/* Initialize message spying */
if (!SPY_Init()) return FALSE;
- /* Check wine.conf for old/bad entries */
- if (!TWEAK_CheckConfiguration()) return FALSE;
-
/* Create system message queue */
queueSize = GetProfileIntA( "windows", "TypeAhead", 120 );
if (!QUEUE_CreateSysMsgQueue( queueSize )) return FALSE;
diff --git a/misc/tweak.c b/misc/tweak.c
index f6f299a..fc00292 100644
--- a/misc/tweak.c
+++ b/misc/tweak.c
@@ -99,21 +99,3 @@
return 1;
}
-
-
-/******************************************************************************
- *
- * int TWEAK_CheckConfiguration()
- *
- * Examines wine.conf for old/bad entries and recommends changes to the user.
- *
- * Revision history
- * 05-Jul-1997 Dave Cuthbert (dacut@ece.cmu.edu)
- * Original implementation.
- *
- *****************************************************************************/
-
-int TWEAK_CheckConfiguration()
-{
- return 1;
-}
diff --git a/ole/ole2nls.c b/ole/ole2nls.c
index 29fe249..0af57a4 100644
--- a/ole/ole2nls.c
+++ b/ole/ole2nls.c
@@ -32,7 +32,7 @@
struct NLS_localevar {
const int type;
const char *val;
- } locvars[150];
+ } locvars[120];
};
static LPVOID lpNLSInfo = NULL;
@@ -295,8 +295,8 @@
* last entry has NULL name, 0 id.
*/
#define LOCALE_ENTRY(x) {#x,LOCALE_##x}
-static struct tagLOCALE_NAME2ID {
- char *name;
+static const struct tagLOCALE_NAME2ID {
+ const char *name;
DWORD id;
} locale_name2id[]= {
LOCALE_ENTRY(ILANGUAGE),
diff --git a/scheduler/synchro.c b/scheduler/synchro.c
index bd8724b..aa98c07 100644
--- a/scheduler/synchro.c
+++ b/scheduler/synchro.c
@@ -14,7 +14,6 @@
#include "winerror.h"
#include "syslevel.h"
#include "message.h"
-#include "x11drv.h"
#include "server.h"
/***********************************************************************
diff --git a/windows/ttydrv/init.c b/windows/ttydrv/init.c
index 5914887..55f8e64 100644
--- a/windows/ttydrv/init.c
+++ b/windows/ttydrv/init.c
@@ -17,9 +17,7 @@
USER_DRIVER TTYDRV_USER_Driver =
{
TTYDRV_USER_Initialize,
- TTYDRV_USER_Finalize,
- TTYDRV_USER_BeginDebugging,
- TTYDRV_USER_EndDebugging
+ TTYDRV_USER_Finalize
};
CLIPBOARD_DRIVER TTYDRV_CLIPBOARD_Driver =
diff --git a/windows/ttydrv/keyboard.c b/windows/ttydrv/keyboard.c
index 6b078f5..d374ca0 100644
--- a/windows/ttydrv/keyboard.c
+++ b/windows/ttydrv/keyboard.c
@@ -4,6 +4,7 @@
* Copyright 1998 Patrik Stridvall
*/
+#include "dinput.h"
#include "keyboard.h"
#include "ttydrv.h"
diff --git a/windows/ttydrv/main.c b/windows/ttydrv/main.c
index 455e49c..f20283b 100644
--- a/windows/ttydrv/main.c
+++ b/windows/ttydrv/main.c
@@ -38,19 +38,3 @@
void TTYDRV_USER_Finalize(void)
{
}
-
-/**************************************************************************
- * TTYDRV_USER_BeginDebugging
- */
-void TTYDRV_USER_BeginDebugging(void)
-{
-}
-
-/**************************************************************************
- * TTYDRV_USER_EndDebugging
- */
-void TTYDRV_USER_EndDebugging(void)
-{
-}
-
-
diff --git a/windows/x11drv/init.c b/windows/x11drv/init.c
index b215040..0b4870b 100644
--- a/windows/x11drv/init.c
+++ b/windows/x11drv/init.c
@@ -21,9 +21,7 @@
USER_DRIVER X11DRV_USER_Driver =
{
X11DRV_USER_Initialize,
- X11DRV_USER_Finalize,
- X11DRV_USER_BeginDebugging,
- X11DRV_USER_EndDebugging
+ X11DRV_USER_Finalize
};
CLIPBOARD_DRIVER X11DRV_CLIPBOARD_Driver =
diff --git a/windows/x11drv/main.c b/windows/x11drv/main.c
index 6e10dbe..d0be677 100644
--- a/windows/x11drv/main.c
+++ b/windows/x11drv/main.c
@@ -31,8 +31,6 @@
#include "win.h"
#include "windef.h"
#include "x11drv.h"
-#include "xmalloc.h"
-#include "version.h"
/**********************************************************************/
@@ -125,22 +123,6 @@
X11DRV_USER_RestoreSetup();
}
-/**************************************************************************
- * X11DRV_USER_BeginDebugging
- */
-void X11DRV_USER_BeginDebugging(void)
-{
- TSXUngrabServer(display);
- TSXFlush(display);
-}
-
-/**************************************************************************
- * X11DRV_USER_EndDebugging
- */
-void X11DRV_USER_EndDebugging(void)
-{
-}
-
/***********************************************************************
* X11DRV_USER_SaveSetup
*/
