reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-13 08:44:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added missing declarations.

Browse Source
This commit is contained in:
Rémi Assailly 2005-01-20 20:36:01 +00:00 committed by Alexandre Julliard
parent b3a7f37aaf
commit 81b13c4bb5
4 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/x11drv/event.c
View File

@ -42,7 +42,6 @@
#include "shlobj.h" /* DROPFILES */ #include "shlobj.h" /* DROPFILES */
#include "win.h" #include "win.h"
#include "winpos.h"
#include "winreg.h" #include "winreg.h"
#include "x11drv.h" #include "x11drv.h"
#include "shellapi.h" #include "shellapi.h"
@ -93,18 +92,6 @@ static void EVENT_SelectionClear( HWND hWnd, XSelectionClearEvent *event);
static void EVENT_PropertyNotify( XPropertyEvent *event ); static void EVENT_PropertyNotify( XPropertyEvent *event );
static void EVENT_ClientMessage( HWND hWnd, XClientMessageEvent *event ); static void EVENT_ClientMessage( HWND hWnd, XClientMessageEvent *event );
extern void X11DRV_ButtonPress( HWND hwnd, XButtonEvent *event );
extern void X11DRV_ButtonRelease( HWND hwnd, XButtonEvent *event );
extern void X11DRV_MotionNotify( HWND hwnd, XMotionEvent *event );
extern void X11DRV_EnterNotify( HWND hwnd, XCrossingEvent *event );
extern void X11DRV_KeyEvent( HWND hwnd, XKeyEvent *event );
extern void X11DRV_KeymapNotify( HWND hwnd, XKeymapEvent *event );
extern void X11DRV_Expose( HWND hwnd, XExposeEvent *event );
extern void X11DRV_MapNotify( HWND hwnd, XMapEvent *event );
extern void X11DRV_UnmapNotify( HWND hwnd, XUnmapEvent *event );
extern void X11DRV_ConfigureNotify( HWND hwnd, XConfigureEvent *event );
extern void X11DRV_MappingNotify( XMappingEvent *event );
#ifdef HAVE_LIBXXF86DGA2 #ifdef HAVE_LIBXXF86DGA2
static int DGAMotionEventType; static int DGAMotionEventType;
static int DGAButtonPressEventType; static int DGAButtonPressEventType;
@ -114,10 +101,6 @@ static int DGAKeyReleaseEventType;
static BOOL DGAUsed = FALSE; static BOOL DGAUsed = FALSE;
static HWND DGAhwnd = 0; static HWND DGAhwnd = 0;
extern void X11DRV_DGAMotionEvent( HWND hwnd, XDGAMotionEvent *event );
extern void X11DRV_DGAButtonPressEvent( HWND hwnd, XDGAButtonEvent *event );
extern void X11DRV_DGAButtonReleaseEvent( HWND hwnd, XDGAButtonEvent *event );
#endif #endif
/* Static used for the current input method */ /* Static used for the current input method */

2
dlls/x11drv/window.c
View File

@ -47,8 +47,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(x11drv); WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
extern Pixmap X11DRV_BITMAP_Pixmap( HBITMAP );
/* X context to associate a hwnd to an X window */ /* X context to associate a hwnd to an X window */
XContext winContext = 0; XContext winContext = 0;

20
dlls/x11drv/x11drv.h
View File

@ -34,6 +34,9 @@
#ifdef HAVE_LIBXXSHM #ifdef HAVE_LIBXXSHM
# include <X11/extensions/XShm.h> # include <X11/extensions/XShm.h>
#endif /* defined(HAVE_LIBXXSHM) */ #endif /* defined(HAVE_LIBXXSHM) */
#ifdef HAVE_LIBXXF86DGA2
#include <X11/extensions/xf86dga.h>
#endif
#undef Status /* avoid conflict with wintrnl.h */ #undef Status /* avoid conflict with wintrnl.h */
typedef int Status; typedef int Status;
@ -202,6 +205,7 @@ extern HBITMAP X11DRV_BITMAP_CreateBitmapHeaderFromPixmap(HDC hdc, Pixmap pixmap
extern HGLOBAL X11DRV_DIB_CreateDIBFromBitmap(HDC hdc, HBITMAP hBmp); extern HGLOBAL X11DRV_DIB_CreateDIBFromBitmap(HDC hdc, HBITMAP hBmp);
extern HGLOBAL X11DRV_DIB_CreateDIBFromPixmap(Pixmap pixmap, HDC hdc, BOOL bDeletePixmap); extern HGLOBAL X11DRV_DIB_CreateDIBFromPixmap(Pixmap pixmap, HDC hdc, BOOL bDeletePixmap);
extern Pixmap X11DRV_DIB_CreatePixmapFromDIB( HGLOBAL hPackedDIB, HDC hdc ); extern Pixmap X11DRV_DIB_CreatePixmapFromDIB( HGLOBAL hPackedDIB, HDC hdc );
extern Pixmap X11DRV_BITMAP_Pixmap( HBITMAP );
extern RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ); extern RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp );
@ -499,8 +503,24 @@ typedef enum {
} INPUT_TYPE; } INPUT_TYPE;
extern INPUT_TYPE X11DRV_EVENT_SetInputMethod(INPUT_TYPE type); extern INPUT_TYPE X11DRV_EVENT_SetInputMethod(INPUT_TYPE type);
extern void X11DRV_ButtonPress( HWND hwnd, XButtonEvent *event );
extern void X11DRV_ButtonRelease( HWND hwnd, XButtonEvent *event );
extern void X11DRV_MotionNotify( HWND hwnd, XMotionEvent *event );
extern void X11DRV_EnterNotify( HWND hwnd, XCrossingEvent *event );
extern void X11DRV_KeyEvent( HWND hwnd, XKeyEvent *event );
extern void X11DRV_KeymapNotify( HWND hwnd, XKeymapEvent *event );
extern void X11DRV_Expose( HWND hwnd, XExposeEvent *event );
extern void X11DRV_MapNotify( HWND hwnd, XMapEvent *event );
extern void X11DRV_UnmapNotify( HWND hwnd, XUnmapEvent *event );
extern void X11DRV_ConfigureNotify( HWND hwnd, XConfigureEvent *event );
extern void X11DRV_MappingNotify( XMappingEvent *event );
#ifdef HAVE_LIBXXF86DGA2 #ifdef HAVE_LIBXXF86DGA2
void X11DRV_EVENT_SetDGAStatus(HWND hwnd, int event_base) ; void X11DRV_EVENT_SetDGAStatus(HWND hwnd, int event_base) ;
extern void X11DRV_DGAMotionEvent( HWND hwnd, XDGAMotionEvent *event );
extern void X11DRV_DGAButtonPressEvent( HWND hwnd, XDGAButtonEvent *event );
extern void X11DRV_DGAButtonReleaseEvent( HWND hwnd, XDGAButtonEvent *event );
#endif #endif
extern DWORD EVENT_x11_time_to_win32_time(Time time); extern DWORD EVENT_x11_time_to_win32_time(Time time);

2
dlls/x11drv/xfont.c
View File

@ -1755,7 +1755,7 @@ static LPCSTR XFONT_UnAlias(char* font)
* set FR_REMOVED flag to delay removal until the resource is not in use * set FR_REMOVED flag to delay removal until the resource is not in use
* any more. * any more.
*/ */
void XFONT_RemoveFontResource( fontResource** ppfr ) static void XFONT_RemoveFontResource( fontResource** ppfr )
{ {
fontResource* pfr = *ppfr; fontResource* pfr = *ppfr;
#if 0 #if 0