wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

Eric Pouech : winhelp: Emit proper RTF tokens for a bitmap.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 5309ad1c8f77cb29a208d68630aa747482ec44d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5309ad1c8f77cb29a208d6863… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Apr 24 22:06:28 2008 +0200 winhelp: Emit proper RTF tokens for a bitmap. --- programs/winhelp/hlpfile.c | 207 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 206 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 2230cf6..6417c90 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -679,6 +679,203 @@ static BOOL HLPFILE_RtfAddText(struct RtfData* rd, const char* str) } /****************************************************************** + * RtfAddHexBytes + * + */ +static BOOL HLPFILE_RtfAddHexBytes(struct RtfData* rd, const void* _ptr, unsigned sz) +{ + char tmp[512]; + unsigned i, step; + const BYTE* ptr = _ptr; + static const char* _2hex = "0123456789abcdef"; + + if (!rd) return TRUE; /* FIXME: TEMP */ + if (!rd->in_text) + { + if (!HLPFILE_RtfAddRawString(rd, " ", 1)) return FALSE; + rd->in_text = TRUE; + } + for (; sz; sz -= step) + { + step = min(256, sz); + for (i = 0; i < step; i++) + { + tmp[2 * i + 0] = _2hex[*ptr >> 4]; + tmp[2 * i + 1] = _2hex[*ptr++ & 0xF]; + } + if (!HLPFILE_RtfAddRawString(rd, tmp, 2 * step)) return FALSE; + } + return TRUE; +} + +/****************************************************************** + * HLPFILE_RtfAddBitmap + * + */ +static BOOL HLPFILE_RtfAddBitmap(struct RtfData* rd, BYTE* beg, BYTE type, BYTE pack) +{ + BYTE* ptr; + BYTE* pict_beg; + BITMAPINFO* bi; + unsigned long off, csz; + unsigned nc = 0; + BOOL ret = FALSE; + char tmp[256]; + + bi = HeapAlloc(GetProcessHeap(), 0, sizeof(*bi)); + if (!bi) return FALSE; + + ptr = beg + 2; /* for type and pack */ + + bi->bmiHeader.biSize = sizeof(bi->bmiHeader); + bi->bmiHeader.biXPelsPerMeter = fetch_ulong(&ptr); + bi->bmiHeader.biYPelsPerMeter = fetch_ulong(&ptr); + bi->bmiHeader.biPlanes = fetch_ushort(&ptr); + bi->bmiHeader.biBitCount = fetch_ushort(&ptr); + bi->bmiHeader.biWidth = fetch_ulong(&ptr); + bi->bmiHeader.biHeight = fetch_ulong(&ptr); + bi->bmiHeader.biClrUsed = fetch_ulong(&ptr); + bi->bmiHeader.biClrImportant = fetch_ulong(&ptr); + bi->bmiHeader.biCompression = BI_RGB; + if (bi->bmiHeader.biBitCount > 32) WINE_FIXME("Unknown bit count %u\n", bi->bmiHeader.biBitCount); + if (bi->bmiHeader.biPlanes != 1) WINE_FIXME("Unsupported planes %u\n", bi->bmiHeader.biPlanes); + bi->bmiHeader.biSizeImage = (((bi->bmiHeader.biWidth * bi->bmiHeader.biBitCount + 31) & ~31) / 8) * bi->bmiHeader.biHeight; + WINE_TRACE("planes=%d bc=%d size=(%d,%d)\n", + bi->bmiHeader.biPlanes, bi->bmiHeader.biBitCount, + bi->bmiHeader.biWidth, bi->bmiHeader.biHeight); + + csz = fetch_ulong(&ptr); + fetch_ulong(&ptr); /* hotspot size */ + + off = GET_UINT(ptr, 0); ptr += 4; + /* GET_UINT(ptr, 0); hotspot offset */ ptr += 4; + + /* now read palette info */ + if (type == 0x06) + { + unsigned i; + + nc = bi->bmiHeader.biClrUsed; + /* not quite right, especially for bitfields type of compression */ + if (!nc && bi->bmiHeader.biBitCount <= 8) + nc = 1 << bi->bmiHeader.biBitCount; + + bi = HeapReAlloc(GetProcessHeap(), 0, bi, sizeof(*bi) + nc * sizeof(RGBQUAD)); + if (!bi) return FALSE; + for (i = 0; i < nc; i++) + { + bi->bmiColors[i].rgbBlue = ptr[0]; + bi->bmiColors[i].rgbGreen = ptr[1]; + bi->bmiColors[i].rgbRed = ptr[2]; + bi->bmiColors[i].rgbReserved = 0; + ptr += 4; + } + } + pict_beg = HLPFILE_DecompressGfx(beg + off, csz, bi->bmiHeader.biSizeImage, pack); + + + if (!HLPFILE_RtfAddControl(rd, "{\\pict")) goto done; + if (type == 0x06) + { + sprintf(tmp, "\\dibitmap0\\picw%d\\pich%d", + bi->bmiHeader.biWidth, bi->bmiHeader.biHeight); + if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; + if (!HLPFILE_RtfAddHexBytes(rd, bi, sizeof(*bi) + nc * sizeof(RGBQUAD))) goto done; + } + else + { + sprintf(tmp, "\\wbitmap0\\wbmbitspixel%d\\wbmplanes%d\\picw%d\\pich%d", + bi->bmiHeader.biBitCount, bi->bmiHeader.biPlanes, + bi->bmiHeader.biWidth, bi->bmiHeader.biHeight); + if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; + } + if (!HLPFILE_RtfAddHexBytes(rd, pict_beg, bi->bmiHeader.biSizeImage)) goto done; + if (!HLPFILE_RtfAddControl(rd, "}")) goto done; + + ret = TRUE; +done: + HeapFree(GetProcessHeap(), 0, bi); + if (pict_beg != beg + off) HeapFree(GetProcessHeap(), 0, pict_beg); + + return ret; +} + +/****************************************************************** + * HLPFILE_RtfAddMetaFile + * + */ +static BOOL HLPFILE_RtfAddMetaFile(struct RtfData* rd, BYTE* beg, BYTE pack) +{ + return TRUE; +} + +/****************************************************************** + * HLPFILE_RtfAddGfxByAddr + * + */ +static BOOL HLPFILE_RtfAddGfxByAddr(struct RtfData* rd, HLPFILE *hlpfile, + BYTE* ref, unsigned long size) +{ + unsigned i, numpict; + + numpict = GET_USHORT(ref, 2); + WINE_TRACE("Got picture magic=%04x #=%d\n", GET_USHORT(ref, 0), numpict); + + for (i = 0; i < numpict; i++) + { + BYTE* beg; + BYTE* ptr; + BYTE type, pack; + + WINE_TRACE("Offset[%d] = %x\n", i, GET_UINT(ref, (1 + i) * 4)); + beg = ptr = ref + GET_UINT(ref, (1 + i) * 4); + + type = *ptr++; + pack = *ptr++; + + switch (type) + { + case 5: /* device dependent bmp */ + case 6: /* device independent bmp */ + HLPFILE_RtfAddBitmap(rd, beg, type, pack); + break; + case 8: + HLPFILE_RtfAddMetaFile(rd, beg, pack); + break; + default: WINE_FIXME("Unknown type %u\n", type); return FALSE; + } + + /* FIXME: hotspots */ + + /* FIXME: implement support for multiple picture format */ + if (numpict != 1) WINE_FIXME("Supporting only one bitmap format per logical bitmap (for now). Using first format\n"); + break; + } + return TRUE; +} + +/****************************************************************** + * HLPFILE_RtfAddGfxByIndex + * + * + */ +static BOOL HLPFILE_RtfAddGfxByIndex(struct RtfData* rd, HLPFILE *hlpfile, + unsigned index) +{ + char tmp[16]; + BYTE *ref, *end; + + WINE_TRACE("Loading picture #%d\n", index); + + sprintf(tmp, "|bm%u", index); + + if (!HLPFILE_FindSubFile(hlpfile, tmp, &ref, &end)) {WINE_WARN("no sub file\n"); return FALSE;} + + ref += 9; + return HLPFILE_RtfAddGfxByAddr(rd, hlpfile, ref, end - ref); +} + +/****************************************************************** * HLPFILE_LoadBitmap * * @@ -1273,6 +1470,10 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE case 0: HLPFILE_LoadGfxByIndex(page->file, GET_SHORT(format, 2), paragraph); + if (rd) { /* FIXME: TEMP */ + HLPFILE_RtfAddGfxByIndex(rd, page->file, GET_SHORT(format, 2)); + rd->char_pos++; + } break; case 1: WINE_FIXME("does it work ??? %x<%lu>#%u\n", @@ -1280,7 +1481,11 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE size, GET_SHORT(format, 2)); HLPFILE_LoadGfxByAddr(page->file, format + 2, size - 4, paragraph); - break; + if (rd) { /* FIXME: TEMP */ + HLPFILE_RtfAddGfxByAddr(rd, page->file, format + 2, size - 4); + rd->char_pos++; + } + break; default: WINE_FIXME("??? %u\n", GET_SHORT(format, 0)); break;

1 0

Eric Pouech : winhelp: Properly decode the keep bit in paragraph style.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 666bf7b8925e52186477ab5ac2db4427bf60ca1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=666bf7b8925e52186477ab5ac… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Apr 24 22:06:22 2008 +0200 winhelp: Properly decode the keep bit in paragraph style. --- programs/winhelp/hlpfile.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 1f5b735..2230cf6 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1122,6 +1122,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE } /* 0x1000 doesn't need space */ + if ((bits & 0x1000) && !HLPFILE_RtfAddControl(rd, "\\keep")) goto done; if ((bits & 0xE080) != 0) WINE_FIXME("Unsupported bits %04x, potential trouble ahead\n", bits);

1 0

Eric Pouech : winhelp: Set the borders of a paragraph in richedit.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 3299f1b8694074bd024cdee9691985c6fcdb587b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3299f1b8694074bd024cdee96… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Apr 24 22:06:16 2008 +0200 winhelp: Set the borders of a paragraph in richedit. --- programs/winhelp/hlpfile.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index cbac2c3..1f5b735 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1067,7 +1067,28 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE sprintf(tmp, "\\fi%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } - if (bits & 0x0100) format += 3; + if (bits & 0x0100) + { + BYTE brdr = *format++; + short w; + + if (brdr & 0x01 && !HLPFILE_RtfAddControl(rd, "\\box")) goto done; + if (brdr & 0x02 && !HLPFILE_RtfAddControl(rd, "\\brdrt")) goto done; + if (brdr & 0x04 && !HLPFILE_RtfAddControl(rd, "\\brdrl")) goto done; + if (brdr & 0x08 && !HLPFILE_RtfAddControl(rd, "\\brdrb")) goto done; + if (brdr & 0x10 && !HLPFILE_RtfAddControl(rd, "\\brdrr")) goto done; + if (brdr & 0x20 && !HLPFILE_RtfAddControl(rd, "\\brdrth")) goto done; + if (!(brdr & 0x20) && !HLPFILE_RtfAddControl(rd, "\\brdrs")) goto done; + if (brdr & 0x40 && !HLPFILE_RtfAddControl(rd, "\\brdrdb")) goto done; + /* 0x80: unknown */ + + w = GET_SHORT(format, 0); format += 2; + if (w) + { + sprintf(tmp, "\\brdrw%d", HLPFILE_HalfPointsToTwips(w)); + if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; + } + } if (bits & 0x0200) { int i, ntab = fetch_short(&format);

1 0

Eric Pouech : winhelp: Set the alignment of paragraph in richedit.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 300fa962452985e8e2775867d36c92423fc9bb98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=300fa962452985e8e2775867d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Apr 24 22:06:10 2008 +0200 winhelp: Set the alignment of paragraph in richedit. --- programs/winhelp/hlpfile.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index cf9ab0b..cbac2c3 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1092,7 +1092,15 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } } - /* 0x0400, 0x0800 and 0x1000 don't need space */ + switch (bits & 0xc00) + { + default: WINE_FIXME("Unsupported alignment 0xC00\n"); break; + case 0: if (!HLPFILE_RtfAddControl(rd, "\\ql")) goto done; break; + case 0x400: if (!HLPFILE_RtfAddControl(rd, "\\qr")) goto done; break; + case 0x800: if (!HLPFILE_RtfAddControl(rd, "\\qc")) goto done; break; + } + + /* 0x1000 doesn't need space */ if ((bits & 0xE080) != 0) WINE_FIXME("Unsupported bits %04x, potential trouble ahead\n", bits);

1 0

Eric Pouech : winhelp: Added support for paragraph information.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 26de7ddcd46172d5152ce970da6c77b86e2a923c URL: http://source.winehq.org/git/wine.git/?a=commit;h=26de7ddcd46172d5152ce970d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Apr 24 22:06:05 2008 +0200 winhelp: Added support for paragraph information. --- programs/winhelp/hlpfile.c | 36 ++++++++++++++++++++++++++++++------ 1 files changed, 30 insertions(+), 6 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 3e85dc3..cf9ab0b 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1037,12 +1037,36 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE format += 4; bits = GET_USHORT(format, 0); format += 2; if (bits & 0x0001) fetch_long(&format); - if (bits & 0x0002) fetch_short(&format); - if (bits & 0x0004) fetch_short(&format); - if (bits & 0x0008) fetch_short(&format); - if (bits & 0x0010) fetch_short(&format); - if (bits & 0x0020) fetch_short(&format); - if (bits & 0x0040) fetch_short(&format); + if (bits & 0x0002) + { + sprintf(tmp, "\\sb%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; + } + if (bits & 0x0004) + { + sprintf(tmp, "\\sa%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; + } + if (bits & 0x0008) + { + sprintf(tmp, "\\sl%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; + } + if (bits & 0x0010) + { + sprintf(tmp, "\\li%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; + } + if (bits & 0x0020) + { + sprintf(tmp, "\\ri%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; + } + if (bits & 0x0040) + { + sprintf(tmp, "\\fi%d", HLPFILE_HalfPointsToTwips(fetch_short(&format))); + if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; + } if (bits & 0x0100) format += 3; if (bits & 0x0200) {

1 0

Eric Pouech : winhelp: Added support for richedit tabs in paragraph format.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 523a5b3f3141a0f746256ff059df8eab3efe3d1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=523a5b3f3141a0f746256ff05… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Apr 24 22:05:59 2008 +0200 winhelp: Added support for richedit tabs in paragraph format. --- programs/winhelp/hlpfile.c | 35 ++++++++++++++++++++++++++++++----- programs/winhelp/hlpfile.h | 6 ++++++ 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 78a9643..3e85dc3 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -943,6 +943,18 @@ static HLPFILE_LINK* HLPFILE_AllocLink(struct RtfData* rd, int cookie, return link; } +unsigned HLPFILE_HalfPointsToTwips(unsigned pts) +{ + static unsigned logPxY; + if (!logPxY) + { + HDC hdc = GetDC(NULL); + logPxY = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(NULL, hdc); + } + return MulDiv(pts, 72 * 10, logPxY); +} + /*********************************************************************** * * HLPFILE_BrowseParagraph @@ -1034,13 +1046,26 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE if (bits & 0x0100) format += 3; if (bits & 0x0200) { - int ntab = fetch_short(&format); - unsigned short ts; + int i, ntab = fetch_short(&format); + unsigned tab, ts; + const char* kind; - while (ntab-- > 0) + for (i = 0; i < ntab; i++) { - ts = fetch_ushort(&format); - if (ts & 0x4000) fetch_ushort(&format); + tab = fetch_ushort(&format); + ts = (tab & 0x4000) ? fetch_ushort(&format) : 0 /* left */; + switch (ts) + { + default: WINE_FIXME("Unknown tab style %x\n", ts); + /* fall through */ + case 0: kind = ""; break; + case 1: kind = "\\tqr"; break; + case 2: kind = "\\tqc"; break; + } + /* FIXME: do kind */ + sprintf(tmp, "%s\\tx%d", + kind, HLPFILE_HalfPointsToTwips(tab & 0x3FFF)); + if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; } } /* 0x0400, 0x0800 and 0x1000 don't need space */ diff --git a/programs/winhelp/hlpfile.h b/programs/winhelp/hlpfile.h index 63ddc0c..7b67259 100644 --- a/programs/winhelp/hlpfile.h +++ b/programs/winhelp/hlpfile.h @@ -201,6 +201,12 @@ HLPFILE_PAGE* HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset, ULONG* relativ LONG HLPFILE_Hash(LPCSTR lpszContext); void HLPFILE_FreeLink(HLPFILE_LINK* link); void HLPFILE_FreeHlpFile(HLPFILE*); +unsigned HLPFILE_HalfPointsToTwips(unsigned pts); + +static inline unsigned HLPFILE_PointsToTwips(unsigned pts) +{ + return HLPFILE_HalfPointsToTwips(2 * pts); +} void* HLPFILE_BPTreeSearch(BYTE*, const void*, HLPFILE_BPTreeCompare); void HLPFILE_BPTreeEnum(BYTE*, HLPFILE_BPTreeCallback cb, void *cookie);

1 0

Alexandre Julliard : makedep: Don't try to open .tlb files.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 5f4f2c0b9268427ebc91a7fb4118850b44d65713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f4f2c0b9268427ebc91a7fb4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 24 23:43:04 2008 +0200 makedep: Don't try to open .tlb files. --- tools/makedep.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index e311058..d7f820e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -727,6 +727,13 @@ static void parse_file( INCL_FILE *pFile, int src ) return; } + /* don't try to open .tlb files */ + if (strendswith( pFile->name, ".tlb" )) + { + pFile->filename = xstrdup( pFile->name ); + return; + } + file = src ? open_src_file( pFile ) : open_include_file( pFile ); if (!file) return;

1 0

Nikolay Sivov : gdiplus: Implemented GdipSetLineColors.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 59ef3c920d2eb0f43d28387b78cf73c31aed3bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ef3c920d2eb0f43d28387b7… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 24 22:43:41 2008 +0400 gdiplus: Implemented GdipSetLineColors. --- dlls/gdiplus/brush.c | 9 +++++---- include/gdiplusflat.h | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index d2097eb..727d12d 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -675,12 +675,13 @@ GpStatus WINGDIPAPI GdipSetTextureTransform(GpTexture *texture, GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient *brush, ARGB color1, ARGB color2) { - static int calls; + if(!brush) + return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + brush->startcolor = color1; + brush->endcolor = color2; - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipGetLineColors(GpLineGradient *brush, ARGB *colors) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index c369377..366e8a5 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -175,6 +175,7 @@ GpStatus WINGDIPAPI GdipSetLineBlend(GpLineGradient*,GDIPCONST REAL*, GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient*,BOOL); GpStatus WINGDIPAPI GdipSetLineSigmaBlend(GpLineGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetLineWrapMode(GpLineGradient*,GpWrapMode); +GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient*,ARGB,ARGB); GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient*,ARGB); GpStatus WINGDIPAPI GdipSetPathGradientCenterPoint(GpPathGradient*,GpPointF*); GpStatus WINGDIPAPI GdipSetPathGradientFocusScales(GpPathGradient*,REAL,REAL);

1 0

Nikolay Sivov : gdiplus: Implemented GdipGetLineColors.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: b31f2250dda236aa19f24b58cae46923bd02e3b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b31f2250dda236aa19f24b58c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 24 22:43:36 2008 +0400 gdiplus: Implemented GdipGetLineColors. --- dlls/gdiplus/brush.c | 11 +++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 15180e6..d2097eb 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -683,6 +683,17 @@ GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient *brush, ARGB color1, return NotImplemented; } +GpStatus WINGDIPAPI GdipGetLineColors(GpLineGradient *brush, ARGB *colors) +{ + if(!brush || !colors) + return InvalidParameter; + + colors[0] = brush->startcolor; + colors[1] = brush->endcolor; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetLineLinearBlend(GpLineGradient *brush, REAL focus, REAL scale) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 1353a87..3905c74 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -302,7 +302,7 @@ @ stdcall GdipGetInterpolationMode(ptr ptr) @ stub GdipGetLineBlend @ stub GdipGetLineBlendCount -@ stub GdipGetLineColors +@ stdcall GdipGetLineColors(ptr ptr) @ stdcall GdipGetLineGammaCorrection(ptr ptr) @ stub GdipGetLinePresetBlend @ stub GdipGetLinePresetBlendCount diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 16a10b6..c369377 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -159,6 +159,7 @@ GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*); GpStatus WINGDIPAPI GdipGetLineGammaCorrection(GpLineGradient*,BOOL*); GpStatus WINGDIPAPI GdipGetLineRect(GpLineGradient*,GpRectF*); GpStatus WINGDIPAPI GdipGetLineRectI(GpLineGradient*,GpRect*); +GpStatus WINGDIPAPI GdipGetLineColors(GpLineGradient*,ARGB*); GpStatus WINGDIPAPI GdipGetPathGradientCenterColor(GpPathGradient*,ARGB*); GpStatus WINGDIPAPI GdipGetPathGradientCenterPoint(GpPathGradient*,GpPointF*); GpStatus WINGDIPAPI GdipGetPathGradientFocusScales(GpPathGradient*,REAL*,REAL*);

1 0

Nikolay Sivov : gdiplus: Implemented GdipGetLineRect/GdipGetLineRectI.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 3d274bc1cf16653acc2c230e46870f5ca927e10f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d274bc1cf16653acc2c230e4… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 24 22:43:26 2008 +0400 gdiplus: Implemented GdipGetLineRect/GdipGetLineRectI. --- dlls/gdiplus/brush.c | 31 +++++++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 4 ++-- include/gdiplusflat.h | 2 ++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 1c69518..15180e6 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -715,3 +715,34 @@ GpStatus WINGDIPAPI GdipSetLineTransform(GpLineGradient *brush, return NotImplemented; } + +GpStatus WINGDIPAPI GdipGetLineRect(GpLineGradient *brush, GpRectF *rect) +{ + if(!brush || !rect) + return InvalidParameter; + + rect->X = (brush->startpoint.X < brush->endpoint.X ? brush->startpoint.X: brush->endpoint.X); + rect->Y = (brush->startpoint.Y < brush->endpoint.Y ? brush->startpoint.Y: brush->endpoint.Y); + + rect->Width = fabs(brush->startpoint.X - brush->endpoint.X); + rect->Height = fabs(brush->startpoint.Y - brush->endpoint.Y); + + return Ok; +} + +GpStatus WINGDIPAPI GdipGetLineRectI(GpLineGradient *brush, GpRect *rect) +{ + GpRectF rectF; + GpStatus ret; + + ret = GdipGetLineRect(brush, &rectF); + + if(ret == Ok){ + rect->X = roundr(rectF.X); + rect->Y = roundr(rectF.Y); + rect->Width = roundr(rectF.Width); + rect->Height = roundr(rectF.Height); + } + + return ret; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 66eb23d..1353a87 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -306,8 +306,8 @@ @ stdcall GdipGetLineGammaCorrection(ptr ptr) @ stub GdipGetLinePresetBlend @ stub GdipGetLinePresetBlendCount -@ stub GdipGetLineRect -@ stub GdipGetLineRectI +@ stdcall GdipGetLineRect(ptr ptr) +@ stdcall GdipGetLineRectI(ptr ptr) @ stub GdipGetLineSpacing @ stub GdipGetLineTransform @ stub GdipGetLineWrapMode diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 1e04a23..16a10b6 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -157,6 +157,8 @@ GpStatus WINGDIPAPI GdipCreateTextureIAI(GpImage*,GDIPCONST GpImageAttributes*, GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*); GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*); GpStatus WINGDIPAPI GdipGetLineGammaCorrection(GpLineGradient*,BOOL*); +GpStatus WINGDIPAPI GdipGetLineRect(GpLineGradient*,GpRectF*); +GpStatus WINGDIPAPI GdipGetLineRectI(GpLineGradient*,GpRect*); GpStatus WINGDIPAPI GdipGetPathGradientCenterColor(GpPathGradient*,ARGB*); GpStatus WINGDIPAPI GdipGetPathGradientCenterPoint(GpPathGradient*,GpPointF*); GpStatus WINGDIPAPI GdipGetPathGradientFocusScales(GpPathGradient*,REAL*,REAL*);

1 0

Nikolay Sivov : gdiplus: Implemented GdipFillPieI.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 2c059d7f526a7c8a603b13d1e584165e1a25784e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c059d7f526a7c8a603b13d1e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 24 20:48:23 2008 +0400 gdiplus: Implemented GdipFillPieI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 4ce7989..66eb23d 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -221,7 +221,7 @@ @ stub GdipFillEllipseI @ stdcall GdipFillPath(ptr ptr ptr) @ stdcall GdipFillPie(ptr ptr long long long long long long) -@ stub GdipFillPieI +@ stdcall GdipFillPieI(ptr ptr long long long long long long) @ stub GdipFillPolygon2 @ stub GdipFillPolygon2I @ stdcall GdipFillPolygon(ptr ptr ptr long long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c6a4e33..ef57def 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1626,6 +1626,12 @@ GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, return Ok; } +GpStatus WINGDIPAPI GdipFillPieI(GpGraphics *graphics, GpBrush *brush, INT x, + INT y, INT width, INT height, REAL startAngle, REAL sweepAngle) +{ + return GdipFillPie(graphics,brush,(REAL)x,(REAL)y,(REAL)width,(REAL)height,startAngle,sweepAngle); +} + GpStatus WINGDIPAPI GdipFillPolygon(GpGraphics *graphics, GpBrush *brush, GDIPCONST GpPointF *points, INT count, GpFillMode fillMode) {

1 0

Nikolay Sivov : gdiplus: Implemented GdipDrawPolygon/GdipDrawPolygonI.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 4697593e859920ebba73138253d01450546b0d21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4697593e859920ebba7313825… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 24 20:48:17 2008 +0400 gdiplus: Implemented GdipDrawPolygon/GdipDrawPolygonI. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/graphics.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 ++ 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 2e747ce..4ce7989 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -192,8 +192,8 @@ @ stdcall GdipDrawPath(ptr ptr ptr) @ stdcall GdipDrawPie(ptr ptr long long long long long long) @ stdcall GdipDrawPieI(ptr ptr long long long long long long) -@ stub GdipDrawPolygon -@ stub GdipDrawPolygonI +@ stdcall GdipDrawPolygon(ptr ptr ptr long) +@ stdcall GdipDrawPolygonI(ptr ptr ptr long) @ stdcall GdipDrawRectangle(ptr ptr long long long long) @ stdcall GdipDrawRectangleI(ptr ptr long long long long) @ stdcall GdipDrawRectangles(ptr ptr ptr long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 238712a..c6a4e33 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2161,3 +2161,47 @@ GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpGraphics *graph return NotImplemented; } + +GpStatus WINGDIPAPI GdipDrawPolygon(GpGraphics *graphics,GpPen *pen,GDIPCONST GpPointF *points, + INT count) +{ + INT save_state; + POINT *pti; + + if(!graphics || !pen || count<=0) + return InvalidParameter; + + pti = GdipAlloc(sizeof(POINT) * count); + + save_state = prepare_dc(graphics, pen); + SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH)); + + transform_and_round_points(graphics, pti, (GpPointF*)points, count); + Polygon(graphics->hdc, pti, count); + + restore_dc(graphics, save_state); + GdipFree(pti); + + return Ok; +} + +GpStatus WINGDIPAPI GdipDrawPolygonI(GpGraphics *graphics,GpPen *pen,GDIPCONST GpPoint *points, + INT count) +{ + GpStatus ret; + GpPointF *ptf; + INT i; + + if(count<=0) return InvalidParameter; + ptf = GdipAlloc(sizeof(GpPointF) * count); + + for(i = 0;i < count; i++){ + ptf[i].X = (REAL)points[i].X; + ptf[i].Y = (REAL)points[i].Y; + } + + ret = GdipDrawPolygon(graphics,pen,ptf,count); + GdipFree(ptf); + + return ret; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ba2c6ee..1e04a23 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -94,6 +94,8 @@ GpStatus WINGDIPAPI GdipDrawLinesI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipDrawPath(GpGraphics*,GpPen*,GpPath*); GpStatus WINGDIPAPI GdipDrawPie(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawPieI(GpGraphics*,GpPen*,INT,INT,INT,INT,REAL,REAL); +GpStatus WINGDIPAPI GdipDrawPolygon(GpGraphics*,GpPen*,GDIPCONST GpPointF*, INT); +GpStatus WINGDIPAPI GdipDrawPolygonI(GpGraphics*,GpPen*,GDIPCONST GpPoint*, INT); GpStatus WINGDIPAPI GdipDrawRectangle(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics*,GpPen*,GDIPCONST GpRectF*,INT);

1 0

Nikolay Sivov : gdiplus: Implemented GdipDrawRectanglesI.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 3903ac6ee819c8be3888168c3dfe936879ce619b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3903ac6ee819c8be3888168c3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 24 20:48:08 2008 +0400 gdiplus: Implemented GdipDrawRectanglesI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 0ac4314..2e747ce 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -197,7 +197,7 @@ @ stdcall GdipDrawRectangle(ptr ptr long long long long) @ stdcall GdipDrawRectangleI(ptr ptr long long long long) @ stdcall GdipDrawRectangles(ptr ptr ptr long) -@ stub GdipDrawRectanglesI +@ stdcall GdipDrawRectanglesI(ptr ptr ptr long) @ stdcall GdipDrawString(ptr ptr long ptr ptr ptr ptr) @ stub GdipEmfToWmfBits @ stub GdipEndContainer diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 691cefc..238712a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1392,6 +1392,33 @@ GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics *graphics, GpPen *pen, return Ok; } +GpStatus WINGDIPAPI GdipDrawRectanglesI(GpGraphics *graphics, GpPen *pen, + GDIPCONST GpRect* rects, INT count) +{ + GpRectF *rectsF; + GpStatus ret; + INT i; + + if(!rects || count<=0) + return InvalidParameter; + + rectsF = GdipAlloc(sizeof(GpRectF) * count); + if(!rectsF) + return OutOfMemory; + + for(i = 0;i < count;i++){ + rectsF[i].X = (REAL)rects[i].X; + rectsF[i].Y = (REAL)rects[i].Y; + rectsF[i].Width = (REAL)rects[i].Width; + rectsF[i].Height = (REAL)rects[i].Height; + } + + ret = GdipDrawRectangles(graphics, pen, rectsF, count); + GdipFree(rectsF); + + return ret; +} + GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, GDIPCONST GpBrush *brush)

1 0

Nikolay Sivov : gdiplus: Implemented GdipDrawPieI.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 71931613f9b79501c48eadb21050ac18e8f8fa7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=71931613f9b79501c48eadb21… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 24 20:48:00 2008 +0400 gdiplus: Implemented GdipDrawPieI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 14f600a..0ac4314 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -191,7 +191,7 @@ @ stdcall GdipDrawLinesI(ptr ptr ptr long) @ stdcall GdipDrawPath(ptr ptr ptr) @ stdcall GdipDrawPie(ptr ptr long long long long long long) -@ stub GdipDrawPieI +@ stdcall GdipDrawPieI(ptr ptr long long long long long long) @ stub GdipDrawPolygon @ stub GdipDrawPolygonI @ stdcall GdipDrawRectangle(ptr ptr long long long long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4912759..691cefc 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1308,6 +1308,12 @@ GpStatus WINGDIPAPI GdipDrawPie(GpGraphics *graphics, GpPen *pen, REAL x, return Ok; } +GpStatus WINGDIPAPI GdipDrawPieI(GpGraphics *graphics, GpPen *pen, INT x, + INT y, INT width, INT height, REAL startAngle, REAL sweepAngle) +{ + return GdipDrawPie(graphics,pen,(REAL)x,(REAL)y,(REAL)width,(REAL)height,startAngle,sweepAngle); +} + GpStatus WINGDIPAPI GdipDrawRectangle(GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height) {

1 0

Nikolay Sivov : gdiplus: Implemented GdipTransformMatrixPointsI.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 3aa94d33e488f4437de85d8abc386371caddc681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aa94d33e488f4437de85d8ab… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 24 20:47:52 2008 +0400 gdiplus: Implemented GdipTransformMatrixPointsI. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/matrix.c | 27 +++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index e301f57..14f600a 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -604,7 +604,7 @@ @ stub GdipStringFormatGetGenericTypographic @ stub GdipTestControl @ stdcall GdipTransformMatrixPoints(ptr ptr long) -@ stub GdipTransformMatrixPointsI +@ stdcall GdipTransformMatrixPointsI(ptr ptr long) @ stdcall GdipTransformPath(ptr ptr) @ stub GdipTransformPoints @ stub GdipTransformPointsI diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index e80031f..e04e2cd 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -259,6 +259,33 @@ GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix *matrix, GpPointF *pts, return Ok; } +GpStatus WINGDIPAPI GdipTransformMatrixPointsI(GpMatrix *matrix, GpPoint *pts, INT count) +{ + GpPointF *ptsF; + GpStatus ret; + INT i; + + ptsF = GdipAlloc(sizeof(GpPointF) * count); + if(!ptsF) + return OutOfMemory; + + for(i = 0; i < count; i++){ + ptsF[i].X = (REAL)pts[i].X; + ptsF[i].Y = (REAL)pts[i].Y; + } + + ret = GdipTransformMatrixPoints(matrix, ptsF, count); + + if(ret == Ok) + for(i = 0; i < count; i++){ + pts[i].X = roundr(ptsF[i].X); + pts[i].Y = roundr(ptsF[i].Y); + } + GdipFree(ptsF); + + return ret; +} + GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix *matrix, REAL offsetX, REAL offsetY, GpMatrixOrder order) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 5765795..ba2c6ee 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -229,6 +229,7 @@ GpStatus WINGDIPAPI GdipRotateMatrix(GpMatrix*,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSetMatrixElements(GpMatrix*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix*,GpPointF*,INT); +GpStatus WINGDIPAPI GdipTransformMatrixPointsI(GpMatrix*,GpPoint*,INT); GpStatus WINGDIPAPI GdipVectorTransformMatrixPoints(GpMatrix*,GpPointF*,INT); GpStatus WINGDIPAPI GdipVectorTransformMatrixPointsI(GpMatrix*,GpPoint*,INT); GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder);

1 0

Rob Shearman : widl: Add typedef statements to the statement lists.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 1fcc2084e849ba9b4e245029f0290c61ef8dcbc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fcc2084e849ba9b4e245029f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Apr 24 19:06:42 2008 +0100 widl: Add typedef statements to the statement lists. --- tools/widl/parser.y | 61 +++++++++++++++++++++++++++++------------------- tools/widl/widltypes.h | 7 +++++ 2 files changed, 44 insertions(+), 24 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index a9c7d02..b4805ed 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -124,7 +124,7 @@ static void write_iid(type_t *iface); static int compute_method_indexes(type_t *iface); static char *gen_name(void); -static void process_typedefs(var_list_t *names); +static statement_t *process_typedefs(var_list_t *names); static void check_arg(var_t *arg); static void check_functions(const type_t *iface); static void check_all_user_types(const statement_list_t *stmts); @@ -301,7 +301,7 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %type <uuid> uuid_string %type <num> import_start %type <typelib> library_start librarydef -%type <statement> statement +%type <statement> statement typedef %type <stmt_list> gbl_statements imp_statements %left ',' @@ -393,7 +393,7 @@ statement: constdef ';' { $$ = make_statement_init_decl($1); fprintf(header, ";\n\n"); } } - | typedef ';' { $$ = NULL; /* FIXME */ } + | typedef ';' { $$ = $1; } | uniondef ';' { $$ = make_statement_type_decl($1); if (!parse_only && do_header) { write_type_def_or_decl(header, $1, FALSE, NULL); @@ -989,7 +989,7 @@ type: tVOID { $$ = duptype(find_type("void", 0), 1); } ; typedef: tTYPEDEF m_attributes type pident_list { reg_typedefs($3, $4, check_typedef_attrs($2)); - process_typedefs($4); + $$ = process_typedefs($4); } ; @@ -1989,26 +1989,6 @@ static char *gen_name(void) return name; } -static void process_typedefs(pident_list_t *pidents) -{ - pident_t *pident, *next; - - if (!pidents) return; - LIST_FOR_EACH_ENTRY_SAFE( pident, next, pidents, pident_t, entry ) - { - var_t *var = pident->var; - type_t *type = find_type(var->name, 0); - - if (! parse_only && do_header) - write_typedef(type); - if (in_typelib && type->attrs) - add_typelib_entry(type); - - free(pident); - free(var); - } -} - struct allowed_attr { unsigned int dce_compatible : 1; @@ -2603,6 +2583,39 @@ static statement_t *make_statement_module(type_t *type) return stmt; } +static statement_t *process_typedefs(pident_list_t *pidents) +{ + pident_t *pident, *next; + statement_t *stmt; + type_list_t **type_list; + + if (!pidents) return NULL; + + stmt = make_statement(STMT_TYPEDEF); + stmt->u.type_list = NULL; + type_list = &stmt->u.type_list; + + LIST_FOR_EACH_ENTRY_SAFE( pident, next, pidents, pident_t, entry ) + { + var_t *var = pident->var; + type_t *type = find_type(var->name, 0); + *type_list = xmalloc(sizeof(type_list_t)); + (*type_list)->type = type; + (*type_list)->next = NULL; + + if (! parse_only && do_header) + write_typedef(type); + if (in_typelib && type->attrs) + add_typelib_entry(type); + + type_list = &(*type_list)->next; + free(pident); + free(var); + } + + return stmt; +} + static statement_list_t *append_statement(statement_list_t *list, statement_t *stmt) { if (!stmt) return list; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 10064b7..ab4acde 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -52,6 +52,7 @@ typedef struct _importinfo_t importinfo_t; typedef struct _typelib_t typelib_t; typedef struct _user_type_t user_type_t; typedef struct _user_type_t context_handle_t; +typedef struct _type_list_t type_list_t; typedef struct _statement_t statement_t; typedef struct list attr_list_t; @@ -357,6 +358,11 @@ struct _user_type_t { const char *name; }; +struct _type_list_t { + type_t *type; + struct _type_list_t *next; +}; + struct _statement_t { struct list entry; enum statement_type type; @@ -367,6 +373,7 @@ struct _statement_t { const char *str; var_t *var; typelib_t *lib; + type_list_t *type_list; } u; };

1 0

Rob Shearman : widl: Create a list of statements in the whole IDL file, instead of just a list of interfaces.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: df0e38c0670a40eb5892e53ffb506bb1f4bc33ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=df0e38c0670a40eb5892e53ff… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Apr 24 19:06:28 2008 +0100 widl: Create a list of statements in the whole IDL file, instead of just a list of interfaces. --- tools/widl/client.c | 75 ++++++++++------- tools/widl/header.c | 6 +- tools/widl/header.h | 6 +- tools/widl/parser.y | 211 +++++++++++++++++++++++++++++++++++++---------- tools/widl/proxy.c | 132 +++++++++++++++++++---------- tools/widl/server.c | 75 ++++++++++------- tools/widl/typegen.c | 117 +++++++++++++++++--------- tools/widl/typegen.h | 10 +- tools/widl/typelib.c | 14 +--- tools/widl/typelib.h | 2 +- tools/widl/widl.c | 4 +- tools/widl/widl.h | 8 +- tools/widl/widltypes.h | 31 +++++++ tools/widl/write_msft.c | 7 +- 14 files changed, 470 insertions(+), 228 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df0e38c0670a40eb5892e…

1 0

Rob Shearman : widl: Allow NULL to be used in expressions.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 58be89230e29689eedb84d5f97710b33f101bd06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58be89230e29689eedb84d5f9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Apr 24 19:04:14 2008 +0100 widl: Allow NULL to be used in expressions. --- tools/widl/parser.l | 1 + tools/widl/parser.y | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 4e2a6f4..4ae37ef 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -191,6 +191,7 @@ struct keyword { static const struct keyword keywords[] = { {"FALSE", tFALSE}, + {"NULL", tNULL}, {"TRUE", tTRUE}, {"__cdecl", tCDECL}, {"__fastcall", tFASTCALL}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index f514701..0514d9c 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -219,6 +219,7 @@ static void add_explicit_handle_if_necessary(func_t *func); %token tNONBROWSABLE %token tNONCREATABLE %token tNONEXTENSIBLE +%token tNULL %token tOBJECT tODL tOLEAUTOMATION %token tOPTIONAL %token tOUT @@ -624,6 +625,7 @@ expr: aNUM { $$ = make_exprl(EXPR_NUM, $1); } | aHEXNUM { $$ = make_exprl(EXPR_HEXNUM, $1); } | aDOUBLE { $$ = make_exprd(EXPR_DOUBLE, $1); } | tFALSE { $$ = make_exprl(EXPR_TRUEFALSE, 0); } + | tNULL { $$ = make_exprl(EXPR_NUM, 0); } | tTRUE { $$ = make_exprl(EXPR_TRUEFALSE, 1); } | aIDENTIFIER { $$ = make_exprs(EXPR_IDENTIFIER, $1); } | expr '?' expr ':' expr { $$ = make_expr3(EXPR_COND, $1, $3, $5); }

1 0

Rob Shearman : widl: Construct the pointer chain while parsing pointers, rather than storing a ptr_level.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: ec81a78f017f169954d792dcbed62f87eb30c3d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec81a78f017f169954d792dcb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Apr 24 19:03:50 2008 +0100 widl: Construct the pointer chain while parsing pointers, rather than storing a ptr_level. This method is more flexible and somewhat simpler. --- tools/widl/parser.y | 175 +++++++++++++++++++++++++---------------------- tools/widl/widltypes.h | 9 +-- 2 files changed, 95 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec81a78f017f169954d79…

1 0

Rob Shearman : widl: Implement lcid property on library declarations.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 02f5412a535315bfd3ef6ad57f1962dce0ef9775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02f5412a535315bfd3ef6ad57… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Apr 24 19:03:07 2008 +0100 widl: Implement lcid property on library declarations. --- tools/widl/parser.y | 2 ++ tools/widl/widltypes.h | 1 + tools/widl/write_msft.c | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index bce194c..99be1f2 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -493,6 +493,7 @@ attribute: { $$ = NULL; } | tIN { $$ = make_attr(ATTR_IN); } | tINPUTSYNC { $$ = make_attr(ATTR_INPUTSYNC); } | tLENGTHIS '(' m_exprs ')' { $$ = make_attrp(ATTR_LENGTHIS, $3); } + | tLCID '(' expr_const ')' { $$ = make_attrp(ATTR_LIBLCID, $3); } | tLOCAL { $$ = make_attr(ATTR_LOCAL); } | tNONBROWSABLE { $$ = make_attr(ATTR_NONBROWSABLE); } | tNONCREATABLE { $$ = make_attr(ATTR_NONCREATABLE); } @@ -2010,6 +2011,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_IN */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "in" }, /* ATTR_INPUTSYNC */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "inputsync" }, /* ATTR_LENGTHIS */ { 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, "length_is" }, + /* ATTR_LIBLCID */ { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "lcid" }, /* ATTR_LOCAL */ { 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, "local" }, /* ATTR_NONBROWSABLE */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "nonbrowsable" }, /* ATTR_NONCREATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "noncreatable" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index fd8b8dd..bf28a01 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -104,6 +104,7 @@ enum attr_type ATTR_IN, ATTR_INPUTSYNC, ATTR_LENGTHIS, + ATTR_LIBLCID, ATTR_LOCAL, ATTR_NONBROWSABLE, ATTR_NONCREATABLE, diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 56bff46..accb648 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2322,8 +2322,8 @@ static void set_help_string_context(msft_typelib_t *typelib) static void set_lcid(msft_typelib_t *typelib) { - typelib->typelib_header.lcid2 = 0x0; - return; + const expr_t *lcid_expr = get_attrp( typelib->typelib->attrs, ATTR_LIBLCID ); + typelib->typelib_header.lcid2 = lcid_expr ? lcid_expr->cval : 0x0; } static void set_lib_flags(msft_typelib_t *typelib)

1 0

Jacek Caban : mshtml: Added IDispatchEx support to HTMLElementCollection object.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 989574510cdc8627b09b6ee94d1120ed1f334f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=989574510cdc8627b09b6ee94… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 24 18:26:56 2008 +0200 mshtml: Added IDispatchEx support to HTMLElementCollection object. --- dlls/mshtml/dispex.c | 2 ++ dlls/mshtml/htmlelem.c | 15 +++++++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 2 ++ 4 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index eb973b8..153d864 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -53,6 +53,7 @@ static REFIID tid_ids[] = { &IID_NULL, &DIID_DispHTMLDocument, &DIID_DispHTMLDOMTextNode, + &DIID_DispHTMLElementCollection, &DIID_DispHTMLUnknownElement, &DIID_DispHTMLWindow2, &IID_IHTMLDocument2, @@ -64,6 +65,7 @@ static REFIID tid_ids[] = { &IID_IHTMLDOMTextNode, &IID_IHTMLElement, &IID_IHTMLElement2, + &IID_IHTMLElementCollection, &IID_IHTMLWindow2, &IID_IHTMLWindow3, &IID_IOmNavigator diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 82acb53..c44e2e5 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1363,6 +1363,7 @@ HTMLElement *HTMLElement_Create(nsIDOMNode *nsnode) } typedef struct { + DispatchEx dispex; const IHTMLElementCollectionVtbl *lpHTMLElementCollectionVtbl; IUnknown *ref_unk; @@ -1389,6 +1390,9 @@ static HRESULT WINAPI HTMLElementCollection_QueryInterface(IHTMLElementCollectio }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = HTMLELEMCOL(This); + }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { + TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); + *ppv = DISPATCHEX(&This->dispex); }else if(IsEqualGUID(&IID_IHTMLElementCollection, riid)) { TRACE("(%p)->(IID_IHTMLElementCollection %p)\n", This, ppv); *ppv = HTMLELEMCOL(This); @@ -1664,6 +1668,15 @@ static const IHTMLElementCollectionVtbl HTMLElementCollectionVtbl = { HTMLElementCollection_tags }; +static dispex_static_data_t HTMLElementCollection_dispex = { + DispHTMLElementCollection_tid, + NULL, + { + IHTMLElementCollection_tid, + 0 + } +}; + IHTMLElementCollection *create_all_collection(HTMLDOMNode *node) { elem_vector buf = {NULL, 0, 8}; @@ -1687,6 +1700,8 @@ static IHTMLElementCollection *HTMLElementCollection_Create(IUnknown *ref_unk, ret->elems = elems; ret->len = len; + init_dispex(&ret->dispex, (IUnknown*)HTMLELEMCOL(ret), &HTMLElementCollection_dispex); + IUnknown_AddRef(ref_unk); ret->ref_unk = ref_unk; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e6041a0..126bc2e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -63,6 +63,7 @@ typedef enum { NULL_tid, DispHTMLDocument_tid, DispHTMLDOMTextNode_tid, + DispHTMLElementCollection_tid, DispHTMLUnknownElement_tid, DispHTMLWindow2_tid, IHTMLDocument2_tid, @@ -74,6 +75,7 @@ typedef enum { IHTMLDOMTextNode_tid, IHTMLElement_tid, IHTMLElement2_tid, + IHTMLElementCollection_tid, IHTMLWindow2_tid, IHTMLWindow3_tid, IOmNavigator_tid, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 620ad97..8c6f60f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -709,6 +709,8 @@ static void _test_elem_collection(unsigned line, IHTMLElementCollection *col, IDispatch *disp; HRESULT hres; + test_disp((IUnknown*)col, &DIID_DispHTMLElementCollection); + hres = IHTMLElementCollection_get_length(col, &len); ok_(__FILE__,line) (hres == S_OK, "get_length failed: %08x\n", hres); ok_(__FILE__,line) (len == exlen, "len=%ld, expected %ld\n", len, exlen);

1 0

Jacek Caban : mshtml.idl: Added DispHTMLElementCollection declaration.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 74c571a441545997796b790e55ccb2851c7c2aaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c571a441545997796b790e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 24 18:26:37 2008 +0200 mshtml.idl: Added DispHTMLElementCollection declaration. --- include/mshtmdid.h | 6 ++++++ include/mshtml.idl | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index e269091..23ffe9c 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -986,6 +986,12 @@ #define DISPID_IHTMLELEMENTCOLLECTION__NEWENUM DISPID_NEWENUM #define DISPID_IHTMLELEMENTCOLLECTION_ITEM DISPID_VALUE +/* IHTMLElementCollection2 */ +#define DISPID_IHTMLELEMENTCOLLECTION2_URNS DISPID_COLLECTION+5 + +/* IHTMLElementCollection3 */ +#define DISPID_IHTMLELEMENTCOLLECTION3_NAMEDITEM DISPID_COLLECTION+6 + /* HTMLElementEvents */ #define DISPID_HTMLELEMENTEVENTS_ONHELP DISPID_EVMETH_ONHELP #define DISPID_HTMLELEMENTEVENTS_ONCLICK DISPID_EVMETH_ONCLICK diff --git a/include/mshtml.idl b/include/mshtml.idl index 4a30f0d..6eb4b5a 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -3378,6 +3378,45 @@ interface IHTMLElementCollection : IDispatch } /***************************************************************************** + * DispHTMLElementCollection dispinterface + */ +[ + hidden, + uuid(3050f56b-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLElementCollection +{ +properties: +methods: + [id(DISPID_IHTMLELEMENTCOLLECTION_TOSTRING)] + BSTR toString(); + + [propput, id(DISPID_IHTMLELEMENTCOLLECTION_LENGTH)] + void length(long v); + + [propget, id(DISPID_IHTMLELEMENTCOLLECTION_LENGTH)] + long length(); + + [propget, id(DISPID_IHTMLELEMENTCOLLECTION__NEWENUM), hidden, restricted] + IUnknown *_newEnum(); + + [id(DISPID_IHTMLELEMENTCOLLECTION_ITEM)] + IDispatch *item( + [in, optional] VARIANT name, + [in, optional] VARIANT index); + + [id(DISPID_IHTMLELEMENTCOLLECTION_TAGS)] + IDispatch *tags( + [in] VARIANT tagName); + + [id(DISPID_IHTMLELEMENTCOLLECTION2_URNS)] + IDispatch *urns([in] VARIANT urn); + + [id(DISPID_IHTMLELEMENTCOLLECTION3_NAMEDITEM)] + IDispatch *namedItem([in] BSTR name); +} + +/***************************************************************************** * IHTMLSelectElement interface */ [

1 0

Jacek Caban : mshtml: Added get_nodeType implementation.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: bb05803a2ac56c078393803503fc73400c51c9c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb05803a2ac56c07839380350… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 24 18:26:18 2008 +0200 mshtml: Added get_nodeType implementation. --- dlls/mshtml/htmlnode.c | 26 ++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 26 ++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index ee0d727..7abf2ef 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -104,8 +104,30 @@ static HRESULT WINAPI HTMLDOMNode_Invoke(IHTMLDOMNode *iface, DISPID dispIdMembe static HRESULT WINAPI HTMLDOMNode_get_nodeType(IHTMLDOMNode *iface, long *p) { HTMLDOMNode *This = HTMLDOMNODE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRUint16 type = -1; + + TRACE("(%p)->(%p)\n", This, p); + + nsIDOMNode_GetNodeType(This->nsnode, &type); + + switch(type) { + case ELEMENT_NODE: + *p = 1; + break; + case TEXT_NODE: + *p = 3; + break; + default: + /* + * FIXME: + * According to MSDN only ELEMENT_NODE and TEXT_NODE are supported. + * It needs more tests. + */ + FIXME("type %u\n", type); + *p = 0; + } + + return S_OK; } static HRESULT WINAPI HTMLDOMNode_get_parentNode(IHTMLDOMNode *iface, IHTMLDOMNode **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f91da86..620ad97 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -763,6 +763,24 @@ static IHTMLDOMNode *_get_first_child(unsigned line, IUnknown *unk) return child; } +#define get_node_type(n) _get_node_type(__LINE__,n) +static long _get_node_type(unsigned line, IUnknown *unk) +{ + IHTMLDOMNode *node; + long type = -1; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMNode, (void**)&node); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMNode: %08x\n", hres); + + hres = IHTMLDOMNode_get_nodeType(node, &type); + ok(hres == S_OK, "get_nodeType failed: %08x\n", hres); + + IHTMLDOMNode_Release(node); + + return type; +} + static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, const elem_type_t *elem_types, long len) { @@ -1406,6 +1424,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement *elem; IHTMLDOMNode *node, *node2; IDispatch *disp; + long type; HRESULT hres; static const WCHAR xW[] = {'x',0}; @@ -1484,6 +1503,9 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLDOMNode_Release(node); } + type = get_node_type((IUnknown*)select); + ok(type == 1, "type=%ld\n", type); + IHTMLSelectElement_Release(select); IHTMLElement_Release(elem); } @@ -1512,9 +1534,13 @@ static void test_elems(IHTMLDocument2 *doc) if(node) { test_ifaces((IUnknown*)node, text_iids); test_disp((IUnknown*)node, &DIID_DispHTMLDOMTextNode); + node2 = get_first_child((IUnknown*)node); ok(!node2, "node2 != NULL\n"); + type = get_node_type((IUnknown*)node); + ok(type == 3, "type=%ld\n", type); + IHTMLDOMNode_Release(node); }

1 0

Jacek Caban : mshtml: Added IDispatchEx support to text node.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: af271b3b45b195243a1798b4c111a94e41838877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af271b3b45b195243a1798b4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 24 18:25:51 2008 +0200 mshtml: Added IDispatchEx support to text node. --- dlls/mshtml/dispex.c | 2 ++ dlls/mshtml/htmltextnode.c | 13 +++++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 1 + 4 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 949d7b8..eb973b8 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -52,6 +52,7 @@ static struct list dispex_data_list = LIST_INIT(dispex_data_list); static REFIID tid_ids[] = { &IID_NULL, &DIID_DispHTMLDocument, + &DIID_DispHTMLDOMTextNode, &DIID_DispHTMLUnknownElement, &DIID_DispHTMLWindow2, &IID_IHTMLDocument2, @@ -60,6 +61,7 @@ static REFIID tid_ids[] = { &IID_IHTMLDocument5, &IID_IHTMLDOMNode, &IID_IHTMLDOMNode2, + &IID_IHTMLDOMTextNode, &IID_IHTMLElement, &IID_IHTMLElement2, &IID_IHTMLWindow2, diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 585d84f..fa6308e 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -185,6 +185,17 @@ static const NodeImplVtbl HTMLDOMTextNodeImplVtbl = { HTMLDOMTextNode_destructor }; +static dispex_static_data_t HTMLDOMTextNode_dispex = { + DispHTMLDOMTextNode_tid, + 0, + { + IHTMLDOMNode_tid, + IHTMLDOMNode2_tid, + IHTMLDOMTextNode_tid, + 0 + } +}; + HTMLDOMNode *HTMLDOMTextNode_Create(nsIDOMNode *nsnode) { HTMLDOMTextNode *ret ; @@ -193,5 +204,7 @@ HTMLDOMNode *HTMLDOMTextNode_Create(nsIDOMNode *nsnode) ret->node.vtbl = &HTMLDOMTextNodeImplVtbl; ret->lpIHTMLDOMTextNodeVtbl = &HTMLDOMTextNodeVtbl; + init_dispex(&ret->node.dispex, (IUnknown*)HTMLTEXT(ret), &HTMLDOMTextNode_dispex); + return &ret->node; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index cf3cfba..e6041a0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -62,6 +62,7 @@ typedef struct event_target_t event_target_t; typedef enum { NULL_tid, DispHTMLDocument_tid, + DispHTMLDOMTextNode_tid, DispHTMLUnknownElement_tid, DispHTMLWindow2_tid, IHTMLDocument2_tid, @@ -70,6 +71,7 @@ typedef enum { IHTMLDocument5_tid, IHTMLDOMNode_tid, IHTMLDOMNode2_tid, + IHTMLDOMTextNode_tid, IHTMLElement_tid, IHTMLElement2_tid, IHTMLWindow2_tid, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 346ee5d..f91da86 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1511,6 +1511,7 @@ static void test_elems(IHTMLDocument2 *doc) ok(node != NULL, "node == NULL\n"); if(node) { test_ifaces((IUnknown*)node, text_iids); + test_disp((IUnknown*)node, &DIID_DispHTMLDOMTextNode); node2 = get_first_child((IUnknown*)node); ok(!node2, "node2 != NULL\n");

1 0

Jacek Caban : mshtml: Added IHTMLDOMTextNode stub implementation.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 754adce78190c726db510873af89ba389b7d2b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=754adce78190c726db510873a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 24 18:25:34 2008 +0200 mshtml: Added IHTMLDOMTextNode stub implementation. --- dlls/mshtml/Makefile.in | 3 +- dlls/mshtml/htmlnode.c | 3 + dlls/mshtml/htmltextnode.c | 197 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/dom.c | 29 ++++++- 5 files changed, 231 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=754adce78190c726db510…

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2008