wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Dmitry Timoshkov : windowscodecs: Extend IWICImagingFactory to IWICComponentFactory.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 50d53928e048ea4679528ec5f21fda1ad71d52c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50d53928e048ea4679528ec5f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 28 18:41:38 2012 +0900 windowscodecs: Extend IWICImagingFactory to IWICComponentFactory. --- dlls/windowscodecs/clsfactory.c | 2 +- dlls/windowscodecs/imgfactory.c | 211 ++++++++++++++++++++----------- dlls/windowscodecs/proxy.c | 2 +- dlls/windowscodecs/tests/metadata.c | 5 +- dlls/windowscodecs/wincodecs_private.h | 2 +- 5 files changed, 142 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50d53928e048ea4679528…

1 0

Dmitry Timoshkov : windowscodecs: Add support for preferred vendor guid in CreateDecoderFromStream.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: fd31112ab0a0528fd9be99e0afd49dd98f523d2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd31112ab0a0528fd9be99e0a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 28 18:41:27 2012 +0900 windowscodecs: Add support for preferred vendor guid in CreateDecoderFromStream. --- dlls/windowscodecs/imgfactory.c | 43 +++++++++++++++++++++++++++++---------- 1 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index a2e8e7f..c9b2716 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -122,11 +122,11 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( IWICImagingFactory *iface, IStream *pIStream, const GUID *pguidVendor, WICDecodeOptions metadataOptions, IWICBitmapDecoder **ppIDecoder) { - static int fixme=0; IEnumUnknown *enumdecoders; IUnknown *unkdecoderinfo; IWICBitmapDecoderInfo *decoderinfo; - IWICBitmapDecoder *decoder=NULL; + IWICBitmapDecoder *decoder = NULL, *preferred_decoder = NULL; + GUID vendor; HRESULT res=S_OK; ULONG num_fetched; BOOL matches; @@ -134,13 +134,10 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( TRACE("(%p,%p,%s,%u,%p)\n", iface, pIStream, debugstr_guid(pguidVendor), metadataOptions, ppIDecoder); - if (pguidVendor && !fixme++) - FIXME("ignoring vendor GUID\n"); - res = CreateComponentEnumerator(WICDecoder, WICComponentEnumerateDefault, &enumdecoders); if (FAILED(res)) return res; - while (!decoder) + while (!preferred_decoder) { res = IEnumUnknown_Next(enumdecoders, 1, &unkdecoderinfo, &num_fetched); @@ -154,19 +151,36 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( if (SUCCEEDED(res) && matches) { - res = IWICBitmapDecoderInfo_CreateInstance(decoderinfo, &decoder); + IWICBitmapDecoder *new_decoder; + + res = IWICBitmapDecoderInfo_CreateInstance(decoderinfo, &new_decoder); /* FIXME: should use QueryCapability to choose a decoder */ if (SUCCEEDED(res)) { - res = IWICBitmapDecoder_Initialize(decoder, pIStream, metadataOptions); + res = IWICBitmapDecoder_Initialize(new_decoder, pIStream, metadataOptions); - if (FAILED(res)) + if (SUCCEEDED(res)) { - IWICBitmapDecoder_Release(decoder); - decoder = NULL; + if (pguidVendor) + { + res = IWICBitmapDecoderInfo_GetVendorGUID(decoderinfo, &vendor); + if (SUCCEEDED(res) && IsEqualIID(&vendor, pguidVendor)) + { + preferred_decoder = new_decoder; + new_decoder = NULL; + } + } + + if (new_decoder && !decoder) + { + decoder = new_decoder; + new_decoder = NULL; + } } + + if (new_decoder) IWICBitmapDecoder_Release(new_decoder); } } @@ -181,6 +195,13 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( IEnumUnknown_Release(enumdecoders); + if (preferred_decoder) + { + *ppIDecoder = preferred_decoder; + if (decoder) IWICBitmapDecoder_Release(decoder); + return S_OK; + } + if (decoder) { *ppIDecoder = decoder;

1 0

Dmitry Timoshkov : windowscodecs: Fix the test for rational IFD tag.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 74d53af5fdd047347f8704fa157fff7ed1912322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74d53af5fdd047347f8704fa1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 28 18:41:15 2012 +0900 windowscodecs: Fix the test for rational IFD tag. --- dlls/windowscodecs/tests/metadata.c | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index d4249f42..6e8ac66 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -54,8 +54,8 @@ struct IFD_entry struct IFD_rational { - ULONG numerator; - ULONG denominator; + LONG numerator; + LONG denominator; }; static const struct @@ -63,20 +63,21 @@ static const struct USHORT number_of_entries; struct IFD_entry entry[6]; ULONG next_IFD; - struct IFD_rational rational; + struct IFD_rational xres; } IFD_data = { 6, { - { 0xfe, IFD_SHORT, 1, 1 }, - { 0x100, IFD_LONG, 1, 222 }, - { 0x101, IFD_LONG, 1, 333 }, - { 0x102, IFD_SHORT, 1, 24 }, - { 0x103, IFD_LONG, 1, 32773 }, - { 0x11a, IFD_RATIONAL, 1, sizeof(USHORT) + sizeof(struct IFD_entry) * 6 + sizeof(ULONG) } + { 0xfe, IFD_SHORT, 1, 1 }, /* NEWSUBFILETYPE */ + { 0x100, IFD_LONG, 1, 222 }, /* IMAGEWIDTH */ + { 0x101, IFD_LONG, 1, 333 }, /* IMAGELENGTH */ + { 0x102, IFD_SHORT, 1, 24 }, /* BITSPERSAMPLE */ + { 0x103, IFD_LONG, 1, 32773 }, /* COMPRESSION: packbits */ + { 0x11a, IFD_RATIONAL, 1, /* XRESOLUTION */ + sizeof(USHORT) + sizeof(struct IFD_entry) * 6 + sizeof(ULONG) } }, 0, - { 300, 1 } + { 900, 3 } }; #include "poppack.h" @@ -321,7 +322,8 @@ static void test_metadata_IFD(void) { static const struct test_data { - ULONG type, id, value; + ULONG type, id; + LONGLONG value; } td[6] = { { VT_UI2, 0xfe, 1 }, @@ -329,7 +331,7 @@ static void test_metadata_IFD(void) { VT_UI4, 0x101, 333 }, { VT_UI2, 0x102, 24 }, { VT_UI4, 0x103, 32773 }, - { VT_UI8, 0x11a, 300 } + { VT_UI8, 0x11a, ((LONGLONG)3 << 32) | 900 } }; HRESULT hr; IWICMetadataReader *reader; @@ -376,7 +378,7 @@ static void test_metadata_IFD(void) ok(id.vt == VT_UI2, "%u: unexpected vt: %u\n", i, id.vt); ok(U(id).uiVal == td[i].id, "%u: unexpected id: %#x\n", i, U(id).uiVal); ok(value.vt == td[i].type, "%u: unexpected vt: %u\n", i, value.vt); - ok(U(value).ulVal == td[i].value, "%u: unexpected id: %u\n", i, U(value).ulVal); + ok(U(value).uhVal.QuadPart == td[i].value, "%u: unexpected id: %d/%d\n", i, U(value).uhVal.LowPart, U(value).uhVal.HighPart); PropVariantClear(&schema); PropVariantClear(&id);

1 0

André Hentschel : d3drm: Implement IDirect3DRMLight_[ Get|Set]Range.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: d04d994093b3d091220dda4b5b30ae63f50f86b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d04d994093b3d091220dda4b5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 27 15:52:57 2012 +0200 d3drm: Implement IDirect3DRMLight_[Get|Set]Range. --- dlls/d3drm/light.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 0e3b5af..1326b6a 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -36,6 +36,7 @@ typedef struct { LONG ref; D3DRMLIGHTTYPE type; D3DCOLOR color; + D3DVALUE range; } IDirect3DRMLightImpl; static inline IDirect3DRMLightImpl *impl_from_IDirect3DRMLight(IDirect3DRMLight *iface) @@ -214,9 +215,11 @@ static HRESULT WINAPI IDirect3DRMLightImpl_SetRange(IDirect3DRMLight* iface, D3D { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(%f): stub\n", iface, This, range); + TRACE("(%p/%p)->(%f)\n", iface, This, range); - return E_NOTIMPL; + This->range = range; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMLightImpl_SetUmbra(IDirect3DRMLight* iface, D3DVALUE umbra) @@ -271,9 +274,9 @@ static D3DVALUE WINAPI IDirect3DRMLightImpl_GetRange(IDirect3DRMLight* iface) { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return 0; + return This->range; } static D3DVALUE WINAPI IDirect3DRMLightImpl_GetUmbra(IDirect3DRMLight* iface)

1 0

André Hentschel : d3drm: Implement IDirect3DRMLight_[ Get|Set]Color and IDirect3DRMLight_SetColorRGB.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: d2a52d1e17bc2500744824e6801a7fdb7e6bce05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a52d1e17bc2500744824e68… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 27 15:52:32 2012 +0200 d3drm: Implement IDirect3DRMLight_[Get|Set]Color and IDirect3DRMLight_SetColorRGB. --- dlls/d3drm/light.c | 21 +++++++++++++++------ dlls/d3drm/tests/d3drm.c | 10 +++++----- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 620fb97..0e3b5af 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -29,10 +29,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); +#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff))) + typedef struct { IDirect3DRMLight IDirect3DRMLight_iface; LONG ref; D3DRMLIGHTTYPE type; + D3DCOLOR color; } IDirect3DRMLightImpl; static inline IDirect3DRMLightImpl *impl_from_IDirect3DRMLight(IDirect3DRMLight *iface) @@ -186,9 +189,11 @@ static HRESULT WINAPI IDirect3DRMLightImpl_SetColor(IDirect3DRMLight* iface, D3D { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(%u): stub\n", iface, This, color); + TRACE("(%p/%p)->(%u)\n", iface, This, color); - return E_NOTIMPL; + This->color = color; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMLightImpl_SetColorRGB(IDirect3DRMLight* iface, @@ -196,9 +201,13 @@ static HRESULT WINAPI IDirect3DRMLightImpl_SetColorRGB(IDirect3DRMLight* iface, { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(%f,%f,%f): stub\n", iface, This, red, green, blue); + TRACE("(%p/%p)->(%f,%f,%f)\n", iface, This, red, green, blue); - return E_NOTIMPL; + This->color = D3DCOLOR_ARGB(0xff, (BYTE)(red * 255.0f), + (BYTE)(green * 255.0f), + (BYTE)(blue * 255.0f)); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMLightImpl_SetRange(IDirect3DRMLight* iface, D3DVALUE range) @@ -316,9 +325,9 @@ static D3DCOLOR WINAPI IDirect3DRMLightImpl_GetColor(IDirect3DRMLight* iface) { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return 0; + return This->color; } static D3DRMLIGHTTYPE WINAPI IDirect3DRMLightImpl_GetType(IDirect3DRMLight* iface) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 16db2c2..b6ed51a 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -842,7 +842,7 @@ static void test_Light(void) ok(type == D3DRMLIGHT_SPOT, "wrong type (%u)\n", type); color = IDirect3DRMLight_GetColor(pLight); - todo_wine ok(color == 0xff7f7f7f, "wrong color (%x)\n", color); + ok(color == 0xff7f7f7f, "wrong color (%x)\n", color); hr = IDirect3DRMLight_SetType(pLight, D3DRMLIGHT_POINT); ok(hr == D3DRM_OK, "Cannot set type (hr = %x)\n", hr); @@ -850,14 +850,14 @@ static void test_Light(void) ok(type == D3DRMLIGHT_POINT, "wrong type (%u)\n", type); hr = IDirect3DRMLight_SetColor(pLight, 0xff180587); - todo_wine ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); color = IDirect3DRMLight_GetColor(pLight); - todo_wine ok(color == 0xff180587, "wrong color (%x)\n", color); + ok(color == 0xff180587, "wrong color (%x)\n", color); hr = IDirect3DRMLight_SetColorRGB(pLight, 0.5, 0.5, 0.5); - todo_wine ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); color = IDirect3DRMLight_GetColor(pLight); - todo_wine ok(color == 0xff7f7f7f, "wrong color (%x)\n", color); + ok(color == 0xff7f7f7f, "wrong color (%x)\n", color); IDirect3DRMLight_Release(pLight);

1 0

André Hentschel : d3drm: Implement IDirect3DRMLight_[ Get|Set]Type.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 8fa6a0b4fd2ecd6299286965a2df8df940f8edc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fa6a0b4fd2ecd6299286965a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 27 15:52:03 2012 +0200 d3drm: Implement IDirect3DRMLight_[Get|Set]Type. --- dlls/d3drm/light.c | 11 +++++++---- dlls/d3drm/tests/d3drm.c | 6 +++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 82ec825..620fb97 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); typedef struct { IDirect3DRMLight IDirect3DRMLight_iface; LONG ref; + D3DRMLIGHTTYPE type; } IDirect3DRMLightImpl; static inline IDirect3DRMLightImpl *impl_from_IDirect3DRMLight(IDirect3DRMLight *iface) @@ -174,9 +175,11 @@ static HRESULT WINAPI IDirect3DRMLightImpl_SetType(IDirect3DRMLight* iface, D3DR { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(%u): stub\n", iface, This, type); + TRACE("(%p/%p)->(%u)\n", iface, This, type); - return E_NOTIMPL; + This->type = type; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMLightImpl_SetColor(IDirect3DRMLight* iface, D3DCOLOR color) @@ -322,9 +325,9 @@ static D3DRMLIGHTTYPE WINAPI IDirect3DRMLightImpl_GetType(IDirect3DRMLight* ifac { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return D3DRMLIGHT_AMBIENT; + return This->type; } static HRESULT WINAPI IDirect3DRMLightImpl_SetEnableFrame(IDirect3DRMLight* iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 5bbd363..16db2c2 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -839,15 +839,15 @@ static void test_Light(void) ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface (hr = %x)\n", hr); type = IDirect3DRMLight_GetType(pLight); - todo_wine ok(type == D3DRMLIGHT_SPOT, "wrong type (%u)\n", type); + ok(type == D3DRMLIGHT_SPOT, "wrong type (%u)\n", type); color = IDirect3DRMLight_GetColor(pLight); todo_wine ok(color == 0xff7f7f7f, "wrong color (%x)\n", color); hr = IDirect3DRMLight_SetType(pLight, D3DRMLIGHT_POINT); - todo_wine ok(hr == D3DRM_OK, "Cannot set type (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot set type (hr = %x)\n", hr); type = IDirect3DRMLight_GetType(pLight); - todo_wine ok(type == D3DRMLIGHT_POINT, "wrong type (%u)\n", type); + ok(type == D3DRMLIGHT_POINT, "wrong type (%u)\n", type); hr = IDirect3DRMLight_SetColor(pLight, 0xff180587); todo_wine ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr);

1 0

André Hentschel : d3drm: Improve stub for IDirect3DRMWinDevice_HandleActivate.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: fde35902a7c97dc6ae0eb1303396ba8fabc7360c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fde35902a7c97dc6ae0eb1303… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 27 15:37:40 2012 +0200 d3drm: Improve stub for IDirect3DRMWinDevice_HandleActivate. --- dlls/d3drm/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 1b4967a..767e157 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -1134,7 +1134,7 @@ static HRESULT WINAPI IDirect3DRMWinDeviceImpl_HandleActivate(IDirect3DRMWinDevi FIXME("(%p/%p)->(%u): stub\n", iface, This, wparam); - return E_NOTIMPL; + return D3DRM_OK; } static const struct IDirect3DRMWinDeviceVtbl Direct3DRMWinDevice_Vtbl =

1 0

André Hentschel : d3drm: Implement width and height handling in device interfaces.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 5ab7b75cebe86236d53ed5cf867ce02c2cc9eb76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ab7b75cebe86236d53ed5cf8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 27 15:37:09 2012 +0200 d3drm: Implement width and height handling in device interfaces. --- dlls/d3drm/device.c | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 7d29236..1b4967a 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -42,6 +42,8 @@ typedef struct { BOOL dither; D3DRMRENDERQUALITY quality; DWORD rendermode; + DWORD height; + DWORD width; } IDirect3DRMDeviceImpl; static inline IDirect3DRMDeviceImpl *impl_from_IDirect3DRMDevice2(IDirect3DRMDevice2 *iface) @@ -204,9 +206,9 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_Init(IDirect3DRMDevice2* iface, ULO { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - FIXME("(%p/%p)->(%u, %u): stub\n", iface, This, width, height); + TRACE("(%p/%p)->(%u, %u)\n", iface, This, width, height); - return E_NOTIMPL; + return IDirect3DRMDevice3_Init(&This->IDirect3DRMDevice3_iface, width, height); } /*** IDirect3DRMDevice2 methods ***/ @@ -227,9 +229,10 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromClipper(IDirect3DRMDevice2* { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - FIXME("(%p/%p)->(%p, %p, %u, %u): stub\n", iface, This, lpDDClipper, lpGUID, width, height); + TRACE("(%p/%p)->(%p, %p, %u, %u)\n", iface, This, lpDDClipper, lpGUID, width, height); - return E_NOTIMPL; + return IDirect3DRMDevice3_InitFromClipper(&This->IDirect3DRMDevice3_iface, lpDDClipper, lpGUID, + width, height); } static HRESULT WINAPI IDirect3DRMDevice2Impl_Update(IDirect3DRMDevice2* iface) @@ -350,18 +353,18 @@ static DWORD WINAPI IDirect3DRMDevice2Impl_GetHeight(IDirect3DRMDevice2* iface) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetHeight(&This->IDirect3DRMDevice3_iface); } static DWORD WINAPI IDirect3DRMDevice2Impl_GetWidth(IDirect3DRMDevice2* iface) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetWidth(&This->IDirect3DRMDevice3_iface); } static DWORD WINAPI IDirect3DRMDevice2Impl_GetTrianglesDrawn(IDirect3DRMDevice2* iface) @@ -627,7 +630,10 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_Init(IDirect3DRMDevice3* iface, ULO FIXME("(%p/%p)->(%u, %u): stub\n", iface, This, width, height); - return E_NOTIMPL; + This->height = height; + This->width = width; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromD3D(IDirect3DRMDevice3* iface, @@ -649,7 +655,10 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromClipper(IDirect3DRMDevice3* FIXME("(%p/%p)->(%p, %p, %u, %u): stub\n", iface, This, lpDDClipper, lpGUID, width, height); - return E_NOTIMPL; + This->height = height; + This->width = width; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMDevice3Impl_Update(IDirect3DRMDevice3* iface) @@ -774,18 +783,18 @@ static DWORD WINAPI IDirect3DRMDevice3Impl_GetHeight(IDirect3DRMDevice3* iface) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return E_NOTIMPL; + return This->height; } static DWORD WINAPI IDirect3DRMDevice3Impl_GetWidth(IDirect3DRMDevice3* iface) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return E_NOTIMPL; + return This->width; } static DWORD WINAPI IDirect3DRMDevice3Impl_GetTrianglesDrawn(IDirect3DRMDevice3* iface)

1 0

André Hentschel : d3drm: Implement IDirect3DRMDeviceX_ [Get|Set]RenderMode.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 2ab69db4c300c62934a4e67c6dd1dedebf4c8df4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ab69db4c300c62934a4e67c6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 27 15:35:34 2012 +0200 d3drm: Implement IDirect3DRMDeviceX_[Get|Set]RenderMode. --- dlls/d3drm/device.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index cd2cda3..7d29236 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -41,6 +41,7 @@ typedef struct { LONG ref; BOOL dither; D3DRMRENDERQUALITY quality; + DWORD rendermode; } IDirect3DRMDeviceImpl; static inline IDirect3DRMDeviceImpl *impl_from_IDirect3DRMDevice2(IDirect3DRMDevice2 *iface) @@ -444,18 +445,18 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_SetRenderMode(IDirect3DRMDevice2* i { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - FIXME("(%p/%p)->(%u): stub\n", iface, This, dwFlags); + TRACE("(%p/%p)->(%u)\n", iface, This, dwFlags); - return E_NOTIMPL; + return IDirect3DRMDevice3_SetRenderMode(&This->IDirect3DRMDevice3_iface, dwFlags); } static DWORD WINAPI IDirect3DRMDevice2Impl_GetRenderMode(IDirect3DRMDevice2* iface) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetRenderMode(&This->IDirect3DRMDevice3_iface); } static HRESULT WINAPI IDirect3DRMDevice2Impl_GetDirect3DDevice2(IDirect3DRMDevice2* iface, @@ -869,18 +870,20 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_SetRenderMode(IDirect3DRMDevice3* i { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - FIXME("(%p/%p)->(%u): stub\n", iface, This, dwFlags); + TRACE("(%p/%p)->(%u)\n", iface, This, dwFlags); - return E_NOTIMPL; + This->rendermode = dwFlags; + + return D3DRM_OK; } static DWORD WINAPI IDirect3DRMDevice3Impl_GetRenderMode(IDirect3DRMDevice3* iface) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return E_NOTIMPL; + return This->rendermode; } static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice2(IDirect3DRMDevice3* iface,

1 0

André Hentschel : d3drm: Implement IDirect3DRMDeviceX_ [Get|Set]Quality.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 66262eea55ce710740493e4e318ea44923cea8cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=66262eea55ce710740493e4e3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 27 15:35:01 2012 +0200 d3drm: Implement IDirect3DRMDeviceX_[Get|Set]Quality. --- dlls/d3drm/device.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 9ad9367..cd2cda3 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -40,6 +40,7 @@ typedef struct { IDirect3DRMWinDevice IDirect3DRMWinDevice_iface; LONG ref; BOOL dither; + D3DRMRENDERQUALITY quality; } IDirect3DRMDeviceImpl; static inline IDirect3DRMDeviceImpl *impl_from_IDirect3DRMDevice2(IDirect3DRMDevice2 *iface) @@ -301,9 +302,9 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_SetQuality(IDirect3DRMDevice2* ifac { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - FIXME("(%p/%p)->(%u): stub\n", iface, This, quality); + TRACE("(%p/%p)->(%u)\n", iface, This, quality); - return E_NOTIMPL; + return IDirect3DRMDevice3_SetQuality(&This->IDirect3DRMDevice3_iface, quality); } static HRESULT WINAPI IDirect3DRMDevice2Impl_SetTextureQuality(IDirect3DRMDevice2* iface, @@ -384,9 +385,9 @@ static D3DRMRENDERQUALITY WINAPI IDirect3DRMDevice2Impl_GetQuality(IDirect3DRMDe { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetQuality(&This->IDirect3DRMDevice3_iface); } static D3DCOLORMODEL WINAPI IDirect3DRMDevice2Impl_GetColorModel(IDirect3DRMDevice2* iface) @@ -723,9 +724,11 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_SetQuality(IDirect3DRMDevice3* ifac { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - FIXME("(%p/%p)->(%u): stub\n", iface, This, quality); + TRACE("(%p/%p)->(%u)\n", iface, This, quality); - return E_NOTIMPL; + This->quality = quality; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMDevice3Impl_SetTextureQuality(IDirect3DRMDevice3* iface, @@ -806,9 +809,9 @@ static D3DRMRENDERQUALITY WINAPI IDirect3DRMDevice3Impl_GetQuality(IDirect3DRMDe { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return E_NOTIMPL; + return This->quality; } static D3DCOLORMODEL WINAPI IDirect3DRMDevice3Impl_GetColorModel(IDirect3DRMDevice3* iface)

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2012