Skip to content

W
wine-cw
Commit 9b59da0d authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Misc small cleanups.

parent 62f824f7
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 91 deletions
graphics/psdrv/escape.c
View file @ 9b59da0d
......@@ -25,13 +25,18 @@ INT PSDRV_Escape( DC *dc, INT nEscape, INT cbInput,
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 */
......
include/dinput.h
View file @ 9b59da0d
......@@ -402,7 +402,7 @@ typedef BOOL (CALLBACK * LPDIENUMCREATEDEFFECTOBJECTSCALLBACK)(LPDIRECTINPUTEFFE
#define DIGDD_PEEK 0x00000001
typedef struct {
typedef struct DIDEVICEOBJECTDATA {
DWORD dwOfs;
DWORD dwData;
DWORD dwTimeStamp;
......
include/keyboard.h
View file @ 9b59da0d
......@@ -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 @@ typedef struct tagKEYBOARD_DRIVER {
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;
......
include/ttydrv.h
View file @ 9b59da0d
......@@ -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 tagWND;
struct tagCURSORICONINFO;
struct tagCREATESTRUCTA;
struct tagWINDOWPOS;
struct tagKEYBOARD_CONFIG;
struct DIDEVICEOBJECTDATA;
/**************************************************************************
* TTY GDI driver
......@@ -119,8 +118,6 @@ extern struct tagUSER_DRIVER TTYDRV_USER_Driver;
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 BOOL TTYDRV_KEYBOARD_GetBeepActive(void);
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 */
......
include/tweak.h
View file @ 9b59da0d
......@@ -20,7 +20,6 @@ typedef enum
int TWEAK_Init(void);
int TWEAK_CheckConfiguration(void);
extern WINE_LOOK TWEAK_WineLook;
......
include/user.h
View file @ 9b59da0d
......@@ -32,8 +32,6 @@ extern WORD USER_HeapSel;
typedef struct tagUSER_DRIVER {
BOOL (*pInitialize)(void);
void (*pFinalize)(void);
void (*pBeginDebugging)(void);
void (*pEndDebugging)(void);
} USER_DRIVER;
extern USER_DRIVER *USER_Driver;
......
include/x11drv.h
View file @ 9b59da0d
......@@ -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 tagDeviceCaps;
struct tagPALETTEOBJ;
struct tagWND;
struct tagWINDOWPOS;
struct tagKEYBOARD_CONFIG;
struct DIDEVICEOBJECTDATA;
/* X physical pen */
typedef struct
......@@ -85,7 +84,6 @@ extern DeviceCaps X11DRV_DevCaps;
/* 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 Window X11DRV_GetXRootWindow(void);
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 BOOL X11DRV_KEYBOARD_GetBeepActive(void);
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);
......
loader/main.c
View file @ 9b59da0d
......@@ -261,9 +261,6 @@ BOOL WINAPI MAIN_UserInit(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserve
/* 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;
......
misc/tweak.c
View file @ 9b59da0d
......@@ -99,21 +99,3 @@ int TWEAK_Init (void)
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;
}
ole/ole2nls.c
View file @ 9b59da0d
......@@ -32,7 +32,7 @@ struct NLS_langlocale {
struct NLS_localevar {
const int type;
const char *val;
} locvars[150];
} locvars[120];
};
static LPVOID lpNLSInfo = NULL;
......@@ -295,8 +295,8 @@ LANG_END
* 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),
......
scheduler/synchro.c
View file @ 9b59da0d
......@@ -14,7 +14,6 @@
#include "winerror.h"
#include "syslevel.h"
#include "message.h"
#include "x11drv.h"
#include "server.h"
/***********************************************************************
......
windows/ttydrv/init.c
View file @ 9b59da0d
......@@ -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 =
......
windows/ttydrv/keyboard.c
View file @ 9b59da0d
......@@ -4,6 +4,7 @@
* Copyright 1998 Patrik Stridvall
*/
#include "dinput.h"
#include "keyboard.h"
#include "ttydrv.h"
......
windows/ttydrv/main.c
View file @ 9b59da0d
......@@ -38,19 +38,3 @@ BOOL TTYDRV_USER_Initialize(void)
void TTYDRV_USER_Finalize(void)
{
}
/**************************************************************************
* TTYDRV_USER_BeginDebugging
*/
void TTYDRV_USER_BeginDebugging(void)
{
}
/**************************************************************************
* TTYDRV_USER_EndDebugging
*/
void TTYDRV_USER_EndDebugging(void)
{
}
windows/x11drv/init.c
View file @ 9b59da0d
......@@ -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 =
......
windows/x11drv/main.c
View file @ 9b59da0d
......@@ -31,8 +31,6 @@
#include "win.h"
#include "windef.h"
#include "x11drv.h"
#include "xmalloc.h"
#include "version.h"
/**********************************************************************/
......@@ -125,22 +123,6 @@ void X11DRV_USER_Finalize(void)
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
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment