October 2009 - Wine-Commits

Paul Vriens : advapi32/tests: Add a input parameter check (CloseEventLog).
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

Module: wine Branch: master Commit: 4af8e5f24d8e4cc214b5f68dc770c6e3fc444b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4af8e5f24d8e4cc214b5f68dc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 27 10:37:07 2009 +0100 advapi32/tests: Add a input parameter check (CloseEventLog). --- dlls/advapi32/eventlog.c | 11 +++++++++-- dlls/advapi32/tests/eventlog.c | 3 --- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 495623c..1074ccc 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -125,8 +125,15 @@ BOOL WINAPI ClearEventLogW( HANDLE hEventLog, LPCWSTR lpBackupFileName ) */ BOOL WINAPI CloseEventLog( HANDLE hEventLog ) { - FIXME("(%p) stub\n", hEventLog); - return TRUE; + FIXME("(%p) stub\n", hEventLog); + + if (!hEventLog) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + return TRUE; } /****************************************************************************** diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 9fdf745..2823f17 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -34,13 +34,10 @@ static void test_open_close(void) SetLastError(0xdeadbeef); ret = CloseEventLog(NULL); - todo_wine - { ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_NOACCESS, /* W2K */ "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - } SetLastError(0xdeadbeef); handle = OpenEventLogA(NULL, NULL);

1 0

Ken Thomases : winex11: Allow assigning non-OEM virtual key codes for remaining keys.
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

Module: wine Branch: master Commit: e606da3be98d27d185b9b59985d0448e193ce0a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e606da3be98d27d185b9b5998… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Oct 26 22:29:35 2009 -0500 winex11: Allow assigning non-OEM virtual key codes for remaining keys. This is safe because the keyboard layout tables and standard virtual key code assignments have all already been done. This is necessary because some X11 keyboard mappings (e.g. Greek keyboard layout on a Mac) are full of non-Latin keysyms. --- dlls/winex11.drv/keyboard.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 63d8f55..7cf0fdc 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1688,6 +1688,10 @@ void X11DRV_InitKeyboard( Display *display ) char ckey[4]={0,0,0,0}; const char (*lkey)[MAIN_LEN][4]; char vkey_used[256] = { 0 }; + + /* Ranges of OEM, function key, and character virtual key codes. + * Don't include those handled specially in X11DRV_ToUnicodeEx and + * X11DRV_MapVirtualKeyEx, like VK_NUMPAD0 - VK_DIVIDE. */ static const struct { WORD first, last; } vkey_ranges[] = { @@ -1695,6 +1699,10 @@ void X11DRV_InitKeyboard( Display *display ) { VK_OEM_4, VK_ICO_00 }, { 0xe6, 0xe6 }, { 0xe9, 0xf5 }, + { VK_OEM_NEC_EQUAL, VK_OEM_NEC_EQUAL }, + { VK_F1, VK_F24 }, + { 0x30, 0x39 }, /* VK_0 - VK_9 */ + { 0x41, 0x5a }, /* VK_A - VK_Z */ { 0, 0 } }; int vkey_range; @@ -1870,8 +1878,8 @@ 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, and [0xe9,0xf5]) */ + /* For any keycodes which still don't have a vkey, assign any spare + * character, function key, or OEM virtual key code. */ vkey_range = 0; vkey = vkey_ranges[vkey_range].first; for (keyc = min_keycode; keyc <= max_keycode; keyc++) @@ -1903,7 +1911,7 @@ void X11DRV_InitKeyboard( Display *display ) if (TRACE_ON(keyboard)) { - TRACE("OEM specific virtual key %X assigned to keycode %X:\n", + TRACE("spare virtual key %X assigned to keycode %X:\n", vkey, e2.keycode); TRACE("("); for (i = 0; i < keysyms_per_keycode; i += 1)

1 0

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

Oct. 27, 2009

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: Use a table of available OEM virtual key codes.
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

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

Rico Schüller : d3d10: Add ID3D10EffectShaderVariableVtbl.
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

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: Add ID3D10EffectDepthStencilViewVariableVtbl.
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

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 ID3D10EffectRenderTargetViewVariableVtbl.
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

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 ID3D10EffectStringVariableVtbl.
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

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 Oct. 27, 2009

Oct. 27, 2009

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

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

Oct. 27, 2009

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