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

Huw Davies : wineps: Always update the default devmode.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 87292bb39640f8b39c51a5cec7d240ed34997f1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=87292bb39640f8b39c51a5cec… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 21 12:59:01 2012 +0100 wineps: Always update the default devmode. --- dlls/wineps.drv/init.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 4beb45a..07d52d2 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -630,8 +630,6 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) dm.dmPublic.u1.s1.dmPaperSize = papersize; PSDRV_MergeDevmodes(pi->Devmode, &dm, pi); } - - set_devmode( hPrinter, pi->Devmode ); } if(pi->ppd->DefaultPageSize) { /* We'll let the ppd override the devmode */ @@ -672,6 +670,8 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) pi->Devmode->dmPublic.dmDuplex = DMDUP_SIMPLEX; } + set_devmode( hPrinter, pi->Devmode ); + pi->FontSubTable = load_font_sub_table( hPrinter, &pi->FontSubTableSize ); LIST_FOR_EACH_ENTRY( font, &pi->ppd->InstalledFonts, FONTNAME, entry )

1 0

Huw Davies : winspool: Update the devmode when we update the driver.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 0c31766c882478cf78fb05d4a9156b66858d3fd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c31766c882478cf78fb05d4a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 21 12:59:02 2012 +0100 winspool: Update the devmode when we update the driver. --- dlls/winspool.drv/info.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d1afe56..a8d245f 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -974,6 +974,10 @@ static BOOL update_driver( HANDLE printer ) HeapFree( GetProcessHeap(), 0, ppd_dir ); HeapFree( GetProcessHeap(), 0, ppd ); HeapFree( GetProcessHeap(), 0, queue_name ); + + /* call into the driver to update the devmode */ + DocumentPropertiesW( 0, printer, NULL, NULL, NULL, 0 ); + return ret; } @@ -2369,7 +2373,6 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAU /* Get the unique handle of the printer or Printserver */ *phPrinter = get_opened_printer_entry(lpPrinterName, pDefault); - WaitForSingleObject( init_mutex, INFINITE ); if (*phPrinter) { HKEY key; @@ -2377,15 +2380,14 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAU DWORD status; WINSPOOL_GetOpenedPrinterRegKey( *phPrinter, &key ); RegQueryValueExW( key, May_Delete_Value, NULL, &type, (LPBYTE)&deleting, &size ); + WaitForSingleObject( init_mutex, INFINITE ); status = get_dword_from_reg( key, StatusW ); + set_reg_DWORD( key, StatusW, status & ~PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); + ReleaseMutex( init_mutex ); if (!deleting && (status & PRINTER_STATUS_DRIVER_UPDATE_NEEDED)) - { update_driver( *phPrinter ); - set_reg_DWORD( key, StatusW, status & ~PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); - } RegCloseKey( key ); } - ReleaseMutex( init_mutex ); TRACE("returning %d with %u and %p\n", *phPrinter != NULL, GetLastError(), *phPrinter); return (*phPrinter != 0);

1 0

Huw Davies : winspool: On OS/ X read the default paper size from the core printing api.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 6a65a048932df790c92abcb736ef0ac0c5978a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a65a048932df790c92abcb73… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 21 12:59:03 2012 +0100 winspool: On OS/X read the default paper size from the core printing api. --- dlls/winspool.drv/Makefile.in | 1 + dlls/winspool.drv/info.c | 106 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in index 1c6933b..7a5380f 100644 --- a/dlls/winspool.drv/Makefile.in +++ b/dlls/winspool.drv/Makefile.in @@ -3,6 +3,7 @@ MODULE = winspool.drv IMPORTLIB = winspool IMPORTS = user32 gdi32 advapi32 EXTRAINCL = @CUPSINCL@ +EXTRALIBS = @APPLICATIONSERVICESLIB@ C_SRCS = \ info.c \ diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index a8d245f..bb530de 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -45,6 +45,63 @@ # include <cups/cups.h> #endif +#ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H +#define GetCurrentProcess GetCurrentProcess_Mac +#define GetCurrentThread GetCurrentThread_Mac +#define LoadResource LoadResource_Mac +#define AnimatePalette AnimatePalette_Mac +#define EqualRgn EqualRgn_Mac +#define FillRgn FillRgn_Mac +#define FrameRgn FrameRgn_Mac +#define GetPixel GetPixel_Mac +#define InvertRgn InvertRgn_Mac +#define LineTo LineTo_Mac +#define OffsetRgn OffsetRgn_Mac +#define PaintRgn PaintRgn_Mac +#define Polygon Polygon_Mac +#define ResizePalette ResizePalette_Mac +#define SetRectRgn SetRectRgn_Mac +#define EqualRect EqualRect_Mac +#define FillRect FillRect_Mac +#define FrameRect FrameRect_Mac +#define GetCursor GetCursor_Mac +#define InvertRect InvertRect_Mac +#define OffsetRect OffsetRect_Mac +#define PtInRect PtInRect_Mac +#define SetCursor SetCursor_Mac +#define SetRect SetRect_Mac +#define ShowCursor ShowCursor_Mac +#define UnionRect UnionRect_Mac +#include <ApplicationServices/ApplicationServices.h> +#undef GetCurrentProcess +#undef GetCurrentThread +#undef LoadResource +#undef AnimatePalette +#undef EqualRgn +#undef FillRgn +#undef FrameRgn +#undef GetPixel +#undef InvertRgn +#undef LineTo +#undef OffsetRgn +#undef PaintRgn +#undef Polygon +#undef ResizePalette +#undef SetRectRgn +#undef EqualRect +#undef FillRect +#undef FrameRect +#undef GetCursor +#undef InvertRect +#undef OffsetRect +#undef PtInRect +#undef SetCursor +#undef SetRect +#undef ShowCursor +#undef UnionRect +#undef DPRINTF +#endif + #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "wine/library.h" @@ -242,6 +299,9 @@ static const WCHAR LPR_Port[] = {'L','P','R',':',0}; static const WCHAR default_doc_title[] = {'L','o','c','a','l',' ','D','o','w','n','l','e','v','e','l',' ', 'D','o','c','u','m','e','n','t',0}; +static const WCHAR PPD_Overrides[] = {'P','P','D',' ','O','v','e','r','r','i','d','e','s',0}; +static const WCHAR DefaultPageSize[] = {'D','e','f','a','u','l','t','P','a','g','e','S','i','z','e',0}; + static const DWORD di_sizeof[] = {0, sizeof(DRIVER_INFO_1W), sizeof(DRIVER_INFO_2W), sizeof(DRIVER_INFO_3W), sizeof(DRIVER_INFO_4W), sizeof(DRIVER_INFO_5W), sizeof(DRIVER_INFO_6W), @@ -944,6 +1004,50 @@ end: } +static void set_ppd_overrides( HANDLE printer ) +{ + WCHAR *wstr = NULL; + int size = 0; +#ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H + OSStatus status; + PMPrintSession session = NULL; + PMPageFormat format = NULL; + PMPaper paper; + CFStringRef paper_name; + CFRange range; + + status = PMCreateSession( &session ); + if (status) goto end; + + status = PMCreatePageFormat( &format ); + if (status) goto end; + + status = PMSessionDefaultPageFormat( session, format ); + if (status) goto end; + + status = PMGetPageFormatPaper( format, &paper ); + if (status) goto end; + + status = PMPaperGetPPDPaperName( paper, &paper_name ); + if (status) goto end; + + range.location = 0; + range.length = CFStringGetLength( paper_name ); + size = (range.length + 1) * sizeof(WCHAR); + + wstr = HeapAlloc( GetProcessHeap(), 0, size ); + CFStringGetCharacters( paper_name, range, (UniChar*)wstr ); + wstr[range.length] = 0; + +end: + if (format) PMRelease( format ); + if (session) PMRelease( session ); +#endif + + SetPrinterDataExW( printer, PPD_Overrides, DefaultPageSize, REG_SZ, (BYTE*)wstr, size ); + HeapFree( GetProcessHeap(), 0, wstr ); +} + static BOOL update_driver( HANDLE printer ) { BOOL ret, is_cups; @@ -975,6 +1079,8 @@ static BOOL update_driver( HANDLE printer ) HeapFree( GetProcessHeap(), 0, ppd ); HeapFree( GetProcessHeap(), 0, queue_name ); + set_ppd_overrides( printer ); + /* call into the driver to update the devmode */ DocumentPropertiesW( 0, printer, NULL, NULL, NULL, 0 );

1 0

Thomas Faber : include/httprequest.idl: Use widl-specific attributes only with widl.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 55ee48af4cdec79531f6506e27a45753e92e2d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=55ee48af4cdec79531f6506e2… Author: Thomas Faber <thfabba(a)gmx.de> Date: Thu Jun 21 17:18:30 2012 +0200 include/httprequest.idl: Use widl-specific attributes only with widl. --- include/httprequest.idl | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/httprequest.idl b/include/httprequest.idl index caa1238..838ce26 100644 --- a/include/httprequest.idl +++ b/include/httprequest.idl @@ -20,6 +20,12 @@ import "oaidl.idl"; +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + [ uuid(662901fc-6951-4854-9eb2-d9a2570f2b2e), helpstring("Microsoft WinHTTP Services, version 5.1"),

1 0

Henri Verbeet : ddraw: Use wined3d_get_adapter_display_mode() in ddraw7_GetScanLine().
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 11b7604934daace063eee9a9059d6d2f04b83158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11b7604934daace063eee9a90… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 21 19:35:31 2012 +0200 ddraw: Use wined3d_get_adapter_display_mode() in ddraw7_GetScanLine(). --- dlls/ddraw/ddraw.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index ce3eade..979fb94 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1948,6 +1948,7 @@ static HRESULT WINAPI ddraw7_GetScanLine(IDirectDraw7 *iface, DWORD *Scanline) struct wined3d_display_mode mode; static BOOL hide = FALSE; DWORD time, frame_progress, lines; + HRESULT hr; TRACE("iface %p, line %p.\n", iface, Scanline); @@ -1959,8 +1960,13 @@ static HRESULT WINAPI ddraw7_GetScanLine(IDirectDraw7 *iface, DWORD *Scanline) } wined3d_mutex_lock(); - wined3d_device_get_display_mode(ddraw->wined3d_device, 0, &mode); + hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode); wined3d_mutex_unlock(); + if (FAILED(hr)) + { + ERR("Failed to get display mode, hr %#x.\n", hr); + return hr; + } /* Fake the line sweeping of the monitor */ /* FIXME: We should synchronize with a source to keep the refresh rate */

1 0

Henri Verbeet : ddraw: Use wined3d_get_adapter_display_mode() in CreateSurface().
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: a78708ca50fd6beac858c261fa0f56b6382f98c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a78708ca50fd6beac858c261f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 21 19:35:32 2012 +0200 ddraw: Use wined3d_get_adapter_display_mode() in CreateSurface(). --- dlls/ddraw/ddraw.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 979fb94..b0b2c31 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2892,11 +2892,11 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, desc2.u4.ddpfPixelFormat.dwSize=sizeof(DDPIXELFORMAT); /* Just to be sure */ /* Get the video mode from WineD3D - we will need it */ - hr = wined3d_device_get_display_mode(ddraw->wined3d_device, 0, &mode); - if (FAILED(hr)) + if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode))) { - ERR("Failed to read display mode from wined3d\n"); - switch(ddraw->orig_bpp) + ERR("Failed to get display mode, hr %#x.\n", hr); + + switch (ddraw->orig_bpp) { case 8: mode.format_id = WINED3DFMT_P8_UINT;

1 0

Henri Verbeet : ddraw: Use wined3d_get_adapter_display_mode() in d3d7_EnumZBufferFormats().
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: bf876d2a7ceb091864b00f9612cefccc9397f1f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf876d2a7ceb091864b00f961… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 21 19:35:33 2012 +0200 ddraw: Use wined3d_get_adapter_display_mode() in d3d7_EnumZBufferFormats(). --- dlls/ddraw/ddraw.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b0b2c31..6c45737 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4642,7 +4642,12 @@ static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device * not like that we'll have to find some workaround, like iterating over * all imaginable formats and collecting all the depth stencil formats we * can get. */ - hr = wined3d_device_get_display_mode(ddraw->wined3d_device, 0, &mode); + if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode))) + { + ERR("Failed to get display mode, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; + } for (i = 0; i < (sizeof(formats) / sizeof(*formats)); ++i) {

1 0

Henri Verbeet : ddraw: Use wined3d_get_adapter_display_mode() in d3d_device7_EnumTextureFormats().
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 339ef6c2522dafaedce036f72172176bbf4850c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=339ef6c2522dafaedce036f72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 21 19:35:34 2012 +0200 ddraw: Use wined3d_get_adapter_display_mode() in d3d_device7_EnumTextureFormats(). --- dlls/ddraw/device.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index c79c6aa..aa16757 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1068,8 +1068,7 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, wined3d_mutex_lock(); memset(&mode, 0, sizeof(mode)); - hr = wined3d_device_get_display_mode(device->ddraw->wined3d_device, 0, &mode); - if (FAILED(hr)) + if (FAILED(hr = wined3d_get_adapter_display_mode(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode))) { wined3d_mutex_unlock(); WARN("Cannot get the current adapter format\n");

1 0

Henri Verbeet : ddraw: Use wined3d_get_adapter_display_mode() in d3d_device2_EnumTextureFormats().
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 220a55c36cc54738c526cd3f58592341e7f7fe95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=220a55c36cc54738c526cd3f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 21 19:35:35 2012 +0200 ddraw: Use wined3d_get_adapter_display_mode() in d3d_device2_EnumTextureFormats(). --- dlls/ddraw/device.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index aa16757..3179d02 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1198,8 +1198,7 @@ static HRESULT WINAPI d3d_device2_EnumTextureFormats(IDirect3DDevice2 *iface, wined3d_mutex_lock(); memset(&mode, 0, sizeof(mode)); - hr = wined3d_device_get_display_mode(device->ddraw->wined3d_device, 0, &mode); - if (FAILED(hr)) + if (FAILED(hr = wined3d_get_adapter_display_mode(device->ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode))) { wined3d_mutex_unlock(); WARN("Cannot get the current adapter format\n");

1 0

Dmitry Timoshkov : windowscodecs: Add support for more types of IFD fields.
by Alexandre Julliard 21 Jun '12

21 Jun '12

Module: wine Branch: master Commit: 281768f76553ea8a9f5c0a9d50b2f733fadf8fcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=281768f76553ea8a9f5c0a9d5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 21 11:20:31 2012 +0900 windowscodecs: Add support for more types of IFD fields. --- dlls/windowscodecs/metadatahandler.c | 43 ++++++++++++++++++++++++++++++--- 1 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 9f36d65..eecbf65 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -679,6 +679,28 @@ struct IFD_rational #define IFD_DOUBLE 12 #define IFD_IFD 13 +static int tag_to_vt(SHORT tag) +{ + static const int tag2vt[] = + { + VT_EMPTY, /* 0 */ + VT_UI1, /* IFD_BYTE 1 */ + VT_LPSTR, /* IFD_ASCII 2 */ + VT_UI2, /* IFD_SHORT 3 */ + VT_UI4, /* IFD_LONG 4 */ + VT_UI8, /* IFD_RATIONAL 5 */ + VT_I1, /* IFD_SBYTE 6 */ + VT_BLOB, /* IFD_UNDEFINED 7 */ + VT_I2, /* IFD_SSHORT 8 */ + VT_I4, /* IFD_SLONG 9 */ + VT_I8, /* IFD_SRATIONAL 10 */ + VT_R4, /* IFD_FLOAT 11 */ + VT_R8, /* IFD_DOUBLE 12 */ + VT_BLOB, /* IFD_IFD 13 */ + }; + return (tag > 0 && tag <= 13) ? tag2vt[tag] : VT_BLOB; +} + static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, MetadataItem *item, BOOL native_byte_order) { @@ -694,30 +716,44 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, SWAP_ULONG(count); type = entry->type; SWAP_USHORT(type); + item->value.vt = tag_to_vt(type); value = entry->value; SWAP_ULONG(value); switch (type) { + case IFD_BYTE: + case IFD_SBYTE: + if (count == 1) + { + item->value.u.bVal = *(const BYTE *)&entry->value; + break; + } + FIXME("loading multiple byte fields is not implemented\n"); + break; case IFD_SHORT: + case IFD_SSHORT: if (count == 1) { - item->value.vt = VT_UI2; - item->value.u.uiVal = value; + item->value.u.uiVal = *(const SHORT *)&entry->value; + SWAP_USHORT(item->value.u.uiVal); break; } FIXME("loading multiple short fields is not implemented\n"); break; case IFD_LONG: + case IFD_SLONG: + case IFD_FLOAT: if (count == 1) { - item->value.vt = VT_UI4; item->value.u.ulVal = value; break; } FIXME("loading multiple long fields is not implemented\n"); break; case IFD_RATIONAL: + case IFD_SRATIONAL: + case IFD_DOUBLE: if (count == 1) { HRESULT hr; @@ -728,7 +764,6 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, hr = IStream_Seek(input, pos, SEEK_SET, NULL); if (FAILED(hr)) return hr; - item->value.vt = VT_UI8; hr = IStream_Read(input, &rational, sizeof(rational), NULL); if (FAILED(hr)) return hr; item->value.u.uhVal.QuadPart = ((LONGLONG)rational.denominator << 32) | rational.numerator;

1 0