October 2009 - Wine-commits

Huw Davies : msdaps: Implement IRowsetInfo_GetProperties proxy and stub.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 021eaadea37b8748290dd827f3a8b565f7b62d74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=021eaadea37b8748290dd827f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 10:19:26 2009 +0000 msdaps: Implement IRowsetInfo_GetProperties proxy and stub. --- dlls/msdaps/usrmarshal.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 6ed855a..5752404 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -604,9 +604,11 @@ HRESULT __RPC_STUB IAccessor_ReleaseAccessor_Stub(IAccessor* This, HACCESSOR hAc HRESULT CALLBACK IRowsetInfo_GetProperties_Proxy(IRowsetInfo* This, const ULONG cPropertyIDSets, const DBPROPIDSET rgPropertyIDSets[], ULONG *pcPropertySets, DBPROPSET **prgPropertySets) { + HRESULT hr; + IErrorInfo *error; ULONG i; - FIXME("(%p)->(%d, %p, %p, %p): stub\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); + TRACE("(%p)->(%d, %p, %p, %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); for(i = 0; i < cPropertyIDSets; i++) { @@ -616,15 +618,29 @@ HRESULT CALLBACK IRowsetInfo_GetProperties_Proxy(IRowsetInfo* This, const ULONG TRACE("\t%d: prop id %d\n", j, rgPropertyIDSets[i].rgPropertyIDs[j]); } - return E_NOTIMPL; + hr = IRowsetInfo_RemoteGetProperties_Proxy(This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets, &error); + + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + return hr; } HRESULT __RPC_STUB IRowsetInfo_GetProperties_Stub(IRowsetInfo* This, ULONG cPropertyIDSets, const DBPROPIDSET *rgPropertyIDSets, ULONG *pcPropertySets, DBPROPSET **prgPropertySets, IErrorInfo **ppErrorInfoRem) { - FIXME("(%p)->(%d, %p, %p, %p, %p): stub\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets, ppErrorInfoRem); + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p)->(%d, %p, %p, %p, %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets, ppErrorInfoRem); + + *ppErrorInfoRem = NULL; + + hr = IRowsetInfo_GetProperties(This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); + if(FAILED(hr)) GetErrorInfo(0, ppErrorInfoRem); + TRACE("returning %08x\n", hr); + return hr; } HRESULT CALLBACK IRowsetInfo_GetReferencedRowset_Proxy(IRowsetInfo* This, DBORDINAL iOrdinal, REFIID riid, IUnknown **ppReferencedRowset)

1 0

Huw Davies : oledb32: Add CanConvert support for DBTYPE_FILETIME.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: ed53dafcab9935682d4c8184ce9f4c3dba7a07a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed53dafcab9935682d4c8184c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 12:17:27 2009 +0000 oledb32: Add CanConvert support for DBTYPE_FILETIME. --- dlls/oledb32/convert.c | 18 +++++++++++++++--- dlls/oledb32/tests/convert.c | 27 ++++++++++++++------------- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index ad86398..e5443cb 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -452,6 +452,7 @@ static HRESULT WINAPI convert_CanConvert(IDataConvert* iface, { case DBTYPE_DATE: case DBTYPE_GUID: + case DBTYPE_FILETIME: return S_OK; default: if(dst_base_type == DBTYPE_DBTIMESTAMP) return S_OK; @@ -462,7 +463,8 @@ static HRESULT WINAPI convert_CanConvert(IDataConvert* iface, switch(dst_base_type) { case DBTYPE_NULL: - case DBTYPE_VARIANT: return S_OK; + case DBTYPE_VARIANT: + case DBTYPE_FILETIME: return S_OK; default: return S_FALSE; } @@ -486,8 +488,12 @@ static HRESULT WINAPI convert_CanConvert(IDataConvert* iface, case DBTYPE_I8: if(common_class(dst_class)) return S_OK; - if(dst_base_type == DBTYPE_BYTES) return S_OK; - return S_FALSE; + switch(dst_base_type) + { + case DBTYPE_BYTES: + case DBTYPE_FILETIME: return S_OK; + default: return S_FALSE; + } case DBTYPE_DATE: switch(dst_class) @@ -502,6 +508,7 @@ static HRESULT WINAPI convert_CanConvert(IDataConvert* iface, case DBTYPE_I8: case DBTYPE_DATE: case DBTYPE_DBDATE: + case DBTYPE_FILETIME: return S_OK; default: return S_FALSE; } @@ -524,6 +531,7 @@ static HRESULT WINAPI convert_CanConvert(IDataConvert* iface, case DBTYPE_GUID: case DBTYPE_BYTES: case DBTYPE_DBDATE: + case DBTYPE_FILETIME: return S_OK; default: return S_FALSE; } @@ -567,6 +575,9 @@ static HRESULT WINAPI convert_CanConvert(IDataConvert* iface, default: return S_FALSE; } + case DBTYPE_FILETIME: + if(dst_class == DBTYPE_I8) return S_OK; + /* fall through */ case DBTYPE_DBDATE: switch(dst_class) { @@ -576,6 +587,7 @@ static HRESULT WINAPI convert_CanConvert(IDataConvert* iface, case DBTYPE_BSTR: case DBTYPE_VARIANT: case DBTYPE_DBDATE: + case DBTYPE_FILETIME: return S_OK; default: return S_FALSE; } diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index a1378cf..6cd44f5 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -150,22 +150,22 @@ struct can_convert DWORD can_convert_to; } simple_convert[] = { - {DBTYPE_EMPTY, 0x23bfd9ff}, - {DBTYPE_NULL, 0x00001002}, + {DBTYPE_EMPTY, 0x63bfd9ff}, + {DBTYPE_NULL, 0x40001002}, {DBTYPE_I2, 0x3b9fd9ff}, {DBTYPE_I4, 0x3bdfd9ff}, {DBTYPE_R4, 0x3b9fd9ff}, {DBTYPE_R8, 0x3b9fd9ff}, {DBTYPE_CY, 0x039fd97f}, - {DBTYPE_DATE, 0x399f99bf}, + {DBTYPE_DATE, 0x799f99bf}, - {DBTYPE_BSTR, 0x3bffd9ff}, - {DBTYPE_IDISPATCH, 0x3bffffff}, + {DBTYPE_BSTR, 0x7bffd9ff}, + {DBTYPE_IDISPATCH, 0x7bffffff}, {DBTYPE_ERROR, 0x01001500}, {DBTYPE_BOOL, 0x039fd9ff}, - {DBTYPE_VARIANT, 0x3bffffff}, + {DBTYPE_VARIANT, 0x7bffffff}, {DBTYPE_IUNKNOWN, 0x00003203}, {DBTYPE_DECIMAL, 0x3b9fd97f}, {DBTYPE_I1, 0x3b9fd9ff}, @@ -173,20 +173,21 @@ struct can_convert {DBTYPE_UI1, 0x3b9fd9ff}, {DBTYPE_UI2, 0x3b9fd9ff}, {DBTYPE_UI4, 0x3bdfd9ff}, - {DBTYPE_I8, 0x03dfd97f}, + {DBTYPE_I8, 0x43dfd97f}, - {DBTYPE_UI8, 0x03dfd97f}, + {DBTYPE_UI8, 0x43dfd97f}, {DBTYPE_GUID, 0x01e01103}, {DBTYPE_BYTES, 0x01fc110b}, - {DBTYPE_STR, 0x3bffd9ff}, + {DBTYPE_STR, 0x7bffd9ff}, - {DBTYPE_WSTR, 0x3bffd9ff}, + {DBTYPE_WSTR, 0x7bffd9ff}, {DBTYPE_NUMERIC, 0x039fd97f}, {DBTYPE_UDT, 0x00000000}, - {DBTYPE_DBDATE, 0x39801183}, + {DBTYPE_DBDATE, 0x79801183}, - {DBTYPE_DBTIME, 0x39801183}, - {DBTYPE_DBTIMESTAMP, 0x39801183} + {DBTYPE_DBTIME, 0x79801183}, + {DBTYPE_DBTIMESTAMP, 0x79801183}, + {DBTYPE_FILETIME, 0x79981183} };

1 0

Rico Schüller : d3d10: Add ID3D10EffectStringVariableVtbl.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: d7ad96285423a5bbcb8106ad386149d385da42e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7ad96285423a5bbcb8106ad3… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Oct 26 18:38:57 2009 +0100 d3d10: Add ID3D10EffectStringVariableVtbl. --- dlls/d3d10/effect.c | 209 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 209 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7ad96285423a5bbcb810…

1 0

Rico Schüller : d3d10: Add ID3D10EffectShaderResourceVariableVtbl.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: d070923e691be52c871ab64121a330bb1cbc1dfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d070923e691be52c871ab6412… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Oct 26 18:39:00 2009 +0100 d3d10: Add ID3D10EffectShaderResourceVariableVtbl. --- dlls/d3d10/effect.c | 227 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 227 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d070923e691be52c871ab…

1 0

Rico Schüller : d3d10: Add ID3D10EffectRenderTargetViewVariableVtbl.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: baa3d77fde70a2f295d15cc77b59390de7f9f19a URL: http://source.winehq.org/git/wine.git/?a=commit;h=baa3d77fde70a2f295d15cc77… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Oct 26 18:39:04 2009 +0100 d3d10: Add ID3D10EffectRenderTargetViewVariableVtbl. --- dlls/d3d10/effect.c | 228 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 228 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=baa3d77fde70a2f295d15…

1 0

Rico Schüller : d3d10: Add ID3D10EffectDepthStencilViewVariableVtbl.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 5fe60e8bdbbf3c7d0661952829f78e5073bebc68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fe60e8bdbbf3c7d066195282… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Oct 26 18:39:11 2009 +0100 d3d10: Add ID3D10EffectDepthStencilViewVariableVtbl. --- dlls/d3d10/effect.c | 228 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 228 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fe60e8bdbbf3c7d06619…

1 0

Rico Schüller : d3d10: Add ID3D10EffectShaderVariableVtbl.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: da5cd600089ef5c2fdc0e35e3dbb469f220ac1d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5cd600089ef5c2fdc0e35e3… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Oct 26 18:39:15 2009 +0100 d3d10: Add ID3D10EffectShaderVariableVtbl. --- dlls/d3d10/effect.c | 249 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 249 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da5cd600089ef5c2fdc0e…

1 0

Rico Schüller : d3d10: Improve set_variable_vtbl().
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 8c090941bb9dd4664c23a0808dbe32e994b63fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c090941bb9dd4664c23a0808… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Oct 26 18:39:19 2009 +0100 d3d10: Improve set_variable_vtbl(). --- dlls/d3d10/effect.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index bed9ad8..ac3d972 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -636,6 +636,61 @@ static void set_variable_vtbl(struct d3d10_effect_variable *v) v->vtbl = &d3d10_effect_variable_vtbl; break; + case D3D10_SVC_OBJECT: + switch(v->type->basetype) + { + case D3D10_SVT_STRING: + v->vtbl = (ID3D10EffectVariableVtbl *)&d3d10_effect_string_variable_vtbl; + break; + + case D3D10_SVT_TEXTURE1D: + case D3D10_SVT_TEXTURE1DARRAY: + case D3D10_SVT_TEXTURE2D: + case D3D10_SVT_TEXTURE2DARRAY: + case D3D10_SVT_TEXTURE2DMS: + case D3D10_SVT_TEXTURE2DMSARRAY: + case D3D10_SVT_TEXTURE3D: + case D3D10_SVT_TEXTURECUBE: + v->vtbl = (ID3D10EffectVariableVtbl *)&d3d10_effect_shader_resource_variable_vtbl; + break; + + case D3D10_SVT_RENDERTARGETVIEW: + v->vtbl = (ID3D10EffectVariableVtbl *)&d3d10_effect_render_target_view_variable_vtbl; + break; + + case D3D10_SVT_DEPTHSTENCILVIEW: + v->vtbl = (ID3D10EffectVariableVtbl *)&d3d10_effect_depth_stencil_view_variable_vtbl; + break; + + case D3D10_SVT_DEPTHSTENCIL: + v->vtbl = (ID3D10EffectVariableVtbl *)&d3d10_effect_depth_stencil_variable_vtbl; + break; + + case D3D10_SVT_VERTEXSHADER: + case D3D10_SVT_GEOMETRYSHADER: + case D3D10_SVT_PIXELSHADER: + v->vtbl = (ID3D10EffectVariableVtbl *)&d3d10_effect_shader_variable_vtbl; + break; + + case D3D10_SVT_BLEND: + v->vtbl = (ID3D10EffectVariableVtbl *)&d3d10_effect_blend_variable_vtbl; + break; + + case D3D10_SVT_RASTERIZER: + v->vtbl = (ID3D10EffectVariableVtbl *)&d3d10_effect_rasterizer_variable_vtbl; + break; + + case D3D10_SVT_SAMPLER: + v->vtbl = (ID3D10EffectVariableVtbl *)&d3d10_effect_sampler_variable_vtbl; + break; + + default: + FIXME("Unhandled basetype %s.\n", debug_d3d10_shader_variable_type(v->type->basetype)); + v->vtbl = &d3d10_effect_variable_vtbl; + break; + } + break; + default: FIXME("Unhandled type class %s.\n", debug_d3d10_shader_variable_class(v->type->type_class)); v->vtbl = &d3d10_effect_variable_vtbl;

1 0

Ken Thomases : winex11: Assign OEM virtual key codes in a separate loop.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: f6a6712a31d6e58b8b8d5a018b20d46e31f6b036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6a6712a31d6e58b8b8d5a018… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Oct 26 22:29:16 2009 -0500 winex11: Assign OEM virtual key codes in a separate loop. --- dlls/winex11.drv/keyboard.c | 70 +++++++++++++++++++++++++----------------- 1 files changed, 42 insertions(+), 28 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 1964d5c..97d4be6 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1737,7 +1737,6 @@ void X11DRV_InitKeyboard( Display *display ) e2.display = display; e2.state = 0; - OEMvkey = VK_OEM_8; /* next is available. */ memset(keyc2vkey, 0, sizeof(keyc2vkey)); for (keyc = min_keycode; keyc <= max_keycode; keyc++) { @@ -1854,39 +1853,54 @@ void X11DRV_InitKeyboard( Display *display ) } } - if (!vkey) + if (vkey) + { + TRACE("keycode %04x => vkey %04x\n", e2.keycode, vkey); + keyc2vkey[e2.keycode] = vkey; + } + } /* for */ + + /* Others keys: let's assign OEM virtual key codes in the allowed range, + * that is ([0xba,0xc0], [0xdb,0xe4], 0xe6 (given up) et [0xe9,0xf5]) */ + OEMvkey = VK_OEM_8; /* next is available. */ + for (keyc = min_keycode; keyc <= max_keycode; keyc++) + { + if (keyc2vkey[keyc] & 0xff) + continue; + + e2.keycode = (KeyCode)keyc; + keysym = XLookupKeysym(&e2, 0); + if (!keysym) + continue; + + do { - /* Others keys: let's assign OEM virtual key codes in the allowed range, - * that is ([0xba,0xc0], [0xdb,0xe4], 0xe6 (given up) et [0xe9,0xf5]) */ - do + switch (++OEMvkey) { - switch (++OEMvkey) - { - case 0xc1 : OEMvkey=0xdb; break; - case 0xe5 : OEMvkey=0xe9; break; - case 0xf6 : OEMvkey=0xf5; WARN("No more OEM vkey available!\n"); - } - } while (OEMvkey < 0xf5 && vkey_used[OEMvkey]); + case 0xc1 : OEMvkey=0xdb; break; + case 0xe5 : OEMvkey=0xe9; break; + case 0xf6 : OEMvkey=0xf5; WARN("No more OEM vkey available!\n"); + } + } while (OEMvkey < 0xf5 && vkey_used[OEMvkey]); - vkey = VKEY_IF_NOT_USED(OEMvkey); + vkey = VKEY_IF_NOT_USED(OEMvkey); - if (TRACE_ON(keyboard)) + if (TRACE_ON(keyboard)) + { + TRACE("OEM specific virtual key %X assigned to keycode %X:\n", + OEMvkey, e2.keycode); + TRACE("("); + for (i = 0; i < keysyms_per_keycode; i += 1) { - TRACE("OEM specific virtual key %X assigned to keycode %X:\n", - OEMvkey, e2.keycode); - TRACE("("); - for (i = 0; i < keysyms_per_keycode; i += 1) - { - const char *ksname; + const char *ksname; - keysym = XLookupKeysym(&e2, i); - ksname = XKeysymToString(keysym); - if (!ksname) - ksname = "NoSymbol"; - TRACE( "%lX (%s) ", keysym, ksname); - } - TRACE(")\n"); + keysym = XLookupKeysym(&e2, i); + ksname = XKeysymToString(keysym); + if (!ksname) + ksname = "NoSymbol"; + TRACE( "%lX (%s) ", keysym, ksname); } + TRACE(")\n"); } if (vkey)

1 0

Ken Thomases : winex11: Use a table of available OEM virtual key codes.
by Alexandre Julliard 27 Oct '09

27 Oct '09

Module: wine Branch: master Commit: 58156740f914ebbcee1d54ac6dae872241dcdd11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58156740f914ebbcee1d54ac6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Oct 26 22:29:26 2009 -0500 winex11: Use a table of available OEM virtual key codes. Restore availability of vkeys prior to VK_OEM_8. That's safe now that OEM vkeys are assigned in a separate loop after standard OEM vkey assignments have been made. --- dlls/winex11.drv/keyboard.c | 46 ++++++++++++++++++++++++++++--------------- 1 files changed, 30 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 97d4be6..63d8f55 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1683,11 +1683,21 @@ void X11DRV_InitKeyboard( Display *display ) KeySym keysym; KeyCode *kcp; XKeyEvent e2; - WORD scan, vkey, OEMvkey; + WORD scan, vkey; int keyc, i, keyn, syms; char ckey[4]={0,0,0,0}; const char (*lkey)[MAIN_LEN][4]; char vkey_used[256] = { 0 }; + static const struct { + WORD first, last; + } vkey_ranges[] = { + { VK_OEM_1, VK_OEM_3 }, + { VK_OEM_4, VK_ICO_00 }, + { 0xe6, 0xe6 }, + { 0xe9, 0xf5 }, + { 0, 0 } + }; + int vkey_range; set_kbd_layout_preload_key(); @@ -1861,8 +1871,9 @@ void X11DRV_InitKeyboard( Display *display ) } /* for */ /* Others keys: let's assign OEM virtual key codes in the allowed range, - * that is ([0xba,0xc0], [0xdb,0xe4], 0xe6 (given up) et [0xe9,0xf5]) */ - OEMvkey = VK_OEM_8; /* next is available. */ + * that is ([0xba,0xc0], [0xdb,0xe4], 0xe6, and [0xe9,0xf5]) */ + vkey_range = 0; + vkey = vkey_ranges[vkey_range].first; for (keyc = min_keycode; keyc <= max_keycode; keyc++) { if (keyc2vkey[keyc] & 0xff) @@ -1873,22 +1884,27 @@ void X11DRV_InitKeyboard( Display *display ) if (!keysym) continue; - do + while (vkey && vkey_used[vkey]) { - switch (++OEMvkey) + if (vkey == vkey_ranges[vkey_range].last) { - case 0xc1 : OEMvkey=0xdb; break; - case 0xe5 : OEMvkey=0xe9; break; - case 0xf6 : OEMvkey=0xf5; WARN("No more OEM vkey available!\n"); + vkey_range++; + vkey = vkey_ranges[vkey_range].first; } - } while (OEMvkey < 0xf5 && vkey_used[OEMvkey]); + else + vkey++; + } - vkey = VKEY_IF_NOT_USED(OEMvkey); + if (!vkey) + { + WARN("No more vkeys available!\n"); + break; + } if (TRACE_ON(keyboard)) { TRACE("OEM specific virtual key %X assigned to keycode %X:\n", - OEMvkey, e2.keycode); + vkey, e2.keycode); TRACE("("); for (i = 0; i < keysyms_per_keycode; i += 1) { @@ -1903,11 +1919,9 @@ void X11DRV_InitKeyboard( Display *display ) TRACE(")\n"); } - if (vkey) - { - TRACE("keycode %04x => vkey %04x\n", e2.keycode, vkey); - keyc2vkey[e2.keycode] = vkey; - } + TRACE("keycode %04x => vkey %04x\n", e2.keycode, vkey); + keyc2vkey[e2.keycode] = vkey; + vkey_used[vkey] = 1; } /* for */ #undef VKEY_IF_NOT_USED

1 0