wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Huw Davies : wineps: Add a helper to find a duplex entry.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 64edac40efb156156ccaac5d24d90caefdc20708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64edac40efb156156ccaac5d2… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 16 13:18:39 2012 +0100 wineps: Add a helper to find a duplex entry. --- dlls/wineps.drv/driver.c | 14 ++++++++++++++ dlls/wineps.drv/ps.c | 17 +++-------------- dlls/wineps.drv/psdrv.h | 1 + 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index c9c5b19..9443c66 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -67,6 +67,20 @@ PAGESIZE *find_pagesize( PPD *ppd, PSDRV_DEVMODE *dm ) return NULL; } +DUPLEX *find_duplex( PPD *ppd, PSDRV_DEVMODE *dm ) +{ + DUPLEX *duplex; + WORD win_duplex = dm->dmPublic.dmFields & DM_DUPLEX ? dm->dmPublic.dmDuplex : 0; + + if (win_duplex == 0) return NULL; /* Not capable */ + + LIST_FOR_EACH_ENTRY( duplex, &ppd->Duplexes, DUPLEX, entry ) + if (duplex->WinDuplex == win_duplex) + return duplex; + + return NULL; +} + /************************************************************************ * * PSDRV_MergeDevmodes diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index f4444e8..4aca6f1 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -303,8 +303,7 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) char *buf, *escaped_title; INPUTSLOT *slot = find_slot( physDev->pi->ppd, physDev->Devmode ); PAGESIZE *page = find_pagesize( physDev->pi->ppd, physDev->Devmode ); - DUPLEX *duplex; - int win_duplex; + DUPLEX *duplex = find_duplex( physDev->pi->ppd, physDev->Devmode ); int llx, lly, urx, ury; int ret, len; @@ -356,18 +355,8 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) if (page && page->InvocationString) PSDRV_WriteFeature( dev, "*PageSize", page->Name, page->InvocationString ); - win_duplex = physDev->Devmode->dmPublic.dmFields & DM_DUPLEX ? - physDev->Devmode->dmPublic.dmDuplex : 0; - LIST_FOR_EACH_ENTRY( duplex, &physDev->pi->ppd->Duplexes, DUPLEX, entry ) - { - if(duplex->WinDuplex == win_duplex) { - if(duplex->InvocationString) { - PSDRV_WriteFeature(dev, "*Duplex", duplex->Name, - duplex->InvocationString); - break; - } - } - } + if (duplex && duplex->InvocationString) + PSDRV_WriteFeature( dev, "*Duplex", duplex->Name, duplex->InvocationString ); write_spool( dev, psendsetup, strlen(psendsetup) ); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index f314dd9..38e8306 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -403,6 +403,7 @@ extern char *PSDRV_ANSIVector[256] DECLSPEC_HIDDEN; extern INPUTSLOT *find_slot( PPD *ppd, PSDRV_DEVMODE *dm ); extern PAGESIZE *find_pagesize( PPD *ppd, PSDRV_DEVMODE *dm ); +extern DUPLEX *find_duplex( PPD *ppd, PSDRV_DEVMODE *dm ); /* GDI driver functions */ extern BOOL PSDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,

1 0

Huw Davies : wineps: Add a helper to find a page size.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 44d880b430e6c6f017950667a8d9fc70c2209ff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44d880b430e6c6f017950667a… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 16 13:18:38 2012 +0100 wineps: Add a helper to find a page size. --- dlls/wineps.drv/driver.c | 32 +++++++++++++++++++++----------- dlls/wineps.drv/ps.c | 13 +++---------- dlls/wineps.drv/psdrv.h | 1 + 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 9e2753d..c9c5b19 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -56,6 +56,17 @@ INPUTSLOT *find_slot( PPD *ppd, PSDRV_DEVMODE *dm ) return NULL; } +PAGESIZE *find_pagesize( PPD *ppd, PSDRV_DEVMODE *dm ) +{ + PAGESIZE *page; + + LIST_FOR_EACH_ENTRY( page, &ppd->PageSizes, PAGESIZE, entry ) + if (page->WinPage == dm->dmPublic.u1.s1.dmPaperSize) + return page; + + return NULL; +} + /************************************************************************ * * PSDRV_MergeDevmodes @@ -78,14 +89,12 @@ void PSDRV_MergeDevmodes( PSDRV_DEVMODE *dm1, PSDRV_DEVMODE *dm2, PRINTERINFO *p } /* NB PaperWidth is always < PaperLength */ - if(dm2->dmPublic.dmFields & DM_PAPERSIZE) { - PAGESIZE *page; + if (dm2->dmPublic.dmFields & DM_PAPERSIZE) + { + PAGESIZE *page = find_pagesize( pi->ppd, dm2 ); - LIST_FOR_EACH_ENTRY(page, &pi->ppd->PageSizes, PAGESIZE, entry) { - if(page->WinPage == dm2->dmPublic.u1.s1.dmPaperSize) - break; - } - if(&page->entry != &pi->ppd->PageSizes ) { + if (page) + { dm1->dmPublic.u1.s1.dmPaperSize = dm2->dmPublic.u1.s1.dmPaperSize; dm1->dmPublic.u1.s1.dmPaperWidth = paper_size_from_points( page->PaperDimension->x ); dm1->dmPublic.u1.s1.dmPaperLength = paper_size_from_points( page->PaperDimension->y ); @@ -94,11 +103,12 @@ void PSDRV_MergeDevmodes( PSDRV_DEVMODE *dm1, PSDRV_DEVMODE *dm2, PRINTERINFO *p TRACE("Changing page to %s %d x %d\n", page->FullName, dm1->dmPublic.u1.s1.dmPaperWidth, dm1->dmPublic.u1.s1.dmPaperLength ); - } else { - TRACE("Trying to change to unsupported pagesize %d\n", - dm2->dmPublic.u1.s1.dmPaperSize); } - } else if((dm2->dmPublic.dmFields & DM_PAPERLENGTH) && + else + TRACE("Trying to change to unsupported pagesize %d\n", dm2->dmPublic.u1.s1.dmPaperSize); + } + + else if((dm2->dmPublic.dmFields & DM_PAPERLENGTH) && (dm2->dmPublic.dmFields & DM_PAPERWIDTH)) { dm1->dmPublic.u1.s1.dmPaperLength = dm2->dmPublic.u1.s1.dmPaperLength; dm1->dmPublic.u1.s1.dmPaperWidth = dm2->dmPublic.u1.s1.dmPaperWidth; diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 1501d33..f4444e8 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -302,7 +302,7 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); char *buf, *escaped_title; INPUTSLOT *slot = find_slot( physDev->pi->ppd, physDev->Devmode ); - PAGESIZE *page; + PAGESIZE *page = find_pagesize( physDev->pi->ppd, physDev->Devmode ); DUPLEX *duplex; int win_duplex; int llx, lly, urx, ury; @@ -353,15 +353,8 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) if (slot && slot->InvocationString) PSDRV_WriteFeature( dev, "*InputSlot", slot->Name, slot->InvocationString ); - LIST_FOR_EACH_ENTRY(page, &physDev->pi->ppd->PageSizes, PAGESIZE, entry) { - if(page->WinPage == physDev->Devmode->dmPublic.u1.s1.dmPaperSize) { - if(page->InvocationString) { - PSDRV_WriteFeature(dev, "*PageSize", page->Name, - page->InvocationString); - break; - } - } - } + if (page && page->InvocationString) + PSDRV_WriteFeature( dev, "*PageSize", page->Name, page->InvocationString ); win_duplex = physDev->Devmode->dmPublic.dmFields & DM_DUPLEX ? physDev->Devmode->dmPublic.dmDuplex : 0; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 911c1e4..f314dd9 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -402,6 +402,7 @@ extern HANDLE PSDRV_Heap DECLSPEC_HIDDEN; extern char *PSDRV_ANSIVector[256] DECLSPEC_HIDDEN; extern INPUTSLOT *find_slot( PPD *ppd, PSDRV_DEVMODE *dm ); +extern PAGESIZE *find_pagesize( PPD *ppd, PSDRV_DEVMODE *dm ); /* GDI driver functions */ extern BOOL PSDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,

1 0

Huw Davies : wineps: Add a helper to find an input slot.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 61efdbfd5f1e840d06545bf1c36c1372b145acb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61efdbfd5f1e840d06545bf1c… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 16 13:18:37 2012 +0100 wineps: Add a helper to find an input slot. --- dlls/wineps.drv/driver.c | 19 +++++++++++++------ dlls/wineps.drv/ps.c | 13 +++---------- dlls/wineps.drv/psdrv.h | 2 ++ 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 926daf5..9e2753d 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -45,6 +45,17 @@ static inline int paper_size_from_points( float size ) return size * 254 / 72; } +INPUTSLOT *find_slot( PPD *ppd, PSDRV_DEVMODE *dm ) +{ + INPUTSLOT *slot; + + LIST_FOR_EACH_ENTRY( slot, &ppd->InputSlots, INPUTSLOT, entry ) + if (slot->WinBin == dm->dmPublic.u1.s1.dmDefaultSource) + return slot; + + return NULL; +} + /************************************************************************ * * PSDRV_MergeDevmodes @@ -117,13 +128,9 @@ void PSDRV_MergeDevmodes( PSDRV_DEVMODE *dm1, PSDRV_DEVMODE *dm2, PRINTERINFO *p if (dm2->dmPublic.dmFields & DM_DEFAULTSOURCE) { - INPUTSLOT *slot; - - LIST_FOR_EACH_ENTRY( slot, &pi->ppd->InputSlots, INPUTSLOT, entry ) - if(slot->WinBin == dm2->dmPublic.u1.s1.dmDefaultSource) - break; + INPUTSLOT *slot = find_slot( pi->ppd, dm2 ); - if (&slot->entry != &pi->ppd->InputSlots) + if (slot) { dm1->dmPublic.u1.s1.dmDefaultSource = dm2->dmPublic.u1.s1.dmDefaultSource; TRACE("Changing bin to '%s'\n", slot->FullName); diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 1e30736..1501d33 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -301,7 +301,7 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); char *buf, *escaped_title; - INPUTSLOT *slot; + INPUTSLOT *slot = find_slot( physDev->pi->ppd, physDev->Devmode ); PAGESIZE *page; DUPLEX *duplex; int win_duplex; @@ -350,15 +350,8 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) write_spool(dev, copies_buf, strlen(copies_buf)); } - LIST_FOR_EACH_ENTRY( slot, &physDev->pi->ppd->InputSlots, INPUTSLOT, entry ) { - if(slot->WinBin == physDev->Devmode->dmPublic.u1.s1.dmDefaultSource) { - if(slot->InvocationString) { - PSDRV_WriteFeature(dev, "*InputSlot", slot->Name, - slot->InvocationString); - break; - } - } - } + if (slot && slot->InvocationString) + PSDRV_WriteFeature( dev, "*InputSlot", slot->Name, slot->InvocationString ); LIST_FOR_EACH_ENTRY(page, &physDev->pi->ppd->PageSizes, PAGESIZE, entry) { if(page->WinPage == physDev->Devmode->dmPublic.u1.s1.dmPaperSize) { diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 2ffe28a..911c1e4 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -401,6 +401,8 @@ extern HINSTANCE PSDRV_hInstance DECLSPEC_HIDDEN; extern HANDLE PSDRV_Heap DECLSPEC_HIDDEN; extern char *PSDRV_ANSIVector[256] DECLSPEC_HIDDEN; +extern INPUTSLOT *find_slot( PPD *ppd, PSDRV_DEVMODE *dm ); + /* GDI driver functions */ extern BOOL PSDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : axcore.idl: Guard GetTimeFormat by WINE_NO_UNICODE_MACROS ifdef and added missing AM_GBF_NODDSURFACELOCK define .
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: c9178fdf6fe4d7c77422a786ce825a554424b5f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9178fdf6fe4d7c77422a786c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 16 13:55:00 2012 +0200 axcore.idl: Guard GetTimeFormat by WINE_NO_UNICODE_MACROS ifdef and added missing AM_GBF_NODDSURFACELOCK define. --- include/axcore.idl | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/axcore.idl b/include/axcore.idl index 66746d5..b8c0e69 100644 --- a/include/axcore.idl +++ b/include/axcore.idl @@ -21,7 +21,9 @@ cpp_quote("#define CHARS_IN_GUID 39") /* GetTimeFormat is defined in winnls.h as * either the W or A suffixed version */ +cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") cpp_quote("#undef GetTimeFormat") +cpp_quote("#endif") typedef struct _AMMediaType { @@ -472,6 +474,7 @@ cpp_quote("#define AM_GBF_PREVFRAMESKIPPED 1") cpp_quote("#define AM_GBF_NOTASYNCPOINT 2") cpp_quote("#define AM_GBF_NOWAIT 4") +cpp_quote("#define AM_GBF_NODDSURFACELOCK 8") [ object,

1 0

Jacek Caban : mshtml: Added IHTMLStyle::removeAttribute tests.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 33171f3b5d902c588e1ac6dc535b9c6e8406b37d URL: http://source.winehq.org/git/wine.git/?a=commit;h=33171f3b5d902c588e1ac6dc5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 16 13:49:22 2012 +0200 mshtml: Added IHTMLStyle::removeAttribute tests. --- dlls/mshtml/tests/jstest.html | 11 +++++++++++ dlls/mshtml/tests/style.c | 25 +++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index b465491..abda45e 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -62,6 +62,16 @@ function test_document_name_as_index() { ok(!("formid" in document), "formid is in document"); } +function test_remove_style_attribute() { + var s = document.body.style, b; + + s.somevar = "test"; + b = s.removeAttribute("somevar", 1); + ok(b, "removeAttribute returned " + b + " expected true"); + b = s.removeAttribute("somevar", 1); + ok(b === false, "removeAttribute returned " + b + " expected false"); +} + var globalVar = false; function runTest() { @@ -75,6 +85,7 @@ function runTest() { test_select_index(); test_createDocumentFragment(); test_document_name_as_index(); + test_remove_style_attribute(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r); diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index cecdd20..6a31665 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -242,6 +242,19 @@ static void _test_style_set_csstext(unsigned line, IHTMLStyle *style, const char SysFreeString(tmp); } +#define test_style_remove_attribute(a,b,c) _test_style_remove_attribute(__LINE__,a,b,c) +static void _test_style_remove_attribute(unsigned line, IHTMLStyle *style, const char *attr, VARIANT_BOOL exb) +{ + BSTR str = a2bstr(attr); + VARIANT_BOOL b = 100; + HRESULT hres; + + hres = IHTMLStyle_removeAttribute(style, str, 1, &b); + SysFreeString(str); + ok_(__FILE__,line)(hres == S_OK, "removeAttribute failed: %08x\n", hres); + ok_(__FILE__,line)(b == exb, "removeAttribute returned %x, expected %x\n", b, exb); +} + static void test_set_csstext(IHTMLStyle *style) { VARIANT v; @@ -1883,6 +1896,13 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(str, "always"), "pageBreakBefore = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + test_style_remove_attribute(style, "pageBreakBefore", VARIANT_TRUE); + test_style_remove_attribute(style, "pageBreakBefore", VARIANT_FALSE); + + hres = IHTMLStyle_get_pageBreakBefore(style, &str); + ok(hres == S_OK, "get_pageBreakBefore failed: %08x\n", hres); + ok(!str, "pageBreakBefore = %s\n", wine_dbgstr_w(str)); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) { @@ -1984,6 +2004,11 @@ static void test_style_filters(IHTMLElement *elem) test_style_filter(style, "alpha(opacity=100)"); set_style_filter(style, "xxx(a,b,c) alpha(opacity=100)"); set_style_filter(style, NULL); + set_style_filter(style, "alpha(opacity=100)"); + test_style_remove_attribute(style, "filter", VARIANT_TRUE); + test_style_remove_attribute(style, "filter", VARIANT_FALSE); + test_style_filter(style, NULL); + IHTMLCurrentStyle2_Release(current_style2); IHTMLStyle_Release(style);

1 0

Jacek Caban : mshtml: Added IHTMLStyle::removeAttribute implementation.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 0cad55aee9d85ccae6e5f820755fbe4eead8f3ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cad55aee9d85ccae6e5f8207… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 16 13:49:09 2012 +0200 mshtml: Added IHTMLStyle::removeAttribute implementation. --- dlls/mshtml/htmlstyle.c | 54 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 1f8947c..0ac98b4 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2748,9 +2748,57 @@ static HRESULT WINAPI HTMLStyle_removeAttribute(IHTMLStyle *iface, BSTR strAttri LONG lFlags, VARIANT_BOOL *pfSuccess) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%s %08x %p)\n", This, debugstr_w(strAttributeName), - lFlags, pfSuccess); - return E_NOTIMPL; + const style_tbl_entry_t *style_entry; + nsAString name_str, ret_str; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%s %08x %p)\n", This, debugstr_w(strAttributeName), lFlags, pfSuccess); + + style_entry = lookup_style_tbl(strAttributeName); + if(!style_entry) { + DISPID dispid; + unsigned i; + + hres = IDispatchEx_GetDispID(&This->dispex.IDispatchEx_iface, strAttributeName, + (lFlags&1) ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &dispid); + if(hres != S_OK) { + *pfSuccess = VARIANT_FALSE; + return S_OK; + } + + for(i=0; i < sizeof(style_tbl)/sizeof(*style_tbl); i++) { + if(dispid == style_tbl[i].dispid) + break; + } + + if(i == sizeof(style_tbl)/sizeof(*style_tbl)) + return remove_prop(&This->dispex, strAttributeName, pfSuccess); + style_entry = style_tbl+i; + } + + /* filter property is a special case */ + if(style_entry->dispid == DISPID_IHTMLSTYLE_FILTER) { + *pfSuccess = This->elem->filter && *This->elem->filter ? VARIANT_TRUE : VARIANT_FALSE; + heap_free(This->elem->filter); + This->elem->filter = NULL; + update_filter(This); + return S_OK; + } + + nsAString_InitDepend(&name_str, style_entry->name); + nsAString_Init(&ret_str, NULL); + nsres = nsIDOMCSSStyleDeclaration_RemoveProperty(This->nsstyle, &name_str, &ret_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *ret; + nsAString_GetData(&ret_str, &ret); + *pfSuccess = *ret ? VARIANT_TRUE : VARIANT_FALSE; + }else { + ERR("RemoveProperty failed: %08x\n", nsres); + } + nsAString_Finish(&name_str); + nsAString_Finish(&ret_str); + return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLStyle_toString(IHTMLStyle *iface, BSTR *String)

1 0

Jacek Caban : mshtml: Moved style_tbl lookup to separated function.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: a9c83385b59d510568a0cd73bb9693e7b0d235f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c83385b59d510568a0cd73b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 16 13:48:55 2012 +0200 mshtml: Moved style_tbl lookup to separated function. --- dlls/mshtml/htmlstyle.c | 45 +++++++++++++++++++++++++++++---------------- 1 files changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 4f94c5c..1f8947c 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -173,10 +173,12 @@ static const WCHAR attrWordWrap[] = static const WCHAR attrZIndex[] = {'z','-','i','n','d','e','x',0}; -static const struct{ +typedef struct { const WCHAR *name; DISPID dispid; -} style_tbl[] = { +} style_tbl_entry_t; + +static const style_tbl_entry_t style_tbl[] = { {attrBackground, DISPID_IHTMLSTYLE_BACKGROUND}, {attrBackgroundColor, DISPID_IHTMLSTYLE_BACKGROUNDCOLOR}, {attrBackgroundImage, DISPID_IHTMLSTYLE_BACKGROUNDIMAGE}, @@ -264,6 +266,26 @@ static const WCHAR valBlink[] = static const WCHAR px_formatW[] = {'%','d','p','x',0}; static const WCHAR emptyW[] = {0}; +static const style_tbl_entry_t *lookup_style_tbl(const WCHAR *name) +{ + int c, i, min = 0, max = sizeof(style_tbl)/sizeof(*style_tbl)-1; + + while(min <= max) { + i = (min+max)/2; + + c = strcmpW(style_tbl[i].name, name); + if(!c) + return style_tbl+i; + + if(c > 0) + max = i-1; + else + min = i+1; + } + + return NULL; +} + static LPWSTR fix_px_value(LPCWSTR val) { LPCWSTR ptr = val; @@ -2929,21 +2951,12 @@ static const IHTMLStyleVtbl HTMLStyleVtbl = { static HRESULT HTMLStyle_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) { - int c, i, min=0, max = sizeof(style_tbl)/sizeof(*style_tbl)-1; - - while(min <= max) { - i = (min+max)/2; - - c = strcmpW(style_tbl[i].name, name); - if(!c) { - *dispid = style_tbl[i].dispid; - return S_OK; - } + const style_tbl_entry_t *style_entry; - if(c > 0) - max = i-1; - else - min = i+1; + style_entry = lookup_style_tbl(name); + if(style_entry) { + *dispid = style_entry->dispid; + return S_OK; } return DISP_E_UNKNOWNNAME;

1 0

Jacek Caban : mshtml: Added support for IHTMLEventObj:: cancelBubble property.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: cea8bc5237268be68185c1bb2081915f5c6fc6bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cea8bc5237268be68185c1bb2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 16 13:48:46 2012 +0200 mshtml: Added support for IHTMLEventObj::cancelBubble property. --- dlls/mshtml/htmlevent.c | 18 +++++++---- dlls/mshtml/tests/events.c | 68 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 2d8dc83..b9c9aad 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -250,6 +250,7 @@ typedef struct { const event_info_t *type; nsIDOMEvent *nsevent; BOOL prevent_default; + BOOL cancel_bubble; } HTMLEventObj; static inline HTMLEventObj *impl_from_IHTMLEventObj(IHTMLEventObj *iface) @@ -471,17 +472,20 @@ static HRESULT WINAPI HTMLEventObj_get_returnValue(IHTMLEventObj *iface, VARIANT static HRESULT WINAPI HTMLEventObj_put_cancelBubble(IHTMLEventObj *iface, VARIANT_BOOL v) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, v); + + This->cancel_bubble = !!v; + return S_OK; } static HRESULT WINAPI HTMLEventObj_get_cancelBubble(IHTMLEventObj *iface, VARIANT_BOOL *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); - *p = VARIANT_FALSE; + *p = This->cancel_bubble ? VARIANT_TRUE : VARIANT_FALSE; return S_OK; } @@ -1016,7 +1020,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode call_event_handlers(doc, event_obj, *get_node_event_target(node), node->cp_container, eid, (IDispatch*)&node->IHTMLDOMNode_iface); - if(!(event_info[eid].flags & EVENT_BUBBLE)) + if(!(event_info[eid].flags & EVENT_BUBBLE) || (event_obj && event_obj->cancel_bubble)) break; nsIDOMNode_GetParentNode(nsnode, &parent); @@ -1028,7 +1032,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode nsIDOMNode_GetNodeType(nsnode, &node_type); }while(node_type == ELEMENT_NODE); - if(!(event_info[eid].flags & EVENT_BUBBLE)) + if(!(event_info[eid].flags & EVENT_BUBBLE) || (event_obj && event_obj->cancel_bubble)) break; case DOCUMENT_NODE: @@ -1076,7 +1080,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode if(node && node->vtbl->handle_event) { hres = node->vtbl->handle_event(node, eid, nsevent, &prevent_default); - if(FAILED(hres) || prevent_default) + if(FAILED(hres) || prevent_default || (event_obj && event_obj->cancel_bubble)) break; } diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index d1f4e9b..6d74f40 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -78,7 +78,9 @@ DEFINE_EXPECT(input_onblur); DEFINE_EXPECT(form_onsubmit); DEFINE_EXPECT(form_onclick); DEFINE_EXPECT(submit_onclick); +DEFINE_EXPECT(submit_onclick_cancel); DEFINE_EXPECT(submit_onclick_attached); +DEFINE_EXPECT(submit_onclick_attached_check_cancel); DEFINE_EXPECT(submit_onclick_setret); static HWND container_hwnd = NULL; @@ -429,6 +431,7 @@ static void _test_event_shiftkey(unsigned line, IHTMLEventObj *event, VARIANT_BO ok_(__FILE__,line)(b == exval, "shiftKey = %x, expected %x\n", b, exval); } +#define test_event_cancelbubble(a,b) _test_event_cancelbubble(__LINE__,a,b) static void _test_event_cancelbubble(unsigned line, IHTMLEventObj *event, VARIANT_BOOL exval) { VARIANT_BOOL b; @@ -1015,6 +1018,27 @@ static HRESULT WINAPI submit_onclick_attached(IDispatchEx *iface, DISPID id, LCI EVENT_HANDLER_FUNC_OBJ(submit_onclick_attached); +static HRESULT WINAPI submit_onclick_attached_check_cancel(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + IHTMLEventObj *event; + HRESULT hres; + + CHECK_EXPECT(submit_onclick_attached_check_cancel); + test_attached_event_args(id, wFlags, pdp, pvarRes, pei); + test_event_src("INPUT"); + + event = NULL; + hres = IHTMLWindow2_get_event(window, &event); + ok(hres == S_OK, "get_event failed: %08x\n", hres); + ok(event != NULL, "event == NULL\n"); + + test_event_cancelbubble(event, VARIANT_TRUE); + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(submit_onclick_attached_check_cancel); + static VARIANT onclick_retval, onclick_event_retval; static HRESULT WINAPI submit_onclick_setret(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, @@ -1042,6 +1066,33 @@ static HRESULT WINAPI submit_onclick_setret(IDispatchEx *iface, DISPID id, LCID EVENT_HANDLER_FUNC_OBJ(submit_onclick_setret); +static HRESULT WINAPI submit_onclick_cancel(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + IHTMLEventObj *event; + HRESULT hres; + + CHECK_EXPECT(submit_onclick_cancel); + test_event_args(NULL, id, wFlags, pdp, pvarRes, pei, pspCaller); + test_event_src("INPUT"); + + event = NULL; + hres = IHTMLWindow2_get_event(window, &event); + ok(hres == S_OK, "get_event failed: %08x\n", hres); + ok(event != NULL, "event == NULL\n"); + + test_event_cancelbubble(event, VARIANT_FALSE); + + hres = IHTMLEventObj_put_cancelBubble(event, VARIANT_TRUE); + ok(hres == S_OK, "put_returnValue failed: %08x\n", hres); + IHTMLEventObj_Release(event); + + test_event_cancelbubble(event, VARIANT_TRUE); + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(submit_onclick_cancel); + static HRESULT WINAPI iframedoc_onreadystatechange(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -1930,6 +1981,23 @@ static void test_submit(IHTMLDocument2 *doc) CHECK_CALLED(submit_onclick_setret); CHECK_CALLED(form_onclick); + elem_attach_event((IUnknown*)submit, "onclick", (IDispatch*)&submit_onclick_attached_obj); + elem_attach_event((IUnknown*)submit, "onclick", (IDispatch*)&submit_onclick_attached_check_cancel_obj); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&submit_onclick_cancel_obj; + hres = IHTMLElement_put_onclick(submit, v); + ok(hres == S_OK, "put_onclick failed: %08x\n", hres); + + SET_EXPECT(submit_onclick_cancel); + SET_EXPECT(submit_onclick_attached_check_cancel); + SET_EXPECT(submit_onclick_attached); + hres = IHTMLElement_click(submit); + ok(hres == S_OK, "click failed: %08x\n", hres); + CHECK_CALLED(submit_onclick_cancel); + CHECK_CALLED(submit_onclick_attached_check_cancel); + CHECK_CALLED(submit_onclick_attached); + IHTMLElement_Release(submit); }

1 0

Jacek Caban : mshtml: Added IHTMLStyle2::bottom implementation.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 53adfe77d39f6ae3e0ad86d915cbaee6fccea631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53adfe77d39f6ae3e0ad86d91… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 16 13:48:22 2012 +0200 mshtml: Added IHTMLStyle2::bottom implementation. --- dlls/mshtml/htmlstyle2.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 26 ++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle2.c b/dlls/mshtml/htmlstyle2.c index e3bd22f..d85ea97 100644 --- a/dlls/mshtml/htmlstyle2.c +++ b/dlls/mshtml/htmlstyle2.c @@ -205,15 +205,19 @@ static HRESULT WINAPI HTMLStyle2_get_unicodeBidi(IHTMLStyle2 *iface, BSTR *p) static HRESULT WINAPI HTMLStyle2_put_bottom(IHTMLStyle2 *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BOTTOM, &v, 0); } static HRESULT WINAPI HTMLStyle2_get_bottom(IHTMLStyle2 *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_BOTTOM, p, 0); } static HRESULT WINAPI HTMLStyle2_put_right(IHTMLStyle2 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 9c7da84..cecdd20 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -52,6 +52,16 @@ static BSTR a2bstr(const char *str) return ret; } +#define test_var_bstr(a,b) _test_var_bstr(__LINE__,a,b) +static void _test_var_bstr(unsigned line, const VARIANT *v, const char *expect) +{ + ok_(__FILE__,line)(V_VT(v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(v)); + if(expect) + ok_(__FILE__,line)(!strcmp_wa(V_BSTR(v), expect), "V_BSTR(v) = %s, expected %s\n", wine_dbgstr_w(V_BSTR(v)), expect); + else + ok_(__FILE__,line)(!V_BSTR(v), "V_BSTR(v) = %s, expected NULL\n", wine_dbgstr_w(V_BSTR(v))); +} + #define get_elem2_iface(u) _get_elem2_iface(__LINE__,u) static IHTMLElement2 *_get_elem2_iface(unsigned line, IUnknown *unk) { @@ -305,6 +315,22 @@ static void test_style2(IHTMLStyle2 *style2) ok(hres == S_OK, "get_direction failed: %08x\n", hres); ok(!strcmp_wa(str, "ltr"), "str = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + + /* bottom */ + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle2_get_bottom(style2, &v); + ok(hres == S_OK, "get_bottom failed: %08x\n", hres); + test_var_bstr(&v, NULL); + + V_VT(&v) = VT_I4; + V_I4(&v) = 4; + hres = IHTMLStyle2_put_bottom(style2, v); + ok(hres == S_OK, "put_bottom failed: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle2_get_bottom(style2, &v); + ok(hres == S_OK, "get_bottom failed: %08x\n", hres); + test_var_bstr(&v, "4px"); } static void test_style3(IHTMLStyle3 *style3)

1 0

Piotr Caban : msvcrt: Added support for %W and %U format in strftime.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: bfa3045816d2d9caf64b4a13fb06fb77b6361ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfa3045816d2d9caf64b4a13f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 16 12:26:16 2012 +0200 msvcrt: Added support for %W and %U format in strftime. --- dlls/msvcrt/tests/time.c | 26 ++++++++++++++++++++++++++ dlls/msvcrt/time.c | 16 +++++++++++++--- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 6fb7491..c6e2a9c 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -704,6 +704,32 @@ static void test_strftime(void) ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "AM"), "got %s\n", bufA); + retA = strftime(bufA, 256, "%U", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "00"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%W", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "00"), "got %s\n", bufA); + + gmt_tm->tm_wday = 0; + retA = strftime(bufA, 256, "%U", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "01"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%W", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "00"), "got %s\n", bufA); + + gmt_tm->tm_yday = 365; + retA = strftime(bufA, 256, "%U", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "53"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%W", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "52"), "got %s\n", bufA); + gmt_tm->tm_mon = 1; gmt_tm->tm_mday = 30; retA = strftime(bufA, 256, "%c", gmt_tm); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 69bd391..bc68218 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1077,9 +1077,19 @@ MSVCRT_size_t CDECL _Strftime(char *str, MSVCRT_size_t max, const char *format, break; case 'U': case 'W': - FIXME("format %c not yet supported (%x)\n", *format, alternate); - str[0] = 0; - return 0; + if(mstm->tm_wday<0 || mstm->tm_wday>6 || mstm->tm_yday<0 || mstm->tm_yday>365) + goto einval_error; + if(*format == 'U') + tmp = mstm->tm_wday; + else if(!mstm->tm_wday) + tmp = 6; + else + tmp = mstm->tm_wday-1; + + tmp = mstm->tm_yday/7 + (tmp<=mstm->tm_yday%7); + if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 2, 0, 53)) + return 0; + break; case '%': str[ret++] = '%'; break;

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
72
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 2012