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

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 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: 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 : 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

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

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 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 cups job ticket containing pagesize and duplex information.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 7af7c7869eaddbd8a199ba84b67cbb036011647d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7af7c7869eaddbd8a199ba84b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 16 13:18:40 2012 +0100 wineps: Add a cups job ticket containing pagesize and duplex information. --- dlls/wineps.drv/ps.c | 67 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 60 insertions(+), 7 deletions(-) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 4aca6f1..0312b36 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -34,8 +34,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); +static const char psadobe[] = +"%!PS-Adobe-3.0\n"; + +static const char media[] = "%cupsJobTicket: media="; +static const char cups_one_sided[] = "%cupsJobTicket: sides=one-sided\n"; +static const char cups_two_sided_long[] = "%cupsJobTicket: sides=two-sided-long-edge\n"; +static const char cups_two_sided_short[] = "%cupsJobTicket: sides=two-sided-short-edge\n"; +static const char *cups_duplexes[3] = +{ + cups_one_sided, /* DMDUP_SIMPLEX */ + cups_two_sided_long, /* DMDUP_VERTICAL */ + cups_two_sided_short /* DMDUP_HORIZONTAL */ +}; + static const char psheader[] = /* title llx lly urx ury */ -"%%!PS-Adobe-3.0\n" "%%%%Creator: Wine PostScript Driver\n" "%%%%Title: %s\n" "%%%%BoundingBox: %d %d %d %d\n" @@ -296,6 +309,40 @@ done: return ret; } +struct ticket_info +{ + PAGESIZE *page; + DUPLEX *duplex; +}; + +static void write_cups_job_ticket( PHYSDEV dev, const struct ticket_info *info ) +{ + char buf[256]; + int len; + + if (info->page && info->page->InvocationString) + { + len = sizeof(media) + strlen( info->page->Name ) + 1; + if (len <= sizeof(buf)) + { + memcpy( buf, media, sizeof(media) ); + strcat( buf, info->page->Name ); + strcat( buf, "\n"); + write_spool( dev, buf, len - 1 ); + } + else + WARN( "paper name %s will be too long for DSC\n", info->page->Name ); + } + + if (info->duplex && info->duplex->InvocationString) + { + if (info->duplex->WinDuplex >= 1 && info->duplex->WinDuplex <= 3) + { + const char *str = cups_duplexes[ info->duplex->WinDuplex - 1 ]; + write_spool( dev, str, strlen( str ) ); + } + } +} INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) { @@ -306,9 +353,20 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) DUPLEX *duplex = find_duplex( physDev->pi->ppd, physDev->Devmode ); int llx, lly, urx, ury; int ret, len; + struct ticket_info ticket_info = { page, duplex }; TRACE("%s\n", debugstr_w(title)); + len = strlen( psadobe ); + ret = write_spool( dev, psadobe, len ); + if (ret != len) + { + WARN("WriteSpool error\n"); + return 0; + } + + write_cups_job_ticket( dev, &ticket_info ); + escaped_title = escape_title(title); buf = HeapAlloc( GetProcessHeap(), 0, sizeof(psheader) + strlen(escaped_title) + 30 ); @@ -330,13 +388,8 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) HeapFree(GetProcessHeap(), 0, escaped_title); len = strlen( buf ); - ret = write_spool( dev, buf, len ); + write_spool( dev, buf, len ); HeapFree( GetProcessHeap(), 0, buf ); - if (ret != len) - { - WARN("WriteSpool error\n"); - return 0; - } write_spool( dev, psbeginprolog, strlen(psbeginprolog) ); write_spool( dev, psprolog, strlen(psprolog) );

1 0

Huw Davies : winspool: Simplify cups function loading.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: b2accddffe37ea650cca2892367ff1e5dda12f2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2accddffe37ea650cca28923… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 16 13:18:41 2012 +0100 winspool: Simplify cups function loading. --- dlls/winspool.drv/info.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index a5b065c..e958022 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -469,12 +469,19 @@ static BOOL add_printer_driver(WCHAR *name) } #ifdef SONAME_LIBCUPS -static typeof(cupsFreeDests) *pcupsFreeDests; -static typeof(cupsGetDests) *pcupsGetDests; -static typeof(cupsGetPPD) *pcupsGetPPD; -static typeof(cupsPrintFile) *pcupsPrintFile; + static void *cupshandle; +#define CUPS_FUNCS \ + DO_FUNC(cupsFreeDests); \ + DO_FUNC(cupsGetDests); \ + DO_FUNC(cupsGetPPD); \ + DO_FUNC(cupsPrintFile); + +#define DO_FUNC(f) static typeof(f) *p##f +CUPS_FUNCS; +#undef DO_FUNC + static BOOL CUPS_LoadPrinters(void) { int i, nrofdests; @@ -493,15 +500,9 @@ static BOOL CUPS_LoadPrinters(void) } TRACE("%p: %s loaded\n", cupshandle, SONAME_LIBCUPS); -#define DYNCUPS(x) \ - p##x = wine_dlsym(cupshandle, #x, NULL,0); \ - if (!p##x) return FALSE; - - DYNCUPS(cupsFreeDests); - DYNCUPS(cupsGetPPD); - DYNCUPS(cupsGetDests); - DYNCUPS(cupsPrintFile); -#undef DYNCUPS +#define DO_FUNC(x) p##x = wine_dlsym( cupshandle, #x, NULL, 0 ); if (!p##x) return FALSE; + CUPS_FUNCS; +#undef DO_FUNC if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != ERROR_SUCCESS) {

1 0

Huw Davies : winspool: Explicitly set CUPS options based on any job ticket lines, which otherwise get ignored by cupsPrintFile.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 30d18c116519a151a012c1199bae30490a2d5b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30d18c116519a151a012c1199… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 16 13:18:42 2012 +0100 winspool: Explicitly set CUPS options based on any job ticket lines, which otherwise get ignored by cupsPrintFile. --- dlls/winspool.drv/info.c | 47 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index e958022..9b3c335 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -474,8 +474,10 @@ static void *cupshandle; #define CUPS_FUNCS \ DO_FUNC(cupsFreeDests); \ + DO_FUNC(cupsFreeOptions); \ DO_FUNC(cupsGetDests); \ DO_FUNC(cupsGetPPD); \ + DO_FUNC(cupsParseOptions); \ DO_FUNC(cupsPrintFile); #define DO_FUNC(f) static typeof(f) *p##f @@ -7617,6 +7619,37 @@ static BOOL schedule_lpr(LPCWSTR printer_name, LPCWSTR filename) return r; } +#ifdef SONAME_LIBCUPS +/***************************************************************************** + * get_cups_jobs_ticket_options + * + * Explicitly set CUPS options based on any %cupsJobTicket lines. + * The CUPS scheduler only looks for these in Print-File requests, and since + * cupsPrintFile uses Create-Job / Send-Document, the ticket lines don't get + * parsed. + */ +static int get_cups_job_ticket_options( const char *file, int num_options, cups_option_t **options ) +{ + FILE *fp = fopen( file, "r" ); + char buf[257]; /* DSC max of 256 + '\0' */ + const char *ps_adobe = "%!PS-Adobe-"; + const char *cups_job = "%cupsJobTicket:"; + + if (!fp) return num_options; + if (!fgets( buf, sizeof(buf), fp )) goto end; + if (strncmp( buf, ps_adobe, strlen( ps_adobe ) )) goto end; + while (fgets( buf, sizeof(buf), fp )) + { + if (strncmp( buf, cups_job, strlen( cups_job ) )) break; + num_options = pcupsParseOptions( buf + strlen( cups_job ), num_options, options ); + } + +end: + fclose( fp ); + return num_options; +} +#endif + /***************************************************************************** * schedule_cups */ @@ -7628,6 +7661,8 @@ static BOOL schedule_cups(LPCWSTR printer_name, LPCWSTR filename, LPCWSTR docume char *unixname, *queue, *unix_doc_title; DWORD len; BOOL ret; + int num_options = 0, i; + cups_option_t *options = NULL; if(!(unixname = wine_get_unix_file_name(filename))) return FALSE; @@ -7640,8 +7675,16 @@ static BOOL schedule_cups(LPCWSTR printer_name, LPCWSTR filename, LPCWSTR docume unix_doc_title = HeapAlloc(GetProcessHeap(), 0, len); WideCharToMultiByte(CP_UNIXCP, 0, document_title, -1, unix_doc_title, len, NULL, NULL); - TRACE("printing via cups\n"); - ret = pcupsPrintFile(queue, unixname, unix_doc_title, 0, NULL); + num_options = get_cups_job_ticket_options( unixname, num_options, &options ); + + TRACE( "printing via cups with options:\n" ); + for (i = 0; i < num_options; i++) + TRACE( "\t%d: %s = %s\n", i, options[i].name, options[i].value ); + + ret = pcupsPrintFile( queue, unixname, unix_doc_title, num_options, options ); + + pcupsFreeOptions( num_options, options ); + HeapFree(GetProcessHeap(), 0, unix_doc_title); HeapFree(GetProcessHeap(), 0, queue); HeapFree(GetProcessHeap(), 0, unixname);

1 0