Skip to content

W
wine-cw
Commit f193197a authored by Jeremy White's avatar Jeremy White Committed by Alexandre Julliard
Browse files
Options

wintab32: Capture the number of buttons earlier, allowing our button maps to be filled in.

parent 3036e7f6
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
dlls/winex11.drv/wintab.c
View file @ f193197a
......@@ -474,8 +474,8 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault)
int shft = 0;
X11DRV_expect_error(data->display,Tablet_ErrorHandler,NULL);
pXGetDeviceButtonMapping(data->display, opendevice, map, 32);
if (X11DRV_check_error())
cursor->BUTTONS = pXGetDeviceButtonMapping(data->display, opendevice, map, 32);
if (X11DRV_check_error() || cursor->BUTTONS <= 0)
{
TRACE("No buttons, Non Tablet Device\n");
pXCloseDevice(data->display, opendevice);
......@@ -606,7 +606,8 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault)
int i;
Button = (XButtonInfoPtr) any;
cursor->BUTTONS = Button->num_buttons;
TRACE(" ButtonInput %d: [class %d|length %d|num_buttons %d]\n",
class_loop, (int) Button->class, Button->length, Button->num_buttons);
cursor->BTNNAMES = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*cchBuf);
for (i = 0; i < cursor->BUTTONS; i++)
{
......
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