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

Andrew Eikum : winmm: Pull wave and mixer functions into their own source file.
by Alexandre Julliard 29 Jun '11

29 Jun '11

Module: wine Branch: master Commit: a700f9e0fc247eea36233efc370594fa240bd247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a700f9e0fc247eea36233efc3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jun 23 13:12:11 2011 -0500 winmm: Pull wave and mixer functions into their own source file. --- dlls/winmm/Makefile.in | 1 + dlls/winmm/waveform.c | 1292 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/winmm/winemm.h | 2 + dlls/winmm/winmm.c | 1262 +---------------------------------------------- 4 files changed, 1296 insertions(+), 1261 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a700f9e0fc247eea36233…

1 0

Marcus Meissner : explorer: Remove useless array NULL check (Coverity).
by Alexandre Julliard 28 Jun '11

28 Jun '11

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: Fix the order of arguments to expectf in test_string_functions.
by Alexandre Julliard 28 Jun '11

28 Jun '11

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

Vincent Povirk : gdiplus: Test MeasureDriverString with a character that has an underhang.
by Alexandre Julliard 28 Jun '11

28 Jun '11

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 28 Jun '11

28 Jun '11

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

Rico Schüller : d3dx9: Fix ID3DXEffect:: SetStateManager().
by Alexandre Julliard 28 Jun '11

28 Jun '11

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 28 Jun '11

28 Jun '11

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

Michał Ziętek : wscript: Implemented Host_get_Version.
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: 41eedc6d0ba8a23b8d1d82c381b5e89077bfc899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41eedc6d0ba8a23b8d1d82c38… Author: Michał Ziętek <smierc.w.wenecji(a)gmail.com> Date: Tue Jun 28 13:38:56 2011 +0200 wscript: Implemented Host_get_Version. --- programs/wscript/host.c | 8 ++++++-- programs/wscript/tests/run.js | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 3021656..f6dfaa0 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -30,6 +30,7 @@ #include <wine/debug.h> static const WCHAR wshNameW[] = {'W','i','n','d','o','w','s',' ','S','c','r','i','p','t',' ','H','o','s','t',0}; +static const WCHAR wshVersionW[] = {'5','.','8'}; WINE_DEFAULT_DEBUG_CHANNEL(wscript); @@ -159,8 +160,11 @@ static HRESULT WINAPI Host_get_Arguments(IHost *iface, IArguments2 **out_Argumen static HRESULT WINAPI Host_get_Version(IHost *iface, BSTR *out_Version) { - WINE_FIXME("(%p)\n", out_Version); - return E_NOTIMPL; + WINE_TRACE("(%p)\n", out_Version); + + if(!(*out_Version = SysAllocString(wshVersionW))) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI Host_get_BuildVersion(IHost *iface, int *out_Build) diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index 84d7789..8b43ce7 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -26,5 +26,6 @@ ok(typeof(WScript) === "object", "typeof(WScript) = " + typeof(WScript)); ok(typeof(WSH) === "object", "typeof(WSH) = " + typeof(WSH)); ok(WScript === WSH, "WScript !== WSH"); ok(WScript.Name === "Windows Script Host", "WScript.Name = " + WScript.Name); +ok(typeof(WScript.Version) === "string", "typeof(WScript.Version) = " + typeof(WScript.Version)); winetest.reportSuccess();

1 0

Lucas Fialho Zawacki : dinput8/tests: Test EnumDevicesBySemantics mouse and keyboard enumeration with flags.
by Alexandre Julliard 28 Jun '11

28 Jun '11

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

Lucas Fialho Zawacki : dinput: EnumDevicesBySemantics enumerating keyboard and mouse with priority flags.
by Alexandre Julliard 28 Jun '11

28 Jun '11

Module: wine Branch: master Commit: 0f17c828f7381ddd606e17347a7ee32347c167fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f17c828f7381ddd606e17347… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Tue Jun 28 13:54:36 2011 -0300 dinput: EnumDevicesBySemantics enumerating keyboard and mouse with priority flags. --- dlls/dinput/dinput_main.c | 73 +++++++++++++++++++++++++++++++++++++++--- dlls/dinput/dinput_private.h | 3 ++ dlls/dinput8/tests/device.c | 10 +++--- 3 files changed, 76 insertions(+), 10 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index d3727bc..c032642 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -681,8 +681,13 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( ) { IDirectInputImpl *This = impl_from_IDirectInput8A( iface ); + DIDEVICEINSTANCEA didevi; + LPDIRECTINPUTDEVICE8A lpdid; + BOOL ret; + DWORD callbackFlags = 0; + int i; - FIXME("(this=%p,%s,%p,%p,%p,%04x): stub\n", This, ptszUserName, lpdiActionFormat, + FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, ptszUserName, lpdiActionFormat, lpCallback, pvRef, dwFlags); #define X(x) if (dwFlags & x) FIXME("\tdwFlags |= "#x"\n"); X(DIEDBSFL_ATTACHEDONLY) @@ -695,6 +700,32 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( _dump_diactionformatA(lpdiActionFormat); + didevi.dwSize = sizeof(didevi); + + /* enum the keyboard first */ + IDirectInput_CreateDevice(iface, &GUID_SysKeyboard, &lpdid, NULL); + IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); + /* if there's any DIKEYBOARD action, keyboard is priority 1*/ + for(i=0; i < lpdiActionFormat->dwActionSize; i++) + if ((lpdiActionFormat->rgoAction[i].dwSemantic & DIKEYBOARD_MASK) == DIKEYBOARD_MASK) + callbackFlags |= DIEDBS_MAPPEDPRI1; + + ret = lpCallback(&didevi, lpdid, callbackFlags, 1, pvRef); + + if (ret == DIENUM_STOP) return DI_OK; + + callbackFlags = 0; + + /* and then the mouse */ + IDirectInput_CreateDevice(iface, &GUID_SysMouse, &lpdid, NULL); + IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); + /* same as above, but for the mouse */ + for(i=0; i < lpdiActionFormat->dwActionSize; i++) + if ((lpdiActionFormat->rgoAction[i].dwSemantic & DIMOUSE_MASK) == DIMOUSE_MASK) + callbackFlags |= DIEDBS_MAPPEDPRI1; + + lpCallback(&didevi, lpdid, callbackFlags, 0, pvRef); + return DI_OK; } @@ -704,11 +735,43 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( LPVOID pvRef, DWORD dwFlags ) { - IDirectInputImpl *This = impl_from_IDirectInput8W( iface ); + IDirectInputImpl *This = impl_from_IDirectInput8W(iface); + DIDEVICEINSTANCEW didevi; + LPDIRECTINPUTDEVICE8W lpdid; + BOOL ret; + DWORD callbackFlags = 0; + int i; - FIXME("(this=%p,%s,%p,%p,%p,%04x): stub\n", This, debugstr_w(ptszUserName), lpdiActionFormat, - lpCallback, pvRef, dwFlags); - return 0; + FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, debugstr_w(ptszUserName), lpdiActionFormat, + lpCallback, pvRef, dwFlags); + + didevi.dwSize = sizeof(didevi); + + /* enum the keyboard first */ + IDirectInput_CreateDevice(iface, &GUID_SysKeyboard, &lpdid, NULL); + IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); + /* if there's any DIKEYBOARD action, keyboard is priority 1*/ + for(i=0; i < lpdiActionFormat->dwActionSize; i++) + if ((lpdiActionFormat->rgoAction[i].dwSemantic & DIKEYBOARD_MASK) == DIKEYBOARD_MASK) + callbackFlags |= DIEDBS_MAPPEDPRI1; + + ret = lpCallback(&didevi, lpdid, callbackFlags, 1, pvRef); + + if (ret == DIENUM_STOP) return DI_OK; + + callbackFlags = 0; + + /* and then the mouse */ + IDirectInput_CreateDevice(iface, &GUID_SysMouse, &lpdid, NULL); + IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); + /* same as above, but for the mouse */ + for(i=0; i < lpdiActionFormat->dwActionSize; i++) + if ((lpdiActionFormat->rgoAction[i].dwSemantic & DIMOUSE_MASK) == DIMOUSE_MASK) + callbackFlags |= DIEDBS_MAPPEDPRI1; + + lpCallback(&didevi, lpdid, callbackFlags, 0, pvRef); + + return DI_OK; } static HRESULT WINAPI IDirectInput8AImpl_ConfigureDevices( diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 5972081..33cc823 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -66,4 +66,7 @@ extern void _dump_diactionformatA(LPDIACTIONFORMATA) DECLSPEC_HIDDEN; #define IS_DIPROP(x) (((ULONG_PTR)(x) >> 16) == 0) +#define DIKEYBOARD_MASK 0x81000000 +#define DIMOUSE_MASK 0x82000000 + #endif /* __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H */ diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 992821d..8344486 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -68,7 +68,7 @@ static BOOL CALLBACK enumeration_callback( IDirectInputDevice_AddRef(lpdid); data->keyboard = lpdid; - todo_wine ok (dwFlags & DIEDBS_MAPPEDPRI1, "Keyboard should be mapped as pri1 dwFlags=%08x\n", dwFlags); + ok (dwFlags & DIEDBS_MAPPEDPRI1, "Keyboard should be mapped as pri1 dwFlags=%08x\n", dwFlags); } if (IsEqualGUID(&lpddi->guidInstance, &GUID_SysMouse)) @@ -76,7 +76,7 @@ static BOOL CALLBACK enumeration_callback( IDirectInputDevice_AddRef(lpdid); data->mouse = lpdid; - todo_wine ok (dwFlags & DIEDBS_MAPPEDPRI1, "Mouse should be mapped as pri1 dwFlags=%08x\n", dwFlags); + ok (dwFlags & DIEDBS_MAPPEDPRI1, "Mouse should be mapped as pri1 dwFlags=%08x\n", dwFlags); } return DIENUM_CONTINUE; @@ -122,9 +122,9 @@ static void test_action_mapping(void) 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"); + ok (data.ndevices > 0, "EnumDevicesBySemantics did not call the callback hr=%08x\n", hr); + ok (data.keyboard != NULL, "EnumDevicesBySemantics should enumerate the keyboard\n"); + ok (data.mouse != NULL, "EnumDevicesBySemantics should enumerate the mouse\n"); /* The call fails with a zeroed GUID */ memset(&af.guidActionMap, 0, sizeof(GUID));

1 0