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

Henri Verbeet : wined3d: Get rid of the glsl_src_param_t typedef.
by Alexandre Julliard June 29, 2011

June 29, 2011

Module: wine Branch: master Commit: 8fa44dd76de2e1182cd366d3a812ef1bf7899db4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fa44dd76de2e1182cd366d3a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 29 12:33:51 2011 +0200 wined3d: Get rid of the glsl_src_param_t typedef. --- dlls/wined3d/glsl_shader.c | 170 +++++++++++++++++++++++--------------------- 1 files changed, 89 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8fa44dd76de2e1182cd36…

1 0

Rico Schüller : d3dx9: Fix ID3DXEffect:: SetStateManager().
by Alexandre Julliard June 28, 2011

June 28, 2011

Module: wine Branch: master Commit: 32bba812dfcdf373a82c882b5d46d599c48068ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=32bba812dfcdf373a82c882b5… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jun 28 22:49:44 2011 +0200 d3dx9: Fix ID3DXEffect::SetStateManager(). --- dlls/d3dx9_36/effect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 756163a..4253863 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2944,8 +2944,8 @@ static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, LPD3DX TRACE("iface %p, manager %p\n", This, manager); - if (This->manager) IUnknown_Release(This->manager); if (manager) IUnknown_AddRef(manager); + if (This->manager) IUnknown_Release(This->manager); This->manager = manager;

1 0

Vincent Povirk : gdiplus: Use DrawDriverString to draw the text in DrawString.
by Alexandre Julliard June 28, 2011

June 28, 2011

Module: wine Branch: master Commit: d59c3d45e34817e08e68305d3e5f632e3c8523a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d59c3d45e34817e08e68305d3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 27 14:40:59 2011 -0500 gdiplus: Use DrawDriverString to draw the text in DrawString. --- dlls/gdiplus/graphics.c | 77 +++++++++++++++++++--------------------------- 1 files changed, 32 insertions(+), 45 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index d756c0b..be25653 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4608,9 +4608,9 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, } struct draw_string_args { - POINT drawbase; - UINT drawflags; - REAL ang_cos, ang_sin; + GpGraphics *graphics; + GDIPCONST GpBrush *brush; + REAL x, y, rel_width, rel_height, ascent; }; static GpStatus draw_string_callback(HDC hdc, @@ -4619,14 +4619,14 @@ static GpStatus draw_string_callback(HDC hdc, INT lineno, const RectF *bounds, void *user_data) { struct draw_string_args *args = user_data; - RECT drawcoord; + PointF position; - drawcoord.left = drawcoord.right = args->drawbase.x + roundr(args->ang_sin * bounds->Y); - drawcoord.top = drawcoord.bottom = args->drawbase.y + roundr(args->ang_cos * bounds->Y); + position.X = args->x + bounds->X / args->rel_width; + position.Y = args->y + bounds->Y / args->rel_height + args->ascent; - DrawTextW(hdc, string + index, length, &drawcoord, args->drawflags); - - return Ok; + return GdipDrawDriverString(args->graphics, &string[index], length, font, + args->brush, &position, + DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, NULL); } GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string, @@ -4637,10 +4637,12 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string HFONT gdifont; GpPointF pt[3], rectcpy[4]; POINT corners[4]; - REAL angle, rel_width, rel_height; + REAL rel_width, rel_height; INT offsety = 0, save_state; struct draw_string_args args; RectF scaled_rect; + HDC hdc, temp_hdc=NULL; + TEXTMETRICW textmetric; TRACE("(%p, %s, %i, %p, %s, %p, %p)\n", graphics, debugstr_wn(string, length), length, font, debugstr_rectf(rect), format, brush); @@ -4648,15 +4650,13 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if(!graphics || !string || !font || !brush || !rect) return InvalidParameter; - if((brush->bt != BrushTypeSolidColor)){ - FIXME("not implemented for given parameters\n"); - return NotImplemented; + if(graphics->hdc) + { + hdc = graphics->hdc; } - - if(!graphics->hdc) + else { - FIXME("graphics object has no HDC\n"); - return Ok; + hdc = temp_hdc = CreateCompatibleDC(0); } if(format){ @@ -4675,9 +4675,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string } } - save_state = SaveDC(graphics->hdc); - SetBkMode(graphics->hdc, TRANSPARENT); - SetTextColor(graphics->hdc, brush->lb.lbColor); + save_state = SaveDC(hdc); pt[0].X = 0.0; pt[0].Y = 0.0; @@ -4686,9 +4684,6 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string pt[2].X = 0.0; pt[2].Y = 1.0; GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); - angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); - args.ang_cos = cos(angle); - args.ang_sin = sin(angle); rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ @@ -4709,38 +4704,30 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string { /* FIXME: If only the width or only the height is 0, we should probably still clip */ rgn = CreatePolygonRgn(corners, 4, ALTERNATE); - SelectClipRgn(graphics->hdc, rgn); + SelectClipRgn(hdc, rgn); } get_font_hfont(graphics, font, &gdifont); - SelectObject(graphics->hdc, gdifont); + SelectObject(hdc, gdifont); - if (!format || format->align == StringAlignmentNear) - { - args.drawbase.x = corners[0].x; - args.drawbase.y = corners[0].y; - args.drawflags = DT_NOCLIP | DT_EXPANDTABS; - } - else if (format->align == StringAlignmentCenter) - { - args.drawbase.x = (corners[0].x + corners[1].x)/2; - args.drawbase.y = (corners[0].y + corners[1].y)/2; - args.drawflags = DT_NOCLIP | DT_EXPANDTABS | DT_CENTER; - } - else /* (format->align == StringAlignmentFar) */ - { - args.drawbase.x = corners[1].x; - args.drawbase.y = corners[1].y; - args.drawflags = DT_NOCLIP | DT_EXPANDTABS | DT_RIGHT; - } + args.graphics = graphics; + args.brush = brush; - gdip_format_string(graphics->hdc, string, length, font, &scaled_rect, format, + args.rel_width = rel_width; + args.rel_height = rel_height; + + GetTextMetricsW(hdc, &textmetric); + args.ascent = textmetric.tmAscent / rel_height; + + gdip_format_string(hdc, string, length, font, &scaled_rect, format, draw_string_callback, &args); DeleteObject(rgn); DeleteObject(gdifont); - RestoreDC(graphics->hdc, save_state); + RestoreDC(hdc, save_state); + + DeleteDC(temp_hdc); return Ok; }

1 0

Vincent Povirk : gdiplus: Fix the order of arguments to expectf in test_string_functions.
by Alexandre Julliard June 28, 2011

June 28, 2011

Module: wine Branch: master Commit: 0ec9d398a57351b65806b6975dab2cd79523d328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec9d398a57351b65806b6975… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jun 28 13:53:41 2011 -0500 gdiplus: Fix the order of arguments to expectf in test_string_functions. --- dlls/gdiplus/tests/graphics.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 49f6815..64472f4 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3087,7 +3087,7 @@ static void test_string_functions(void) identity, &rc); todo_wine expect(Ok, status); - expectf(rc.X, 0.0); + expectf(0.0, rc.X); todo_wine ok(rc.Y < 0.0, "unexpected Y %0.2f\n", rc.Y); todo_wine ok(rc.Width > 0.0, "unexpected Width %0.2f\n", rc.Width); todo_wine ok(rc.Height > 0.0, "unexpected Y %0.2f\n", rc.Y); @@ -3104,10 +3104,10 @@ static void test_string_functions(void) identity, &rc); todo_wine expect(Ok, status); - expectf(rc.X, 0.0); + expectf(0.0, rc.X); todo_wine ok(rc.Y < 0.0, "unexpected Y %0.2f\n", rc.Y); todo_wine ok(rc.Width < char_width, "got Width %0.2f, expecting less than %0.2f\n", rc.Width, char_width); - expectf(rc.Height, char_height); + expectf(char_height, rc.Height); GdipDeleteMatrix(identity); GdipDeleteStringFormat(format);

1 0

Marcus Meissner : explorer: Remove useless array NULL check (Coverity).
by Alexandre Julliard June 28, 2011

June 28, 2011

Module: wine Branch: master Commit: 436ec812401b87a1b0e2f4567d5fe24de0d303d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=436ec812401b87a1b0e2f4567… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 28 08:31:31 2011 +0200 explorer: Remove useless array NULL check (Coverity). --- programs/explorer/explorer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index d04457b..0dc82cf 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -167,7 +167,7 @@ static IShellFolder* get_starting_shell_folder(parameters_struct* params) HRESULT hres; SHGetDesktopFolder(&desktop); - if(!params->root || (strlenW(params->root)==0)) + if (!params->root[0]) { return desktop; }

1 0

Vincent Povirk : gdiplus: Test MeasureDriverString with a character that has an underhang.
by Alexandre Julliard June 28, 2011

June 28, 2011

Module: wine Branch: master Commit: 640c7b5e4ffcdad40efc2dde2496484c609edc66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=640c7b5e4ffcdad40efc2dde2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jun 28 13:57:23 2011 -0500 gdiplus: Test MeasureDriverString with a character that has an underhang. --- dlls/gdiplus/tests/graphics.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 64472f4..0ab570d 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2827,6 +2827,7 @@ static void test_string_functions(void) HDC hdc = GetDC( hwnd ); const WCHAR fontname[] = {'T','a','h','o','m','a',0}; const WCHAR teststring[] = {'M','M',' ','M','\n','M',0}; + const WCHAR teststring2[] = {'j',0}; REAL char_width, char_height; INT codepointsfitted, linesfilled; GpStringFormat *format; @@ -3109,6 +3110,20 @@ static void test_string_functions(void) todo_wine ok(rc.Width < char_width, "got Width %0.2f, expecting less than %0.2f\n", rc.Width, char_width); expectf(char_height, rc.Height); + rc.X = 0; + rc.Y = 0; + rc.Width = 0; + rc.Height = 0; + status = GdipMeasureDriverString(graphics, teststring2, 1, font, &position, + DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, + identity, &rc); + todo_wine expect(Ok, status); + + expectf(rc.X, 0.0); + todo_wine ok(rc.Y < 0.0, "unexpected Y %0.2f\n", rc.Y); + todo_wine ok(rc.Width > 0, "unexpected Width %0.2f\n", rc.Width); + expectf(rc.Height, char_height); + GdipDeleteMatrix(identity); GdipDeleteStringFormat(format); GdipDeleteBrush(brush);

1 0

Vincent Povirk : gdiplus: Implement GdipMeasureDriverString.
by Alexandre Julliard June 28, 2011

June 28, 2011

Module: wine Branch: master Commit: 6cc7e7f7c4b353257e18cd6356c58df2d00e2923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cc7e7f7c4b353257e18cd635… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 27 13:24:39 2011 -0500 gdiplus: Implement GdipMeasureDriverString. --- dlls/gdiplus/graphics.c | 108 ++++++++++++++++++++++++++++++++++++++++- dlls/gdiplus/tests/graphics.c | 34 ++++++------ 2 files changed, 123 insertions(+), 19 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 8c6a042..d756c0b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5624,8 +5624,112 @@ GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT GDIPCONST GpFont *font, GDIPCONST PointF *positions, INT flags, GDIPCONST GpMatrix *matrix, RectF *boundingBox) { - FIXME("(%p %p %d %p %p %d %p %p): stub\n", graphics, text, length, font, positions, flags, matrix, boundingBox); - return NotImplemented; + static const INT unsupported_flags = ~(DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance); + HFONT hfont; + HDC hdc; + REAL min_x, min_y, max_x, max_y, x, y; + int i; + TEXTMETRICW textmetric; + const WORD *glyph_indices; + WORD *dynamic_glyph_indices=NULL; + REAL rel_width, rel_height, ascent, descent; + GpPointF pt[3]; + + TRACE("(%p %p %d %p %p %d %p %p)\n", graphics, text, length, font, positions, flags, matrix, boundingBox); + + if (!graphics || !text || !font || !positions || !boundingBox) + return InvalidParameter; + + if (length == -1) + length = strlenW(text); + + if (length == 0) + { + boundingBox->X = 0.0; + boundingBox->Y = 0.0; + boundingBox->Width = 0.0; + boundingBox->Height = 0.0; + } + + if (flags & unsupported_flags) + FIXME("Ignoring flags %x\n", flags & unsupported_flags); + + if (matrix) + FIXME("Ignoring matrix\n"); + + get_font_hfont(graphics, font, &hfont); + + hdc = CreateCompatibleDC(0); + SelectObject(hdc, hfont); + + GetTextMetricsW(hdc, &textmetric); + + pt[0].X = 0.0; + pt[0].Y = 0.0; + pt[1].X = 1.0; + pt[1].Y = 0.0; + pt[2].X = 0.0; + pt[2].Y = 1.0; + GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); + rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ + (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); + rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ + (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); + + if (flags & DriverStringOptionsCmapLookup) + { + glyph_indices = dynamic_glyph_indices = GdipAlloc(sizeof(WORD) * length); + if (!glyph_indices) + { + DeleteDC(hdc); + DeleteObject(hfont); + return OutOfMemory; + } + + GetGlyphIndicesW(hdc, text, length, dynamic_glyph_indices, 0); + } + else + glyph_indices = text; + + min_x = max_x = x = positions[0].X; + min_y = max_y = y = positions[0].Y; + + ascent = textmetric.tmAscent / rel_height; + descent = textmetric.tmDescent / rel_height; + + for (i=0; i<length; i++) + { + int char_width; + ABC abc; + + if (!(flags & DriverStringOptionsRealizedAdvance)) + { + x = positions[i].X; + y = positions[i].Y; + } + + GetCharABCWidthsW(hdc, glyph_indices[i], glyph_indices[i], &abc); + char_width = abc.abcA + abc.abcB + abc.abcB; + + if (min_y > y - ascent) min_y = y - ascent; + if (max_y < y + descent) max_y = y + descent; + if (min_x > x) min_x = x; + + x += char_width / rel_width; + + if (max_x < x) max_x = x; + } + + GdipFree(dynamic_glyph_indices); + DeleteDC(hdc); + DeleteObject(hfont); + + boundingBox->X = min_x; + boundingBox->Y = min_y; + boundingBox->Width = max_x - min_x; + boundingBox->Height = max_y - min_y; + + return Ok; } static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT16 *text, INT length, diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 0ab570d..bbca69f 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3048,36 +3048,36 @@ static void test_string_functions(void) status = GdipMeasureDriverString(NULL, teststring, 6, font, &position, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); - todo_wine expect(InvalidParameter, status); + expect(InvalidParameter, status); status = GdipMeasureDriverString(graphics, NULL, 6, font, &position, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); - todo_wine expect(InvalidParameter, status); + expect(InvalidParameter, status); status = GdipMeasureDriverString(graphics, teststring, 6, NULL, &position, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); - todo_wine expect(InvalidParameter, status); + expect(InvalidParameter, status); status = GdipMeasureDriverString(graphics, teststring, 6, font, NULL, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); - todo_wine expect(InvalidParameter, status); + expect(InvalidParameter, status); status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, 0x100, identity, &rc); - todo_wine expect(Ok, status); + expect(Ok, status); status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, NULL, &rc); - todo_wine expect(Ok, status); + expect(Ok, status); status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, NULL); - todo_wine expect(InvalidParameter, status); + expect(InvalidParameter, status); rc.X = 0; rc.Y = 0; @@ -3086,12 +3086,12 @@ static void test_string_functions(void) status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); - todo_wine expect(Ok, status); + expect(Ok, status); expectf(0.0, rc.X); - todo_wine ok(rc.Y < 0.0, "unexpected Y %0.2f\n", rc.Y); - todo_wine ok(rc.Width > 0.0, "unexpected Width %0.2f\n", rc.Width); - todo_wine ok(rc.Height > 0.0, "unexpected Y %0.2f\n", rc.Y); + ok(rc.Y < 0.0, "unexpected Y %0.2f\n", rc.Y); + ok(rc.Width > 0.0, "unexpected Width %0.2f\n", rc.Width); + ok(rc.Height > 0.0, "unexpected Y %0.2f\n", rc.Y); char_width = rc.Width; char_height = rc.Height; @@ -3103,11 +3103,11 @@ static void test_string_functions(void) status = GdipMeasureDriverString(graphics, teststring, 4, font, &position, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); - todo_wine expect(Ok, status); + expect(Ok, status); expectf(0.0, rc.X); - todo_wine ok(rc.Y < 0.0, "unexpected Y %0.2f\n", rc.Y); - todo_wine ok(rc.Width < char_width, "got Width %0.2f, expecting less than %0.2f\n", rc.Width, char_width); + ok(rc.Y < 0.0, "unexpected Y %0.2f\n", rc.Y); + ok(rc.Width < char_width, "got Width %0.2f, expecting less than %0.2f\n", rc.Width, char_width); expectf(char_height, rc.Height); rc.X = 0; @@ -3117,11 +3117,11 @@ static void test_string_functions(void) status = GdipMeasureDriverString(graphics, teststring2, 1, font, &position, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); - todo_wine expect(Ok, status); + expect(Ok, status); expectf(rc.X, 0.0); - todo_wine ok(rc.Y < 0.0, "unexpected Y %0.2f\n", rc.Y); - todo_wine ok(rc.Width > 0, "unexpected Width %0.2f\n", rc.Width); + ok(rc.Y < 0.0, "unexpected Y %0.2f\n", rc.Y); + ok(rc.Width > 0, "unexpected Width %0.2f\n", rc.Width); expectf(rc.Height, char_height); GdipDeleteMatrix(identity);

1 0

Lucas Fialho Zawacki : dinput8/tests: Testing BuildActionMap and SetActionMap with keyboard input.
by Alexandre Julliard June 28, 2011

June 28, 2011

Module: wine Branch: master Commit: 636cc9acff29666ebf7f1d0043db49c37518c7fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=636cc9acff29666ebf7f1d004… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Tue Jun 28 13:54:49 2011 -0300 dinput8/tests: Testing BuildActionMap and SetActionMap with keyboard input. --- dlls/dinput8/tests/device.c | 119 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 119 insertions(+), 0 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 8344486..af14d60 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -38,6 +38,13 @@ struct enum_data { /* Dummy GUID */ static const GUID ACTION_MAPPING_GUID = { 0x1, 0x2, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } }; +enum { + DITEST_AXIS, + DITEST_BUTTON, + DITEST_KEYBOARDSPACE, + DITEST_MOUSEBUTTON0, +}; + static DIACTION actionMapping[]= { /* axis */ @@ -50,6 +57,63 @@ static DIACTION actionMapping[]= { 3, DIMOUSE_BUTTON0 , 0, { "Select" } } }; +static void test_keyboard_input( + LPDIRECTINPUTDEVICE8 lpdid, + DWORD key, + DWORD expected +) +{ + HRESULT hr; + DIDEVICEOBJECTDATA obj_data; + DWORD data_size = 1; + + hr = IDirectInputDevice8_Acquire(lpdid); + todo_wine ok (SUCCEEDED(hr), "Failed to acquire device hr=%08x\n", hr); + + keybd_event( key, 0, 0, 0); + + IDirectInputDevice8_Poll(lpdid); + hr = IDirectInputDevice8_GetDeviceData(lpdid, sizeof(obj_data), &obj_data, &data_size, 0); + + if (data_size != 1) + { + win_skip("We're not able to inject input into Windows dinput8 with events\n"); + return; + } + + ok (data_size == 1, "GetDeviceData did not read any event\n"); + todo_wine ok (obj_data.uAppData == expected, "Retrieval of action failed uAppData=%lu expected=%d\n", obj_data.uAppData, expected); +} + +static void test_build_action_map( + LPDIRECTINPUTDEVICE8 lpdid, + LPDIACTIONFORMAT lpdiaf, + int action_index, + DWORD obj_expected +) +{ + HRESULT hr; + DIACTION *actions; + DWORD obj_instance, how; + GUID assigned_to; + DIDEVICEINSTANCEA ddi; + + ddi.dwSize = sizeof(ddi); + IDirectInputDevice_GetDeviceInfo(lpdid, &ddi); + + hr = IDirectInputDevice8_BuildActionMap(lpdid, lpdiaf, NULL, DIDBAM_INITIALIZE); + ok (SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr); + + actions = lpdiaf->rgoAction; + obj_instance = DIDFT_GETINSTANCE(actions[action_index].dwObjID); + how = actions[action_index].dwHow; + assigned_to = actions[action_index].guidInstance; + + todo_wine ok (how == DIAH_USERCONFIG || how == DIAH_DEFAULT, "Action was not set dwHow=%08x\n", how); + todo_wine ok (obj_instance == obj_expected, "Action not mapped correctly instance=%08x expected=%08x\n", obj_instance, obj_expected); + todo_wine ok (IsEqualGUID(&assigned_to, &ddi.guidInstance), "Action and device GUID do not match action=%d\n", action_index); +} + static BOOL CALLBACK enumeration_callback( LPCDIDEVICEINSTANCE lpddi, LPDIRECTINPUTDEVICE8 lpdid, @@ -57,6 +121,8 @@ static BOOL CALLBACK enumeration_callback( DWORD dwRemaining, LPVOID pvRef) { + HRESULT hr; + DIPROPDWORD dp; struct enum_data *data = pvRef; if (!data) return DIENUM_CONTINUE; @@ -79,6 +145,36 @@ static BOOL CALLBACK enumeration_callback( ok (dwFlags & DIEDBS_MAPPEDPRI1, "Mouse should be mapped as pri1 dwFlags=%08x\n", dwFlags); } + /* Building and setting an action map */ + /* It should not use any pre-stored mappings so we use DIDBAM_INITIALIZE */ + hr = IDirectInputDevice8_BuildActionMap(lpdid, data->lpdiaf, NULL, DIDBAM_INITIALIZE); + ok (SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr); + + /* Device has no data format and thus can't be acquired */ + hr = IDirectInputDevice8_Acquire(lpdid); + ok (hr == DIERR_INVALIDPARAM, "Device was acquired before SetActionMap hr=%08x\n", hr); + + hr = IDirectInputDevice8_SetActionMap(lpdid, data->lpdiaf, NULL, 0); + ok (SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr); + + /* Test buffer size */ + memset(&dp, 0, sizeof(dp)); + dp.diph.dwSize = sizeof(dp); + dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dp.diph.dwHow = DIPH_DEVICE; + + hr = IDirectInputDevice_GetProperty(lpdid, DIPROP_BUFFERSIZE, &dp.diph); + ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); + todo_wine ok (dp.dwData == data->lpdiaf->dwBufferSize, "SetActionMap must set the buffer, buffersize=%d\n", dp.dwData); + + /* SetActionMap has set the data format so now it should work */ + hr = IDirectInputDevice8_Acquire(lpdid); + todo_wine ok (SUCCEEDED(hr), "Acquire failed hr=%08x\n", hr); + + /* SetActionMap should not work on an acquired device */ + hr = IDirectInputDevice8_SetActionMap(lpdid, data->lpdiaf, NULL, 0); + todo_wine ok (hr == DIERR_ACQUIRED, "SetActionMap succeeded with an acquired device hr=%08x\n", hr); + return DIENUM_CONTINUE; } @@ -119,6 +215,7 @@ static void test_action_mapping(void) af.rgoAction = actionMapping; af.guidActionMap = ACTION_MAPPING_GUID; af.dwGenre = 0x01000000; /* DIVIRTUAL_DRIVING_RACE */ + af.dwBufferSize = 32; hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, enumeration_callback, &data, 0); ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr); @@ -126,6 +223,28 @@ static void test_action_mapping(void) ok (data.keyboard != NULL, "EnumDevicesBySemantics should enumerate the keyboard\n"); ok (data.mouse != NULL, "EnumDevicesBySemantics should enumerate the mouse\n"); + if (data.keyboard != NULL) + { + /* Test keyboard BuildActionMap */ + test_build_action_map(data.keyboard, data.lpdiaf, DITEST_KEYBOARDSPACE, DIK_SPACE); + /* Test keyboard input */ + test_keyboard_input(data.keyboard, VK_SPACE, 2); + + /* Test BuildActionMap with no suitable actions for a device */ + IDirectInputDevice_Unacquire(data.keyboard); + af.dwDataSize = 4 * DITEST_KEYBOARDSPACE; + af.dwNumActions = DITEST_KEYBOARDSPACE; + + hr = IDirectInputDevice8_BuildActionMap(data.keyboard, data.lpdiaf, NULL, DIDBAM_INITIALIZE); + todo_wine ok (hr == DI_NOEFFECT, "BuildActionMap should have no effect with no actions hr=%08x\n", hr); + + hr = IDirectInputDevice8_SetActionMap(data.keyboard, data.lpdiaf, NULL, 0); + todo_wine ok (hr == DI_NOEFFECT, "SetActionMap should have no effect with no actions to map hr=%08x\n", hr); + + af.dwDataSize = 4 * sizeof(actionMapping) / sizeof(actionMapping[0]); + af.dwNumActions = sizeof(actionMapping) / sizeof(actionMapping[0]); + } + /* The call fails with a zeroed GUID */ memset(&af.guidActionMap, 0, sizeof(GUID)); hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, enumeration_callback, 0, 0);

1 0

Lucas Fialho Zawacki : dinput8/tests: Test EnumDevicesBySemantics mouse and keyboard enumeration with flags.
by Alexandre Julliard June 28, 2011

June 28, 2011

Module: wine Branch: master Commit: 3ed476caac4d9762b9db66267d95161ac7a7266d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ed476caac4d9762b9db66267… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Tue Jun 28 13:54:20 2011 -0300 dinput8/tests: Test EnumDevicesBySemantics mouse and keyboard enumeration with flags. --- dlls/dinput8/tests/device.c | 73 +++++++++++++++++++++++++++++++------------ 1 files changed, 53 insertions(+), 20 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index c18a83a..992821d 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -27,13 +27,58 @@ #include "initguid.h" #include "dinput.h" -static BOOL CALLBACK enum_by_semantics( +struct enum_data { + LPDIRECTINPUT8 pDI; + LPDIACTIONFORMAT lpdiaf; + LPDIRECTINPUTDEVICE8 keyboard; + LPDIRECTINPUTDEVICE8 mouse; + int ndevices; +}; + +/* Dummy GUID */ +static const GUID ACTION_MAPPING_GUID = { 0x1, 0x2, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } }; + +static DIACTION actionMapping[]= +{ + /* axis */ + { 0, 0x01008A01 /* DIAXIS_DRIVINGR_STEER */ , 0, { "Steer" } }, + /* button */ + { 1, 0x01000C01 /* DIBUTTON_DRIVINGR_SHIFTUP */ , 0, { "Upshift" } }, + /* keyboard key */ + { 2, DIKEYBOARD_SPACE , 0, { "Missile" } }, + /* mouse button */ + { 3, DIMOUSE_BUTTON0 , 0, { "Select" } } +}; + +static BOOL CALLBACK enumeration_callback( LPCDIDEVICEINSTANCE lpddi, LPDIRECTINPUTDEVICE8 lpdid, DWORD dwFlags, DWORD dwRemaining, LPVOID pvRef) { + struct enum_data *data = pvRef; + if (!data) return DIENUM_CONTINUE; + + data->ndevices++; + + /* collect the mouse and keyboard */ + if (IsEqualGUID(&lpddi->guidInstance, &GUID_SysKeyboard)) + { + IDirectInputDevice_AddRef(lpdid); + data->keyboard = lpdid; + + todo_wine ok (dwFlags & DIEDBS_MAPPEDPRI1, "Keyboard should be mapped as pri1 dwFlags=%08x\n", dwFlags); + } + + if (IsEqualGUID(&lpddi->guidInstance, &GUID_SysMouse)) + { + IDirectInputDevice_AddRef(lpdid); + data->mouse = lpdid; + + todo_wine ok (dwFlags & DIEDBS_MAPPEDPRI1, "Mouse should be mapped as pri1 dwFlags=%08x\n", dwFlags); + } + return DIENUM_CONTINUE; } @@ -44,17 +89,7 @@ static void test_action_mapping(void) HINSTANCE hinst = GetModuleHandle(NULL); LPDIRECTINPUT8 pDI = NULL; DIACTIONFORMAT af; - /* Dummy GUID */ - const GUID ACTION_MAPPING_GUID = { 0x1, 0x2, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } }; - - DIACTION actionMapping[]= - { - /* axis */ - { 0, 0x01008A01 /* DIAXIS_DRIVINGR_STEER */ , 0, { "Steer" } }, - - /* button */ - { 1, 0x01000C01 /* DIBUTTON_DRIVINGR_SHIFTUP */ , 0, { "Upshift" } } - }; + struct enum_data data = {pDI, &af, NULL, NULL, 0}; hr = CoCreateInstance(&CLSID_DirectInput8, 0, 1, &IID_IDirectInput8A, (LPVOID*)&pDI); if (hr == DIERR_OLDDIRECTINPUTVERSION || @@ -85,18 +120,16 @@ static void test_action_mapping(void) af.guidActionMap = ACTION_MAPPING_GUID; af.dwGenre = 0x01000000; /* DIVIRTUAL_DRIVING_RACE */ - hr = IDirectInput8_EnumDevicesBySemantics(pDI,0, &af, - enum_by_semantics, 0, 0); - - ok(SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n",hr); + hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, enumeration_callback, &data, 0); + ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr); + todo_wine ok (data.ndevices > 0, "EnumDevicesBySemantics did not call the callback hr=%08x\n", hr); + todo_wine ok (data.keyboard != NULL, "EnumDevicesBySemantics should enumerate the keyboard\n"); + todo_wine ok (data.mouse != NULL, "EnumDevicesBySemantics should enumerate the mouse\n"); /* The call fails with a zeroed GUID */ memset(&af.guidActionMap, 0, sizeof(GUID)); - hr = IDirectInput8_EnumDevicesBySemantics(pDI,0, &af, - enum_by_semantics, 0, 0); - + hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, enumeration_callback, 0, 0); todo_wine ok(FAILED(hr), "EnumDevicesBySemantics succeeded with invalid GUID hr=%08x\n", hr); - } START_TEST(device)

1 0

Dylan Smith : ddraw: Partially revert a struct copy change to fix a regression.
by Alexandre Julliard June 28, 2011

June 28, 2011

Module: wine Branch: master Commit: ced4c383241a1069eca094408d288fbc3784c094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced4c383241a1069eca094408… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jun 28 12:41:21 2011 -0400 ddraw: Partially revert a struct copy change to fix a regression. Commit 3871329872afe3976e0b2b85330e3a7c47301658 caused the regression. --- dlls/ddraw/ddraw_private.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index c73743a..0f3864a 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -585,10 +585,11 @@ typedef struct #define DD_STRUCT_COPY_BYSIZE_(to,from,from_size) \ do { \ DWORD __size = (to)->dwSize; \ - DWORD __copysize = min(__size, from_size); \ + DWORD __resetsize = min(__size, sizeof(*to)); \ + DWORD __copysize = min(__resetsize, from_size); \ assert(to != from); \ memcpy(to, from, __copysize); \ - memset((char*)(to) + __copysize, 0, __size - __copysize); \ + memset((char*)(to) + __copysize, 0, __resetsize - __copysize); \ (to)->dwSize = __size; /* restore size */ \ } while (0)

1 0