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

Alexandre Julliard : winex11: Move ChoosePixelFormat implementation to opengl32 and base it on DescribePixelFormat .
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: 81cd178ae1baea33212acf7d7e8e65d354e50492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81cd178ae1baea33212acf7d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 25 21:51:16 2012 +0200 winex11: Move ChoosePixelFormat implementation to opengl32 and base it on DescribePixelFormat. --- dlls/gdi32/opengl.c | 18 ++++ dlls/gdi32/painting.c | 29 ------- dlls/opengl32/wgl.c | 159 +++++++++++++++++++++++++++++++++++- dlls/winex11.drv/opengl.c | 200 +-------------------------------------------- 4 files changed, 175 insertions(+), 231 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81cd178ae1baea33212ac…

1 0

Dmitry Timoshkov : windowscodecs: Implement TiffFrameDecode_GetThumbnail.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: 2d3cf48300cbb731d0be9b0f5fbb9fc3df29109a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d3cf48300cbb731d0be9b0f5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 25 12:27:22 2012 +0900 windowscodecs: Implement TiffFrameDecode_GetThumbnail. --- dlls/windowscodecs/tiffformat.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index a64d65f..5351098 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1096,8 +1096,12 @@ static HRESULT WINAPI TiffFrameDecode_GetColorContexts(IWICBitmapFrameDecode *if static HRESULT WINAPI TiffFrameDecode_GetThumbnail(IWICBitmapFrameDecode *iface, IWICBitmapSource **ppIThumbnail) { - FIXME("(%p,%p): stub\n", iface, ppIThumbnail); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIThumbnail); + + if (!ppIThumbnail) return E_INVALIDARG; + + *ppIThumbnail = NULL; + return WINCODEC_ERR_CODECNOTHUMBNAIL; } static const IWICBitmapFrameDecodeVtbl TiffFrameDecode_Vtbl = {

1 0

Alexandre Julliard : gdi32: Forward SwapBuffers to opengl32 which in turn calls GdiSwapBuffers.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: 67e7eda96c16417526e9659be0eeecf2b6edd4c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67e7eda96c16417526e9659be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 25 22:45:28 2012 +0200 gdi32: Forward SwapBuffers to opengl32 which in turn calls GdiSwapBuffers. --- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/opengl.c | 15 +++++++++++++++ dlls/gdi32/painting.c | 12 +++--------- dlls/opengl32/wgl.c | 5 +++-- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 98fe5c6..2a7edc3 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -218,7 +218,7 @@ @ stub GdiSetServerAttr # @ stub GdiStartDocEMF # @ stub GdiStartPageEMF -# @ stub GdiSwapBuffers +@ stdcall GdiSwapBuffers(long) @ stdcall GdiTransparentBlt(long long long long long long long long long long long) # @ stub GdiValidateHandle @ stub GdiWinWatchClose diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index 18b5fcb..d2ab2aa 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -43,6 +43,7 @@ static HMODULE opengl32; static INT (WINAPI *wglChoosePixelFormat)(HDC,const PIXELFORMATDESCRIPTOR *); static INT (WINAPI *wglDescribePixelFormat)(HDC,INT,UINT,PIXELFORMATDESCRIPTOR*); static BOOL (WINAPI *wglSetPixelFormat)(HDC,INT,const PIXELFORMATDESCRIPTOR*); +static BOOL (WINAPI *wglSwapBuffers)(HDC); static HDC default_hdc = 0; @@ -267,3 +268,17 @@ BOOL WINAPI SetPixelFormat( HDC hdc, INT fmt, const PIXELFORMATDESCRIPTOR *pfd ) } return wglSetPixelFormat( hdc, fmt, pfd ); } + +/****************************************************************************** + * SwapBuffers (GDI32.@) + */ +BOOL WINAPI SwapBuffers( HDC hdc ) +{ + if (!wglSwapBuffers) + { + if (!opengl32) opengl32 = LoadLibraryW( opengl32W ); + if (!(wglSwapBuffers = (void *)GetProcAddress( opengl32, "wglSwapBuffers" ))) + return 0; + } + return wglSwapBuffers( hdc ); +} diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 4be8cb3..571a96b 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -562,17 +562,11 @@ INT WINAPI GdiDescribePixelFormat( HDC hdc, INT iPixelFormat, UINT nBytes, /****************************************************************************** - * SwapBuffers [GDI32.@] - * Exchanges front and back buffers of window + * GdiSwapBuffers [GDI32.@] * - * PARAMS - * hdc [I] Device context whose buffers get swapped - * - * RETURNS - * Success: TRUE - * Failure: FALSE + * Probably not the correct semantics, it's supposed to be an internal backend for SwapBuffers. */ -BOOL WINAPI SwapBuffers( HDC hdc ) +BOOL WINAPI GdiSwapBuffers( HDC hdc ) { INT bRet = FALSE; DC * dc = get_dc_ptr( hdc ); diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 328cb63..79aefcd 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -90,6 +90,7 @@ const GLubyte * WINAPI wine_glGetString( GLenum name ); /* internal GDI functions */ extern INT WINAPI GdiDescribePixelFormat( HDC hdc, INT fmt, UINT size, PIXELFORMATDESCRIPTOR *pfd ); extern BOOL WINAPI GdiSetPixelFormat( HDC hdc, INT fmt, const PIXELFORMATDESCRIPTOR *pfd ); +extern BOOL WINAPI GdiSwapBuffers( HDC hdc ); /*********************************************************************** * wglSetPixelFormat(OPENGL32.@) @@ -560,7 +561,7 @@ BOOL WINAPI wglSwapLayerBuffers(HDC hdc, TRACE_(opengl)("(%p, %08x)\n", hdc, fuPlanes); if (fuPlanes & WGL_SWAP_MAIN_PLANE) { - if (!SwapBuffers(hdc)) return FALSE; + if (!GdiSwapBuffers(hdc)) return FALSE; fuPlanes &= ~WGL_SWAP_MAIN_PLANE; } @@ -1062,7 +1063,7 @@ void WINAPI wine_glGetIntegerv( GLenum pname, GLint* params ) */ BOOL WINAPI DECLSPEC_HOTPATCH wglSwapBuffers( HDC hdc ) { - return SwapBuffers(hdc); + return GdiSwapBuffers(hdc); } /* This is for brain-dead applications that use OpenGL functions before even

1 0

Vincent Povirk : windowscodecs: Implement PixelFormatInfo_GetBitsPerPixel.
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: 9dbd0833bc822edda2832be27ffda8f6ef58441d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dbd0833bc822edda2832be27… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 16 15:40:35 2012 -0500 windowscodecs: Implement PixelFormatInfo_GetBitsPerPixel. --- dlls/windowscodecs/info.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index b67eddd..815c775 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -46,6 +46,7 @@ static const WCHAR containerformat_valuename[] = {'C','o','n','t','a','i','n','e static const WCHAR metadataformat_valuename[] = {'M','e','t','a','d','a','t','a','F','o','r','m','a','t',0}; static const WCHAR vendor_valuename[] = {'V','e','n','d','o','r',0}; static const WCHAR version_valuename[] = {'V','e','r','s','i','o','n',0}; +static const WCHAR bitsperpixel_valuename[] = {'B','i','t','L','e','n','g','t','h',0}; static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, UINT buffer_size, WCHAR *buffer, UINT *actual_size) @@ -106,6 +107,27 @@ static HRESULT ComponentInfo_GetGUIDValue(HKEY classkey, LPCWSTR value, return hr; } +static HRESULT ComponentInfo_GetDWORDValue(HKEY classkey, LPCWSTR value, + DWORD *result) +{ + LONG ret; + DWORD cbdata = sizeof(DWORD); + + if (!result) + return E_INVALIDARG; + + ret = RegGetValueW(classkey, NULL, value, RRF_RT_DWORD, NULL, + result, &cbdata); + + if (ret == ERROR_FILE_NOT_FOUND) + { + *result = 0; + return S_OK; + } + + return HRESULT_FROM_WIN32(ret); +} + typedef struct { IWICBitmapDecoderInfo IWICBitmapDecoderInfo_iface; LONG ref; @@ -1231,8 +1253,11 @@ static HRESULT WINAPI PixelFormatInfo_GetColorContext(IWICPixelFormatInfo2 *ifac static HRESULT WINAPI PixelFormatInfo_GetBitsPerPixel(IWICPixelFormatInfo2 *iface, UINT *puiBitsPerPixel) { - FIXME("(%p,%p): stub\n", iface, puiBitsPerPixel); - return E_NOTIMPL; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + + TRACE("(%p,%p)\n", iface, puiBitsPerPixel); + + return ComponentInfo_GetDWORDValue(This->classkey, bitsperpixel_valuename, puiBitsPerPixel); } static HRESULT WINAPI PixelFormatInfo_GetChannelCount(IWICPixelFormatInfo2 *iface,

1 0

Vincent Povirk : windowscodecs: Implement PixelFormatInfo_GetChannelCount.
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: 80f6890616a833ab81453fd79f4a5837b2888123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f6890616a833ab81453fd79… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 16 16:03:57 2012 -0500 windowscodecs: Implement PixelFormatInfo_GetChannelCount. --- dlls/windowscodecs/info.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 815c775..b520f82 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -47,6 +47,7 @@ static const WCHAR metadataformat_valuename[] = {'M','e','t','a','d','a','t','a' static const WCHAR vendor_valuename[] = {'V','e','n','d','o','r',0}; static const WCHAR version_valuename[] = {'V','e','r','s','i','o','n',0}; static const WCHAR bitsperpixel_valuename[] = {'B','i','t','L','e','n','g','t','h',0}; +static const WCHAR channelcount_valuename[] = {'C','h','a','n','n','e','l','C','o','u','n','t',0}; static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, UINT buffer_size, WCHAR *buffer, UINT *actual_size) @@ -1263,8 +1264,11 @@ static HRESULT WINAPI PixelFormatInfo_GetBitsPerPixel(IWICPixelFormatInfo2 *ifac static HRESULT WINAPI PixelFormatInfo_GetChannelCount(IWICPixelFormatInfo2 *iface, UINT *puiChannelCount) { - FIXME("(%p,%p): stub\n", iface, puiChannelCount); - return E_NOTIMPL; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + + TRACE("(%p,%p)\n", iface, puiChannelCount); + + return ComponentInfo_GetDWORDValue(This->classkey, channelcount_valuename, puiChannelCount); } static HRESULT WINAPI PixelFormatInfo_GetChannelMask(IWICPixelFormatInfo2 *iface,

1 0

Vincent Povirk : windowscodecs: Implement IWICPixelFormatInfo:: GetFormatGUID.
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: c8fea25a33cbf1e29386ca484ad897d247fc32d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8fea25a33cbf1e29386ca484… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 13 10:20:48 2012 -0500 windowscodecs: Implement IWICPixelFormatInfo::GetFormatGUID. --- dlls/windowscodecs/info.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index f6c7fd0..21c291b 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1241,8 +1241,15 @@ static HRESULT WINAPI PixelFormatInfo_GetFriendlyName(IWICPixelFormatInfo2 *ifac static HRESULT WINAPI PixelFormatInfo_GetFormatGUID(IWICPixelFormatInfo2 *iface, GUID *pFormat) { - FIXME("(%p,%p): stub\n", iface, pFormat); - return E_NOTIMPL; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + TRACE("(%p,%p)\n", iface, pFormat); + + if (!pFormat) + return E_INVALIDARG; + + *pFormat = This->clsid; + + return S_OK; } static HRESULT WINAPI PixelFormatInfo_GetColorContext(IWICPixelFormatInfo2 *iface,

1 0

Vincent Povirk : windowscodecs: Implement IWICPixelFormatInfo2:: GetNumericRepresentation.
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: 9ceb1fc188de4c0138e363e72d478e7d31dee8c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ceb1fc188de4c0138e363e72… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 13 10:22:33 2012 -0500 windowscodecs: Implement IWICPixelFormatInfo2::GetNumericRepresentation. --- dlls/windowscodecs/info.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 21c291b..1b650d6 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -49,6 +49,7 @@ static const WCHAR version_valuename[] = {'V','e','r','s','i','o','n',0}; static const WCHAR bitsperpixel_valuename[] = {'B','i','t','L','e','n','g','t','h',0}; static const WCHAR channelcount_valuename[] = {'C','h','a','n','n','e','l','C','o','u','n','t',0}; static const WCHAR channelmasks_keyname[] = {'C','h','a','n','n','e','l','M','a','s','k','s',0}; +static const WCHAR numericrepresentation_valuename[] = {'N','u','m','e','r','i','c','R','e','p','r','e','s','e','n','t','a','t','i','o','n',0}; static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, UINT buffer_size, WCHAR *buffer, UINT *actual_size) @@ -1330,8 +1331,11 @@ static HRESULT WINAPI PixelFormatInfo_SupportsTransparency(IWICPixelFormatInfo2 static HRESULT WINAPI PixelFormatInfo_GetNumericRepresentation(IWICPixelFormatInfo2 *iface, WICPixelFormatNumericRepresentation *pNumericRepresentation) { - FIXME("(%p,%p): stub\n", iface, pNumericRepresentation); - return E_NOTIMPL; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + + TRACE("(%p,%p)\n", iface, pNumericRepresentation); + + return ComponentInfo_GetDWORDValue(This->classkey, numericrepresentation_valuename, pNumericRepresentation); } static const IWICPixelFormatInfo2Vtbl PixelFormatInfo_Vtbl = {

1 0

Vincent Povirk : windowscodecs: Implement IWICPixelFormatInfo:: GetChannelMask.
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: 0648e09f3c8cc5d8a2661dc17817b12ac8738005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0648e09f3c8cc5d8a2661dc17… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 13 10:11:53 2012 -0500 windowscodecs: Implement IWICPixelFormatInfo::GetChannelMask. --- dlls/windowscodecs/info.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index b520f82..f6c7fd0 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -48,6 +48,7 @@ static const WCHAR vendor_valuename[] = {'V','e','n','d','o','r',0}; static const WCHAR version_valuename[] = {'V','e','r','s','i','o','n',0}; static const WCHAR bitsperpixel_valuename[] = {'B','i','t','L','e','n','g','t','h',0}; static const WCHAR channelcount_valuename[] = {'C','h','a','n','n','e','l','C','o','u','n','t',0}; +static const WCHAR channelmasks_keyname[] = {'C','h','a','n','n','e','l','M','a','s','k','s',0}; static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, UINT buffer_size, WCHAR *buffer, UINT *actual_size) @@ -1274,8 +1275,42 @@ static HRESULT WINAPI PixelFormatInfo_GetChannelCount(IWICPixelFormatInfo2 *ifac static HRESULT WINAPI PixelFormatInfo_GetChannelMask(IWICPixelFormatInfo2 *iface, UINT uiChannelIndex, UINT cbMaskBuffer, BYTE *pbMaskBuffer, UINT *pcbActual) { - FIXME("(%p,%u,%u,%p,%p): stub\n", iface, uiChannelIndex, cbMaskBuffer, pbMaskBuffer, pcbActual); - return E_NOTIMPL; + static const WCHAR uintformatW[] = {'%','u',0}; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + UINT channel_count; + HRESULT hr; + LONG ret; + WCHAR valuename[11]; + DWORD cbData; + + TRACE("(%p,%u,%u,%p,%p)\n", iface, uiChannelIndex, cbMaskBuffer, pbMaskBuffer, pcbActual); + + if (!pcbActual) + return E_INVALIDARG; + + hr = PixelFormatInfo_GetChannelCount(iface, &channel_count); + + if (SUCCEEDED(hr) && uiChannelIndex >= channel_count) + hr = E_INVALIDARG; + + if (SUCCEEDED(hr)) + { + snprintfW(valuename, 11, uintformatW, uiChannelIndex); + + cbData = cbMaskBuffer; + + ret = RegGetValueW(This->classkey, channelmasks_keyname, valuename, RRF_RT_REG_BINARY, NULL, pbMaskBuffer, &cbData); + + if (ret == ERROR_SUCCESS || ret == ERROR_MORE_DATA) + *pcbActual = cbData; + + if (ret == ERROR_MORE_DATA) + hr = E_INVALIDARG; + else + hr = HRESULT_FROM_WIN32(ret); + } + + return hr; } static HRESULT WINAPI PixelFormatInfo_SupportsTransparency(IWICPixelFormatInfo2 *iface,

1 0

Józef Kucia : wined3d: Use the system memory pool for the logo surface.
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: d760b21ab611f5ef51af7f147d60db846cdd3433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d760b21ab611f5ef51af7f147… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Thu Jun 21 14:15:39 2012 +0200 wined3d: Use the system memory pool for the logo surface. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4c3282c..ed1ebbd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -944,7 +944,7 @@ static void device_load_logo(struct wined3d_device *device, const char *filename } hr = wined3d_surface_create(device, bm.bmWidth, bm.bmHeight, WINED3DFMT_B5G6R5_UNORM, 0, 0, - WINED3D_POOL_DEFAULT, WINED3D_MULTISAMPLE_NONE, 0, WINED3D_SURFACE_TYPE_OPENGL, WINED3D_SURFACE_MAPPABLE, + WINED3D_POOL_SYSTEM_MEM, WINED3D_MULTISAMPLE_NONE, 0, WINED3D_SURFACE_TYPE_OPENGL, WINED3D_SURFACE_MAPPABLE, NULL, &wined3d_null_parent_ops, &device->logo_surface); if (FAILED(hr)) {

1 0

Nikolay Sivov : msxml3: Accept VT_ERROR body as empty data.
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: 3ec82583d0ca47f77fe7651cef89892beea59bd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ec82583d0ca47f77fe7651ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 24 00:16:39 2012 +0400 msxml3: Accept VT_ERROR body as empty data. --- dlls/msxml3/httprequest.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 3ea7745..5700311 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -695,6 +695,7 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * break; } case VT_EMPTY: + case VT_ERROR: ptr = NULL; size = 0; break;

1 0