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

Jacek Caban : mshtml: Added IHTMLStyle::removeAttribute tests.
by Alexandre Julliard April 16, 2012

April 16, 2012

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 April 16, 2012

April 16, 2012

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 : winspool: Simplify cups function loading.
by Alexandre Julliard April 16, 2012

April 16, 2012

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

Bruno Jesus : ole32: Make sure StgIsStorageILockBytes tests real data.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: 2cd2628c7ba43840d26f66070b08244eda181f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd2628c7ba43840d26f66070… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Apr 15 05:07:11 2012 -0300 ole32: Make sure StgIsStorageILockBytes tests real data. --- dlls/ole32/storage32.c | 7 ++++--- dlls/ole32/tests/storage32.c | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f279ee5..f233b61 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -7846,15 +7846,16 @@ HRESULT WINAPI StgSetTimes(OLECHAR const *str, FILETIME const *pctime, */ HRESULT WINAPI StgIsStorageILockBytes(ILockBytes *plkbyt) { - BYTE sig[8]; + BYTE sig[sizeof(STORAGE_magic)]; ULARGE_INTEGER offset; + ULONG read = 0; offset.u.HighPart = 0; offset.u.LowPart = 0; - ILockBytes_ReadAt(plkbyt, offset, sig, sizeof(sig), NULL); + ILockBytes_ReadAt(plkbyt, offset, sig, sizeof(sig), &read); - if (memcmp(sig, STORAGE_magic, sizeof(STORAGE_magic)) == 0) + if (read == sizeof(sig) && memcmp(sig, STORAGE_magic, sizeof(sig)) == 0) return S_OK; return S_FALSE; diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index b465269..bc0cc25 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -66,6 +66,9 @@ static void test_hglobal_storage_stat(void) r = CreateILockBytesOnHGlobal( NULL, TRUE, &ilb ); ok( r == S_OK, "CreateILockBytesOnHGlobal failed\n"); + r = StgIsStorageILockBytes( ilb ); + ok( r == S_FALSE, "StgIsStorageILockBytes should have failed\n"); + mode = STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE;/*0x1012*/ r = StgCreateDocfileOnILockBytes( ilb, mode, 0, &stg ); ok( r == S_OK, "StgCreateDocfileOnILockBytes failed\n"); @@ -73,6 +76,9 @@ static void test_hglobal_storage_stat(void) r = WriteClassStg( stg, &test_stg_cls ); ok( r == S_OK, "WriteClassStg failed\n"); + r = StgIsStorageILockBytes( ilb ); + ok( r == S_OK, "StgIsStorageILockBytes failed\n"); + memset( &stat, 0, sizeof stat ); r = IStorage_Stat( stg, &stat, 0 );

1 0

Huw Davies : wineps: Add a cups job ticket containing pagesize and duplex information.
by Alexandre Julliard April 16, 2012

April 16, 2012

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 : wineps: Add a helper to find a page size.
by Alexandre Julliard April 16, 2012

April 16, 2012

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

Jacek Caban : mshtml: Added IHTMLStyle2::bottom implementation.
by Alexandre Julliard April 16, 2012

April 16, 2012

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

Jacek Caban : mshtml: Added support for IHTMLEventObj:: cancelBubble property.
by Alexandre Julliard April 16, 2012

April 16, 2012

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

Alexandre Julliard : gdi32: Add a GetBoundsRect driver entry point.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: 582a2f511f23f4677434a8ffff70b1ba8a0a8567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=582a2f511f23f4677434a8fff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 16:17:14 2012 +0200 gdi32: Add a GetBoundsRect driver entry point. --- dlls/gdi32/dc.c | 28 ++++++++++++++++++++++++++++ dlls/gdi32/dibdrv/dc.c | 1 + dlls/gdi32/driver.c | 6 ++++++ dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/freetype.c | 1 + dlls/gdi32/mfdrv/init.c | 10 ++++++++++ dlls/gdi32/path.c | 1 + dlls/gdi32/tests/dc.c | 1 - dlls/wineps.drv/init.c | 1 + dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/xrender.c | 1 + include/wine/gdi_driver.h | 3 ++- 12 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c256f26..a35e4fa 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -222,6 +222,22 @@ void update_dc( DC *dc ) /*********************************************************************** + * fetch_device_bounds + * + * Fetch and clear the device-specific bounds, and add them to the DC if necessary. + */ +static BOOL fetch_device_bounds( DC *dc ) +{ + RECT rect; + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetBoundsRect ); + UINT ret = physdev->funcs->pGetBoundsRect( physdev, &rect, DCB_RESET ); + + if (dc->bounds_enabled && ret == DCB_SET) add_bounds_rect( &dc->bounds, &rect ); + return ret; +} + + +/*********************************************************************** * DC_DeleteObject */ static BOOL DC_DeleteObject( HGDIOBJ handle ) @@ -1316,6 +1332,12 @@ UINT WINAPI GetBoundsRect(HDC hdc, LPRECT rect, UINT flags) if ( !dc ) return 0; + if (!fetch_device_bounds( dc )) + { + release_dc_ptr( dc ); + return 0; + } + if (rect) { if (is_rect_empty( &dc->bounds )) @@ -1351,6 +1373,12 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) if ((flags & DCB_ENABLE) && (flags & DCB_DISABLE)) return 0; if (!(dc = get_dc_ptr( hdc ))) return 0; + if (!fetch_device_bounds( dc )) + { + release_dc_ptr( dc ); + return 0; + } + ret = (dc->bounds_enabled ? DCB_ENABLE : DCB_DISABLE) | (is_rect_empty( &dc->bounds ) ? DCB_RESET : DCB_SET); diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 9f1a633..af4f6e7 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -599,6 +599,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ + NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 36bf48f..43dcc20 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -311,6 +311,11 @@ static BOOL nulldrv_GdiRealizationInfo( PHYSDEV dev, void *info ) return FALSE; } +static UINT nulldrv_GetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) +{ + return DCB_RESET; +} + static BOOL nulldrv_GetCharABCWidths( PHYSDEV dev, UINT first, UINT last, LPABC abc ) { return FALSE; @@ -758,6 +763,7 @@ const struct gdi_dc_funcs null_driver = nulldrv_FrameRgn, /* pFrameRgn */ nulldrv_GdiComment, /* pGdiComment */ nulldrv_GdiRealizationInfo, /* pGdiRealizationInfo */ + nulldrv_GetBoundsRect, /* pGetBoundsRect */ nulldrv_GetCharABCWidths, /* pGetCharABCWidths */ nulldrv_GetCharABCWidthsI, /* pGetCharABCWidthsI */ nulldrv_GetCharWidth, /* pGetCharWidth */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 883ca5a..3356911 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -75,6 +75,7 @@ static const struct gdi_dc_funcs EMFDRV_Funcs = EMFDRV_FrameRgn, /* pFrameRgn */ EMFDRV_GdiComment, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ + NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 0a5d3c3..3875e4f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7772,6 +7772,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ freetype_GdiRealizationInfo, /* pGdiRealizationInfo */ + NULL, /* pGetBoundsRect */ freetype_GetCharABCWidths, /* pGetCharABCWidths */ freetype_GetCharABCWidthsI, /* pGetCharABCWidthsI */ freetype_GetCharWidth, /* pGetCharWidth */ diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index e02c6be..6ccbfe4 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -60,6 +60,15 @@ static INT MFDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_da /****************************************************************** + * MFDRV_GetBoundsRect + */ +static UINT MFDRV_GetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) +{ + return 0; +} + + +/****************************************************************** * MFDRV_GetDeviceCaps * *A very simple implementation that returns DT_METAFILE @@ -120,6 +129,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_FrameRgn, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ + MFDRV_GetBoundsRect, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 058a48a..ec6348c 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -2274,6 +2274,7 @@ const struct gdi_dc_funcs path_driver = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ + NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 4b8567d..bc03b25 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -367,7 +367,6 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) SetMapMode( hdc, MM_TEXT ); Rectangle( hdc, 2, 2, 5, 5 ); type = GetBoundsRect( hdc, &rect, DCB_RESET ); - todo_wine ok( !type, "GetBoundsRect succeeded on %s\n", descr ); } else diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index b2597d7..c51a7e3 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -857,6 +857,7 @@ static const struct gdi_dc_funcs psdrv_funcs = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ + NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ PSDRV_GetCharWidth, /* pGetCharWidth */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index de0d029..324e3f0 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -491,6 +491,7 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ + NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ X11DRV_GetCharWidth, /* pGetCharWidth */ diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 7c763fc..7cd87d9 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2684,6 +2684,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ + NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index eb64b36..01e2ebb 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -101,6 +101,7 @@ struct gdi_dc_funcs BOOL (*pFrameRgn)(PHYSDEV,HRGN,HBRUSH,INT,INT); BOOL (*pGdiComment)(PHYSDEV,UINT,CONST BYTE*); BOOL (*pGdiRealizationInfo)(PHYSDEV,void*); + UINT (*pGetBoundsRect)(PHYSDEV,RECT*,UINT); BOOL (*pGetCharABCWidths)(PHYSDEV,UINT,UINT,LPABC); BOOL (*pGetCharABCWidthsI)(PHYSDEV,UINT,UINT,WORD*,LPABC); BOOL (*pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT); @@ -211,7 +212,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 24 +#define WINE_GDI_DRIVER_VERSION 25 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) {

1 0

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

April 16, 2012

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