October 2010 - Wine-Commits

Alexandre Julliard : winegcc: Fix the lib dir detection.
by Alexandre Julliard Oct. 28, 2010

Oct. 28, 2010

Module: wine Branch: master Commit: 62f9966fdc8e37720d9ad60a87592b0a593a03a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62f9966fdc8e37720d9ad60a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 28 11:45:05 2010 +0200 winegcc: Fix the lib dir detection. Spotted by André Hentschel. --- tools/winegcc/winegcc.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index bec4be3..dcfe778 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -340,28 +340,36 @@ static int check_platform( struct options *opts, const char *file ) static char *get_lib_dir( struct options *opts ) { static const char *stdlibpath[] = { LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; + static const char libwine[] = "/libwine.so"; unsigned int i; for (i = 0; i < sizeof(stdlibpath)/sizeof(stdlibpath[0]); i++) { - char *p, *buffer = xmalloc( strlen(stdlibpath[i]) + sizeof("32/libwine.so") ); + char *p, *buffer = xmalloc( strlen(stdlibpath[i]) + strlen(libwine) + 3 ); strcpy( buffer, stdlibpath[i] ); p = buffer + strlen(buffer); while (p > buffer && p[-1] == '/') p--; - strcpy( p, "/libwine.so" ); - if (check_platform( opts, buffer )) return buffer; + strcpy( p, libwine ); + if (check_platform( opts, buffer )) goto found; if (p > buffer + 2 && (!memcmp( p - 2, "32", 2 ) || !memcmp( p - 2, "64", 2 ))) p -= 2; if (opts->force_pointer_size == 4 || (!opts->force_pointer_size && opts->target_cpu != CPU_x86_64)) { - strcpy( p, "32/libwine.so" ); - if (check_platform( opts, buffer )) return buffer; + strcpy( p, "32" ); + strcat( p, libwine ); + if (check_platform( opts, buffer )) goto found; } if (opts->force_pointer_size == 8 || (!opts->force_pointer_size && opts->target_cpu == CPU_x86_64)) { - strcpy( p, "64/libwine.so" ); - if (check_platform( opts, buffer )) return buffer; + strcpy( p, "64" ); + strcat( p, libwine ); + if (check_platform( opts, buffer )) goto found; } free( buffer ); + continue; + + found: + buffer[strlen(buffer) - strlen(libwine)] = 0; + return buffer; } return xstrdup( LIBDIR ); }

1 0

Nikolay Sivov : msxml3: Actually try to use IPersistStream if it' s available.
by Alexandre Julliard Oct. 28, 2010

Oct. 28, 2010

Module: wine Branch: master Commit: 850be4da8c6bbf1c5d2c76c5de4a702561e87d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=850be4da8c6bbf1c5d2c76c5d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 28 01:27:06 2010 +0400 msxml3: Actually try to use IPersistStream if it's available. --- dlls/msxml3/saxreader.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index a0c821e..5f04227 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2043,12 +2043,24 @@ static HRESULT internal_parse( SysFreeString(bstrData); break; } + if(IUnknown_QueryInterface(V_UNKNOWN(&varInput), &IID_IPersistStream, (void**)&persistStream) == S_OK) { + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + if(hr != S_OK) + { + IPersistStream_Release(persistStream); + return hr; + } + hr = IPersistStream_Save(persistStream, stream, TRUE); IPersistStream_Release(persistStream); - if(hr != S_OK) break; + if(hr != S_OK) + { + IStream_Release(stream); + break; + } } if(stream || IUnknown_QueryInterface(V_UNKNOWN(&varInput), &IID_IStream, (void**)&stream) == S_OK)

1 0

Vincent Povirk : gdiplus: Implement GdipGetRegionScans.
by Alexandre Julliard Oct. 28, 2010

Oct. 28, 2010

Module: wine Branch: master Commit: 5f327f7812603c2a0bd763b90f6453508c29ff3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f327f7812603c2a0bd763b90… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 30 15:38:03 2010 -0500 gdiplus: Implement GdipGetRegionScans. --- dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/region.c | 68 +++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/region.c | 79 +++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 + 4 files changed, 151 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b529d0d..6721c01 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -380,9 +380,9 @@ @ stdcall GdipGetRegionData(ptr ptr long ptr) @ stdcall GdipGetRegionDataSize(ptr ptr) @ stdcall GdipGetRegionHRgn(ptr ptr ptr) -@ stub GdipGetRegionScans +@ stdcall GdipGetRegionScans(ptr ptr ptr ptr) @ stdcall GdipGetRegionScansCount(ptr ptr ptr) -@ stub GdipGetRegionScansI +@ stdcall GdipGetRegionScansI(ptr ptr ptr ptr) @ stdcall GdipGetRenderingOrigin(ptr ptr ptr) @ stdcall GdipGetSmoothingMode(ptr ptr) @ stdcall GdipGetSolidFillColor(ptr ptr) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 2e895a8..e9f2d9a 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -1441,3 +1441,71 @@ GpStatus WINGDIPAPI GdipGetRegionScansCount(GpRegion *region, UINT *count, GpMat return stat; } + +GpStatus WINGDIPAPI GdipGetRegionScansI(GpRegion *region, GpRect *scans, INT *count, GpMatrix *matrix) +{ + GpStatus stat; + INT i; + LPRGNDATA data; + RECT *rects; + + if (!region || !count || !matrix) + return InvalidParameter; + + stat = get_region_scans_data(region, matrix, &data); + + if (stat == Ok) + { + *count = data->rdh.nCount; + rects = (RECT*)&data->Buffer; + + if (scans) + { + for (i=0; i<data->rdh.nCount; i++) + { + scans[i].X = rects[i].left; + scans[i].Y = rects[i].top; + scans[i].Width = rects[i].right - rects[i].left; + scans[i].Height = rects[i].bottom - rects[i].top; + } + } + + GdipFree(data); + } + + return Ok; +} + +GpStatus WINGDIPAPI GdipGetRegionScans(GpRegion *region, GpRectF *scans, INT *count, GpMatrix *matrix) +{ + GpStatus stat; + INT i; + LPRGNDATA data; + RECT *rects; + + if (!region || !count || !matrix) + return InvalidParameter; + + stat = get_region_scans_data(region, matrix, &data); + + if (stat == Ok) + { + *count = data->rdh.nCount; + rects = (RECT*)&data->Buffer; + + if (scans) + { + for (i=0; i<data->rdh.nCount; i++) + { + scans[i].X = rects[i].left; + scans[i].Y = rects[i].top; + scans[i].Width = rects[i].right - rects[i].left; + scans[i].Height = rects[i].bottom - rects[i].top; + } + } + + GdipFree(data); + } + + return Ok; +} diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 9d48b25..3052f2e 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -22,6 +22,7 @@ #include "gdiplus.h" #include "wingdi.h" #include "wine/test.h" +#include <math.h> #define RGNDATA_RECT 0x10000000 #define RGNDATA_PATH 0x10000001 @@ -33,6 +34,9 @@ #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define expectf_(expected, got, precision) ok(fabs(expected - got) < precision, "Expected %.2f, got %.2f\n", expected, got) +#define expectf(expected, got) expectf_(expected, got, 0.0001) + #define expect_magic(value) ok(*value == RGNDATA_MAGIC || *value == RGNDATA_MAGIC2, "Expected a known magic value, got %8x\n", *value) #define expect_dword(value, expected) ok(*(value) == expected, "expected %08x got %08x\n", expected, *(value)) @@ -1237,6 +1241,9 @@ static void test_scans(void) GpRectF rectf; GpStatus status; ULONG count=80085; + INT icount; + GpRectF scans[2]; + GpRect scansi[2]; status = GdipCreateRegion(&region); expect(Ok, status); @@ -1254,11 +1261,44 @@ static void test_scans(void) status = GdipGetRegionScansCount(region, &count, NULL); expect(InvalidParameter, status); + status = GdipGetRegionScans(NULL, scans, &icount, matrix); + expect(InvalidParameter, status); + + status = GdipGetRegionScans(region, scans, NULL, matrix); + expect(InvalidParameter, status); + + status = GdipGetRegionScans(region, scans, &icount, NULL); + expect(InvalidParameter, status); + /* infinite */ status = GdipGetRegionScansCount(region, &count, matrix); expect(Ok, status); expect(1, count); + status = GdipGetRegionScans(region, NULL, &icount, matrix); + expect(Ok, status); + expect(1, icount); + + status = GdipGetRegionScans(region, scans, &icount, matrix); + expect(Ok, status); + expect(1, icount); + + status = GdipGetRegionScansI(region, scansi, &icount, matrix); + expect(Ok, status); + expect(1, icount); + expect(-0x400000, scansi[0].X); + expect(-0x400000, scansi[0].Y); + expect(0x800000, scansi[0].Width); + expect(0x800000, scansi[0].Height); + + status = GdipGetRegionScans(region, scans, &icount, matrix); + expect(Ok, status); + expect(1, icount); + expectf((double)-0x400000, scans[0].X); + expectf((double)-0x400000, scans[0].Y); + expectf((double)0x800000, scans[0].Width); + expectf((double)0x800000, scans[0].Height); + /* empty */ status = GdipSetEmpty(region); expect(Ok, status); @@ -1267,6 +1307,10 @@ static void test_scans(void) expect(Ok, status); expect(0, count); + status = GdipGetRegionScans(region, scans, &icount, matrix); + expect(Ok, status); + expect(0, icount); + /* single rectangle */ rectf.X = rectf.Y = 0.0; rectf.Width = rectf.Height = 5.0; @@ -1277,6 +1321,14 @@ static void test_scans(void) expect(Ok, status); expect(1, count); + status = GdipGetRegionScans(region, scans, &icount, matrix); + expect(Ok, status); + expect(1, icount); + expectf(0.0, scans[0].X); + expectf(0.0, scans[0].Y); + expectf(5.0, scans[0].Width); + expectf(5.0, scans[0].Height); + /* two rectangles */ rectf.X = rectf.Y = 5.0; rectf.Width = rectf.Height = 5.0; @@ -1287,6 +1339,33 @@ static void test_scans(void) expect(Ok, status); expect(2, count); + /* Native ignores the initial value of count */ + scans[1].X = scans[1].Y = scans[1].Width = scans[1].Height = 8.0; + icount = 1; + status = GdipGetRegionScans(region, scans, &icount, matrix); + expect(Ok, status); + expect(2, icount); + expectf(0.0, scans[0].X); + expectf(0.0, scans[0].Y); + expectf(5.0, scans[0].Width); + expectf(5.0, scans[0].Height); + expectf(5.0, scans[1].X); + expectf(5.0, scans[1].Y); + expectf(5.0, scans[1].Width); + expectf(5.0, scans[1].Height); + + status = GdipGetRegionScansI(region, scansi, &icount, matrix); + expect(Ok, status); + expect(2, icount); + expect(0, scansi[0].X); + expect(0, scansi[0].Y); + expect(5, scansi[0].Width); + expect(5, scansi[0].Height); + expect(5, scansi[1].X); + expect(5, scansi[1].Y); + expect(5, scansi[1].Width); + expect(5, scansi[1].Height); + status = GdipDeleteRegion(region); expect(Ok, status); status = GdipDeleteMatrix(matrix); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 76549e7..1a443f9 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -643,6 +643,8 @@ GpStatus WINGDIPAPI GdipGetRegionBoundsI(GpRegion *, GpGraphics *, GpRect *); GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *, BYTE *, UINT, UINT *); GpStatus WINGDIPAPI GdipGetRegionDataSize(GpRegion *, UINT *); GpStatus WINGDIPAPI GdipGetRegionHRgn(GpRegion *, GpGraphics *, HRGN *); +GpStatus WINGDIPAPI GdipGetRegionScans(GpRegion *, GpRectF *, INT *, GpMatrix *); +GpStatus WINGDIPAPI GdipGetRegionScansI(GpRegion *, GpRect *, INT *, GpMatrix *); GpStatus WINGDIPAPI GdipGetRegionScansCount(GpRegion *, UINT *, GpMatrix *); GpStatus WINGDIPAPI GdipIsEmptyRegion(GpRegion *, GpGraphics *, BOOL *); GpStatus WINGDIPAPI GdipIsEqualRegion(GpRegion *, GpRegion *, GpGraphics *, BOOL *);

1 0

Vincent Povirk : gdiplus: Reject linear gradients where the start and end points are equal.
by Alexandre Julliard Oct. 28, 2010

Oct. 28, 2010

Module: wine Branch: master Commit: 2661ce79d6ac59822aab535e5b0f70e2378d550e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2661ce79d6ac59822aab535e5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 27 18:02:30 2010 -0500 gdiplus: Reject linear gradients where the start and end points are equal. --- dlls/gdiplus/brush.c | 3 +++ dlls/gdiplus/tests/brush.c | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 02d1522..c3e25d6 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -325,6 +325,9 @@ GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF* startpoint, if(!line || !startpoint || !endpoint || wrap == WrapModeClamp) return InvalidParameter; + if (startpoint->X == endpoint->X && startpoint->Y == endpoint->Y) + return OutOfMemory; + *line = GdipAlloc(sizeof(GpLineGradient)); if(!*line) return OutOfMemory; diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 0effcf4..648a1d3 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -356,6 +356,20 @@ static void test_gradientgetrect(void) expectf(100.0, rectf.Width); expectf(1.0, rectf.Height); status = GdipDeleteBrush((GpBrush*)brush); + /* zero height rect */ + rectf.X = rectf.Y = 10.0; + rectf.Width = 100.0; + rectf.Height = 0.0; + status = GdipCreateLineBrushFromRect(&rectf, 0, 0, LinearGradientModeVertical, + WrapModeTile, &brush); + expect(OutOfMemory, status); + /* zero width rect */ + rectf.X = rectf.Y = 10.0; + rectf.Width = 0.0; + rectf.Height = 100.0; + status = GdipCreateLineBrushFromRect(&rectf, 0, 0, LinearGradientModeHorizontal, + WrapModeTile, &brush); + expect(OutOfMemory, status); /* from rect with LinearGradientModeHorizontal */ rectf.X = rectf.Y = 10.0; rectf.Width = rectf.Height = 100.0; @@ -401,6 +415,10 @@ static void test_lineblend(void) REAL res_positions[6] = {0.3f, 0.0f, 0.0f, 0.0f, 0.0f}; ARGB res_colors[6] = {0xdeadbeef, 0, 0, 0, 0}; + pt1.X = pt1.Y = pt2.Y = pt2.X = 1.0; + status = GdipCreateLineBrush(&pt1, &pt2, 0, 0, WrapModeTile, &brush); + expect(OutOfMemory, status); + pt1.X = pt1.Y = 1.0; pt2.X = pt2.Y = 100.0; status = GdipCreateLineBrush(&pt1, &pt2, 0, 0, WrapModeTile, &brush);

1 0

Vincent Povirk : gdiplus: Make get_path_hrgn work with HDC-less graphics objects.
by Alexandre Julliard Oct. 28, 2010

Oct. 28, 2010

Module: wine Branch: master Commit: bb5f5dba93408b43ddafdd22cc1f47a7ae8f60de URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb5f5dba93408b43ddafdd22c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 27 17:49:55 2010 -0500 gdiplus: Make get_path_hrgn work with HDC-less graphics objects. --- dlls/gdiplus/region.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index e9f2d9a..f11f3ca 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -884,6 +884,7 @@ GpStatus WINGDIPAPI GdipGetRegionDataSize(GpRegion *region, UINT *needed) static GpStatus get_path_hrgn(GpPath *path, GpGraphics *graphics, HRGN *hrgn) { HDC new_hdc=NULL; + GpGraphics *new_graphics=NULL; GpStatus stat; INT save_state; @@ -893,13 +894,20 @@ static GpStatus get_path_hrgn(GpPath *path, GpGraphics *graphics, HRGN *hrgn) if (!new_hdc) return OutOfMemory; - stat = GdipCreateFromHDC(new_hdc, &graphics); + stat = GdipCreateFromHDC(new_hdc, &new_graphics); + graphics = new_graphics; if (stat != Ok) { ReleaseDC(0, new_hdc); return stat; } } + else if (!graphics->hdc) + { + graphics->hdc = new_hdc = GetDC(0); + if (!new_hdc) + return OutOfMemory; + } save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); @@ -918,7 +926,10 @@ static GpStatus get_path_hrgn(GpPath *path, GpGraphics *graphics, HRGN *hrgn) if (new_hdc) { ReleaseDC(0, new_hdc); - GdipDeleteGraphics(graphics); + if (new_graphics) + GdipDeleteGraphics(new_graphics); + else + graphics->hdc = NULL; } return stat;

1 0

Piotr Caban : mshtml: Added IHTMLTextAreaElement_get_type implementation.
by Alexandre Julliard Oct. 28, 2010

Oct. 28, 2010

Module: wine Branch: master Commit: 90edfe08d4acea4fcabc6a754dd9473f2cb3d096 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90edfe08d4acea4fcabc6a754… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 28 00:30:55 2010 +0200 mshtml: Added IHTMLTextAreaElement_get_type implementation. --- dlls/mshtml/htmltextarea.c | 11 +++++++++-- dlls/mshtml/tests/dom.c | 15 +++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index dd33c72..3ea510e 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -97,9 +97,16 @@ static HRESULT WINAPI HTMLTextAreaElement_Invoke(IHTMLTextAreaElement *iface, DI static HRESULT WINAPI HTMLTextAreaElement_get_type(IHTMLTextAreaElement *iface, BSTR *p) { + static const WCHAR textareaW[] = {'t','e','x','t','a','r','e','a',0}; + HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = SysAllocString(textareaW); + if(!*p) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI HTMLTextAreaElement_put_value(IHTMLTextAreaElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ed95b6c..23e0a91 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1240,6 +1240,20 @@ static void _test_textarea_put_readonly(unsigned line, IUnknown *unk, VARIANT_BO _test_textarea_readonly(line, unk, b); } +#define test_textarea_type(t) _test_textarea_type(__LINE__,t) +static void _test_textarea_type(unsigned line, IUnknown *unk) +{ + IHTMLTextAreaElement *textarea = _get_textarea_iface(line, unk); + BSTR type = (void*)0xdeadbeef; + HRESULT hres; + + hres = IHTMLTextAreaElement_get_type(textarea, &type); + IHTMLTextAreaElement_Release(textarea); + ok_(__FILE__,line)(hres == S_OK, "get_type failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(type, "textarea"), "type = %s, expected textarea\n", wine_dbgstr_w(type)); + SysFreeString(type); +} + #define test_comment_text(c,t) _test_comment_text(__LINE__,c,t) static void _test_comment_text(unsigned line, IUnknown *unk, const char *extext) { @@ -6380,6 +6394,7 @@ static void test_elems2(IHTMLDocument2 *doc) test_textarea_readonly((IUnknown*)elem, VARIANT_FALSE); test_textarea_put_readonly((IUnknown*)elem, VARIANT_TRUE); test_textarea_put_readonly((IUnknown*)elem, VARIANT_FALSE); + test_textarea_type((IUnknown*)elem); IHTMLElement_Release(elem); }

1 0

Piotr Caban : mshtml: Added IHTMLFormElement_{get/ put}_encoding implementation.
by Alexandre Julliard Oct. 28, 2010

Oct. 28, 2010

Module: wine Branch: master Commit: ac7e096c00488ab7ddbda446bc3f3cd708aeee3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac7e096c00488ab7ddbda446b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 28 00:42:20 2010 +0200 mshtml: Added IHTMLFormElement_{get/put}_encoding implementation. --- dlls/mshtml/htmlform.c | 45 +++++++++++++++++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 37cf2ec..27aef79 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -188,16 +188,53 @@ static HRESULT WINAPI HTMLFormElement_get_dir(IHTMLFormElement *iface, BSTR *p) static HRESULT WINAPI HTMLFormElement_put_encoding(IHTMLFormElement *iface, BSTR v) { + static const WCHAR urlencodedW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', + 'x','-','w','w','w','-','f','o','r','m','-','u','r','l','e','n','c','o','d','e','d',0}; + static const WCHAR dataW[] = {'m','u','l','t','i','p','a','r','t','/', + 'f','o','r','m','-','d','a','t','a',0}; + static const WCHAR plainW[] = {'t','e','x','t','/','p','l','a','i','n',0}; + HTMLFormElement *This = HTMLFORM_THIS(iface); - FIXME("(%p)->(%s)\n", This, wine_dbgstr_w(v)); - return E_NOTIMPL; + nsAString encoding_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, wine_dbgstr_w(v)); + + if(lstrcmpiW(v, urlencodedW) && lstrcmpiW(v, dataW) && lstrcmpiW(v, plainW)) { + WARN("incorrect enctype\n"); + return E_INVALIDARG; + } + + nsAString_InitDepend(&encoding_str, v); + nsres = nsIDOMHTMLFormElement_SetEnctype(This->nsform, &encoding_str); + nsAString_Finish(&encoding_str); + if(NS_FAILED(nsres)) + return E_FAIL; + + return S_OK; } static HRESULT WINAPI HTMLFormElement_get_encoding(IHTMLFormElement *iface, BSTR *p) { HTMLFormElement *This = HTMLFORM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString encoding_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&encoding_str, NULL); + nsres = nsIDOMHTMLFormElement_GetEnctype(This->nsform, &encoding_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *encoding; + nsAString_GetData(&encoding_str, &encoding); + + *p = SysAllocString(encoding); + if(!*p) + return E_OUTOFMEMORY; + }else + return E_FAIL; + + return S_OK; } static HRESULT WINAPI HTMLFormElement_put_method(IHTMLFormElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c634cf6..ed95b6c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2662,6 +2662,40 @@ static void _test_form_put_name(unsigned line, IUnknown *unk, const char *name) _test_form_name(line, unk, name); } +#define test_form_encoding(f,a) _test_form_encoding(__LINE__,f,a) +static void _test_form_encoding(unsigned line, IUnknown *unk, const char *ex) +{ + IHTMLFormElement *form = _get_form_iface(line, unk); + BSTR encoding = (void*)0xdeadbeef; + HRESULT hres; + + hres = IHTMLFormElement_get_encoding(form, &encoding); + ok_(__FILE__,line)(hres == S_OK, "get_encoding failed: %08x\n", hres); + if(ex) + ok_(__FILE__,line)(!strcmp_wa(encoding, ex), "encoding=%s, expected %s\n", wine_dbgstr_w(encoding), ex); + else + ok_(__FILE__,line)(!encoding, "encoding=%p\n", encoding); + + SysFreeString(encoding); + IHTMLFormElement_Release(form); +} + +#define test_form_put_encoding(f,r,a) _test_form_put_encoding(__LINE__,f,r,a) +static void _test_form_put_encoding(unsigned line, IUnknown *unk, HRESULT exp_hres, const char *encoding) +{ + IHTMLFormElement *form = _get_form_iface(line, unk); + BSTR tmp = a2bstr(encoding); + HRESULT hres; + + hres = IHTMLFormElement_put_encoding(form, tmp); + ok_(__FILE__,line)(hres == exp_hres, "put_encoding returned: %08x, expected %08x\n", hres, exp_hres); + SysFreeString(tmp); + IHTMLFormElement_Release(form); + + if(exp_hres == S_OK) + _test_form_encoding(line, unk, encoding); +} + #define get_elem_doc(e) _get_elem_doc(__LINE__,e) static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) { @@ -6361,6 +6395,13 @@ static void test_elems2(IHTMLDocument2 *doc) test_form_put_method((IUnknown*)elem, S_OK, "post"); test_form_put_method((IUnknown*)elem, E_INVALIDARG, "put"); test_form_method((IUnknown*)elem, "post"); + test_form_name((IUnknown*)elem, NULL); + test_form_put_name((IUnknown*)elem, "Name"); + test_form_encoding((IUnknown*)elem, "application/x-www-form-urlencoded"); + test_form_put_encoding((IUnknown*)elem, S_OK, "text/plain"); + test_form_put_encoding((IUnknown*)elem, S_OK, "multipart/form-data"); + test_form_put_encoding((IUnknown*)elem, E_INVALIDARG, "image/png"); + test_form_encoding((IUnknown*)elem, "multipart/form-data"); IHTMLElement_Release(elem); }

1 0

Piotr Caban : mshtml/test: Fix some memory leaks.
by Alexandre Julliard Oct. 28, 2010

Oct. 28, 2010

Module: wine Branch: master Commit: 02277b48534425ddb8e3ebc6e5b9de9f946cb8d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02277b48534425ddb8e3ebc6e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 28 00:30:10 2010 +0200 mshtml/test: Fix some memory leaks. --- dlls/mshtml/tests/dom.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 94e3fcc..f7a5ee0 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -957,6 +957,7 @@ static void _test_window_name(unsigned line, IHTMLWindow2 *window, const char *e ok_(__FILE__,line)(!strcmp_wa(name, exname), "name = %s\n", wine_dbgstr_w(name)); else ok_(__FILE__,line)(!name, "name = %s\n", wine_dbgstr_w(name)); + SysFreeString(name); } #define set_window_name(w,n) _set_window_name(__LINE__,w,n) @@ -1447,6 +1448,7 @@ static void _test_select_value(unsigned line, IHTMLSelectElement *select, const ok_(__FILE__,line) (!strcmp_wa(val, exval), "unexpected value %s\n", wine_dbgstr_w(val)); else ok_(__FILE__,line) (val == NULL, "val=%s, expected NULL\n", wine_dbgstr_w(val)); + SysFreeString(val); } #define test_select_set_value(s,v) _test_select_set_value(__LINE__,s,v) @@ -1470,6 +1472,7 @@ static void _test_select_type(unsigned line, IHTMLSelectElement *select, const c hres = IHTMLSelectElement_get_type(select, &type); ok_(__FILE__,line) (hres == S_OK, "get_type failed: %08x\n", hres); ok_(__FILE__,line) (!strcmp_wa(type, extype), "type=%s, expected %s\n", wine_dbgstr_w(type), extype); + SysFreeString(type); } #define test_range_text(r,t) _test_range_text(__LINE__,r,t) @@ -2573,6 +2576,7 @@ static void _test_form_action(unsigned line, IUnknown *unk, const char *ex) else ok_(__FILE__,line)(!action, "action=%p\n", action); + SysFreeString(action); IHTMLFormElement_Release(form); } @@ -3443,6 +3447,7 @@ static void test_location(IHTMLDocument2 *doc) hres = IHTMLLocation_get_pathname(location, &str); ok(hres == S_OK, "get_pathname failed: %08x\n", hres); ok(!strcmp_wa(str, "blank"), "unexpected pathname %s\n", wine_dbgstr_w(str)); + SysFreeString(str); hres = IHTMLLocation_get_href(location, NULL); ok(hres == E_POINTER, "get_href passed: %08x\n", hres); @@ -3450,6 +3455,7 @@ static void test_location(IHTMLDocument2 *doc) hres = IHTMLLocation_get_href(location, &str); ok(hres == S_OK, "get_href failed: %08x\n", hres); ok(!strcmp_wa(str, "about:blank"), "unexpected href %s\n", wine_dbgstr_w(str)); + SysFreeString(str); ref = IHTMLLocation_Release(location); ok(!ref, "location chould be destroyed here\n"); @@ -3941,6 +3947,7 @@ static void test_style4(IHTMLStyle4 *style4) ok(hres == S_OK, "get_minHeight failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); ok( !strcmp_wa(V_BSTR(&v), "10px"), "expect 10px got (%s)\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); hres = IHTMLStyle4_put_minHeight(style4, vdefault); ok(hres == S_OK, "put_minHeight failed: %08x\n", hres); @@ -4300,6 +4307,7 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_get_margin(style, &str); ok(hres == S_OK, "get_margin failed: %08x\n", hres); ok(!strcmp_wa(str, "1px"), "margin = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); hres = IHTMLStyle_put_margin(style, NULL); ok(hres == S_OK, "put_margin failed: %08x\n", hres); @@ -4321,6 +4329,7 @@ static void test_default_style(IHTMLStyle *style) ok(hres == S_OK, "get_marginTop failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(marginTop) = %d\n", V_VT(&v)); ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginTop) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); str = NULL; hres = IHTMLStyle_get_border(style, &str); @@ -4776,6 +4785,7 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_get_paddingLeft(style, &v); ok(hres == S_OK, "get_paddingLeft: %08x\n", hres); ok(!strcmp_wa(V_BSTR(&v), "10px"), "expecte 10 = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); hres = IHTMLStyle_put_paddingLeft(style, vDefault); ok(hres == S_OK, "put_paddingLeft: %08x\n", hres);

1 0

Piotr Caban : mshtml: Added IHTMLFormElement_{get/ put}_method implementation.
by Alexandre Julliard Oct. 28, 2010

Oct. 28, 2010

Module: wine Branch: master Commit: bd94cc3b86253e9c7634285e07f485dff045d8af URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd94cc3b86253e9c7634285e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 28 00:42:03 2010 +0200 mshtml: Added IHTMLFormElement_{get/put}_method implementation. --- dlls/mshtml/htmlform.c | 42 ++++++++++++++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 8e16917..954ede8 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -202,16 +202,50 @@ static HRESULT WINAPI HTMLFormElement_get_encoding(IHTMLFormElement *iface, BSTR static HRESULT WINAPI HTMLFormElement_put_method(IHTMLFormElement *iface, BSTR v) { + static const WCHAR postW[] = {'P','O','S','T',0}; + static const WCHAR getW[] = {'G','E','T',0}; + HTMLFormElement *This = HTMLFORM_THIS(iface); - FIXME("(%p)->(%s)\n", This, wine_dbgstr_w(v)); - return E_NOTIMPL; + nsAString method_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, wine_dbgstr_w(v)); + + if(lstrcmpiW(v, postW) && lstrcmpiW(v, getW)) { + WARN("unrecognized method\n"); + return E_INVALIDARG; + } + + nsAString_InitDepend(&method_str, v); + nsres = nsIDOMHTMLFormElement_SetMethod(This->nsform, &method_str); + nsAString_Finish(&method_str); + if(NS_FAILED(nsres)) + return E_FAIL; + + return S_OK; } static HRESULT WINAPI HTMLFormElement_get_method(IHTMLFormElement *iface, BSTR *p) { HTMLFormElement *This = HTMLFORM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString method_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&method_str, NULL); + nsres = nsIDOMHTMLFormElement_GetMethod(This->nsform, &method_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *method; + nsAString_GetData(&method_str, &method); + + *p = SysAllocString(method); + if(!*p) + return E_OUTOFMEMORY; + }else + return E_FAIL; + + return S_OK; } static HRESULT WINAPI HTMLFormElement_get_elements(IHTMLFormElement *iface, IDispatch **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f7a5ee0..7e4343f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2595,6 +2595,40 @@ static void _test_form_put_action(unsigned line, IUnknown *unk, const char *acti _test_form_action(line, unk, action); } +#define test_form_method(f,a) _test_form_method(__LINE__,f,a) +static void _test_form_method(unsigned line, IUnknown *unk, const char *ex) +{ + IHTMLFormElement *form = _get_form_iface(line, unk); + BSTR method = (void*)0xdeadbeef; + HRESULT hres; + + hres = IHTMLFormElement_get_method(form, &method); + ok_(__FILE__,line)(hres == S_OK, "get_method failed: %08x\n", hres); + if(ex) + ok_(__FILE__,line)(!strcmp_wa(method, ex), "method=%s, expected %s\n", wine_dbgstr_w(method), ex); + else + ok_(__FILE__,line)(!method, "method=%p\n", method); + + SysFreeString(method); + IHTMLFormElement_Release(form); +} + +#define test_form_put_method(f,r,a) _test_form_put_method(__LINE__,f,r,a) +static void _test_form_put_method(unsigned line, IUnknown *unk, HRESULT exp_hres, const char *method) +{ + IHTMLFormElement *form = _get_form_iface(line, unk); + BSTR tmp = a2bstr(method); + HRESULT hres; + + hres = IHTMLFormElement_put_method(form, tmp); + ok_(__FILE__,line)(hres == exp_hres, "put_method returned: %08x, expected %08x\n", hres, exp_hres); + SysFreeString(tmp); + IHTMLFormElement_Release(form); + + if(exp_hres == S_OK) + _test_form_method(line, unk, method); +} + #define get_elem_doc(e) _get_elem_doc(__LINE__,e) static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) { @@ -6290,6 +6324,10 @@ static void test_elems2(IHTMLDocument2 *doc) test_form_item(elem); test_form_action((IUnknown*)elem, NULL); test_form_put_action((IUnknown*)elem, "about:blank"); + test_form_method((IUnknown*)elem, "get"); + test_form_put_method((IUnknown*)elem, S_OK, "post"); + test_form_put_method((IUnknown*)elem, E_INVALIDARG, "put"); + test_form_method((IUnknown*)elem, "post"); IHTMLElement_Release(elem); }

1 0

Piotr Caban : mshtml: Added IHTMLFormElement_{get/put}_name implementation.
by Alexandre Julliard Oct. 28, 2010

Oct. 28, 2010

Module: wine Branch: master Commit: 990675e52fc64521330517ff7a8eb3140639d053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=990675e52fc64521330517ff7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 28 00:30:33 2010 +0200 mshtml: Added IHTMLFormElement_{get/put}_name implementation. --- dlls/mshtml/htmlform.c | 37 +++++++++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 954ede8..37cf2ec 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -272,15 +272,44 @@ static HRESULT WINAPI HTMLFormElement_get_target(IHTMLFormElement *iface, BSTR * static HRESULT WINAPI HTMLFormElement_put_name(IHTMLFormElement *iface, BSTR v) { HTMLFormElement *This = HTMLFORM_THIS(iface); - FIXME("(%p)->(%s)\n", This, wine_dbgstr_w(v)); - return E_NOTIMPL; + nsAString name_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, wine_dbgstr_w(v)); + + nsAString_InitDepend(&name_str, v); + nsres = nsIDOMHTMLFormElement_SetName(This->nsform, &name_str); + nsAString_Finish(&name_str); + if(NS_FAILED(nsres)) + return E_FAIL; + + return S_OK; } static HRESULT WINAPI HTMLFormElement_get_name(IHTMLFormElement *iface, BSTR *p) { HTMLFormElement *This = HTMLFORM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString name_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&name_str, NULL); + nsres = nsIDOMHTMLFormElement_GetName(This->nsform, &name_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *name; + nsAString_GetData(&name_str, &name); + + if(*name) { + *p = SysAllocString(name); + if(!*p) + return E_OUTOFMEMORY; + }else + *p = NULL; + }else + return E_FAIL; + + return S_OK; } static HRESULT WINAPI HTMLFormElement_put_onsubmit(IHTMLFormElement *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7e4343f..c634cf6 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2629,6 +2629,39 @@ static void _test_form_put_method(unsigned line, IUnknown *unk, HRESULT exp_hres _test_form_method(line, unk, method); } +#define test_form_name(f,a) _test_form_name(__LINE__,f,a) +static void _test_form_name(unsigned line, IUnknown *unk, const char *ex) +{ + IHTMLFormElement *form = _get_form_iface(line, unk); + BSTR name = (void*)0xdeadbeef; + HRESULT hres; + + hres = IHTMLFormElement_get_name(form, &name); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + if(ex) + ok_(__FILE__,line)(!strcmp_wa(name, ex), "name=%s, expected %s\n", wine_dbgstr_w(name), ex); + else + ok_(__FILE__,line)(!name, "name=%p\n", name); + + SysFreeString(name); + IHTMLFormElement_Release(form); +} + +#define test_form_put_name(f,a) _test_form_put_name(__LINE__,f,a) +static void _test_form_put_name(unsigned line, IUnknown *unk, const char *name) +{ + IHTMLFormElement *form = _get_form_iface(line, unk); + BSTR tmp = a2bstr(name); + HRESULT hres; + + hres = IHTMLFormElement_put_name(form, tmp); + ok_(__FILE__,line)(hres == S_OK, "put_name failed: %08x\n", hres); + SysFreeString(tmp); + IHTMLFormElement_Release(form); + + _test_form_name(line, unk, name); +} + #define get_elem_doc(e) _get_elem_doc(__LINE__,e) static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) {

1 0