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

Alistair Leslie-Hughes : scrrun: Add scrrun tests.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 1c62c9f7f9e2cc20468fe0d827d683f95fb2dd70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c62c9f7f9e2cc20468fe0d82… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 22 16:24:24 2012 +1100 scrrun: Add scrrun tests. --- .gitignore | 1 + configure | 1 + configure.ac | 1 + dlls/scrrun/tests/Makefile.in | 9 + dlls/scrrun/tests/filesystem.c | 68 ++++ dlls/scrrun/tests/scrrun.idl | 691 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 771 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c62c9f7f9e2cc20468fe…

1 0

Jacek Caban : mshtml: Added IHTMLImgElement::onerror implementation.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 8ac7e950a926ecc159ba7b75b658934c49409d87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ac7e950a926ecc159ba7b75b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 5 13:58:03 2012 +0200 mshtml: Added IHTMLImgElement::onerror implementation. --- dlls/mshtml/htmlevent.c | 4 ++-- dlls/mshtml/htmlimg.c | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0950c5e..7454549 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -164,7 +164,7 @@ static const event_info_t event_info[] = { {dragstartW, ondragstartW, EVENTT_MOUSE, DISPID_EVMETH_ONDRAGSTART, EVENT_CANCELABLE}, {errorW, onerrorW, EVENTT_NONE, DISPID_EVMETH_ONERROR, - 0}, + EVENT_NODEHANDLER}, {focusW, onfocusW, EVENTT_HTML, DISPID_EVMETH_ONFOCUS, EVENT_DEFAULTLISTENER}, {keydownW, onkeydownW, EVENTT_KEY, DISPID_EVMETH_ONKEYDOWN, @@ -195,7 +195,7 @@ static const event_info_t event_info[] = { EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE} }; -static const eventid_t node_handled_list[] = { EVENTID_LOAD }; +static const eventid_t node_handled_list[] = { EVENTID_ERROR, EVENTID_LOAD }; eventid_t str_to_eid(LPCWSTR str) { diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index a83f73d..79a3044 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -420,15 +420,19 @@ static HRESULT WINAPI HTMLImgElement_get_onload(IHTMLImgElement *iface, VARIANT static HRESULT WINAPI HTMLImgElement_put_onerror(IHTMLImgElement *iface, VARIANT v) { HTMLImgElement *This = impl_from_IHTMLImgElement(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + return set_node_event(&This->element.node, EVENTID_ERROR, &v); } static HRESULT WINAPI HTMLImgElement_get_onerror(IHTMLImgElement *iface, VARIANT *p) { HTMLImgElement *This = impl_from_IHTMLImgElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->element.node, EVENTID_ERROR, p); } static HRESULT WINAPI HTMLImgElement_put_onabort(IHTMLImgElement *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Added IHTMLImgElement::onerror tests.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 383564ab2f9d7dd5ca179128e388f7a51913dee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=383564ab2f9d7dd5ca179128e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 5 13:58:20 2012 +0200 mshtml: Added IHTMLImgElement::onerror tests. --- dlls/mshtml/tests/events.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index d83a511..82f22f4 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -72,6 +72,7 @@ DEFINE_EXPECT(iframe_onreadystatechange_interactive); DEFINE_EXPECT(iframe_onreadystatechange_complete); DEFINE_EXPECT(iframedoc_onreadystatechange); DEFINE_EXPECT(img_onload); +DEFINE_EXPECT(img_onerror); DEFINE_EXPECT(input_onfocus); DEFINE_EXPECT(form_onsubmit); DEFINE_EXPECT(form_onclick); @@ -927,6 +928,17 @@ static HRESULT WINAPI img_onload(IDispatchEx *iface, DISPID id, LCID lcid, WORD EVENT_HANDLER_FUNC_OBJ(img_onload); +static HRESULT WINAPI img_onerror(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + CHECK_EXPECT(img_onerror); + test_event_args(&DIID_DispHTMLImg, id, wFlags, pdp, pvarRes, pei, pspCaller); + test_event_src("IMG"); + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(img_onerror); + static HRESULT WINAPI input_onfocus(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -1675,6 +1687,18 @@ static void test_imgload(IHTMLDocument2 *doc) ok(V_DISPATCH(&v) == (IDispatch*)&img_onload_obj, "V_DISPATCH(onload) != onloadkFunc\n"); VariantClear(&v); + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&img_onerror_obj; + hres = IHTMLImgElement_put_onerror(img, v); + ok(hres == S_OK, "put_onerror failed: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLImgElement_get_onerror(img, &v); + ok(hres == S_OK, "get_onerror failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(onerror) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) == (IDispatch*)&img_onerror_obj, "V_DISPATCH(onerror) != onerrorFunc\n"); + VariantClear(&v); + str = a2bstr("http://www.winehq.org/images/winehq_logo_text.png"); hres = IHTMLImgElement_put_src(img, str); ok(hres == S_OK, "put_src failed: %08x\n", hres); @@ -1684,6 +1708,17 @@ static void test_imgload(IHTMLDocument2 *doc) pump_msgs(&called_img_onload); CHECK_CALLED(img_onload); + SET_EXPECT(img_onerror); + + str = a2bstr("about:blank"); + hres = IHTMLImgElement_put_src(img, str); + ok(hres == S_OK, "put_src failed: %08x\n", hres); + SysFreeString(str); + + pump_msgs(&called_img_onerror); /* FIXME: should not be needed */ + + CHECK_CALLED(img_onerror); + IHTMLImgElement_Release(img); }

1 0

Jacek Caban : mshtml: Added semi-stub implementation of IOmNavigator:: get_cookieEnabled.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: ebeff88e6e5a05c99fc71435d5e8d8cddb5fbf2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebeff88e6e5a05c99fc71435d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 5 13:58:29 2012 +0200 mshtml: Added semi-stub implementation of IOmNavigator::get_cookieEnabled. --- dlls/mshtml/omnavigator.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index bfc3d23..2ae9811 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -578,8 +578,11 @@ static HRESULT WINAPI OmNavigator_get_plugins(IOmNavigator *iface, IHTMLPluginsC static HRESULT WINAPI OmNavigator_get_cookieEnabled(IOmNavigator *iface, VARIANT_BOOL *p) { OmNavigator *This = impl_from_IOmNavigator(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + WARN("(%p)->(%p) semi-stub\n", This, p); + + *p = VARIANT_TRUE; + return S_OK; } static HRESULT WINAPI OmNavigator_get_opsProfile(IOmNavigator *iface, IHTMLOpsProfile **p)

1 0

Huw Davies : winspool: Generalise the A to W printer info conversion to cope with other levels.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 24215194472e0ab92ddc6bed94b03e0664ce67d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24215194472e0ab92ddc6bed9… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 5 13:25:48 2012 +0100 winspool: Generalise the A to W printer info conversion to cope with other levels. --- dlls/winspool.drv/info.c | 133 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 92 insertions(+), 41 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 14d4b14..b5a312f 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1585,54 +1585,105 @@ static void convert_driverinfo_W_to_A(LPBYTE out, LPBYTE pDriversW, /*********************************************************** - * PRINTER_INFO_2AtoW - * Creates a unicode copy of PRINTER_INFO_2A on heap + * printer_info_AtoW */ -static LPPRINTER_INFO_2W PRINTER_INFO_2AtoW(HANDLE heap, LPPRINTER_INFO_2A piA) +static void *printer_info_AtoW( const void *data, DWORD level ) { - LPPRINTER_INFO_2W piW; + void *ret; UNICODE_STRING usBuffer; - if(!piA) return NULL; - piW = HeapAlloc(heap, 0, sizeof(*piW)); - memcpy(piW, piA, sizeof(*piW)); /* copy everything first */ - - piW->pServerName = asciitounicode(&usBuffer,piA->pServerName); - piW->pPrinterName = asciitounicode(&usBuffer,piA->pPrinterName); - piW->pShareName = asciitounicode(&usBuffer,piA->pShareName); - piW->pPortName = asciitounicode(&usBuffer,piA->pPortName); - piW->pDriverName = asciitounicode(&usBuffer,piA->pDriverName); - piW->pComment = asciitounicode(&usBuffer,piA->pComment); - piW->pLocation = asciitounicode(&usBuffer,piA->pLocation); - piW->pDevMode = piA->pDevMode ? GdiConvertToDevmodeW(piA->pDevMode) : NULL; - piW->pSepFile = asciitounicode(&usBuffer,piA->pSepFile); - piW->pPrintProcessor = asciitounicode(&usBuffer,piA->pPrintProcessor); - piW->pDatatype = asciitounicode(&usBuffer,piA->pDatatype); - piW->pParameters = asciitounicode(&usBuffer,piA->pParameters); - return piW; + if (!data) return NULL; + + if (level < 1 || level > 9) return NULL; + + ret = HeapAlloc( GetProcessHeap(), 0, pi_sizeof[level] ); + if (!ret) return NULL; + + memcpy( ret, data, pi_sizeof[level] ); /* copy everything first */ + + switch (level) + { + case 2: + { + const PRINTER_INFO_2A *piA = (const PRINTER_INFO_2A *)data; + PRINTER_INFO_2W *piW = (PRINTER_INFO_2W *)ret; + + piW->pServerName = asciitounicode( &usBuffer, piA->pServerName ); + piW->pPrinterName = asciitounicode( &usBuffer, piA->pPrinterName ); + piW->pShareName = asciitounicode( &usBuffer, piA->pShareName ); + piW->pPortName = asciitounicode( &usBuffer, piA->pPortName ); + piW->pDriverName = asciitounicode( &usBuffer, piA->pDriverName ); + piW->pComment = asciitounicode( &usBuffer, piA->pComment ); + piW->pLocation = asciitounicode( &usBuffer, piA->pLocation ); + piW->pDevMode = piA->pDevMode ? GdiConvertToDevmodeW( piA->pDevMode ) : NULL; + piW->pSepFile = asciitounicode( &usBuffer, piA->pSepFile ); + piW->pPrintProcessor = asciitounicode( &usBuffer, piA->pPrintProcessor ); + piW->pDatatype = asciitounicode( &usBuffer, piA->pDatatype ); + piW->pParameters = asciitounicode( &usBuffer, piA->pParameters ); + break; + } + + case 8: + case 9: + { + const PRINTER_INFO_9A *piA = (const PRINTER_INFO_9A *)data; + PRINTER_INFO_9W *piW = (PRINTER_INFO_9W *)ret; + + piW->pDevMode = piA->pDevMode ? GdiConvertToDevmodeW( piA->pDevMode ) : NULL; + break; + } + + default: + FIXME( "Unhandled level %d\n", level ); + HeapFree( GetProcessHeap(), 0, ret ); + return NULL; + } + + return ret; } /*********************************************************** - * FREE_PRINTER_INFO_2W - * Free PRINTER_INFO_2W and all strings - */ -static void FREE_PRINTER_INFO_2W(HANDLE heap, LPPRINTER_INFO_2W piW) -{ - if(!piW) return; - - HeapFree(heap,0,piW->pServerName); - HeapFree(heap,0,piW->pPrinterName); - HeapFree(heap,0,piW->pShareName); - HeapFree(heap,0,piW->pPortName); - HeapFree(heap,0,piW->pDriverName); - HeapFree(heap,0,piW->pComment); - HeapFree(heap,0,piW->pLocation); - HeapFree(heap,0,piW->pDevMode); - HeapFree(heap,0,piW->pSepFile); - HeapFree(heap,0,piW->pPrintProcessor); - HeapFree(heap,0,piW->pDatatype); - HeapFree(heap,0,piW->pParameters); - HeapFree(heap,0,piW); + * free_printer_info + */ +static void free_printer_info( void *data, DWORD level ) +{ + if (!data) return; + + switch (level) + { + case 2: + { + PRINTER_INFO_2W *piW = (PRINTER_INFO_2W *)data; + + HeapFree( GetProcessHeap(), 0, piW->pServerName ); + HeapFree( GetProcessHeap(), 0, piW->pPrinterName ); + HeapFree( GetProcessHeap(), 0, piW->pShareName ); + HeapFree( GetProcessHeap(), 0, piW->pPortName ); + HeapFree( GetProcessHeap(), 0, piW->pDriverName ); + HeapFree( GetProcessHeap(), 0, piW->pComment ); + HeapFree( GetProcessHeap(), 0, piW->pLocation ); + HeapFree( GetProcessHeap(), 0, piW->pDevMode ); + HeapFree( GetProcessHeap(), 0, piW->pSepFile ); + HeapFree( GetProcessHeap(), 0, piW->pPrintProcessor ); + HeapFree( GetProcessHeap(), 0, piW->pDatatype ); + HeapFree( GetProcessHeap(), 0, piW->pParameters ); + break; + } + + case 8: + case 9: + { + PRINTER_INFO_9W *piW = (PRINTER_INFO_9W *)data; + + HeapFree( GetProcessHeap(), 0, piW->pDevMode ); + break; + } + + default: + FIXME( "Unhandled level %d\n", level ); + } + + HeapFree( GetProcessHeap(), 0, data ); return; } @@ -2679,11 +2730,11 @@ HANDLE WINAPI AddPrinterA(LPSTR pName, DWORD Level, LPBYTE pPrinter) return 0; } pwstrNameW = asciitounicode(&pNameW,pName); - piW = PRINTER_INFO_2AtoW(GetProcessHeap(), piA); + piW = printer_info_AtoW( piA, Level ); ret = AddPrinterW(pwstrNameW, Level, (LPBYTE)piW); - FREE_PRINTER_INFO_2W(GetProcessHeap(), piW); + free_printer_info( piW, Level ); RtlFreeUnicodeString(&pNameW); return ret; }

1 0

Huw Davies : winspool: Forward SetPrinterA to SetPrinterW.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 9166fcb7a0634df5506a6139f7d8d1b2f9d0f2a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9166fcb7a0634df5506a6139f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 5 13:25:49 2012 +0100 winspool: Forward SetPrinterA to SetPrinterW. --- dlls/winspool.drv/info.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index b5a312f..9083d4d 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2840,11 +2840,22 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter) /***************************************************************************** * SetPrinterA [WINSPOOL.@] */ -BOOL WINAPI SetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, - DWORD Command) +BOOL WINAPI SetPrinterA( HANDLE printer, DWORD level, LPBYTE data, DWORD command ) { - FIXME("(%p,%d,%p,%d): stub\n",hPrinter,Level,pPrinter,Command); - return FALSE; + BYTE *dataW = data; + BOOL ret; + + if (level != 0) + { + dataW = printer_info_AtoW( data, level ); + if (!dataW) return FALSE; + } + + ret = SetPrinterW( printer, level, dataW, command ); + + if (dataW != data) free_printer_info( dataW, level ); + + return ret; } /*****************************************************************************

1 0

Huw Davies : winspool: Add a helper to set devmode data in the registry.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 607b5d77bc761fd6832e873706bb271b8857a7b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=607b5d77bc761fd6832e87370… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 5 13:25:50 2012 +0100 winspool: Add a helper to set devmode data in the registry. --- dlls/winspool.drv/info.c | 133 +++++++++++++++++++++++++--------------------- 1 files changed, 72 insertions(+), 61 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 9083d4d..72fa8f0 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -349,6 +349,46 @@ static DEVMODEW *dup_devmode( const DEVMODEW *dm ) return ret; } +/*********************************************************** + * DEVMODEdupWtoA + * Creates an ansi copy of supplied devmode + */ +static DEVMODEA *DEVMODEdupWtoA( const DEVMODEW *dmW ) +{ + LPDEVMODEA dmA; + DWORD size; + + if (!dmW) return NULL; + size = dmW->dmSize - CCHDEVICENAME - + ((dmW->dmSize > FIELD_OFFSET( DEVMODEW, dmFormName )) ? CCHFORMNAME : 0); + + dmA = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size + dmW->dmDriverExtra ); + if (!dmA) return NULL; + + WideCharToMultiByte( CP_ACP, 0, dmW->dmDeviceName, -1, + (LPSTR)dmA->dmDeviceName, CCHDEVICENAME, NULL, NULL ); + + if (FIELD_OFFSET( DEVMODEW, dmFormName ) >= dmW->dmSize) + { + memcpy( &dmA->dmSpecVersion, &dmW->dmSpecVersion, + dmW->dmSize - FIELD_OFFSET( DEVMODEW, dmSpecVersion ) ); + } + else + { + memcpy( &dmA->dmSpecVersion, &dmW->dmSpecVersion, + FIELD_OFFSET( DEVMODEW, dmFormName ) - FIELD_OFFSET( DEVMODEW, dmSpecVersion ) ); + WideCharToMultiByte( CP_ACP, 0, dmW->dmFormName, -1, + (LPSTR)dmA->dmFormName, CCHFORMNAME, NULL, NULL ); + + memcpy( &dmA->dmLogPixels, &dmW->dmLogPixels, dmW->dmSize - FIELD_OFFSET( DEVMODEW, dmLogPixels ) ); + } + + dmA->dmSize = size; + memcpy( (char *)dmA + dmA->dmSize, (const char *)dmW + dmW->dmSize, dmW->dmDriverExtra ); + return dmA; +} + + /****************************************************************** * verify, that the filename is a local file * @@ -712,6 +752,26 @@ static inline DWORD set_reg_szW(HKEY hkey, const WCHAR *keyname, const WCHAR *va return ERROR_FILE_NOT_FOUND; } +static inline DWORD set_reg_devmode( HKEY key, const WCHAR *name, const DEVMODEW *dm ) +{ + DEVMODEA *dmA = DEVMODEdupWtoA( dm ); + DWORD ret = ERROR_FILE_NOT_FOUND; + + /* FIXME: Write DEVMODEA not DEVMODEW into reg. This is what win9x does + and we support these drivers. NT writes DEVMODEW so somehow + we'll need to distinguish between these when we support NT + drivers */ + + if (dmA) + { + ret = RegSetValueExW( key, name, 0, REG_BINARY, + (LPBYTE)dmA, dmA->dmSize + dmA->dmDriverExtra ); + HeapFree( GetProcessHeap(), 0, dmA ); + } + + return ret; +} + /****************************************************************** * get_servername_from_name (internal) * @@ -1102,44 +1162,6 @@ static LPDEVMODEW DEVMODEcpyAtoW(DEVMODEW *dmW, const DEVMODEA *dmA) return dmW; } -/*********************************************************** - * DEVMODEdupWtoA - * Creates an ansi copy of supplied devmode - */ -static LPDEVMODEA DEVMODEdupWtoA(const DEVMODEW *dmW) -{ - LPDEVMODEA dmA; - DWORD size; - - if (!dmW) return NULL; - size = dmW->dmSize - CCHDEVICENAME - - ((dmW->dmSize > FIELD_OFFSET(DEVMODEW, dmFormName)) ? CCHFORMNAME : 0); - - dmA = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size + dmW->dmDriverExtra); - if (!dmA) return NULL; - - WideCharToMultiByte(CP_ACP, 0, dmW->dmDeviceName, -1, - (LPSTR)dmA->dmDeviceName, CCHDEVICENAME, NULL, NULL); - - if (FIELD_OFFSET(DEVMODEW, dmFormName) >= dmW->dmSize) { - memcpy(&dmA->dmSpecVersion, &dmW->dmSpecVersion, - dmW->dmSize - FIELD_OFFSET(DEVMODEW, dmSpecVersion)); - } - else - { - memcpy(&dmA->dmSpecVersion, &dmW->dmSpecVersion, - FIELD_OFFSET(DEVMODEW, dmFormName) - FIELD_OFFSET(DEVMODEW, dmSpecVersion)); - WideCharToMultiByte(CP_ACP, 0, dmW->dmFormName, -1, - (LPSTR)dmA->dmFormName, CCHFORMNAME, NULL, NULL); - - memcpy(&dmA->dmLogPixels, &dmW->dmLogPixels, dmW->dmSize - FIELD_OFFSET(DEVMODEW, dmLogPixels)); - } - - dmA->dmSize = size; - memcpy((char *)dmA + dmA->dmSize, (const char *)dmW + dmW->dmSize, dmW->dmDriverExtra); - return dmA; -} - /****************************************************************** * convert_printerinfo_W_to_A [internal] * @@ -2560,8 +2582,7 @@ static void set_devices_and_printerports(PRINTER_INFO_2W *pi) HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) { PRINTER_INFO_2W *pi = (PRINTER_INFO_2W *) pPrinter; - LPDEVMODEA dmA; - LPDEVMODEW dmW; + LPDEVMODEW dm; HANDLE retval; HKEY hkeyPrinter, hkeyPrinters, hkeyDriver, hkeyDrivers; LONG size; @@ -2643,7 +2664,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) * * FIXME: * Note that DocumentPropertiesW will briefly try to open the printer we - * just create to find a DEVMODEA struct (it will use the WINEPS default + * just create to find a DEVMODE struct (it will use the WINEPS default * one in case it is not there, so we are ok). */ size = DocumentPropertiesW(0, 0, pi->pPrinterName, NULL, NULL, 0); @@ -2653,37 +2674,27 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) size = sizeof(DEVMODEW); } if(pi->pDevMode) - dmW = pi->pDevMode; + dm = pi->pDevMode; else { - dmW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - dmW->dmSize = size; - if (0>DocumentPropertiesW(0,0,pi->pPrinterName,dmW,NULL,DM_OUT_BUFFER)) + dm = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); + dm->dmSize = size; + if (DocumentPropertiesW(0, 0, pi->pPrinterName, dm, NULL, DM_OUT_BUFFER) < 0) { WARN("DocumentPropertiesW on printer %s failed!\n", debugstr_w(pi->pPrinterName)); - HeapFree(GetProcessHeap(),0,dmW); - dmW=NULL; + HeapFree( GetProcessHeap(), 0, dm ); + dm = NULL; } else { /* set devmode to printer name */ - lstrcpynW(dmW->dmDeviceName, pi->pPrinterName, CCHDEVICENAME); + lstrcpynW( dm->dmDeviceName, pi->pPrinterName, CCHDEVICENAME ); } } - /* Write DEVMODEA not DEVMODEW into reg. This is what win9x does - and we support these drivers. NT writes DEVMODEW so somehow - we'll need to distinguish between these when we support NT - drivers */ - if (dmW) - { - dmA = DEVMODEdupWtoA(dmW); - RegSetValueExW(hkeyPrinter, default_devmodeW, 0, REG_BINARY, - (LPBYTE)dmA, dmA->dmSize + dmA->dmDriverExtra); - HeapFree(GetProcessHeap(), 0, dmA); - if(!pi->pDevMode) - HeapFree(GetProcessHeap(), 0, dmW); - } + set_reg_devmode( hkeyPrinter, default_devmodeW, dm ); + if (!pi->pDevMode) HeapFree( GetProcessHeap(), 0, dm ); + set_reg_szW(hkeyPrinter, DescriptionW, pi->pComment); set_reg_szW(hkeyPrinter, LocationW, pi->pLocation); set_reg_szW(hkeyPrinter, NameW, pi->pPrinterName);

1 0

Huw Davies : winspool: Implement SetPrinterW for level 9.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 79aac9fabce638cc9676b6e128018b7b364f6504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79aac9fabce638cc9676b6e12… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 5 13:25:51 2012 +0100 winspool: Implement SetPrinterW for level 9. --- dlls/winspool.drv/info.c | 51 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 41 insertions(+), 10 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 72fa8f0..a5b065c 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2243,16 +2243,6 @@ BOOL WINAPI DeletePortW (LPWSTR pName, HWND hWnd, LPWSTR pPortName) } /****************************************************************************** - * SetPrinterW [WINSPOOL.@] - */ -BOOL WINAPI SetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD Command) -{ - FIXME("(%p, %d, %p, %d): stub\n", hPrinter, Level, pPrinter, Command); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/****************************************************************************** * WritePrinter [WINSPOOL.@] */ BOOL WINAPI WritePrinter(HANDLE hPrinter, LPVOID pBuf, DWORD cbBuf, LPDWORD pcWritten) @@ -2869,6 +2859,47 @@ BOOL WINAPI SetPrinterA( HANDLE printer, DWORD level, LPBYTE data, DWORD command return ret; } +static BOOL set_printer_9( HKEY key, const PRINTER_INFO_9W *pi ) +{ + if (!pi->pDevMode) return FALSE; + + set_reg_devmode( key, Default_DevModeW, pi->pDevMode ); + return TRUE; +} + +/****************************************************************************** + * SetPrinterW [WINSPOOL.@] + */ +BOOL WINAPI SetPrinterW( HANDLE printer, DWORD level, LPBYTE data, DWORD command ) +{ + HKEY key; + BOOL ret = FALSE; + + TRACE( "(%p, %d, %p, %d)\n", printer, level, data, command ); + + if (command != 0) FIXME( "Ignoring command %d\n", command ); + + if (WINSPOOL_GetOpenedPrinterRegKey( printer, &key )) + return FALSE; + + switch (level) + { + case 9: + { + PRINTER_INFO_9W *pi = (PRINTER_INFO_9W *)data; + ret = set_printer_9( key, pi ); + break; + } + + default: + FIXME( "Unimplemented level %d\n", level ); + SetLastError( ERROR_INVALID_LEVEL ); + } + + RegCloseKey( key ); + return ret; +} + /***************************************************************************** * SetJobA [WINSPOOL.@] */

1 0

Hans Leidekker : msi: Keep the UI level fixed during the lifetime of a package.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: dd205230a0d215cefef42bfe25d2d78b237a9ec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd205230a0d215cefef42bfe2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 5 15:12:15 2012 +0200 msi: Keep the UI level fixed during the lifetime of a package. --- dlls/msi/action.c | 4 ++-- dlls/msi/custom.c | 4 ++-- dlls/msi/dialog.c | 2 +- dlls/msi/media.c | 2 +- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 1 + 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5e9ef35..b3472f8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -480,7 +480,7 @@ UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) static BOOL needs_ui_sequence(MSIPACKAGE *package) { - return (gUILevel & INSTALLUILEVEL_MASK) >= INSTALLUILEVEL_REDUCED; + return (package->ui_level & INSTALLUILEVEL_MASK) >= INSTALLUILEVEL_REDUCED; } UINT msi_set_context(MSIPACKAGE *package) @@ -2954,7 +2954,7 @@ static UINT ITERATE_LaunchConditions(MSIRECORD *row, LPVOID param) r = MSI_EvaluateConditionW(package,cond); if (r == MSICONDITION_FALSE) { - if ((gUILevel & INSTALLUILEVEL_MASK) != INSTALLUILEVEL_NONE) + if ((package->ui_level & INSTALLUILEVEL_MASK) != INSTALLUILEVEL_NONE) { LPWSTR deformated; message = MSI_RecordGetString(row,2); diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 7543767..9e50035 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -903,11 +903,11 @@ static UINT HANDLE_CustomType19(MSIPACKAGE *package, LPCWSTR source, if( row ) { LPCWSTR error = MSI_RecordGetString( row, 1 ); - if ((gUILevel & INSTALLUILEVEL_MASK) != INSTALLUILEVEL_NONE) + if ((package->ui_level & INSTALLUILEVEL_MASK) != INSTALLUILEVEL_NONE) MessageBoxW( NULL, error, NULL, MB_OK ); msiobj_release( &row->hdr ); } - else if ((gUILevel & INSTALLUILEVEL_MASK) != INSTALLUILEVEL_NONE) + else if ((package->ui_level & INSTALLUILEVEL_MASK) != INSTALLUILEVEL_NONE) MessageBoxW( NULL, deformated, NULL, MB_OK ); msi_free( deformated ); diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 04a4a6b..a90d379 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3978,7 +3978,7 @@ UINT msi_spawn_error_dialog( MSIPACKAGE *package, LPWSTR error_dialog, LPWSTR er 'M','S','I','E','r','r','o','r','D','i','a','l','o','g','R','e','s','u','l','t',0 }; - if ((gUILevel & INSTALLUILEVEL_MASK) == INSTALLUILEVEL_NONE) return ERROR_SUCCESS; + if ((package->ui_level & INSTALLUILEVEL_MASK) == INSTALLUILEVEL_NONE) return ERROR_SUCCESS; if ( !error_dialog ) { diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 9a01277..612624d 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -77,7 +77,7 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) static const WCHAR error_prop[] = {'E','r','r','o','r','D','i','a','l','o','g',0}; - if ((gUILevel & INSTALLUILEVEL_MASK) == INSTALLUILEVEL_NONE && + if ((package->ui_level & INSTALLUILEVEL_MASK) == INSTALLUILEVEL_NONE && !gUIHandlerA && !gUIHandlerW && !gUIHandlerRecord) return ERROR_SUCCESS; error = msi_build_error_string(package, 1302, 1, mi->disk_prompt); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 4ed4fd6..dc748e2 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -389,6 +389,7 @@ typedef struct tagMSIPACKAGE LPWSTR localfile; BOOL delete_on_close; + INSTALLUILEVEL ui_level; UINT CurrentInstallState; msi_dialog *dialog; LPWSTR next_dialog; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 834467f..ca836ec 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1180,6 +1180,7 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) set_installed_prop( package ); set_installer_properties( package ); + package->ui_level = gUILevel; sprintfW( uilevel, fmtW, gUILevel & INSTALLUILEVEL_MASK ); msi_set_property(package->db, szUILevel, uilevel);

1 0

Aric Stewart : user32: While calculating lines, discard uniscribe data for non-visible lines.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 4ad945337fe396925f751d6de4c7b97035f055a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad945337fe396925f751d6de… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 30 11:46:34 2012 -0500 user32: While calculating lines, discard uniscribe data for non-visible lines. --- dlls/user32/edit.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index ab87418..316df2a 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -476,6 +476,12 @@ static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData(EDITSTATE *es, HDC dc, IN } } +static inline INT get_vertical_line_count(EDITSTATE *es) +{ + INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + return max(1,vlc); +} + /********************************************************************* * * EDIT_BuildLineDefs_ML @@ -496,6 +502,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta INT line_count = es->line_count; INT orig_net_length; RECT rc; + INT vlc; if (istart == iend && delta == 0) return; @@ -536,6 +543,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta fw = es->format_rect.right - es->format_rect.left; current_position = es->text + current_line->index; + vlc = get_vertical_line_count(es); do { if (current_line != start_line) { @@ -726,6 +734,11 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta es->text_width = max(es->text_width, current_line->width); current_position += current_line->length; previous_line = current_line; + + /* Discard data for non-visible lines. It will be calculated as needed */ + if ((line_index < es->y_offset) || (line_index > es->y_offset + vlc)) + EDIT_InvalidateUniscribeData_linedef(current_line); + current_line = current_line->next; line_index++; } while (previous_line->ending != END_0); @@ -1460,13 +1473,6 @@ static void EDIT_SL_InvalidateText(EDITSTATE *es, INT start, INT end) EDIT_UpdateText(es, &rc, TRUE); } - -static inline INT get_vertical_line_count(EDITSTATE *es) -{ - INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; - return max(1,vlc); -} - /********************************************************************* * * EDIT_ML_InvalidateText

1 0