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

Henri Verbeet : ddraw: Use wined3d_get_adapter_display_mode() in ddraw7_GetScanLine().
by Alexandre Julliard June 21, 2012

June 21, 2012

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

Dmitry Timoshkov : windowscodecs: Add support for loading of multiple simple IFD fields.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: aedd9271b776e037d59ade2dbec8ce1ccfd705b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aedd9271b776e037d59ade2db… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 21 11:20:39 2012 +0900 windowscodecs: Add support for loading of multiple simple IFD fields. --- dlls/windowscodecs/metadatahandler.c | 106 ++++++++++++++++++++++++++++++---- 1 files changed, 94 insertions(+), 12 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index eecbf65..5770e12 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -704,8 +704,10 @@ static int tag_to_vt(SHORT tag) static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, MetadataItem *item, BOOL native_byte_order) { - ULONG count, value; + ULONG count, value, i; SHORT type; + LARGE_INTEGER pos; + HRESULT hr; item->schema.vt = VT_EMPTY; item->id.vt = VT_UI2; @@ -724,22 +726,84 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, { case IFD_BYTE: case IFD_SBYTE: - if (count == 1) + if (count <= 4) { - item->value.u.bVal = *(const BYTE *)&entry->value; + const BYTE *data = (const BYTE *)&entry->value; + + if (count == 1) + item->value.u.bVal = data[0]; + else + { + item->value.vt |= VT_VECTOR; + item->value.u.caub.cElems = count; + item->value.u.caub.pElems = HeapAlloc(GetProcessHeap(), 0, count); + memcpy(item->value.u.caub.pElems, data, count); + } break; } - FIXME("loading multiple byte fields is not implemented\n"); + + item->value.vt |= VT_VECTOR; + item->value.u.caub.cElems = count; + item->value.u.caub.pElems = HeapAlloc(GetProcessHeap(), 0, count); + if (!item->value.u.caub.pElems) return E_OUTOFMEMORY; + + pos.QuadPart = value; + hr = IStream_Seek(input, pos, SEEK_SET, NULL); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, item->value.u.caub.pElems); + return hr; + } + hr = IStream_Read(input, item->value.u.caub.pElems, count, NULL); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, item->value.u.caub.pElems); + return hr; + } break; case IFD_SHORT: case IFD_SSHORT: - if (count == 1) + if (count <= 2) { - item->value.u.uiVal = *(const SHORT *)&entry->value; - SWAP_USHORT(item->value.u.uiVal); + const SHORT *data = (const SHORT *)&entry->value; + + if (count == 1) + { + item->value.u.uiVal = data[0]; + SWAP_USHORT(item->value.u.uiVal); + } + else + { + item->value.vt |= VT_VECTOR; + item->value.u.caui.cElems = count; + item->value.u.caui.pElems = HeapAlloc(GetProcessHeap(), 0, count * 2); + memcpy(item->value.u.caui.pElems, data, count * 2); + for (i = 0; i < count; i++) + SWAP_USHORT(item->value.u.caui.pElems[i]); + } break; } - FIXME("loading multiple short fields is not implemented\n"); + + item->value.vt |= VT_VECTOR; + item->value.u.caui.cElems = count; + item->value.u.caui.pElems = HeapAlloc(GetProcessHeap(), 0, count * 2); + if (!item->value.u.caui.pElems) return E_OUTOFMEMORY; + + pos.QuadPart = value; + hr = IStream_Seek(input, pos, SEEK_SET, NULL); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, item->value.u.caui.pElems); + return hr; + } + hr = IStream_Read(input, item->value.u.caui.pElems, count * 2, NULL); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, item->value.u.caui.pElems); + return hr; + } + for (i = 0; i < count; i++) + SWAP_USHORT(item->value.u.caui.pElems[i]); break; case IFD_LONG: case IFD_SLONG: @@ -749,15 +813,33 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, item->value.u.ulVal = value; break; } - FIXME("loading multiple long fields is not implemented\n"); + + item->value.vt |= VT_VECTOR; + item->value.u.caul.cElems = count; + item->value.u.caul.pElems = HeapAlloc(GetProcessHeap(), 0, count * 4); + if (!item->value.u.caul.pElems) return E_OUTOFMEMORY; + + pos.QuadPart = value; + hr = IStream_Seek(input, pos, SEEK_SET, NULL); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, item->value.u.caul.pElems); + return hr; + } + hr = IStream_Read(input, item->value.u.caul.pElems, count * 4, NULL); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, item->value.u.caul.pElems); + return hr; + } + for (i = 0; i < count; i++) + SWAP_ULONG(item->value.u.caul.pElems[i]); break; case IFD_RATIONAL: case IFD_SRATIONAL: case IFD_DOUBLE: if (count == 1) { - HRESULT hr; - LARGE_INTEGER pos; struct IFD_rational rational; pos.QuadPart = value; @@ -773,7 +855,7 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, FIXME("loading multiple rational fields is not implemented\n"); break; default: - FIXME("loading field of type %d is not implemented\n", entry->type); + FIXME("loading field of type %d, count %u is not implemented\n", type, count); break; } return S_OK;

1 0

Dmitry Timoshkov : windowscodecs: Add support for more types of IFD fields.
by Alexandre Julliard June 21, 2012

June 21, 2012

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

Dmitry Timoshkov : windowscodecs: Fix handling of 8-byte IFD fields.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: 722cb46c052892b166bcf9d9f017b07124d05a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=722cb46c052892b166bcf9d9f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 21 11:20:46 2012 +0900 windowscodecs: Fix handling of 8-byte IFD fields. --- dlls/windowscodecs/metadatahandler.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 5770e12..cf356de 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -649,7 +649,6 @@ HRESULT UnknownMetadataReader_CreateInstance(IUnknown *pUnkOuter, REFIID iid, vo #define SWAP_ULONG(x) do { if (!native_byte_order) (x) = RtlUlongByteSwap(x); } while(0) #define SWAP_ULONGLONG(x) do { if (!native_byte_order) (x) = RtlUlonglongByteSwap(x); } while(0) -#include "pshpack2.h" struct IFD_entry { SHORT id; @@ -658,13 +657,6 @@ struct IFD_entry LONG value; }; -struct IFD_rational -{ - LONG numerator; - LONG denominator; -}; -#include "poppack.h" - #define IFD_BYTE 1 #define IFD_ASCII 2 #define IFD_SHORT 3 @@ -840,16 +832,24 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, case IFD_DOUBLE: if (count == 1) { - struct IFD_rational rational; + ULONGLONG ull; pos.QuadPart = value; hr = IStream_Seek(input, pos, SEEK_SET, NULL); if (FAILED(hr)) return hr; - hr = IStream_Read(input, &rational, sizeof(rational), NULL); + hr = IStream_Read(input, &ull, sizeof(ull), NULL); if (FAILED(hr)) return hr; - item->value.u.uhVal.QuadPart = ((LONGLONG)rational.denominator << 32) | rational.numerator; - SWAP_ULONGLONG(item->value.u.uhVal.QuadPart); + + item->value.u.uhVal.QuadPart = ull; + + if (type == IFD_DOUBLE) + SWAP_ULONGLONG(item->value.u.uhVal.QuadPart); + else + { + SWAP_ULONG(item->value.u.uhVal.u.LowPart); + SWAP_ULONG(item->value.u.uhVal.u.HighPart); + } break; } FIXME("loading multiple rational fields is not implemented\n");

1 0

Henri Verbeet : ddraw: Use wined3d_get_adapter_display_mode() in d3d_device2_EnumTextureFormats().
by Alexandre Julliard June 21, 2012

June 21, 2012

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

Henri Verbeet : ddraw: Use wined3d_get_adapter_display_mode() in d3d7_EnumZBufferFormats().
by Alexandre Julliard June 21, 2012

June 21, 2012

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

Huw Davies : winspool: On OS/ X read the default paper size from the core printing api.
by Alexandre Julliard June 21, 2012

June 21, 2012

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

Henri Verbeet : ddraw: Use wined3d_get_adapter_display_mode() in CreateSurface().
by Alexandre Julliard June 21, 2012

June 21, 2012

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

Piotr Caban : msvcp90: Added istream>>(base type) implementation.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: 1c7f54bfa64d7e9fbbabad0be17f7008ee4a7041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c7f54bfa64d7e9fbbabad0be… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 21 12:27:21 2012 +0200 msvcp90: Added istream>>(base type) implementation. --- dlls/msvcp90/ios.c | 279 +++++++++++++++++++++++++++++++++++++++++------- dlls/msvcp90/locale.c | 38 +++++-- dlls/msvcp90/msvcp90.h | 36 ++++++ 3 files changed, 302 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c7f54bfa64d7e9fbbaba…

1 0

Michael Stefaniuc : avifil32: Drop the 'register' storage-class specifier.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: a2a8a613bed03ae7b5aa42e407f360e807f7235a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2a8a613bed03ae7b5aa42e40… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 21 13:17:51 2012 +0200 avifil32: Drop the 'register' storage-class specifier. --- dlls/avifil32/acmstream.c | 2 +- dlls/avifil32/getframe.c | 2 +- dlls/avifil32/tmpfile.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c index 50e868b..845ea16 100644 --- a/dlls/avifil32/acmstream.c +++ b/dlls/avifil32/acmstream.c @@ -224,7 +224,7 @@ static HRESULT WINAPI ACMStream_fnCreate(IAVIStream *iface, LPARAM lParam1, /* check for swapped parameters */ if ((LPVOID)lParam1 != NULL && ((LPAVICOMPRESSOPTIONS)lParam1)->fccType == streamtypeAUDIO) { - register LPARAM tmp = lParam1; + LPARAM tmp = lParam1; lParam1 = lParam2; lParam2 = tmp; diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index 547f340..c5b2bd4 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -430,7 +430,7 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, } if (lpBits == NULL) { - register DWORD size = This->lpOutFormat->biClrUsed * sizeof(RGBQUAD); + DWORD size = This->lpOutFormat->biClrUsed * sizeof(RGBQUAD); size += This->lpOutFormat->biSize + This->lpOutFormat->biSizeImage; This->lpOutFormat = HeapReAlloc(GetProcessHeap(), 0, This->lpOutFormat, size); diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c index 3bdd50a..62d283b 100644 --- a/dlls/avifil32/tmpfile.c +++ b/dlls/avifil32/tmpfile.c @@ -258,7 +258,7 @@ PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) tmpFile->fInfo.dwSuggestedBufferSize = sInfo.dwSuggestedBufferSize; { - register DWORD tmp; + DWORD tmp; tmp = MulDiv(AVIStreamSampleToTime(ppStreams[i], sInfo.dwLength), tmpFile->fInfo.dwScale, tmpFile->fInfo.dwRate * 1000);

1 0