December 2007 - Wine-Commits

Jacek Caban : urlmon: Added more binding tests.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: 1148d4f13f0fced1f924f6452c2e15a0dd551d9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1148d4f13f0fced1f924f6452… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 24 12:43:35 2007 +0100 urlmon: Added more binding tests. --- dlls/urlmon/tests/protocol.c | 410 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 371 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1148d4f13f0fced1f924f…

1 0

Jacek Caban : urlmon: Fixed BindToObject tests.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: d067fabd383b2cc84931a47012b4f32dc8b9a09d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d067fabd383b2cc84931a4701… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 24 13:21:27 2007 +0100 urlmon: Fixed BindToObject tests. --- dlls/urlmon/tests/url.c | 30 ++++++++++++------------------ 1 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 91c705d..9be2de7 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -39,17 +39,16 @@ #define SET_EXPECT(func) \ expect_ ## func = TRUE -#define CHECK_EXPECT(func) \ +#define CHECK_EXPECT2(func) \ do { \ ok(expect_ ##func, "unexpected call " #func "\n"); \ - expect_ ## func = FALSE; \ called_ ## func = TRUE; \ }while(0) -#define CHECK_EXPECT2(func) \ +#define CHECK_EXPECT(func) \ do { \ - ok(expect_ ##func, "unexpected call " #func "\n"); \ - called_ ## func = TRUE; \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ }while(0) #define CHECK_CALLED(func) \ @@ -1607,7 +1606,6 @@ static void test_BindToObject(int protocol, BOOL emul) LPOLESTR display_name; IBindCtx *bctx; MSG msg; - IBindStatusCallback *previousclb; IUnknown *unk = (IUnknown*)0x00ff00ff; IBinding *bind; @@ -1625,14 +1623,6 @@ static void test_BindToObject(int protocol, BOOL emul) return; CHECK_CALLED(QueryInterface_IServiceProvider); - SET_EXPECT(QueryInterface_IServiceProvider); - hres = RegisterBindStatusCallback(bctx, &bsc, &previousclb, 0); - ok(SUCCEEDED(hres), "RegisterBindStatusCallback failed: %08x\n", hres); - ok(previousclb == &bsc, "previousclb(%p) != sclb(%p)\n", previousclb, &bsc); - CHECK_CALLED(QueryInterface_IServiceProvider); - if(previousclb) - IBindStatusCallback_Release(previousclb); - hres = CreateURLMoniker(NULL, urls[test_protocol], &mon); ok(SUCCEEDED(hres), "failed to create moniker: %08x\n", hres); if(FAILED(hres)) { @@ -1652,8 +1642,10 @@ static void test_BindToObject(int protocol, BOOL emul) ok(hres == S_OK, "GetDisplayName failed %08x\n", hres); ok(!lstrcmpW(display_name, urls[test_protocol]), "GetDisplayName got wrong name\n"); - SET_EXPECT(QueryInterface_IServiceProvider); SET_EXPECT(GetBindInfo); + SET_EXPECT(QueryInterface_IInternetProtocol); + if(!emulate_protocol) + SET_EXPECT(QueryService_IInternetProtocol); SET_EXPECT(OnStartBinding); if(emulate_protocol) { SET_EXPECT(Start); @@ -1693,7 +1685,7 @@ static void test_BindToObject(int protocol, BOOL emul) /* no point testing the calls if binding didn't even work */ if (!SUCCEEDED(hres)) return; - if((bindf & BINDF_ASYNCHRONOUS) && !data_available) { + if((bindf & BINDF_ASYNCHRONOUS)) { ok(hres == MK_S_ASYNCHRONOUS, "IMoniker_BindToStorage failed: %08x\n", hres); ok(unk == NULL, "istr should be NULL\n"); }else { @@ -1709,8 +1701,10 @@ static void test_BindToObject(int protocol, BOOL emul) DispatchMessage(&msg); } - todo_wine CHECK_NOT_CALLED(QueryInterface_IServiceProvider); CHECK_CALLED(GetBindInfo); + CHECK_CALLED(QueryInterface_IInternetProtocol); + if(!emulate_protocol) + CHECK_CALLED(QueryService_IInternetProtocol); CHECK_CALLED(OnStartBinding); if(emulate_protocol) { CHECK_CALLED(Start); @@ -1777,7 +1771,7 @@ static void create_file(void) file = CreateFileW(wszIndexHtml, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); if(file == INVALID_HANDLE_VALUE) return;

1 0

Maarten Lankhorst : winealsa: Add special case for microphone source in mixer.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: 7034b92d904baa71f1bc885d0078d8ab6ae47f35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7034b92d904baa71f1bc885d0… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Mon Dec 24 14:59:59 2007 +0100 winealsa: Add special case for microphone source in mixer. Some microphones don't have a capture control, but a playback control instead. So use the playback volume, but still register it as capture volume. --- dlls/winealsa.drv/mixer.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 5065518..fb989dc 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -371,7 +371,8 @@ static void filllines(mixer *mmixer, snd_mixer_elem_t *mastelem, snd_mixer_elem_ const char * name = snd_mixer_selem_get_name(elem); DWORD comp = getcomponenttype(name); - if (snd_mixer_selem_has_playback_volume(elem)) + if (snd_mixer_selem_has_playback_volume(elem) && + (snd_mixer_selem_has_capture_volume(elem) || comp != MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE)) { (++mline)->component = comp; MultiByteToWideChar(CP_UNIXCP, 0, name, -1, mline->name, MAXPNAMELEN); @@ -382,7 +383,7 @@ static void filllines(mixer *mmixer, snd_mixer_elem_t *mastelem, snd_mixer_elem_ else if (!capt) continue; - if (capt && snd_mixer_selem_has_capture_volume(elem)) + if (capt && (snd_mixer_selem_has_capture_volume(elem) || comp == MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE)) { (++mline)->component = comp; MultiByteToWideChar(CP_UNIXCP, 0, name, -1, mline->name, MAXPNAMELEN); @@ -473,9 +474,19 @@ static void ALSA_MixerInit(void) captelem = elem; else if (!blacklisted(elem)) { + DWORD comp = getcomponenttype(snd_mixer_selem_get_name(elem)); + DWORD skip = 0; + + /* Work around buggy drivers: Make this a capture control if the name is recognised as a microphone */ if (snd_mixer_selem_has_capture_volume(elem)) ++capcontrols; - if (snd_mixer_selem_has_playback_volume(elem)) + else if (comp == MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE) + { + ++capcontrols; + skip = 1; + } + + if (!skip && snd_mixer_selem_has_playback_volume(elem)) { if (!strcasecmp(snd_mixer_selem_get_name(elem), "Headphone") && !headelem) headelem = elem;

1 0

Jacek Caban : urlmon: Added more BindProtocol:: ReportProgress implementation.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: 19bca907101aa3e378fdae1131fde02df97bf05c URL: http://source.winehq.org/git/wine.git/?a=commit;h=19bca907101aa3e378fdae113… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 24 12:43:12 2007 +0100 urlmon: Added more BindProtocol::ReportProgress implementation. --- dlls/urlmon/bindprot.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 0eb7274..a41575c 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -436,13 +436,14 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink TRACE("(%p)->(%u %s)\n", This, ulStatusCode, debugstr_w(szStatusText)); switch(ulStatusCode) { + case BINDSTATUS_FINDINGRESOURCE: + case BINDSTATUS_CONNECTING: case BINDSTATUS_SENDINGREQUEST: - return IInternetProtocolSink_ReportProgress(This->protocol_sink, - ulStatusCode, NULL); case BINDSTATUS_CACHEFILENAMEAVAILABLE: return IInternetProtocolSink_ReportProgress(This->protocol_sink, ulStatusCode, szStatusText); case BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE: + case BINDSTATUS_MIMETYPEAVAILABLE: return IInternetProtocolSink_ReportProgress(This->protocol_sink, BINDSTATUS_MIMETYPEAVAILABLE, szStatusText); default:

1 0

Jacek Caban : urlmon: Added BindProtocol::[Un]LockRequest.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: 4883c8aba620cbed1540ad80e610fabf4233593e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4883c8aba620cbed1540ad80e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 24 12:43:01 2007 +0100 urlmon: Added BindProtocol::[Un]LockRequest. --- dlls/urlmon/bindprot.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 9185718..0eb7274 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -253,15 +253,19 @@ static HRESULT WINAPI BindProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER static HRESULT WINAPI BindProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions) { BindProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%08x)\n", This, dwOptions); - return E_NOTIMPL; + + TRACE("(%p)->(%08x)\n", This, dwOptions); + + return IInternetProtocol_LockRequest(This->protocol, dwOptions); } static HRESULT WINAPI BindProtocol_UnlockRequest(IInternetProtocol *iface) { BindProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return IInternetProtocol_UnlockRequest(This->protocol); } #undef PROTOCOL_THIS

1 0

Jacek Caban : urlmon: Added BindProtocol::Continue implementation.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: f189e7a060a7a8d64d28ce5251e3a48b414aa8ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=f189e7a060a7a8d64d28ce525… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 24 12:42:45 2007 +0100 urlmon: Added BindProtocol::Continue implementation. --- dlls/urlmon/bindprot.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 8e63673..9185718 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -189,8 +189,10 @@ static HRESULT WINAPI BindProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl static HRESULT WINAPI BindProtocol_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData) { BindProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%p)\n", This, pProtocolData); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pProtocolData); + + return IInternetProtocol_Continue(This->protocol, pProtocolData); } static HRESULT WINAPI BindProtocol_Abort(IInternetProtocol *iface, HRESULT hrReason,

1 0

Jacek Caban : urlmon: Added IServiceProvider implementation to BindProtocol object.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: a9765337f8b8c66a898d9cfe75f8fdac8df1a541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9765337f8b8c66a898d9cfe7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 24 12:42:22 2007 +0100 urlmon: Added IServiceProvider implementation to BindProtocol object. --- dlls/urlmon/bindprot.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 1312a84..b8f3a8b 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -25,6 +25,7 @@ typedef struct { const IInternetProtocolVtbl *lpInternetProtocolVtbl; const IInternetBindInfoVtbl *lpInternetBindInfoVtbl; const IInternetPriorityVtbl *lpInternetPriorityVtbl; + const IServiceProviderVtbl *lpServiceProviderVtbl; const IInternetProtocolSinkVtbl *lpInternetProtocolSinkVtbl; LONG ref; @@ -32,6 +33,7 @@ typedef struct { IInternetProtocol *protocol; IInternetBindInfo *bind_info; IInternetProtocolSink *protocol_sink; + IServiceProvider *service_provider; LONG priority; } BindProtocol; @@ -39,6 +41,7 @@ typedef struct { #define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) #define BINDINFO(x) ((IInternetBindInfo*) &(x)->lpInternetBindInfoVtbl) #define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) +#define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) #define PROTSINK(x) ((IInternetProtocolSink*) &(x)->lpInternetProtocolSinkVtbl) #define PROTOCOL_THIS(iface) DEFINE_THIS(BindProtocol, InternetProtocol, iface) @@ -66,7 +69,8 @@ static HRESULT WINAPI BindProtocol_QueryInterface(IInternetProtocol *iface, REFI }else if(IsEqualGUID(&IID_IAuthenticate, riid)) { FIXME("(%p)->(IID_IAuthenticate %p)\n", This, ppv); }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { - FIXME("(%p)->(IID_IServiceProvider %p)\n", This, ppv); + TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); + *ppv = SERVPROV(This); }else if(IsEqualGUID(&IID_IInternetProtocolSink, riid)) { TRACE("(%p)->(IID_IInternetProtocolSink %p)\n", This, ppv); *ppv = PROTSINK(This); @@ -171,6 +175,8 @@ static HRESULT WINAPI BindProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl IInternetProtocolSink_AddRef(pOIProtSink); This->protocol_sink = pOIProtSink; + IInternetProtocolSink_QueryInterface(pOIProtSink, &IID_IServiceProvider, (void**)&This->service_provider); + hres = IInternetProtocol_QueryInterface(protocol, &IID_IInternetPriority, (void**)&priority); if(SUCCEEDED(hres)) { IInternetPriority_SetPriority(priority, This->priority); @@ -470,6 +476,49 @@ static const IInternetProtocolSinkVtbl InternetProtocolSinkVtbl = { InternetProtocolSink_ReportResult }; +#define SERVPROV_THIS(iface) DEFINE_THIS(BindProtocol, ServiceProvider, iface) + +static HRESULT WINAPI BPServiceProvider_QueryInterface(IServiceProvider *iface, + REFIID riid, void **ppv) +{ + BindProtocol *This = SERVPROV_THIS(iface); + return IInternetProtocol_QueryInterface(PROTOCOL(This), riid, ppv); +} + +static ULONG WINAPI BPServiceProvider_AddRef(IServiceProvider *iface) +{ + BindProtocol *This = SERVPROV_THIS(iface); + return IInternetProtocol_AddRef(PROTOCOL(This)); +} + +static ULONG WINAPI BPServiceProvider_Release(IServiceProvider *iface) +{ + BindProtocol *This = SERVPROV_THIS(iface); + return IInternetProtocol_Release(PROTOCOL(This)); +} + +static HRESULT WINAPI BPServiceProvider_QueryService(IServiceProvider *iface, + REFGUID guidService, REFIID riid, void **ppv) +{ + BindProtocol *This = SERVPROV_THIS(iface); + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + + if(!This->service_provider) + return E_NOINTERFACE; + + return IServiceProvider_QueryService(This->service_provider, guidService, riid, ppv); +} + +#undef SERVPROV_THIS + +static const IServiceProviderVtbl ServiceProviderVtbl = { + BPServiceProvider_QueryInterface, + BPServiceProvider_AddRef, + BPServiceProvider_Release, + BPServiceProvider_QueryService +}; + HRESULT create_binding_protocol(LPCWSTR url, IInternetProtocol **protocol) { BindProtocol *ret = heap_alloc(sizeof(BindProtocol)); @@ -477,12 +526,14 @@ HRESULT create_binding_protocol(LPCWSTR url, IInternetProtocol **protocol) ret->lpInternetProtocolVtbl = &BindProtocolVtbl; ret->lpInternetBindInfoVtbl = &InternetBindInfoVtbl; ret->lpInternetPriorityVtbl = &InternetPriorityVtbl; + ret->lpServiceProviderVtbl = &ServiceProviderVtbl; ret->lpInternetProtocolSinkVtbl = &InternetProtocolSinkVtbl; ret->ref = 1; ret->protocol = NULL; ret->bind_info = NULL; ret->protocol_sink = NULL; + ret->service_provider = NULL; ret->priority = 0; URLMON_LockModule();

1 0

Jacek Caban : urlmon: Added BindProtocol::Switch implementation.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: a6eb0780be69dfb373ba05cbd3e83e26cd5429a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6eb0780be69dfb373ba05cbd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 24 12:42:32 2007 +0100 urlmon: Added BindProtocol::Switch implementation. --- dlls/urlmon/bindprot.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index b8f3a8b..8e63673 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -416,8 +416,10 @@ static HRESULT WINAPI InternetProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOLDATA *pProtocolData) { BindProtocol *This = PROTSINK_THIS(iface); - FIXME("(%p)->(%p)\n", This, pProtocolData); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pProtocolData); + + return IInternetProtocolSink_Switch(This->protocol_sink, pProtocolData); } static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink *iface,

1 0

Jacek Caban : urlmon: Added BindProtocol::GetBindString implementation.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: 7cd13e17adcda9ea6131399e172a4e003d807855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cd13e17adcda9ea6131399e1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 24 12:42:09 2007 +0100 urlmon: Added BindProtocol::GetBindString implementation. --- dlls/urlmon/bindprot.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index c2033fc..1312a84 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -317,8 +317,10 @@ static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, ULONG ulStringType, LPOLESTR *ppwzStr, ULONG cEl, ULONG *pcElFetched) { BindProtocol *This = BINDINFO_THIS(iface); - FIXME("(%p)->(%d %p %d %p)\n", This, ulStringType, ppwzStr, cEl, pcElFetched); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p %d %p)\n", This, ulStringType, ppwzStr, cEl, pcElFetched); + + return IInternetBindInfo_GetBindString(This->bind_info, ulStringType, ppwzStr, cEl, pcElFetched); } #undef BINDFO_THIS

1 0

Jeremy White : wintab32: Store and use the physical device id to match device to cursor.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: c9fcb15b11773c5d37d0bf5546dffe7939d8596a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9fcb15b11773c5d37d0bf554… Author: Jeremy White <jwhite(a)winehq.org> Date: Sun Dec 23 10:55:19 2007 -0600 wintab32: Store and use the physical device id to match device to cursor. --- dlls/winex11.drv/wintab.c | 55 +++++++++++++++++++++++++++++++------------- 1 files changed, 39 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index db78a91..f0ded3d 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -419,7 +419,7 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) PK_NORMAL_PRESSURE | PK_TANGENT_PRESSURE | PK_ORIENTATION; - cursor->PHYSID = cursor_target; + cursor->PHYSID = target->id; cursor->NPBUTTON = 1; cursor->NPBTNMARKS[0] = 0 ; cursor->NPBTNMARKS[1] = 1 ; @@ -574,12 +574,12 @@ static int figure_deg(int x, int y) return rc; } -static int get_button_state(int deviceid) +static int get_button_state(int curnum) { - return button_state[deviceid]; + return button_state[curnum]; } -static void set_button_state(XID deviceid) +static void set_button_state(int curnum, XID deviceid) { struct x11drv_thread_data *data = x11drv_thread_data(); XDevice *device; @@ -614,23 +614,40 @@ static void set_button_state(XID deviceid) } pXFreeDeviceState(state); wine_tsx11_unlock(); - button_state[deviceid] = rc; + button_state[curnum] = rc; +} + +static int cursor_from_device(DWORD deviceid, LPWTI_CURSORS_INFO *cursorp) +{ + int i; + for (i = 0; i < gNumCursors; i++) + if (gSysCursor[i].PHYSID == deviceid) + { + *cursorp = &gSysCursor[i]; + return i; + } + + ERR("Could not map device id %d to a cursor\n", (int) deviceid); + return -1; } static void motion_event( HWND hwnd, XEvent *event ) { XDeviceMotionEvent *motion = (XDeviceMotionEvent *)event; - LPWTI_CURSORS_INFO cursor = &gSysCursor[motion->deviceid]; + LPWTI_CURSORS_INFO cursor; + int curnum = cursor_from_device(motion->deviceid, &cursor); + if (curnum < 0) + return; memset(&gMsgPacket,0,sizeof(WTPACKET)); - TRACE("Received tablet motion event (%p)\n",hwnd); + TRACE("Received tablet motion event (%p); device id %d, cursor num %d\n",hwnd, (int) motion->deviceid, curnum); /* Set cursor to inverted if cursor is the eraser */ gMsgPacket.pkStatus = (cursor->TYPE == 0xc85a ?TPS_INVERT:0); gMsgPacket.pkTime = EVENT_x11_time_to_win32_time(motion->time); gMsgPacket.pkSerialNumber = gSerial++; - gMsgPacket.pkCursor = motion->deviceid; + gMsgPacket.pkCursor = curnum; gMsgPacket.pkX = motion->axis_data[0]; gMsgPacket.pkY = motion->axis_data[1]; gMsgPacket.pkOrientation.orAzimuth = figure_deg(motion->axis_data[3],motion->axis_data[4]); @@ -639,14 +656,17 @@ static void motion_event( HWND hwnd, XEvent *event ) abs(motion->axis_data[4]))) * (gMsgPacket.pkStatus & TPS_INVERT?-1:1)); gMsgPacket.pkNormalPressure = motion->axis_data[2]; - gMsgPacket.pkButtons = get_button_state(motion->deviceid); + gMsgPacket.pkButtons = get_button_state(curnum); SendMessageW(hwndTabletDefault,WT_PACKET,0,(LPARAM)hwnd); } static void button_event( HWND hwnd, XEvent *event ) { XDeviceButtonEvent *button = (XDeviceButtonEvent *) event; - LPWTI_CURSORS_INFO cursor = &gSysCursor[button->deviceid]; + LPWTI_CURSORS_INFO cursor; + int curnum = cursor_from_device(button->deviceid, &cursor); + if (curnum < 0) + return; memset(&gMsgPacket,0,sizeof(WTPACKET)); @@ -654,10 +674,10 @@ static void button_event( HWND hwnd, XEvent *event ) /* Set cursor to inverted if cursor is the eraser */ gMsgPacket.pkStatus = (cursor->TYPE == 0xc85a ?TPS_INVERT:0); - set_button_state(button->deviceid); + set_button_state(curnum, button->deviceid); gMsgPacket.pkTime = EVENT_x11_time_to_win32_time(button->time); gMsgPacket.pkSerialNumber = gSerial++; - gMsgPacket.pkCursor = button->deviceid; + gMsgPacket.pkCursor = curnum; gMsgPacket.pkX = button->axis_data[0]; gMsgPacket.pkY = button->axis_data[1]; gMsgPacket.pkOrientation.orAzimuth = figure_deg(button->axis_data[3],button->axis_data[4]); @@ -665,7 +685,7 @@ static void button_event( HWND hwnd, XEvent *event ) abs(button->axis_data[4]))) * (gMsgPacket.pkStatus & TPS_INVERT?-1:1)); gMsgPacket.pkNormalPressure = button->axis_data[2]; - gMsgPacket.pkButtons = get_button_state(button->deviceid); + gMsgPacket.pkButtons = get_button_state(curnum); SendMessageW(hwndTabletDefault,WT_PACKET,0,(LPARAM)hwnd); } @@ -680,7 +700,10 @@ static void key_event( HWND hwnd, XEvent *event ) static void proximity_event( HWND hwnd, XEvent *event ) { XProximityNotifyEvent *proximity = (XProximityNotifyEvent *) event; - LPWTI_CURSORS_INFO cursor = &gSysCursor[proximity->deviceid]; + LPWTI_CURSORS_INFO cursor; + int curnum = cursor_from_device(proximity->deviceid, &cursor); + if (curnum < 0) + return; memset(&gMsgPacket,0,sizeof(WTPACKET)); @@ -690,7 +713,7 @@ static void proximity_event( HWND hwnd, XEvent *event ) gMsgPacket.pkStatus |= (event->type==proximity_out_type)?TPS_PROXIMITY:0; gMsgPacket.pkTime = EVENT_x11_time_to_win32_time(proximity->time); gMsgPacket.pkSerialNumber = gSerial++; - gMsgPacket.pkCursor = proximity->deviceid; + gMsgPacket.pkCursor = curnum; gMsgPacket.pkX = proximity->axis_data[0]; gMsgPacket.pkY = proximity->axis_data[1]; gMsgPacket.pkOrientation.orAzimuth = figure_deg(proximity->axis_data[3],proximity->axis_data[4]); @@ -698,7 +721,7 @@ static void proximity_event( HWND hwnd, XEvent *event ) abs(proximity->axis_data[4]))) * (gMsgPacket.pkStatus & TPS_INVERT?-1:1)); gMsgPacket.pkNormalPressure = proximity->axis_data[2]; - gMsgPacket.pkButtons = get_button_state(proximity->deviceid); + gMsgPacket.pkButtons = get_button_state(curnum); SendMessageW(hwndTabletDefault, WT_PROXIMITY, (event->type == proximity_in_type), (LPARAM)hwnd); }

1 0