July 2012 - Wine-commits - list.winehq.org

Dmitry Timoshkov : gdiplus: Store device resolution in the graphics object.
by Alexandre Julliard 26 Jul '12

26 Jul '12

Module: wine Branch: master Commit: e536a128f7e14f755d6a24395a54ab925aec4616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e536a128f7e14f755d6a24395… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 24 17:18:48 2012 +0900 gdiplus: Store device resolution in the graphics object. --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 50 +++++++++++++++++++-------------------- dlls/gdiplus/image.c | 4 +++ dlls/gdiplus/tests/image.c | 31 ++++++++++++++++++++++++ 4 files changed, 60 insertions(+), 26 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 5d1c685..0c7e055 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -156,6 +156,7 @@ struct GpGraphics{ TextRenderingHint texthint; GpUnit unit; /* page unit */ REAL scale; /* page scale */ + REAL xres, yres; GpMatrix * worldtrans; /* world transform */ BOOL busy; /* hdc handle obtained by GdipGetDC */ GpRegion *clip; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5dcd30a..5ad2f56 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -84,12 +84,6 @@ static BYTE convert_path_point_type(BYTE type) return ret; } -static REAL graphics_res(GpGraphics *graphics) -{ - if (graphics->image) return graphics->image->xres; - else return (REAL)GetDeviceCaps(graphics->hdc, LOGPIXELSX); -} - static COLORREF get_gdi_brush_color(const GpBrush *brush) { ARGB argb; @@ -260,7 +254,7 @@ static INT prepare_dc(GpGraphics *graphics, GpPen *pen) width = sqrt((pt[1].X - pt[0].X) * (pt[1].X - pt[0].X) + (pt[1].Y - pt[0].Y) * (pt[1].Y - pt[0].Y)) / sqrt(2.0); - width *= pen->width * convert_unit(graphics_res(graphics), + width *= pen->width * convert_unit(graphics->xres, pen->unit == UnitWorld ? graphics->unit : pen->unit); } @@ -313,18 +307,22 @@ static GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace d static void transform_and_round_points(GpGraphics *graphics, POINT *pti, GpPointF *ptf, INT count) { - REAL unitscale; + REAL scale_x, scale_y; GpMatrix *matrix; int i; - unitscale = convert_unit(graphics_res(graphics), graphics->unit); + scale_x = convert_unit(graphics->xres, graphics->unit); + scale_y = convert_unit(graphics->yres, graphics->unit); /* apply page scale */ if(graphics->unit != UnitDisplay) - unitscale *= graphics->scale; + { + scale_x *= graphics->scale; + scale_y *= graphics->scale; + } GdipCloneMatrix(graphics->worldtrans, &matrix); - GdipScaleMatrix(matrix, unitscale, unitscale, MatrixOrderAppend); + GdipScaleMatrix(matrix, scale_x, scale_y, MatrixOrderAppend); GdipTransformMatrixPoints(matrix, ptf, count); GdipDeleteMatrix(matrix); @@ -2200,6 +2198,8 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra (*graphics)->compmode = CompositingModeSourceOver; (*graphics)->unit = UnitDisplay; (*graphics)->scale = 1.0; + (*graphics)->xres = GetDeviceCaps(hdc, LOGPIXELSX); + (*graphics)->yres = GetDeviceCaps(hdc, LOGPIXELSY); (*graphics)->busy = FALSE; (*graphics)->textcontrast = 4; list_init(&(*graphics)->containers); @@ -2239,6 +2239,8 @@ GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics) (*graphics)->compmode = CompositingModeSourceOver; (*graphics)->unit = UnitDisplay; (*graphics)->scale = 1.0; + (*graphics)->xres = image->xres; + (*graphics)->yres = image->yres; (*graphics)->busy = FALSE; (*graphics)->textcontrast = 4; list_init(&(*graphics)->containers); @@ -5792,11 +5794,7 @@ GpStatus WINGDIPAPI GdipGetDpiX(GpGraphics *graphics, REAL* dpi) if(graphics->busy) return ObjectBusy; - if (graphics->image) - *dpi = graphics->image->xres; - else - *dpi = (REAL)GetDeviceCaps(graphics->hdc, LOGPIXELSX); - + *dpi = graphics->xres; return Ok; } @@ -5810,11 +5808,7 @@ GpStatus WINGDIPAPI GdipGetDpiY(GpGraphics *graphics, REAL* dpi) if(graphics->busy) return ObjectBusy; - if (graphics->image) - *dpi = graphics->image->yres; - else - *dpi = (REAL)GetDeviceCaps(graphics->hdc, LOGPIXELSY); - + *dpi = graphics->yres; return Ok; } @@ -5999,14 +5993,18 @@ static GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace d GpCoordinateSpace src_space, GpMatrix **matrix) { GpStatus stat = GdipCreateMatrix(matrix); - REAL unitscale; + REAL scale_x, scale_y; if (dst_space != src_space && stat == Ok) { - unitscale = convert_unit(graphics_res(graphics), graphics->unit); + scale_x = convert_unit(graphics->xres, graphics->unit); + scale_y = convert_unit(graphics->yres, graphics->unit); if(graphics->unit != UnitDisplay) - unitscale *= graphics->scale; + { + scale_x *= graphics->scale; + scale_y *= graphics->scale; + } /* transform from src_space to CoordinateSpacePage */ switch (src_space) @@ -6017,7 +6015,7 @@ static GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace d case CoordinateSpacePage: break; case CoordinateSpaceDevice: - GdipScaleMatrix(*matrix, 1.0/unitscale, 1.0/unitscale, MatrixOrderAppend); + GdipScaleMatrix(*matrix, 1.0/scale_x, 1.0/scale_y, MatrixOrderAppend); break; } @@ -6040,7 +6038,7 @@ static GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace d case CoordinateSpacePage: break; case CoordinateSpaceDevice: - GdipScaleMatrix(*matrix, unitscale, unitscale, MatrixOrderAppend); + GdipScaleMatrix(*matrix, scale_x, scale_y, MatrixOrderAppend); break; } } diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9972f40..f415a45 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2305,7 +2305,11 @@ GpStatus WINGDIPAPI GdipGetImageGraphicsContext(GpImage *image, stat = GdipCreateFromHDC(hdc, graphics); if (stat == Ok) + { (*graphics)->image = image; + (*graphics)->xres = image->xres; + (*graphics)->yres = image->yres; + } } else if (image->type == ImageTypeMetafile) stat = METAFILE_GetGraphicsContext((GpMetafile*)image, graphics); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 3d17f3d..0595cc2 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1517,6 +1517,7 @@ static void test_resolution(void) { GpStatus stat; GpBitmap *bitmap; + GpGraphics *graphics; REAL res=-1.0; HDC screendc; int screenxres, screenyres; @@ -1560,6 +1561,15 @@ static void test_resolution(void) expect(Ok, stat); expectf((REAL)screenyres, res); + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + stat = GdipGetDpiX(graphics, &res); + expect(Ok, stat); + expectf((REAL)screenxres, res); + stat = GdipGetDpiY(graphics, &res); + expect(Ok, stat); + expectf((REAL)screenyres, res); + /* test changing the resolution */ stat = GdipBitmapSetResolution(bitmap, screenxres*2.0, screenyres*3.0); expect(Ok, stat); @@ -1572,6 +1582,27 @@ static void test_resolution(void) expect(Ok, stat); expectf(screenyres*3.0, res); + stat = GdipGetDpiX(graphics, &res); + expect(Ok, stat); + expectf((REAL)screenxres, res); + stat = GdipGetDpiY(graphics, &res); + expect(Ok, stat); + expectf((REAL)screenyres, res); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + stat = GdipGetDpiX(graphics, &res); + expect(Ok, stat); + expectf(screenxres*2.0, res); + stat = GdipGetDpiY(graphics, &res); + expect(Ok, stat); + expectf(screenyres*3.0, res); + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + stat = GdipDisposeImage((GpImage*)bitmap); expect(Ok, stat); }

1 0

Dmitry Timoshkov : gdiplus: Add some GdipTransformPoints tests for a device with different x/ y resolutions.
by Alexandre Julliard 26 Jul '12

26 Jul '12

Module: wine Branch: master Commit: e6c69e9685d355a7c2aff55b46b1accfd08f1f7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6c69e9685d355a7c2aff55b4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 25 14:52:46 2012 +0900 gdiplus: Add some GdipTransformPoints tests for a device with different x/y resolutions. --- dlls/gdiplus/tests/graphics.c | 101 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 100 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 7c53ced..e6b6513 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -26,7 +26,7 @@ #define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (INT)(expected), (INT)(got)) #define expectf_(expected, got, precision) ok(fabs((expected) - (got)) < (precision), "Expected %f, got %f\n", (expected), (got)) -#define expectf(expected, got) expectf_((expected), (got), 0.0001) +#define expectf(expected, got) expectf_((expected), (got), 0.001) #define TABLE_LEN (23) static HWND hwnd; @@ -3398,6 +3398,104 @@ static void test_GdipMeasureString(void) DeleteDC(hdc); } +static GpGraphics *create_graphics(REAL res_x, REAL res_y, GpUnit unit, REAL scale) +{ + GpStatus status; + union + { + GpBitmap *bitmap; + GpImage *image; + } u; + GpGraphics *graphics = NULL; + REAL res; + + status = GdipCreateBitmapFromScan0(1, 1, 4, PixelFormat24bppRGB, NULL, &u.bitmap); + expect(Ok, status); + + status = GdipBitmapSetResolution(u.bitmap, res_x, res_y); + expect(Ok, status); + status = GdipGetImageHorizontalResolution(u.image, &res); + expect(Ok, status); + expectf(res_x, res); + status = GdipGetImageVerticalResolution(u.image, &res); + expect(Ok, status); + expectf(res_y, res); + + status = GdipGetImageGraphicsContext(u.image, &graphics); + expect(Ok, status); + status = GdipDisposeImage(u.image); + expect(Ok, status); + + status = GdipGetDpiX(graphics, &res); + expect(Ok, status); + expectf(res_x, res); + status = GdipGetDpiY(graphics, &res); + expect(Ok, status); + expectf(res_y, res); + + status = GdipSetPageUnit(graphics, unit); + expect(Ok, status); + status = GdipSetPageScale(graphics, scale); + expect(Ok, status); + + return graphics; +} + +static void test_transform(void) +{ + static const struct test_data + { + REAL res_x, res_y, scale; + GpUnit unit; + GpPointF in[2], out[2]; + } td[] = + { + { 96.0, 96.0, 1.0, UnitPixel, + { { 100.0, 0.0 }, { 0.0, 100.0 } }, { { 100.0, 0.0 }, { 0.0, 100.0 } } }, + { 96.0, 96.0, 1.0, UnitDisplay, + { { 100.0, 0.0 }, { 0.0, 100.0 } }, { { 100.0, 0.0 }, { 0.0, 100.0 } } }, + { 96.0, 96.0, 1.0, UnitInch, + { { 100.0, 0.0 }, { 0.0, 100.0 } }, { { 9600.0, 0.0 }, { 0.0, 9600.0 } } }, + { 123.0, 456.0, 1.0, UnitPoint, + { { 100.0, 0.0 }, { 0.0, 100.0 } }, { { 170.833313, 0.0 }, { 0.0, 633.333252 } } }, + { 123.0, 456.0, 1.0, UnitDocument, + { { 100.0, 0.0 }, { 0.0, 100.0 } }, { { 40.999996, 0.0 }, { 0.0, 151.999985 } } }, + { 123.0, 456.0, 2.0, UnitMillimeter, + { { 100.0, 0.0 }, { 0.0, 100.0 } }, { { 968.503845, 0.0 }, { 0.0, 3590.550781 } } }, + { 196.0, 296.0, 1.0, UnitDisplay, + { { 100.0, 0.0 }, { 0.0, 100.0 } }, { { 100.0, 0.0 }, { 0.0, 100.0 } } }, + { 196.0, 296.0, 1.0, UnitPixel, + { { 100.0, 0.0 }, { 0.0, 100.0 } }, { { 100.0, 0.0 }, { 0.0, 100.0 } } }, + }; + GpStatus status; + GpGraphics *graphics; + GpPointF ptf[2]; + UINT i; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].scale); + ptf[0].X = td[i].in[0].X; + ptf[0].Y = td[i].in[0].Y; + ptf[1].X = td[i].in[1].X; + ptf[1].Y = td[i].in[1].Y; + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, ptf, 2); + expect(Ok, status); + expectf(td[i].out[0].X, ptf[0].X); + expectf(td[i].out[0].Y, ptf[0].Y); + expectf(td[i].out[1].X, ptf[1].X); + expectf(td[i].out[1].Y, ptf[1].Y); + status = GdipTransformPoints(graphics, CoordinateSpaceWorld, CoordinateSpaceDevice, ptf, 2); + expect(Ok, status); + expectf(td[i].in[0].X, ptf[0].X); + expectf(td[i].in[0].Y, ptf[0].Y); + expectf(td[i].in[1].X, ptf[1].X); + expectf(td[i].in[1].Y, ptf[1].Y); + status = GdipDeleteGraphics(graphics); + expect(Ok, status); + } +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3424,6 +3522,7 @@ START_TEST(graphics) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_transform(); test_GdipMeasureString(); test_constructor_destructor(); test_save_restore();

1 0

Michael Stefaniuc : mlang/tests: Simplify the "pointer to start of array" idiom.
by Alexandre Julliard 26 Jul '12

26 Jul '12

Module: wine Branch: master Commit: 3a51439fc9036729ebc4b45d146985c9a05263c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a51439fc9036729ebc4b45d1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 26 11:23:34 2012 +0200 mlang/tests: Simplify the "pointer to start of array" idiom. --- dlls/mlang/tests/mlang.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 7ff4ec3..91463f9 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -677,7 +677,7 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) n = 0; ret = IEnumCodePage_Next(iEnumCP, 1, &cpinfo2, &n); ok(n == 1 && ret == S_OK, "IEnumCodePage_Next: expected 1/S_OK, got %u/%08x\n", n, ret); - cpinfo_cmp(&cpinfo[0], &cpinfo2); + cpinfo_cmp(cpinfo, &cpinfo2); if (0) { @@ -782,7 +782,7 @@ static void test_EnumScripts(IMultiLanguage2 *iML2, DWORD flags) n = 0; ret = IEnumScript_Next(iEnumScript, 1, &sinfo2, &n); ok(n == 1 && ret == S_OK, "IEnumScript_Next: expected 1/S_OK, got %u/%08x\n", n, ret); - scriptinfo_cmp(&sinfo[0], &sinfo2); + scriptinfo_cmp(sinfo, &sinfo2); if (0) { @@ -861,7 +861,7 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) dwCodePages = 0; processed = 0; - ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[0], 1, 0, &dwCodePages, &processed); + ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 1, 0, &dwCodePages, &processed); ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); ok(processed == 1, "expected 1, got %d\n", processed);

1 0

Lucas Zawacki : Portuguese translation for release 1.5.9
by Jeremy Newman 26 Jul '12

26 Jul '12

Module: website Branch: master Commit: 56e0cd8f43d85e57098abd9cac5e68cb5ce7b686 URL: http://source.winehq.org/git/website.git/?a=commit;h=56e0cd8f43d85e57098abd… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Jul 24 16:04:37 2012 -0300 Portuguese translation for release 1.5.9 --- news/pt/2012071701.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pt/2012071701.xml b/news/pt/2012071701.xml new file mode 100644 index 0000000..7fd6938 --- /dev/null +++ b/news/pt/2012071701.xml @@ -0,0 +1,17 @@ +<news> +<date>17 de Julho de 2012</date> +<title>Wine 1.5.9 lançado</title> +<body> +<p> A versão de desenvolvmento 1.5.9 já está disponível.</p> +<p> <a href="{$root}/announce/1.5.9">Novidades</a> nesta versão: +<ul> + <li>Suporte a tabelas GPOS de fontes no Uniscribe.</li> + <li>Suporte ao XRandr 1.2 e 1.3.</li> + <li>Melhoras no parser do compilador HLSL.</li> + <li>Mais algoritmos de troca de chaves suportados no Mac OS.</li> + <li>Relay tracing na arquitetura ARM.</li> + <li>Várias correções de bugs.</li> +</ul></p> +<p><p>O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.9.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</p></body></news>

1 0

Alexandre Julliard : patches: Avoid deadlocks when uncompressing large patches.
by Alexandre Julliard 26 Jul '12

26 Jul '12

Module: tools Branch: master Commit: 4a01b75984f9120fe7b87881311b79f9c8b17d4b URL: http://source.winehq.org/git/tools.git/?a=commit;h=4a01b75984f9120fe7b87881… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 26 14:31:20 2012 +0200 patches: Avoid deadlocks when uncompressing large patches. --- patches/filter | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/patches/filter b/patches/filter index bed4dca..dbdb9ec 100755 --- a/patches/filter +++ b/patches/filter @@ -20,7 +20,7 @@ use strict; use Email::MIME; -use IPC::Open2; +use File::Temp; use Encode; my $debug = 0; @@ -127,16 +127,18 @@ sub decode_parts(@) $name =~ /\.bz2$/ || $name =~ /\.gz$/) { - my $cmd = "gunzip -c"; + my ($file, $filename) = File::Temp::tempfile(); + my $cmd = "gunzip -c >$filename"; if ($type =~ /^application\/x-bzip2/ || $name =~ /\.bz2$/) { - $cmd = "bunzip2 -c"; + $cmd = "bunzip2 -c >$filename"; } - open2( *READ, *WRITE, $cmd) or die "cannot run $cmd"; + open WRITE, "|$cmd" or die "cannot run $cmd"; print WRITE $part->body; close WRITE; - push @lines, filter_patch(<READ>); - close READ; + push @lines, filter_patch(<$file>); + close $file; + unlink $filename; } elsif ($type =~ /^multipart/) {

1 0

Hans Leidekker : wbemprox: Implement IWbemClassObject::GetMethod.
by Alexandre Julliard 25 Jul '12

25 Jul '12

Module: wine Branch: master Commit: f930085904518860b54f08442581a3d6dc70989a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f930085904518860b54f08442… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 25 13:13:17 2012 +0200 wbemprox: Implement IWbemClassObject::GetMethod. --- dlls/wbemprox/class.c | 172 +++++++++++++++++++++++++++++++++++++- dlls/wbemprox/table.c | 15 ++- dlls/wbemprox/wbemprox_private.h | 14 +++ 3 files changed, 194 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index af7d8f5..293c8c4 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -441,6 +441,163 @@ static HRESULT WINAPI class_object_InheritsFrom( return E_NOTIMPL; } +static UINT count_instances( IEnumWbemClassObject *iter ) +{ + UINT count = 0; + while (!IEnumWbemClassObject_Skip( iter, WBEM_INFINITE, 1 )) count++; + IEnumWbemClassObject_Reset( iter ); + return count; +} + +static void set_default_value( CIMTYPE type, UINT val, BYTE *ptr ) +{ + switch (type) + { + case CIM_SINT16: + *(INT16 *)ptr = val; + break; + case CIM_UINT16: + *(UINT16 *)ptr = val; + break; + case CIM_SINT32: + *(INT32 *)ptr = val; + break; + case CIM_UINT32: + *(UINT32 *)ptr = val; + break; + default: + FIXME("unhandled type %u\n", type); + break; + } +} + +HRESULT create_signature_columns_and_data( IEnumWbemClassObject *iter, UINT *num_cols, + struct column **cols, BYTE **data ) +{ + static const WCHAR parameterW[] = {'P','a','r','a','m','e','t','e','r',0}; + static const WCHAR typeW[] = {'T','y','p','e',0}; + static const WCHAR defaultvalueW[] = {'D','e','f','a','u','l','t','V','a','l','u','e',0}; + struct column *columns; + BYTE *row; + IWbemClassObject *param; + VARIANT val; + HRESULT hr = E_OUTOFMEMORY; + UINT offset = 0; + ULONG count; + int i = 0; + + count = count_instances( iter ); + if (!(columns = heap_alloc( count * sizeof(struct column) ))) return E_OUTOFMEMORY; + if (!(row = heap_alloc_zero( count * sizeof(LONGLONG) ))) goto error; + + for (;;) + { + IEnumWbemClassObject_Next( iter, WBEM_INFINITE, 1, &param, &count ); + if (!count) break; + + hr = IWbemClassObject_Get( param, parameterW, 0, &val, NULL, NULL ); + if (hr != S_OK) goto error; + columns[i].name = heap_strdupW( V_BSTR( &val ) ); + VariantClear( &val ); + + hr = IWbemClassObject_Get( param, typeW, 0, &val, NULL, NULL ); + if (hr != S_OK) goto error; + columns[i].type = V_UI4( &val ); + columns[i].vartype = 0; + + hr = IWbemClassObject_Get( param, defaultvalueW, 0, &val, NULL, NULL ); + if (hr != S_OK) goto error; + if (V_UI4( &val )) set_default_value( columns[i].type, V_UI4( &val ), row + offset ); + offset += get_type_size( columns[i].type ); + + IWbemClassObject_Release( param ); + i++; + } + *num_cols = i; + *cols = columns; + *data = row; + return S_OK; + +error: + for (; i >= 0; i--) heap_free( (WCHAR *)columns[i].name ); + heap_free( columns ); + heap_free( row ); + return hr; +} + +HRESULT create_signature_table( IEnumWbemClassObject *iter, WCHAR *name ) +{ + HRESULT hr; + struct table *table; + struct column *columns; + UINT num_cols; + BYTE *row; + + hr = create_signature_columns_and_data( iter, &num_cols, &columns, &row ); + if (hr != S_OK) return hr; + + if (!(table = create_table( name, num_cols, columns, 1, row, NULL ))) + { + free_columns( columns, num_cols ); + heap_free( row ); + return E_OUTOFMEMORY; + } + if (!add_table( table )) free_table( table ); /* already exists */ + return S_OK; +} + +WCHAR *build_signature_table_name( const WCHAR *class, const WCHAR *method, enum param_direction dir ) +{ + static const WCHAR fmtW[] = {'_','_','%','s','_','%','s','_','%','s',0}; + static const WCHAR outW[] = {'O','U','T',0}; + static const WCHAR inW[] = {'I','N',0}; + UINT len = SIZEOF(fmtW) + SIZEOF(outW) + strlenW( class ) + strlenW( method ); + WCHAR *ret; + + if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) return NULL; + sprintfW( ret, fmtW, class, method, dir == PARAM_IN ? inW : outW ); + return struprW( ret ); +} + +static HRESULT create_signature( const WCHAR *class, const WCHAR *method, enum param_direction dir, + IWbemClassObject **sig ) +{ + static const WCHAR selectW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '_','_','P','A','R','A','M','E','T','E','R','S',' ','W','H','E','R','E',' ', + 'C','l','a','s','s','=','\'','%','s','\'',' ','A','N','D',' ', + 'M','e','t','h','o','d','=','\'','%','s','\'',' ','A','N','D',' ', + 'D','i','r','e','c','t','i','o','n','%','s',0}; + static const WCHAR geW[] = {'>','=','0',0}; + static const WCHAR leW[] = {'<','=','0',0}; + UINT len = SIZEOF(selectW) + SIZEOF(geW); + IEnumWbemClassObject *iter; + WCHAR *query, *name; + HRESULT hr; + + len += strlenW( class ) + strlenW( method ); + if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + sprintfW( query, selectW, class, method, dir >= 0 ? geW : leW ); + + hr = exec_query( query, &iter ); + heap_free( query ); + if (hr != S_OK) return hr; + + if (!(name = build_signature_table_name( class, method, dir ))) + { + IEnumWbemClassObject_Release( iter ); + return E_OUTOFMEMORY; + } + hr = create_signature_table( iter, name ); + IEnumWbemClassObject_Release( iter ); + if (hr != S_OK) + { + heap_free( name ); + return hr; + } + return get_object( name, sig ); +} + static HRESULT WINAPI class_object_GetMethod( IWbemClassObject *iface, LPCWSTR wszName, @@ -448,8 +605,19 @@ static HRESULT WINAPI class_object_GetMethod( IWbemClassObject **ppInSignature, IWbemClassObject **ppOutSignature ) { - FIXME("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); + struct view *view = ec->query->view; + HRESULT hr; + + TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature); + + hr = create_signature( view->table->name, wszName, PARAM_IN, ppInSignature ); + if (hr != S_OK) return hr; + + hr = create_signature( view->table->name, wszName, PARAM_OUT, ppOutSignature ); + if (hr != S_OK) IWbemClassObject_Release( *ppInSignature ); + return hr; } static HRESULT WINAPI class_object_PutMethod( diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index d3ad06d..d94a8e8 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -44,11 +44,11 @@ HRESULT get_column_index( const struct table *table, const WCHAR *name, UINT *co return WBEM_E_INVALID_QUERY; } -static UINT get_column_size( const struct table *table, UINT column ) +UINT get_type_size( CIMTYPE type ) { - if (table->columns[column].type & CIM_FLAG_ARRAY) return sizeof(void *); + if (type & CIM_FLAG_ARRAY) return sizeof(void *); - switch (table->columns[column].type & COL_TYPE_MASK) + switch (type) { case CIM_SINT16: case CIM_UINT16: @@ -63,10 +63,15 @@ static UINT get_column_size( const struct table *table, UINT column ) case CIM_STRING: return sizeof(WCHAR *); default: - ERR("unknown column type %u\n", table->columns[column].type & COL_TYPE_MASK); + ERR("unhandled type %u\n", type); break; } - return sizeof(INT32); + return sizeof(LONGLONG); +} + +static UINT get_column_size( const struct table *table, UINT column ) +{ + return get_type_size( table->columns[column].type & COL_TYPE_MASK ); } static UINT get_column_offset( const struct table *table, UINT column ) diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 725ea8c..a5f0a42 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -24,6 +24,13 @@ struct list *table_list; #define SIZEOF(array) (sizeof(array)/sizeof((array)[0])) +enum param_direction +{ + PARAM_OUT = -1, + PARAM_INOUT = 0, + PARAM_IN = 1 +}; + #define COL_TYPE_MASK 0x0000ffff #define COL_FLAG_DYNAMIC 0x00010000 #define COL_FLAG_KEY 0x00020000 @@ -134,6 +141,7 @@ struct table *create_table( const WCHAR *, UINT, const struct column *, UINT, BOOL add_table( struct table * ) DECLSPEC_HIDDEN; void free_columns( struct column *, UINT ) DECLSPEC_HIDDEN; void free_table( struct table * ) DECLSPEC_HIDDEN; +UINT get_type_size( CIMTYPE ) DECLSPEC_HIDDEN; HRESULT get_column_index( const struct table *, const WCHAR *, UINT * ) DECLSPEC_HIDDEN; HRESULT get_value( const struct table *, UINT, UINT, LONGLONG * ) DECLSPEC_HIDDEN; BSTR get_value_bstr( const struct table *, UINT, UINT ) DECLSPEC_HIDDEN; @@ -161,6 +169,12 @@ static inline void *heap_realloc( void *mem, size_t len ) return HeapReAlloc( GetProcessHeap(), 0, mem, len ); } +static void *heap_alloc_zero( size_t len ) __WINE_ALLOC_SIZE(1); +static inline void *heap_alloc_zero( size_t len ) +{ + return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); +} + static inline BOOL heap_free( void *mem ) { return HeapFree( GetProcessHeap(), 0, mem );

1 0

Jacek Caban : mshtml: Moved more logic to HTMLStyle_Create.
by Alexandre Julliard 25 Jul '12

25 Jul '12

Module: wine Branch: master Commit: 5b633c29b932dc48e04517965453f2ad8d60882a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b633c29b932dc48e04517965… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 25 14:46:54 2012 +0200 mshtml: Moved more logic to HTMLStyle_Create. --- dlls/mshtml/htmlelem.c | 25 +------------------------ dlls/mshtml/htmlstyle.c | 26 ++++++++++++++++++++++++-- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/mshtml_private.h | 1 - 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 82967d8..5c38ebb 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -446,32 +446,9 @@ static HRESULT WINAPI HTMLElement_get_style(IHTMLElement *iface, IHTMLStyle **p) TRACE("(%p)->(%p)\n", This, p); if(!This->style) { - nsIDOMElementCSSInlineStyle *nselemstyle; - nsIDOMCSSStyleDeclaration *nsstyle; - nsresult nsres; HRESULT hres; - if(!This->nselem) { - FIXME("NULL nselem\n"); - return E_NOTIMPL; - } - - nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMElementCSSInlineStyle, - (void**)&nselemstyle); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMCSSStyleDeclaration interface: %08x\n", nsres); - return E_FAIL; - } - - nsres = nsIDOMElementCSSInlineStyle_GetStyle(nselemstyle, &nsstyle); - nsIDOMElementCSSInlineStyle_Release(nselemstyle); - if(NS_FAILED(nsres)) { - ERR("GetStyle failed: %08x\n", nsres); - return E_FAIL; - } - - hres = HTMLStyle_Create(This, nsstyle, &This->style); - nsIDOMCSSStyleDeclaration_Release(nsstyle); + hres = HTMLStyle_Create(This, &This->style); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index b9f0ddd..3d67402 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #include <math.h> #define COBJMACROS @@ -3039,13 +3040,34 @@ static dispex_static_data_t HTMLStyle_dispex = { HTMLStyle_iface_tids }; -HRESULT HTMLStyle_Create(HTMLElement *elem, nsIDOMCSSStyleDeclaration *nsstyle, HTMLStyle **ret) +HRESULT HTMLStyle_Create(HTMLElement *elem, HTMLStyle **ret) { + nsIDOMElementCSSInlineStyle *nselemstyle; + nsIDOMCSSStyleDeclaration *nsstyle; HTMLStyle *style; + nsresult nsres; + + if(!elem->nselem) { + FIXME("NULL nselem\n"); + return E_NOTIMPL; + } + + nsres = nsIDOMHTMLElement_QueryInterface(elem->nselem, &IID_nsIDOMElementCSSInlineStyle, + (void**)&nselemstyle); + assert(nsres == NS_OK); + + nsres = nsIDOMElementCSSInlineStyle_GetStyle(nselemstyle, &nsstyle); + nsIDOMElementCSSInlineStyle_Release(nselemstyle); + if(NS_FAILED(nsres)) { + ERR("GetStyle failed: %08x\n", nsres); + return E_FAIL; + } style = heap_alloc_zero(sizeof(HTMLStyle)); - if(!style) + if(!style) { + nsIDOMCSSStyleDeclaration_Release(nsstyle); return E_OUTOFMEMORY; + } style->IHTMLStyle_iface.lpVtbl = &HTMLStyleVtbl; style->ref = 1; diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index ce42d3e..571931b 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -106,6 +106,7 @@ typedef enum { STYLEID_Z_INDEX } styleid_t; +HRESULT HTMLStyle_Create(HTMLElement*,HTMLStyle**) DECLSPEC_HIDDEN; void HTMLStyle2_Init(HTMLStyle*) DECLSPEC_HIDDEN; void HTMLStyle3_Init(HTMLStyle*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1f51804..abc9794 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -806,7 +806,6 @@ void set_ready_state(HTMLOuterWindow*,READYSTATE) DECLSPEC_HIDDEN; HRESULT HTMLSelectionObject_Create(HTMLDocumentNode*,nsISelection*,IHTMLSelectionObject**) DECLSPEC_HIDDEN; HRESULT HTMLTxtRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLTxtRange**) DECLSPEC_HIDDEN; -HRESULT HTMLStyle_Create(HTMLElement*,nsIDOMCSSStyleDeclaration*,HTMLStyle**) DECLSPEC_HIDDEN; IHTMLStyleSheet *HTMLStyleSheet_Create(nsIDOMStyleSheet*) DECLSPEC_HIDDEN; IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetList*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Added IHTMLElement2:: get_runtimeStyle hackish implementation.
by Alexandre Julliard 25 Jul '12

25 Jul '12

Module: wine Branch: master Commit: 9ccc5f487b844b55bf714c22e74f84babf21c752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ccc5f487b844b55bf714c22e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 25 14:47:13 2012 +0200 mshtml: Added IHTMLElement2::get_runtimeStyle hackish implementation. --- dlls/mshtml/htmlelem.c | 4 ++++ dlls/mshtml/htmlelem2.c | 20 ++++++++++++++++++-- dlls/mshtml/htmlstyle.c | 1 + dlls/mshtml/mshtml_private.h | 1 + 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 5c38ebb..02551db 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1563,6 +1563,10 @@ void HTMLElement_destructor(HTMLDOMNode *iface) This->style->elem = NULL; IHTMLStyle_Release(&This->style->IHTMLStyle_iface); } + if(This->runtime_style) { + This->runtime_style->elem = NULL; + IHTMLStyle_Release(&This->runtime_style->IHTMLStyle_iface); + } if(This->attrs) { HTMLDOMAttribute *attr; diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 4550681..e2e5c13 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -30,6 +30,7 @@ #include "mshtml_private.h" #include "htmlevent.h" +#include "htmlstyle.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -1188,8 +1189,23 @@ static HRESULT WINAPI HTMLElement2_removeBehavior(IHTMLElement2 *iface, LONG coo static HRESULT WINAPI HTMLElement2_get_runtimeStyle(IHTMLElement2 *iface, IHTMLStyle **p) { HTMLElement *This = impl_from_IHTMLElement2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + FIXME("(%p)->(%p): hack\n", This, p); + + /* We can't implement correct behavior on top of Gecko (although we could + try a bit harder). Making runtimeStyle behave like regular style is + enough for most use cases. */ + if(!This->runtime_style) { + HRESULT hres; + + hres = HTMLStyle_Create(This, &This->runtime_style); + if(FAILED(hres)) + return hres; + } + + *p = &This->runtime_style->IHTMLStyle_iface; + IHTMLStyle_AddRef(*p); + return S_OK; } static HRESULT WINAPI HTMLElement2_get_behaviorUrns(IHTMLElement2 *iface, IDispatch **p) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 3d67402..1e068b1 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -721,6 +721,7 @@ static ULONG WINAPI HTMLStyle_Release(IHTMLStyle *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + assert(!This->elem); if(This->nsstyle) nsIDOMCSSStyleDeclaration_Release(This->nsstyle); release_dispex(&This->dispex); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index abc9794..91cbbfe 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -634,6 +634,7 @@ typedef struct { nsIDOMHTMLElement *nselem; HTMLStyle *style; + HTMLStyle *runtime_style; HTMLAttributeCollection *attrs; WCHAR *filter; } HTMLElement;

1 0

Jacek Caban : mshtml: Added runtimeStyle tests.
by Alexandre Julliard 25 Jul '12

25 Jul '12

Module: wine Branch: master Commit: 140cd1b9145f3de57c329422b14c976e0ebbf9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=140cd1b9145f3de57c329422b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 25 15:16:29 2012 +0200 mshtml: Added runtimeStyle tests. --- dlls/mshtml/tests/style.c | 113 +++++++++++++++++++++++++++++++++------------ 1 files changed, 84 insertions(+), 29 deletions(-) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 262c4d1..b44950c 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -255,6 +255,33 @@ static void _test_style_remove_attribute(unsigned line, IHTMLStyle *style, const ok_(__FILE__,line)(b == exb, "removeAttribute returned %x, expected %x\n", b, exb); } +#define set_text_decoration(a,b) _set_text_decoration(__LINE__,a,b) +static void _set_text_decoration(unsigned line, IHTMLStyle *style, const char *v) +{ + BSTR str; + HRESULT hres; + + str = a2bstr(v); + hres = IHTMLStyle_put_textDecoration(style, str); + ok_(__FILE__,line)(hres == S_OK, "put_textDecoration failed: %08x\n", hres); + SysFreeString(str); +} + +#define test_text_decoration(a,b) _test_text_decoration(__LINE__,a,b) +static void _test_text_decoration(unsigned line, IHTMLStyle *style, const char *exdec) +{ + BSTR str; + HRESULT hres; + + hres = IHTMLStyle_get_textDecoration(style, &str); + ok_(__FILE__,line)(hres == S_OK, "get_textDecoration failed: %08x\n", hres); + if(exdec) + ok_(__FILE__,line)(!strcmp_wa(str, exdec), "textDecoration = %s, expected %s\n", wine_dbgstr_w(str), exdec); + else + ok_(__FILE__,line)(!str, "textDecoration = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + static void test_set_csstext(IHTMLStyle *style) { VARIANT v; @@ -738,35 +765,15 @@ static void test_body_style(IHTMLStyle *style) ok(hres == E_INVALIDARG, "put_textDecoration failed: %08x\n", hres); SysFreeString(str); - str = a2bstr("none"); - hres = IHTMLStyle_put_textDecoration(style, str); - ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); - SysFreeString(str); - - str = a2bstr("underline"); - hres = IHTMLStyle_put_textDecoration(style, str); - ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); - SysFreeString(str); - - str = a2bstr("overline"); - hres = IHTMLStyle_put_textDecoration(style, str); - ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); - SysFreeString(str); - - str = a2bstr("line-through"); - hres = IHTMLStyle_put_textDecoration(style, str); - ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); - SysFreeString(str); - - str = a2bstr("blink"); - hres = IHTMLStyle_put_textDecoration(style, str); - ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); - SysFreeString(str); - - hres = IHTMLStyle_get_textDecoration(style, &str); - ok(hres == S_OK, "get_textDecoration failed: %08x\n", hres); - ok(!strcmp_wa(str, "blink"), "str != blink\n"); - SysFreeString(str); + set_text_decoration(style, "none"); + test_text_decoration(style, "none"); + set_text_decoration(style, "underline"); + set_text_decoration(style, "overline"); + set_text_decoration(style, "line-through"); + set_text_decoration(style, "blink"); + set_text_decoration(style, "overline"); + set_text_decoration(style, "blink"); + test_text_decoration(style, "blink"); hres = IHTMLStyle_put_textDecoration(style, sDefault); ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); @@ -2335,6 +2342,53 @@ static void basic_style_test(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } +static const char runtimestyle_test_str[] = + "<html><head><style>body {text-decoration: auto}</style></head><body></body></html>"; + +static void runtimestyle_test(IHTMLDocument2 *doc) +{ + IHTMLStyle *style, *runtime_style; + IHTMLElement2 *elem2; + IHTMLElement *elem; + BSTR str; + HRESULT hres; + + hres = IHTMLDocument2_get_body(doc, &elem); + ok(hres == S_OK, "get_body failed: %08x\n", hres); + + elem2 = get_elem2_iface((IUnknown*)elem); + + hres = IHTMLElement2_get_runtimeStyle(elem2, &runtime_style); + ok(hres == S_OK, "get_runtimeStyle failed: %08x\n", hres); + + hres = IHTMLElement_get_style(elem, &style); + ok(hres == S_OK, "get_style failed: %08x\n", hres); + + test_text_decoration(style, NULL); + test_text_decoration(runtime_style, NULL); + set_text_decoration(style, "underline"); + test_text_decoration(style, "underline"); + + hres = IHTMLStyle_get_textDecoration(style, &str); + ok(hres == S_OK, "get_textDecoration failed: %08x\n", hres); + ok(broken(!str) || !strcmp_wa(str, "underline"), "textDecoration = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + set_text_decoration(runtime_style, "blink"); + test_text_decoration(runtime_style, "blink"); + + hres = IHTMLStyle_get_textDecoration(style, &str); + ok(hres == S_OK, "get_textDecoration failed: %08x\n", hres); + todo_wine + ok(!strcmp_wa(str, "underline"), "textDecoration = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IHTMLStyle_Release(runtime_style); + IHTMLStyle_Release(style); + IHTMLElement2_Release(elem2); + IHTMLElement_Release(elem); +} + static IHTMLDocument2 *notif_doc; static BOOL doc_complete; @@ -2495,6 +2549,7 @@ START_TEST(style) CoInitialize(NULL); run_test(basic_test_str, basic_style_test); + run_test(runtimestyle_test_str, runtimestyle_test); CoUninitialize(); }

1 0

Alexandre Julliard : wined3d: Retrieve OpenGL extension functions directly through the TEB table.
by Alexandre Julliard 25 Jul '12

25 Jul '12

Module: wine Branch: master Commit: 63396e00b93ca8f05989282807f8c2bdc0c91057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63396e00b93ca8f0598928280… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 25 19:59:13 2012 +0200 wined3d: Retrieve OpenGL extension functions directly through the TEB table. --- dlls/wined3d/directx.c | 42 +- dlls/wined3d/wined3d_gl.h | 1057 +++++++++++++++------------------------------ 2 files changed, 378 insertions(+), 721 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63396e00b93ca8f059892…

1 0