Skip to content
Snippets Groups Projects
Commit 56a45b20 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files

Small cleanups.

parent 391fdec8
No related branches found
No related tags found
No related merge requests found
......@@ -11,7 +11,6 @@
#include "ddraw.h"
#include "d3d.h"
#include "debugtools.h"
#include "x11drv.h"
#include "d3d_private.h"
#include "mesa_private.h"
......
......@@ -41,7 +41,6 @@ struct SysKeyboardAImpl
/* SysKeyboardAImpl */
BYTE keystate[256];
KEYBOARD_CONFIG initial_config;
int acquired;
};
......@@ -172,17 +171,6 @@ static HRESULT WINAPI SysKeyboardAImpl_Acquire(LPDIRECTINPUTDEVICE2A iface)
TRACE("(this=%p)\n",This);
if (This->acquired == 0) {
#if 0
KEYBOARD_CONFIG no_auto;
/* Save the original config */
USER_Driver.pGetKeyboardConfig(&(This->initial_config));
/* Now, remove auto-repeat */
no_auto.auto_repeat = FALSE;
USER_Driver.pSetKeyboardConfig(&no_auto, WINE_KEYBOARD_CONFIG_AUTO_REPEAT);
#endif
This->acquired = 1;
}
......@@ -195,10 +183,6 @@ static HRESULT WINAPI SysKeyboardAImpl_Unacquire(LPDIRECTINPUTDEVICE2A iface)
TRACE("(this=%p)\n",This);
if (This->acquired == 1) {
#if 0
/* Restore the original configuration */
USER_Driver.pSetKeyboardConfig(&(This->initial_config), 0xFFFFFFFF);
#endif
This->acquired = 0;
} else {
ERR("Unacquiring a not-acquired device !!!\n");
......
......@@ -73,9 +73,8 @@ static WINE_EXCEPTION_FILTER(page_fault)
/***********************************************************************
* wglCreateContext
*/
HGLRC WINAPI wglCreateContext(HDC hdc) {
DC * dc = DC_GetDCPtr( hdc );
X11DRV_PDEVICE *physDev;
HGLRC WINAPI wglCreateContext(HDC hdc)
{
XVisualInfo *vis;
Wine_GLContext *ret;
int num;
......@@ -83,13 +82,6 @@ HGLRC WINAPI wglCreateContext(HDC hdc) {
TRACE("(%08x)\n", hdc);
if (dc == NULL) {
ERR("Null DC !!!\n");
return NULL;
}
physDev = (X11DRV_PDEVICE *)dc->physDev;
/* First, get the visual in use by the X11DRV */
template.visualid = XVisualIDFromVisual(X11DRV_GetVisual());
vis = XGetVisualInfo(display, VisualIDMask, &template, &num);
......@@ -97,7 +89,6 @@ HGLRC WINAPI wglCreateContext(HDC hdc) {
if (vis == NULL) {
ERR("NULL visual !!!\n");
/* Need to set errors here */
GDI_ReleaseObj( hdc );
return NULL;
}
......@@ -109,8 +100,6 @@ HGLRC WINAPI wglCreateContext(HDC hdc) {
ret->vis = vis;
TRACE(" creating context %p (GL context creation delayed)\n", ret);
GDI_ReleaseObj( hdc );
return (HGLRC) ret;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment