June 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : widl: Don' t require inline stubs for functions that are never generated.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: 350c93a1643d17671d6aabca96f61562fa66bd93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=350c93a1643d17671d6aabca9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 8 14:05:53 2011 +0200 widl: Don't require inline stubs for functions that are never generated. --- tools/widl/proxy.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 0a677b7..549bfaa 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -850,6 +850,23 @@ int need_inline_stubs(const type_t *iface) STATEMENTS_FOR_EACH_FUNC( stmt, type_iface_get_stmts(iface) ) { const var_t *func = stmt->u.var; + if (is_local( func->attrs )) continue; + if (!is_interpreted_func( iface, func )) return 1; + } + return 0; +} + +static int need_proxy_and_inline_stubs(const type_t *iface) +{ + const statement_t *stmt; + + if (!need_proxy( iface )) return 0; + if (get_stub_mode() == MODE_Os) return 1; + + STATEMENTS_FOR_EACH_FUNC( stmt, type_iface_get_stmts(iface) ) + { + const var_t *func = stmt->u.var; + if (is_local( func->attrs )) continue; if (!is_interpreted_func( iface, func )) return 1; } return 0; @@ -942,7 +959,7 @@ static void write_proxy_routines(const statement_list_t *stmts) print_proxy( "#include \"%s\"\n", header_name); print_proxy( "\n"); - if (need_inline_stubs_file( stmts )) + if (does_any_iface(stmts, need_proxy_and_inline_stubs)) { write_exceptions( proxy ); print_proxy( "\n");

1 0

Alexandre Julliard : widl: Don' t allow floating point parameters for interpreted functions.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: 31475455417c5520955ae4af8ef6ccf4c5f9389c URL: http://source.winehq.org/git/wine.git/?a=commit;h=31475455417c5520955ae4af8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 8 13:57:41 2011 +0200 widl: Don't allow floating point parameters for interpreted functions. --- tools/widl/typegen.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 3f5847b..59de872 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1230,14 +1230,26 @@ int is_interpreted_func( const type_t *iface, const var_t *func ) break; } } - /* unions passed by value are not supported in Oi mode */ if (get_stub_mode() != MODE_Oif && args) + { LIST_FOR_EACH_ENTRY( var, args, const var_t, entry ) - { - if (type_get_type( var->type ) == TYPE_UNION || - type_get_type( var->type ) == TYPE_ENCAPSULATED_UNION) - return 0; - } + switch (type_get_type( var->type )) + { + case TYPE_BASIC: + switch (type_basic_get_type( var->type )) + { + /* floating point arguments are not supported in Oi mode */ + case TYPE_BASIC_FLOAT: return 0; + case TYPE_BASIC_DOUBLE: return 0; + default: break; + } + break; + /* unions passed by value are not supported in Oi mode */ + case TYPE_UNION: return 0; + case TYPE_ENCAPSULATED_UNION: return 0; + default: break; + } + } if ((str = get_attrp( func->attrs, ATTR_OPTIMIZE ))) return !strcmp( str, "i" ); if ((str = get_attrp( iface->attrs, ATTR_OPTIMIZE ))) return !strcmp( str, "i" );

1 0

Henri Verbeet : usp10: Fix a memory leak in GDEF_UpdateGlyphProps().
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: 90cf60c796a7102ad0bfcd5479535c6ac3342583 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90cf60c796a7102ad0bfcd547… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 19:44:45 2011 +0200 usp10: Fix a memory leak in GDEF_UpdateGlyphProps(). --- dlls/usp10/shape.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index d4f7d17..66904da 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1322,6 +1322,8 @@ static void GDEF_UpdateGlyphProps(HDC hdc, const WORD *pwGlyphs, const WORD cGly pGlyphProp[i].sva.fZeroWidth = 0; } } + + HeapFree(GetProcessHeap(), 0, header); } static void UpdateClustersFromGlyphProp(const int cGlyphs, const int cChars, WORD* pwLogClust, SCRIPT_GLYPHPROP *pGlyphProp)

1 0

Henri Verbeet : usp10: Store the GDEF table in the script cache.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: 90d673e961ed7aeef9837c9fe3d8b4b482a1cb28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d673e961ed7aeef9837c9fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 19:44:46 2011 +0200 usp10: Store the GDEF table in the script cache. To avoid reloading it all the time. --- dlls/usp10/shape.c | 20 ++++++++++---------- dlls/usp10/usp10.c | 1 + dlls/usp10/usp10_internal.h | 1 + 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 66904da..1d25414 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1281,16 +1281,18 @@ static VOID *load_gdef_table(HDC hdc) return GDEF_Table; } -static void GDEF_UpdateGlyphProps(HDC hdc, const WORD *pwGlyphs, const WORD cGlyphs, WORD* pwLogClust, SCRIPT_GLYPHPROP *pGlyphProp) +static void GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGlyphs, const WORD cGlyphs, WORD* pwLogClust, SCRIPT_GLYPHPROP *pGlyphProp) { - VOID* header = load_gdef_table(hdc); int i; + if (!psc->GDEF_Table) + psc->GDEF_Table = load_gdef_table(hdc); + for (i = 0; i < cGlyphs; i++) { WORD class; - class = GDEF_get_glyph_class(header, pwGlyphs[i]); + class = GDEF_get_glyph_class(psc->GDEF_Table, pwGlyphs[i]); switch (class) { @@ -1322,8 +1324,6 @@ static void GDEF_UpdateGlyphProps(HDC hdc, const WORD *pwGlyphs, const WORD cGly pGlyphProp[i].sva.fZeroWidth = 0; } } - - HeapFree(GetProcessHeap(), 0, header); } static void UpdateClustersFromGlyphProp(const int cGlyphs, const int cChars, WORD* pwLogClust, SCRIPT_GLYPHPROP *pGlyphProp) @@ -2656,7 +2656,7 @@ static void ShapeCharGlyphProp_Default( HDC hdc, ScriptCache* psc, SCRIPT_ANALYS pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_CHARACTER; } - GDEF_UpdateGlyphProps(hdc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); } @@ -2770,7 +2770,7 @@ static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; } - GDEF_UpdateGlyphProps(hdc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); HeapFree(GetProcessHeap(),0,spaces); } @@ -2838,7 +2838,7 @@ static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS } HeapFree(GetProcessHeap(),0,spaces); - GDEF_UpdateGlyphProps(hdc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); /* Do not allow justification between marks and their base */ @@ -2881,7 +2881,7 @@ static void ShapeCharGlyphProp_None( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS* else pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; } - GDEF_UpdateGlyphProps(hdc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); } @@ -2917,7 +2917,7 @@ static void ShapeCharGlyphProp_Tibet( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS else pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; } - GDEF_UpdateGlyphProps(hdc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); /* Tibeten script does not set sva.fDiacritic or sva.fZeroWidth */ diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 6d7f6cd..bcf2741 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -514,6 +514,7 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) heap_free(((ScriptCache *)*psc)->widths[i]); } heap_free(((ScriptCache *)*psc)->GSUB_Table); + heap_free(((ScriptCache *)*psc)->GDEF_Table); heap_free(((ScriptCache *)*psc)->features); heap_free(*psc); *psc = NULL; diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 574e6f3..43edcf3 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -88,6 +88,7 @@ typedef struct { WORD *glyphs[GLYPH_MAX / GLYPH_BLOCK_SIZE]; ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE]; LPVOID GSUB_Table; + LPVOID GDEF_Table; INT feature_count; LoadedFeature *features;

1 0

Henri Verbeet : wined3d: Rename IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt() to wined3d_check_pixel_format_color().
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: c24c2d1eac46bb4ff181b9a09bc9116134187470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c24c2d1eac46bb4ff181b9a09… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 19:44:47 2011 +0200 wined3d: Rename IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt() to wined3d_check_pixel_format_color(). --- dlls/wined3d/directx.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 02cb33c..09c4de1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2931,7 +2931,7 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, return WINED3D_OK; } -static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(const struct wined3d_gl_info *gl_info, +static BOOL wined3d_check_pixel_format_color(const struct wined3d_gl_info *gl_info, const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) { BYTE redSize, greenSize, blueSize, alphaSize, colorBits; @@ -3038,13 +3038,11 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, cfg_count = adapter->nCfgs; for (i = 0; i < cfg_count; ++i) { - if (IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(&adapter->gl_info, &cfgs[i], rt_format)) + if (wined3d_check_pixel_format_color(&adapter->gl_info, &cfgs[i], rt_format) + && wined3d_check_pixel_format_depth(&adapter->gl_info, &cfgs[i], ds_format)) { - if (wined3d_check_pixel_format_depth(&adapter->gl_info, &cfgs[i], ds_format)) - { - TRACE_(d3d_caps)("Formats match.\n"); - return WINED3D_OK; - } + TRACE_(d3d_caps)("Formats match.\n"); + return WINED3D_OK; } } } @@ -3185,11 +3183,9 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, for (it = 0; it < adapter->nCfgs; ++it) { const struct wined3d_pixel_format *cfg = &adapter->cfgs[it]; - if (IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(&adapter->gl_info, cfg, display_format)) - { - if (wined3d_check_pixel_format_depth(&adapter->gl_info, cfg, ds_format)) - return TRUE; - } + if (wined3d_check_pixel_format_color(&adapter->gl_info, cfg, display_format) + && wined3d_check_pixel_format_depth(&adapter->gl_info, cfg, ds_format)) + return TRUE; } } @@ -3231,8 +3227,8 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, * drawable (not offscreen; e.g. Nvidia offers R5G6B5 for pbuffers even when X is running at 24bit) */ for (it = 0; it < adapter->nCfgs; ++it) { - if (cfgs[it].windowDrawable && IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(&adapter->gl_info, - &cfgs[it], check_format)) + if (cfgs[it].windowDrawable + && wined3d_check_pixel_format_color(&adapter->gl_info, &cfgs[it], check_format)) { TRACE_(d3d_caps)("Pixel format %d is compatible with format %s.\n", cfgs[it].iPixelFormat, debug_d3dformat(check_format->id));

1 0

Henri Verbeet : wined3d: cfg can never be NULL in wined3d_check_pixel_format_color().
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: da125e6bca589f40cf368fddd3e42ebdb2d3f83f URL: http://source.winehq.org/git/wine.git/?a=commit;h=da125e6bca589f40cf368fddd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 19:44:48 2011 +0200 wined3d: cfg can never be NULL in wined3d_check_pixel_format_color(). --- dlls/wined3d/directx.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 09c4de1..502b5d7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2936,9 +2936,6 @@ static BOOL wined3d_check_pixel_format_color(const struct wined3d_gl_info *gl_in { BYTE redSize, greenSize, blueSize, alphaSize, colorBits; - if(!cfg) - return FALSE; - /* Float formats need FBOs. If FBOs are used this function isn't called */ if (format->flags & WINED3DFMT_FLAG_FLOAT) return FALSE;

1 0

Henri Verbeet : wined3d: Rename IWineD3DDeviceImpl_LoadLogo() to device_load_logo().
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: 5173f9f05f542152a1a9348fd1621188ebee3f10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5173f9f05f542152a1a9348fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 19:44:49 2011 +0200 wined3d: Rename IWineD3DDeviceImpl_LoadLogo() to device_load_logo(). --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c7bade0..632f102 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -910,7 +910,7 @@ HRESULT CDECL wined3d_device_get_swapchain(struct wined3d_device *device, return WINED3D_OK; } -static void IWineD3DDeviceImpl_LoadLogo(struct wined3d_device *device, const char *filename) +static void device_load_logo(struct wined3d_device *device, const char *filename) { HBITMAP hbm; BITMAP bm; @@ -1317,7 +1317,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, device->d3d_initialized = TRUE; if (wined3d_settings.logo) - IWineD3DDeviceImpl_LoadLogo(device, wined3d_settings.logo); + device_load_logo(device, wined3d_settings.logo); device->highest_dirty_ps_const = 0; device->highest_dirty_vs_const = 0; return WINED3D_OK;

1 0

Vincent Povirk : user32/tests: Add test for flags on keyboard messages.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: wine Branch: master Commit: ad3e0b78ade98e34087b7b616891d1e4f7a1dbb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad3e0b78ade98e34087b7b616… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 3 15:16:26 2011 -0500 user32/tests: Add test for flags on keyboard messages. --- dlls/user32/tests/msg.c | 126 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 126 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2c5be9e..303c629 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12895,6 +12895,131 @@ static void test_SetParent(void) flush_sequence(); } +static const struct message WmKeyReleaseOnly[] = { + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 0x41, 0x80000001 }, + { WM_KEYUP, sent|wparam|lparam, 0x41, 0x80000001 }, + { 0 } +}; +static const struct message WmKeyPressNormal[] = { + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 0x41, 0x1 }, + { WM_KEYDOWN, sent|wparam|lparam, 0x41, 0x1 }, + { 0 } +}; +static const struct message WmKeyPressRepeat[] = { + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 0x41, 0x40000001 }, + { WM_KEYDOWN, sent|wparam|lparam, 0x41, 0x40000001 }, + { 0 } +}; +static const struct message WmKeyReleaseNormal[] = { + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 0x41, 0xc0000001 }, + { WM_KEYUP, sent|wparam|lparam, 0x41, 0xc0000001 }, + { 0 } +}; + +static void test_keyflags(void) +{ + HWND test_window; + SHORT key_state; + BYTE keyboard_state[256]; + MSG msg; + + test_window = CreateWindowEx(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + + flush_sequence(); + + /* keyup without a keydown */ + keybd_event(0x41, 0, KEYEVENTF_KEYUP, 0); + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE)) + DispatchMessage(&msg); + ok_sequence(WmKeyReleaseOnly, "key release only", TRUE); + + key_state = GetAsyncKeyState(0x41); + ok((key_state & 0x8000) == 0, "unexpected key state %x\n", key_state); + + key_state = GetKeyState(0x41); + ok((key_state & 0x8000) == 0, "unexpected key state %x\n", key_state); + + /* keydown */ + keybd_event(0x41, 0, 0, 0); + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE)) + DispatchMessage(&msg); + ok_sequence(WmKeyPressNormal, "key press only", FALSE); + + key_state = GetAsyncKeyState(0x41); + ok((key_state & 0x8000) == 0x8000, "unexpected key state %x\n", key_state); + + key_state = GetKeyState(0x41); + ok((key_state & 0x8000) == 0x8000, "unexpected key state %x\n", key_state); + + /* keydown repeat */ + keybd_event(0x41, 0, 0, 0); + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE)) + DispatchMessage(&msg); + ok_sequence(WmKeyPressRepeat, "key press repeat", FALSE); + + key_state = GetAsyncKeyState(0x41); + ok((key_state & 0x8000) == 0x8000, "unexpected key state %x\n", key_state); + + key_state = GetKeyState(0x41); + ok((key_state & 0x8000) == 0x8000, "unexpected key state %x\n", key_state); + + /* keyup */ + keybd_event(0x41, 0, KEYEVENTF_KEYUP, 0); + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE)) + DispatchMessage(&msg); + ok_sequence(WmKeyReleaseNormal, "key release repeat", FALSE); + + key_state = GetAsyncKeyState(0x41); + ok((key_state & 0x8000) == 0, "unexpected key state %x\n", key_state); + + key_state = GetKeyState(0x41); + ok((key_state & 0x8000) == 0, "unexpected key state %x\n", key_state); + + /* set the key state in this thread */ + GetKeyboardState(keyboard_state); + keyboard_state[0x41] = 0x80; + SetKeyboardState(keyboard_state); + + key_state = GetAsyncKeyState(0x41); + ok((key_state & 0x8000) == 0, "unexpected key state %x\n", key_state); + + /* keydown */ + keybd_event(0x41, 0, 0, 0); + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE)) + DispatchMessage(&msg); + ok_sequence(WmKeyPressRepeat, "key press after setkeyboardstate", TRUE); + + key_state = GetAsyncKeyState(0x41); + ok((key_state & 0x8000) == 0x8000, "unexpected key state %x\n", key_state); + + key_state = GetKeyState(0x41); + ok((key_state & 0x8000) == 0x8000, "unexpected key state %x\n", key_state); + + /* clear the key state in this thread */ + GetKeyboardState(keyboard_state); + keyboard_state[0x41] = 0; + SetKeyboardState(keyboard_state); + + key_state = GetAsyncKeyState(0x41); + ok((key_state & 0x8000) == 0x8000, "unexpected key state %x\n", key_state); + + /* keyup */ + keybd_event(0x41, 0, KEYEVENTF_KEYUP, 0); + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE)) + DispatchMessage(&msg); + ok_sequence(WmKeyReleaseOnly, "key release after setkeyboardstate", TRUE); + + key_state = GetAsyncKeyState(0x41); + ok((key_state & 0x8000) == 0, "unexpected key state %x\n", key_state); + + key_state = GetKeyState(0x41); + ok((key_state & 0x8000) == 0, "unexpected key state %x\n", key_state); + + DestroyWindow(test_window); + flush_sequence(); +} + static const struct message WmHotkeyPressLWIN[] = { { WM_KEYDOWN, kbd_hook|wparam|lparam, VK_LWIN, LLKHF_INJECTED }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_LWIN, 1 }, @@ -13248,6 +13373,7 @@ START_TEST(msg) test_paintingloop(); test_defwinproc(); test_clipboard_viewers(); + test_keyflags(); test_hotkey(); /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct.

1 0

Jacek Caban : winetest: Added an empty file for tests.
by Alexandre Julliard 08 Jun '11

08 Jun '11

Module: tools Branch: master Commit: 8526960cf58fafe85cc676333df170cd530f867a URL: http://source.winehq.org/git/tools.git/?a=commit;h=8526960cf58fafe85cc67633… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 8 13:46:00 2011 +0200 winetest: Added an empty file for tests. --- 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/winetest/tests/empty.js b/winetest/tests/empty.js new file mode 100644 index 0000000..e69de29

1 0

Dylan Smith : d3dx9/tests: Add texture coordinates and vertex colors in X file.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: bbc009f452ad049d03e989f39ceceea0da77343f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbc009f452ad049d03e989f39… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jun 6 12:54:45 2011 -0400 d3dx9/tests: Add texture coordinates and vertex colors in X file. --- dlls/d3dx9_36/tests/mesh.c | 76 +++++++++++++++++++++++++++++-------------- 1 files changed, 51 insertions(+), 25 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index d404073..ee15fdb 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1994,6 +1994,30 @@ static void D3DXLoadMeshTest(void) "TextureFilename { \"texture.jpg\"; }" "}" "}" + "MeshVertexColors {" + "8;" /* DWORD nVertexColors; */ + /* array IndexedColor vertexColors[nVertexColors]; */ + "0; 0.0; 0.0; 0.0; 0.0;;" + "1; 0.0; 0.0; 1.0; 0.1;;" + "2; 0.0; 1.0; 0.0; 0.2;;" + "3; 0.0; 1.0; 1.0; 0.3;;" + "4; 1.0; 0.0; 0.0; 0.4;;" + "5; 1.0; 0.0; 1.0; 0.5;;" + "6; 1.0; 1.0; 0.0; 0.6;;" + "7; 1.0; 1.0; 1.0; 0.7;;" + "}" + "MeshTextureCoords {" + "8;" /* DWORD nTextureCoords; */ + /* array Coords2d textureCoords[nTextureCoords]; */ + "0.0; 1.0;," + "1.0; 1.0;," + "0.0; 0.0;," + "1.0; 0.0;," + "1.0; 1.0;," + "0.0; 1.0;," + "1.0; 0.0;," + "0.0; 0.0;;" + "}" "}"; static const WORD box_index_buffer[] = { 0, 1, 3, @@ -2012,31 +2036,33 @@ static void D3DXLoadMeshTest(void) static const struct { D3DXVECTOR3 position; D3DXVECTOR3 normal; + D3DCOLOR diffuse; + D3DXVECTOR2 tex_coords; } box_vertex_buffer[] = { - {{0.0, 0.0, 0.0}, {-1.0, 0.0, 0.0}}, - {{0.0, 0.0, 1.0}, {-1.0, 0.0, 0.0}}, - {{0.0, 1.0, 0.0}, {-1.0, 0.0, 0.0}}, - {{0.0, 1.0, 1.0}, {-1.0, 0.0, 0.0}}, - {{1.0, 0.0, 0.0}, {1.0, 0.0, 0.0}}, - {{1.0, 0.0, 1.0}, {1.0, 0.0, 0.0}}, - {{1.0, 1.0, 0.0}, {0.0, 1.0, 0.0}}, - {{1.0, 1.0, 1.0}, {0.0, 1.0, 0.0}}, - {{0.0, 1.0, 0.0}, {0.0, 1.0, 0.0}}, - {{0.0, 1.0, 1.0}, {0.0, 1.0, 0.0}}, - {{1.0, 1.0, 0.0}, {1.0, 0.0, 0.0}}, - {{1.0, 1.0, 1.0}, {1.0, 0.0, 0.0}}, - {{0.0, 0.0, 1.0}, {0.0, -1.0, 0.0}}, - {{0.0, 0.0, 0.0}, {0.0, -1.0, 0.0}}, - {{1.0, 0.0, 0.0}, {0.0, -1.0, 0.0}}, - {{1.0, 0.0, 1.0}, {0.0, -1.0, 0.0}}, - {{0.0, 0.0, 1.0}, {0.0, 0.0, 1.0}}, - {{1.0, 0.0, 1.0}, {0.0, 0.0, 1.0}}, - {{1.0, 1.0, 1.0}, {0.0, 0.0, 1.0}}, - {{0.0, 1.0, 1.0}, {0.0, 0.0, 1.0}}, - {{0.0, 0.0, 0.0}, {0.0, 0.0, -1.0}}, - {{0.0, 1.0, 0.0}, {0.0, 0.0, -1.0}}, - {{1.0, 1.0, 0.0}, {0.0, 0.0, -1.0}}, - {{1.0, 0.0, 0.0}, {0.0, 0.0, -1.0}}, + {{0.0, 0.0, 0.0}, {-1.0, 0.0, 0.0}, 0x00000000, {0.0, 1.0}}, + {{0.0, 0.0, 1.0}, {-1.0, 0.0, 0.0}, 0x1a0000ff, {1.0, 1.0}}, + {{0.0, 1.0, 0.0}, {-1.0, 0.0, 0.0}, 0x3300ff00, {0.0, 0.0}}, + {{0.0, 1.0, 1.0}, {-1.0, 0.0, 0.0}, 0x4d00ffff, {1.0, 0.0}}, + {{1.0, 0.0, 0.0}, {1.0, 0.0, 0.0}, 0x66ff0000, {1.0, 1.0}}, + {{1.0, 0.0, 1.0}, {1.0, 0.0, 0.0}, 0x80ff00ff, {0.0, 1.0}}, + {{1.0, 1.0, 0.0}, {0.0, 1.0, 0.0}, 0x99ffff00, {1.0, 0.0}}, + {{1.0, 1.0, 1.0}, {0.0, 1.0, 0.0}, 0xb3ffffff, {0.0, 0.0}}, + {{0.0, 1.0, 0.0}, {0.0, 1.0, 0.0}, 0x3300ff00, {0.0, 0.0}}, + {{0.0, 1.0, 1.0}, {0.0, 1.0, 0.0}, 0x4d00ffff, {1.0, 0.0}}, + {{1.0, 1.0, 0.0}, {1.0, 0.0, 0.0}, 0x99ffff00, {1.0, 0.0}}, + {{1.0, 1.0, 1.0}, {1.0, 0.0, 0.0}, 0xb3ffffff, {0.0, 0.0}}, + {{0.0, 0.0, 1.0}, {0.0, -1.0, 0.0}, 0x1a0000ff, {1.0, 1.0}}, + {{0.0, 0.0, 0.0}, {0.0, -1.0, 0.0}, 0x00000000, {0.0, 1.0}}, + {{1.0, 0.0, 0.0}, {0.0, -1.0, 0.0}, 0x66ff0000, {1.0, 1.0}}, + {{1.0, 0.0, 1.0}, {0.0, -1.0, 0.0}, 0x80ff00ff, {0.0, 1.0}}, + {{0.0, 0.0, 1.0}, {0.0, 0.0, 1.0}, 0x1a0000ff, {1.0, 1.0}}, + {{1.0, 0.0, 1.0}, {0.0, 0.0, 1.0}, 0x80ff00ff, {0.0, 1.0}}, + {{1.0, 1.0, 1.0}, {0.0, 0.0, 1.0}, 0xb3ffffff, {0.0, 0.0}}, + {{0.0, 1.0, 1.0}, {0.0, 0.0, 1.0}, 0x4d00ffff, {1.0, 0.0}}, + {{0.0, 0.0, 0.0}, {0.0, 0.0, -1.0}, 0x00000000, {0.0, 1.0}}, + {{0.0, 1.0, 0.0}, {0.0, 0.0, -1.0}, 0x3300ff00, {0.0, 0.0}}, + {{1.0, 1.0, 0.0}, {0.0, 0.0, -1.0}, 0x99ffff00, {1.0, 0.0}}, + {{1.0, 0.0, 0.0}, {0.0, 0.0, -1.0}, 0x66ff0000, {1.0, 1.0}}, }; static const D3DXMATERIAL box_materials[] = { { @@ -2060,7 +2086,7 @@ static void D3DXLoadMeshTest(void) (char *)"texture.jpg", /* pTextureFilename */ }, }; - const DWORD box_fvf = D3DFVF_XYZ | D3DFVF_NORMAL; + const DWORD box_fvf = D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_DIFFUSE | D3DFVF_TEX1; /*________________________*/ HRESULT hr; HWND wnd = NULL;

1 0