January 2017 - Wine-commits

Huw Davies : comctl32: Correctly set the colour table for ILC_COLOR4 and ILC_COLOR8 imagelists.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 2dd0fb880c005cd5660928d1646a117407cec238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dd0fb880c005cd5660928d16… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 30 18:54:07 2017 +0000 comctl32: Correctly set the colour table for ILC_COLOR4 and ILC_COLOR8 imagelists. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 42 +++++++-- dlls/comctl32/tests/imagelist.c | 203 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 239 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2dd0fb880c005cd566092…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 2a37605ef66455a78d30b728433ba00e06001724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a37605ef66455a78d30b7284… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Jan 27 22:03:59 2017 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/lt.po b/po/lt.po index cd73cb9..bc1054e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,11 +1,11 @@ # Lithuanian translations for Wine -# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014, 2015, 2016. +# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014, 2015, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-11-09 23:09+0300\n" +"PO-Revision-Date: 2017-01-27 22:03+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -8364,10 +8364,8 @@ msgid "Wine Control Panel" msgstr "„Wine“ valdymo skydelis" #: shell32.rc:195 -#, fuzzy -#| msgid "Unable to display Run File dialog box (internal error)" msgid "Unable to display Run dialog box (internal error)" -msgstr "Nepavyko parodyti failo paleidimo dialogo lango (vidinė klaida)" +msgstr "Nepavyko parodyti paleidimo dialogo lango (vidinė klaida)" #: shell32.rc:196 msgid "Unable to display Browse dialog box (internal error)"

1 0

Bruno Jesus : winmm: Fix the ordinal number for function PlaySound.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 00046b816ca0cacbbebe1957326ed45abe24c097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00046b816ca0cacbbebe19573… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Jan 27 19:14:40 2017 -0200 winmm: Fix the ordinal number for function PlaySound. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/wave.c | 6 ++++++ dlls/winmm/winmm.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index d6019f9..a8a5e8d 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1656,6 +1656,12 @@ static void test_PlaySound(void) { BOOL br; char test_file[MAX_PATH], temp[MAX_PATH], *exts; + void *psound_ordinal, *psound_name; + HMODULE dll = GetModuleHandleA("winmm.dll"); + + psound_name = GetProcAddress(dll, "PlaySound"); + psound_ordinal = GetProcAddress(dll, (LPCSTR) 2); + ok(psound_name == psound_ordinal, "Expected ordinal 2 to be PlaySound function\n"); if(waveOutGetNumDevs() == 0) { skip("No output devices available\n"); diff --git a/dlls/winmm/winmm.spec b/dlls/winmm/winmm.spec index 3d5272c..9c6ed2d 100644 --- a/dlls/winmm/winmm.spec +++ b/dlls/winmm/winmm.spec @@ -1,5 +1,5 @@ # ordinal exports -1 stdcall @(ptr long long) PlaySoundA +2 stdcall @(ptr long long) PlaySoundA 3 stub @ 4 stub @

1 0

Nikolay Sivov : oledb32: Fixed IDataInitialize definition.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 37fcb0d630545f4b8daf96d6da65a04cfd7dc85e URL: http://source.winehq.org/git/wine.git/?a=commit;h=37fcb0d630545f4b8daf96d6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 29 21:30:23 2017 +0300 oledb32: Fixed IDataInitialize definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/datainit.c | 10 +++++----- include/msdasc.idl | 10 ++++++++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 42d5dae..8d6b8ef 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -918,13 +918,13 @@ static HRESULT WINAPI datainit_CreateDBInstance(IDataInitialize *iface, REFCLSID return CoCreateInstance(provider, outer, clsctx, riid, (void**)datasource); } -static HRESULT WINAPI datainit_RemoteCreateDBInstanceEx(IDataInitialize *iface, REFCLSID clsidProvider, - IUnknown *pUnkOuter, DWORD dwClsCtx, LPWSTR pwszReserved, COSERVERINFO *pServerInfo, - DWORD cmq, GUID **rgpIID, IUnknown **rgpItf, HRESULT *rghr) +static HRESULT WINAPI datainit_CreateDBInstanceEx(IDataInitialize *iface, REFCLSID provider, IUnknown *outer, + DWORD clsctx, LPWSTR reserved, COSERVERINFO *server_info, DWORD cmq, MULTI_QI *results) { datainit *This = impl_from_IDataInitialize(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s %p %#x %s %p %u %p)\n", This, debugstr_guid(provider), outer, clsctx, + debugstr_w(reserved), server_info, cmq, results); return E_NOTIMPL; } @@ -958,7 +958,7 @@ static const struct IDataInitializeVtbl datainit_vtbl = datainit_GetDataSource, datainit_GetInitializationString, datainit_CreateDBInstance, - datainit_RemoteCreateDBInstanceEx, + datainit_CreateDBInstanceEx, datainit_LoadStringFromStorage, datainit_WriteStringToStorage }; diff --git a/include/msdasc.idl b/include/msdasc.idl index e3efb1d..6a904ba 100644 --- a/include/msdasc.idl +++ b/include/msdasc.idl @@ -102,10 +102,16 @@ library MSDASC [in] DWORD dwClsCtx, [in] LPWSTR pwszReserved, [in] REFIID riid, [out] IUnknown** ppDataSource); + [local] + HRESULT CreateDBInstanceEx([in] REFCLSID clsidProvider, [in] IUnknown* pUnkOuter, + [in] DWORD dwClsCtx, [in] LPWSTR pwszReserved, [in] COSERVERINFO* pServerInfo, + [in] DWORD cmq, [in, out, size_is(cmq)] MULTI_QI *results); + + [call_as(CreateDBInstanceEx)] HRESULT RemoteCreateDBInstanceEx([in] REFCLSID clsidProvider, [in] IUnknown* pUnkOuter, [in] DWORD dwClsCtx, [in] LPWSTR pwszReserved, [in] COSERVERINFO* pServerInfo, - [in] DWORD cmq, [in] GUID** rgpIID, [out] IUnknown** rgpItf, - [out] HRESULT* rghr); + [in] DWORD cmq, [in, size_is(cmq)] const IID **iids, [out, size_is(cmq)] IUnknown **ifs, + [out, size_is(cmq)] HRESULT *hr); HRESULT LoadStringFromStorage([in] LPWSTR pwszFileName, [out] LPWSTR* ppwszInitializationString);

1 0

Alex Henrie : ddraw: Don' t crash if writing out a new ddraw1 surface segfaults.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: d9f2b4627af575ebcd28395d9ba3744cab6c5f36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9f2b4627af575ebcd28395d9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jan 28 15:34:03 2017 -0700 ddraw: Don't crash if writing out a new ddraw1 surface segfaults. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 22 ++++++++++++++++------ dlls/ddraw/tests/ddraw1.c | 2 ++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e313a75..b8e2f57 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -26,6 +26,8 @@ #include "ddraw_private.h" +#include "wine/exception.h" + WINE_DEFAULT_DEBUG_CHANNEL(ddraw); static const struct ddraw *exclusive_ddraw; @@ -2974,14 +2976,22 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, DDSD_to_DDSD2(surface_desc, &surface_desc2); hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 1); wined3d_mutex_unlock(); - if (FAILED(hr)) + + __TRY { - *surface = NULL; - return hr; + if (FAILED(hr)) + { + *surface = NULL; + break; + } + *surface = &impl->IDirectDrawSurface_iface; + impl->ifaceToRelease = NULL; } - - *surface = &impl->IDirectDrawSurface_iface; - impl->ifaceToRelease = NULL; + __EXCEPT_PAGE_FAULT + { + hr = E_INVALIDARG; + } + __ENDTRY; return hr; } diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ed4c5ec..ff88b74 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1967,6 +1967,8 @@ static void test_surface_qi(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; surface_desc.dwWidth = 512; surface_desc.dwHeight = 512; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, (IDirectDrawSurface **)0xdeadbeef, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);

1 0

Alex Henrie : ddraw: Don' t crash if writing out a new ddraw2 surface segfaults.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: f6997e8fe0563da811d1627034dd95ab3a8e10af URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6997e8fe0563da811d162703… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jan 28 15:34:04 2017 -0700 ddraw: Don't crash if writing out a new ddraw2 surface segfaults. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 20 ++++++++++++++------ dlls/ddraw/tests/ddraw2.c | 2 ++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b8e2f57..1e69df4 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2924,14 +2924,22 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 2); wined3d_mutex_unlock(); - if (FAILED(hr)) + + __TRY { - *surface = NULL; - return hr; + if (FAILED(hr)) + { + *surface = NULL; + break; + } + *surface = &impl->IDirectDrawSurface_iface; + impl->ifaceToRelease = NULL; } - - *surface = &impl->IDirectDrawSurface_iface; - impl->ifaceToRelease = NULL; + __EXCEPT_PAGE_FAULT + { + hr = E_INVALIDARG; + } + __ENDTRY; return hr; } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index ce3f6de..26c2c33 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2119,6 +2119,8 @@ static void test_surface_qi(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; surface_desc.dwWidth = 512; surface_desc.dwHeight = 512; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, (IDirectDrawSurface **)0xdeadbeef, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);

1 0

Alex Henrie : ddraw: Don' t crash if writing out a new ddraw4 surface segfaults.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 1850ac577038b8a16c4f153b9f3177e959f27c82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1850ac577038b8a16c4f153b9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jan 28 15:34:05 2017 -0700 ddraw: Don't crash if writing out a new ddraw4 surface segfaults. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 22 +++++++++++++++------- dlls/ddraw/tests/ddraw4.c | 2 ++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 1e69df4..ebb2706 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2868,15 +2868,23 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, hr = ddraw_surface_create(ddraw, surface_desc, &impl, outer_unknown, 4); wined3d_mutex_unlock(); - if (FAILED(hr)) + + __TRY { - *surface = NULL; - return hr; + if (FAILED(hr)) + { + *surface = NULL; + break; + } + *surface = &impl->IDirectDrawSurface4_iface; + IDirectDraw4_AddRef(iface); + impl->ifaceToRelease = (IUnknown *)iface; } - - *surface = &impl->IDirectDrawSurface4_iface; - IDirectDraw4_AddRef(iface); - impl->ifaceToRelease = (IUnknown *)iface; + __EXCEPT_PAGE_FAULT + { + hr = E_INVALIDARG; + } + __ENDTRY; return hr; } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 1ace50a..3aec876 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2267,6 +2267,8 @@ static void test_surface_qi(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; surface_desc.dwWidth = 512; surface_desc.dwHeight = 512; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, (IDirectDrawSurface4 **)0xdeadbeef, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);

1 0

Alex Henrie : ddraw: Don' t crash if writing out a new ddraw7 surface segfaults.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: c9e29bff7bbded119e9052b6740545e70cafdcd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9e29bff7bbded119e9052b67… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jan 28 15:34:06 2017 -0700 ddraw: Don't crash if writing out a new ddraw7 surface segfaults. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 22 +++++++++++++++------- dlls/ddraw/tests/ddraw7.c | 2 ++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index ebb2706..f015b01d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2814,15 +2814,23 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * hr = ddraw_surface_create(ddraw, surface_desc, &impl, outer_unknown, 7); wined3d_mutex_unlock(); - if (FAILED(hr)) + + __TRY { - *surface = NULL; - return hr; + if (FAILED(hr)) + { + *surface = NULL; + break; + } + *surface = &impl->IDirectDrawSurface7_iface; + IDirectDraw7_AddRef(iface); + impl->ifaceToRelease = (IUnknown *)iface; } - - *surface = &impl->IDirectDrawSurface7_iface; - IDirectDraw7_AddRef(iface); - impl->ifaceToRelease = (IUnknown *)iface; + __EXCEPT_PAGE_FAULT + { + hr = E_INVALIDARG; + } + __ENDTRY; return hr; } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d802a59..44695cb 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1994,6 +1994,8 @@ static void test_surface_qi(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; surface_desc.dwWidth = 512; surface_desc.dwHeight = 512; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, (IDirectDrawSurface7 **)0xdeadbeef, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);

1 0

Matteo Bruni : d3d9/tests: Add a trace to clear_test() to show whether sRGB writes are supported.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 7e30dc8b4eadb2b7baedb9bf8ab6fb6f6d21fd53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e30dc8b4eadb2b7baedb9bf8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 27 19:52:53 2017 +0100 d3d9/tests: Add a trace to clear_test() to show whether sRGB writes are supported. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4bea1e1..601461f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -900,7 +900,7 @@ static void clear_test(void) D3DVIEWPORT9 old_vp, vp; RECT scissor; DWORD oldColorWrite; - BOOL invalid_clear_failed = FALSE; + BOOL invalid_clear_failed = FALSE, srgb_supported; IDirect3DDevice9 *device; IDirect3D9 *d3d; ULONG refcount; @@ -1149,6 +1149,9 @@ static void clear_test(void) IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); /* Test D3DRS_SRGBWRITEENABLE interactions with clears. */ + srgb_supported = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_QUERY_SRGBWRITE, D3DRTYPE_TEXTURE, D3DFMT_A8R8G8B8)); + trace("sRGB writing to D3DFMT_A8R8G8B8 is %ssupported.\n", srgb_supported ? "" : "not "); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x7f7f7f7f, 0.0, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);

1 0

Matteo Bruni : wined3d: Correctly handle GL implementations not supporting sRGB FBO attachments.
by Alexandre Julliard 30 Jan '17

30 Jan '17

Module: wine Branch: master Commit: 9fc3444d6ed8ad0e124a77d2faf1e2cc6639f40f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fc3444d6ed8ad0e124a77d2f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 27 19:52:54 2017 +0100 wined3d: Correctly handle GL implementations not supporting sRGB FBO attachments. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/utils.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 944a4a3..d456772 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3893,6 +3893,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD /* Current wined3d sRGB infrastructure requires EXT_texture_sRGB_decode * for GL_ARB_framebuffer_sRGB support (without EXT_texture_sRGB_decode * we never render to sRGB surfaces). */ + TRACE("EXT_texture_sRGB_decode is not supported, disabling ARB_framebuffer_sRGB.\n"); gl_info->supported[ARB_FRAMEBUFFER_SRGB] = FALSE; } if (gl_info->supported[ARB_OCCLUSION_QUERY]) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d7f2182..1976bc6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1220,7 +1220,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_RENDERTARGET, EXT_PACKED_FLOAT}, /* Palettized formats */ - {WINED3DFMT_P8_UINT, GL_R8, GL_R8, 0, + {WINED3DFMT_P8_UINT, GL_R8, GL_R8, 0, GL_RED, GL_UNSIGNED_BYTE, 0, 0, ARB_TEXTURE_RG, NULL}, @@ -2382,11 +2382,14 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for TRACE("Format %s's sRGB format is FBO attachable, type %u.\n", debug_d3dformat(format->id), type); format->flags[type] |= WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB; + if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + format->glInternal = format->glGammaInternal; } else { WARN("Format %s's sRGB format is not FBO attachable, type %u.\n", debug_d3dformat(format->id), type); + format_clear_flag(format, WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); } } else if (status == GL_FRAMEBUFFER_COMPLETE) @@ -2523,11 +2526,14 @@ static void init_format_fbo_compat_info(struct wined3d_caps_gl_ctx *ctx) TRACE("Format %s's sRGB format is FBO attachable, resource type %u.\n", debug_d3dformat(format->id), type); format->flags[type] |= WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB; + if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + format->glInternal = format->glGammaInternal; } else { WARN("Format %s's sRGB format is not FBO attachable, resource type %u.\n", debug_d3dformat(format->id), type); + format_clear_flag(format, WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); } } else if (format->flags[type] & WINED3DFMT_FLAG_FBO_ATTACHABLE) @@ -2739,7 +2745,8 @@ static void query_internal_format(struct wined3d_adapter *adapter, if (!(format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE))) format->glGammaInternal = format->glInternal; - else if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + else if (wined3d_settings.offscreen_rendering_mode != ORM_FBO + && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) format->glInternal = format->glGammaInternal; } } @@ -2761,7 +2768,8 @@ static void query_internal_format(struct wined3d_adapter *adapter, format->glGammaInternal = format->glInternal; format_clear_flag(format, WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); } - else if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + else if (wined3d_settings.offscreen_rendering_mode != ORM_FBO + && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) { format->glInternal = format->glGammaInternal; }

1 0