October 2015 - Wine-Commits

Bruno Jesus : msvidc32: Add missing compression messages to the list.
by Alexandre Julliard Oct. 22, 2015

Oct. 22, 2015

Module: wine Branch: master Commit: 665f308fd97264f4373f0754a10fc8338c4052fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=665f308fd97264f4373f0754a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 22 18:46:13 2015 +0800 msvidc32: Add missing compression messages to the list. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvidc32/msvideo1.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 61baa9e..b3faaf6 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -558,12 +558,15 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, break; case ICM_COMPRESS_QUERY: - FIXME("compression not implemented\n"); r = ICERR_BADFORMAT; + /* fall through */ + case ICM_COMPRESS_GET_FORMAT: + case ICM_COMPRESS_END: + case ICM_COMPRESS: + FIXME("compression not implemented\n"); break; case ICM_CONFIGURE: - r = ICERR_UNSUPPORTED; break; default:

1 0

Bruno Jesus : msvfw32/tests: Check if requesting the default codec works.
by Alexandre Julliard Oct. 22, 2015

Oct. 22, 2015

Module: wine Branch: master Commit: acd79650fe93a54413e1e994c3ec5faab263cbdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=acd79650fe93a54413e1e994c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 22 20:15:45 2015 +0800 msvfw32/tests: Check if requesting the default codec works. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/tests/msvfw.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 0b18e47..a9c4053 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -28,6 +28,29 @@ static void test_OpenCase(void) { HIC h; + ICINFO info; + /* Check if default handler works */ + h = ICOpen(mmioFOURCC('v','i','d','c'),0,ICMODE_DECOMPRESS); +todo_wine + ok(0!=h,"ICOpen(vidc.0) failed\n"); + if (h) { + info.dwSize = sizeof(info); + info.szName[0] = 0; + ICGetInfo(h, &info, sizeof(info)); + trace("The default decompressor is %s\n", wine_dbgstr_w(info.szName)); + ok(ICClose(h)==ICERR_OK,"ICClose failed\n"); + } + h = ICOpen(mmioFOURCC('v','i','d','c'),0,ICMODE_COMPRESS); +todo_wine + ok(0!=h || broken(h == 0),"ICOpen(vidc.0) failed\n"); /* Not present in Win8 */ + if (h) { + info.dwSize = sizeof(info); + info.szName[0] = 0; + ICGetInfo(h, &info, sizeof(info)); + trace("The default compressor is %s\n", wine_dbgstr_w(info.szName)); + ok(ICClose(h)==ICERR_OK,"ICClose failed\n"); + } + /* Open a compressor with combinations of lowercase * and uppercase compressortype and handler. */

1 0

Michael Stefaniuc : d3d9/tests: Test the return value of CreateDepthStencilSurface().
by Alexandre Julliard Oct. 22, 2015

Oct. 22, 2015

Module: wine Branch: master Commit: 4fb840b614691a787c76659f02c163d922f88fba URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fb840b614691a787c76659f0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 21 15:38:06 2015 +0200 d3d9/tests: Test the return value of CreateDepthStencilSurface(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f110905..be276ee 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -16219,6 +16219,7 @@ static void resz_test(void) IDirect3DSurface9_Release(ds); hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 640, 480, D3DFMT_D24S8, D3DMULTISAMPLE_NONE, 0, TRUE, &ds, NULL); + ok(SUCCEEDED(hr), "Failed to create depth stencil surface, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderTarget(device, 0, readback); ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); @@ -19777,6 +19778,7 @@ static void test_depthbias(void) hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 640, 480, formats[i], D3DMULTISAMPLE_NONE, 0, FALSE, &ds, NULL); + ok(SUCCEEDED(hr), "Failed to create depth stencil surface, hr %#x.\n", hr); hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); ok(SUCCEEDED(hr), "Failed to set depth stencil surface, hr %#x.\n", hr); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00000000, 0.5f, 0);

1 0

Jacek Caban : windns.h: Added missing DNS_QUERY_* constants.
by Alexandre Julliard Oct. 22, 2015

Oct. 22, 2015

Module: wine Branch: master Commit: 8d357fc11c41fe1505196ac50c94db4ccefd6e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d357fc11c41fe1505196ac50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 22 11:29:20 2015 +0200 windns.h: Added missing DNS_QUERY_* constants. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windns.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/windns.h b/include/windns.h index 7b11e3a..f150919 100644 --- a/include/windns.h +++ b/include/windns.h @@ -96,8 +96,16 @@ extern "C" { #define DNS_QUERY_NO_NETBT 0x00000080 #define DNS_QUERY_WIRE_ONLY 0x00000100 #define DNS_QUERY_RETURN_MESSAGE 0x00000200 +#define DNS_QUERY_MULTICAST_ONLY 0x00000400 +#define DNS_QUERY_NO_MULTICAST 0x00000800 #define DNS_QUERY_TREAT_AS_FQDN 0x00001000 +#define DNS_QUERY_ADDRCONFIG 0x00002000 +#define DNS_QUERY_DUAL_ADDR 0x00004000 #define DNS_QUERY_DONT_RESET_TTL_VALUES 0x00100000 +#define DNS_QUERY_DISABLE_IDN_ENCODING 0x00200000 +#define DNS_QUERY_APPEND_MULTILABEL 0x00800000 +#define DNS_QUERY_DNSSEC_OK 0x01000000 +#define DNS_QUERY_DNSSEC_CHECKING_DISABLED 0x02000000 #define DNS_QUERY_RESERVED 0xff000000 typedef enum _DNS_NAME_FORMAT

1 0

Hans Leidekker : webservices: Add support for character set detection.
by Alexandre Julliard Oct. 22, 2015

Oct. 22, 2015

Module: wine Branch: master Commit: ce71c50f30749465f0de4959ce0a197b20ada8f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce71c50f30749465f0de4959c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 22 11:30:07 2015 +0200 webservices: Add support for character set detection. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 77 +++++++++++++++++++++++++++++---- dlls/webservices/tests/reader.c | 95 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 154 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce71c50f30749465f0de4…

1 0

Jacek Caban : winerror.h: Added DNS_REQUEST_PENDING error code.
by Alexandre Julliard Oct. 22, 2015

Oct. 22, 2015

Module: wine Branch: master Commit: f38829921f19e0c2a3e4b294e8d775c3be399bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f38829921f19e0c2a3e4b294e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 22 11:27:39 2015 +0200 winerror.h: Added DNS_REQUEST_PENDING error code. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winerror.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winerror.h b/include/winerror.h index 87419d1..c524798 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -1778,6 +1778,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define DNS_ERROR_NO_PACKET 9503 #define DNS_ERROR_RCODE 9504 #define DNS_ERROR_UNSECURE_PACKET 9505 +#define DNS_REQUEST_PENDING 9506 #define DNS_ERROR_INVALID_TYPE 9551 #define DNS_ERROR_INVALID_IP_ADDRESS 9552 #define DNS_ERROR_INVALID_PROPERTY 9553

1 0

Jacek Caban : ole32: Call CoCreateInstanceEx from CoCreateInstance instead of the other way around.
by Alexandre Julliard Oct. 22, 2015

Oct. 22, 2015

Module: wine Branch: master Commit: c5b54b34e97cd23a04c34b8518c8ac934e6e2dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5b54b34e97cd23a04c34b851… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 21 16:24:48 2015 +0200 ole32: Call CoCreateInstanceEx from CoCreateInstance instead of the other way around. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 151 +++++++++++++++++++++++---------------------------- 1 file changed, 68 insertions(+), 83 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index c04d2f0..b3c49d3 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3187,10 +3187,8 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance( REFIID iid, LPVOID *ppv) { + MULTI_QI multi_qi = { iid }; HRESULT hres; - LPCLASSFACTORY lpclf = 0; - APARTMENT *apt; - CLSID clsid; TRACE("(rclsid=%s, pUnkOuter=%p, dwClsContext=%08x, riid=%s, ppv=%p)\n", debugstr_guid(rclsid), pUnkOuter, dwClsContext, debugstr_guid(iid), ppv); @@ -3198,65 +3196,8 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance( if (ppv==0) return E_POINTER; - hres = CoGetTreatAsClass(rclsid, &clsid); - if(FAILED(hres)) - clsid = *rclsid; - - *ppv = 0; - - if (!(apt = COM_CurrentApt())) - { - if (!(apt = apartment_find_multi_threaded())) - { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; - } - apartment_release(apt); - } - - /* - * The Standard Global Interface Table (GIT) object is a process-wide singleton. - */ - if (IsEqualIID(&clsid, &CLSID_StdGlobalInterfaceTable)) - { - IGlobalInterfaceTable *git = get_std_git(); - hres = IGlobalInterfaceTable_QueryInterface(git, iid, ppv); - if (hres != S_OK) return hres; - - TRACE("Retrieved GIT (%p)\n", *ppv); - return S_OK; - } - - if (IsEqualCLSID(&clsid, &CLSID_ManualResetEvent)) - return ManualResetEvent_Construct(pUnkOuter, iid, ppv); - - /* - * Get a class factory to construct the object we want. - */ - hres = CoGetClassObject(&clsid, - dwClsContext, - NULL, - &IID_IClassFactory, - (LPVOID)&lpclf); - - if (FAILED(hres)) - return hres; - - /* - * Create the object and don't forget to release the factory - */ - hres = IClassFactory_CreateInstance(lpclf, pUnkOuter, iid, ppv); - IClassFactory_Release(lpclf); - if (FAILED(hres)) - { - if (hres == CLASS_E_NOAGGREGATION && pUnkOuter) - FIXME("Class %s does not support aggregation\n", debugstr_guid(&clsid)); - else - FIXME("no instance created for interface %s of class %s, hres is 0x%08x\n", - debugstr_guid(iid), - debugstr_guid(&clsid),hres); - } - + hres = CoCreateInstanceEx(rclsid, pUnkOuter, dwClsContext, NULL, 1, &multi_qi); + *ppv = multi_qi.pItf; return hres; } @@ -3309,33 +3250,77 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( ULONG cmq, MULTI_QI* pResults) { - IUnknown* pUnk = NULL; - HRESULT hr; + IUnknown *unk = NULL; + IClassFactory *cf; + APARTMENT *apt; + CLSID clsid; + HRESULT hres; - /* - * Sanity check - */ - if ( (cmq==0) || (pResults==NULL)) - return E_INVALIDARG; + TRACE("(%s %p %x %p %u %p)\n", debugstr_guid(rclsid), pUnkOuter, dwClsContext, pServerInfo, cmq, pResults); - if (pServerInfo!=NULL) - FIXME("() non-NULL pServerInfo not supported!\n"); + if (!cmq || !pResults) + return E_INVALIDARG; - init_multi_qi(cmq, pResults); + if (pServerInfo) + FIXME("() non-NULL pServerInfo not supported!\n"); - /* - * Get the object and get its IUnknown pointer. - */ - hr = CoCreateInstance(rclsid, - pUnkOuter, - dwClsContext, - pResults[0].pIID, - (VOID**)&pUnk); + init_multi_qi(cmq, pResults); - if (hr != S_OK) - return hr; + hres = CoGetTreatAsClass(rclsid, &clsid); + if(FAILED(hres)) + clsid = *rclsid; + + if (!(apt = COM_CurrentApt())) + { + if (!(apt = apartment_find_multi_threaded())) + { + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; + } + apartment_release(apt); + } + + /* + * The Standard Global Interface Table (GIT) object is a process-wide singleton. + */ + if (IsEqualIID(&clsid, &CLSID_StdGlobalInterfaceTable)) + { + IGlobalInterfaceTable *git = get_std_git(); + TRACE("Retrieving GIT\n"); + return return_multi_qi((IUnknown*)git, cmq, pResults, FALSE); + } + + if (IsEqualCLSID(&clsid, &CLSID_ManualResetEvent)) { + hres = ManualResetEvent_Construct(pUnkOuter, pResults[0].pIID, (void**)&unk); + if (FAILED(hres)) + return hres; + return return_multi_qi(unk, cmq, pResults, TRUE); + } + + /* + * Get a class factory to construct the object we want. + */ + hres = CoGetClassObject(&clsid, dwClsContext, NULL, &IID_IClassFactory, (void**)&cf); + if (FAILED(hres)) + return hres; + + /* + * Create the object and don't forget to release the factory + */ + hres = IClassFactory_CreateInstance(cf, pUnkOuter, pResults[0].pIID, (void**)&unk); + IClassFactory_Release(cf); + if (FAILED(hres)) + { + if (hres == CLASS_E_NOAGGREGATION && pUnkOuter) + FIXME("Class %s does not support aggregation\n", debugstr_guid(&clsid)); + else + FIXME("no instance created for interface %s of class %s, hres is 0x%08x\n", + debugstr_guid(pResults[0].pIID), + debugstr_guid(&clsid),hres); + return hres; + } - return return_multi_qi(pUnk, cmq, pResults, TRUE); + return return_multi_qi(unk, cmq, pResults, TRUE); } /***********************************************************************

1 0

Michael Cronenworth : winegcc: Check for linker relocation support before relying on prelink.
by Alexandre Julliard Oct. 22, 2015

Oct. 22, 2015

Module: wine Branch: master Commit: a35f9a13a80fa93c251e12402a73a38a89ec397f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a35f9a13a80fa93c251e12402… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Wed Oct 21 20:54:38 2015 -0500 winegcc: Check for linker relocation support before relying on prelink. Prelink was used to rewrite binares and set their text segment, but modern linkers support setting the value at link time. Prelink is being retired by upstream. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 36 +++++++++++++++++++++++++++++++----- configure.ac | 11 ++++++----- tools/winegcc/winegcc.c | 13 ++++++++++--- 3 files changed, 47 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 6689b65..f21a860 100755 --- a/configure +++ b/configure @@ -8678,7 +8678,32 @@ if test "x$ac_cv_cflags__Wl___section_start__interp_0x7bf00400" = xyes; then : esac fi - # Extract the first word of "prelink", so it can be a program name with args. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000" >&5 +$as_echo_n "checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000... " >&6; } +if ${ac_cv_cflags__Wl__Ttext_segment_0x7bc00000+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wl,-Ttext-segment=0x7bc00000" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wl__Ttext_segment_0x7bc00000=yes +else + ac_cv_cflags__Wl__Ttext_segment_0x7bc00000=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" >&5 +$as_echo "$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" >&6; } +if test "x$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" = xyes; then : + : +else + # Extract the first word of "prelink", so it can be a program name with args. set dummy prelink; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -8719,10 +8744,11 @@ $as_echo "no" >&6; } fi - if test "x$PRELINK" = xfalse - then - as_fn_append wine_warnings "|prelink not found, base address of core dlls won't be set correctly." - fi + if test "x$PRELINK" = xfalse + then + as_fn_append wine_warnings "|prelink not found and linker does not support relocation, base address of core dlls won't be set correctly." + fi +fi ;; esac diff --git a/configure.ac b/configure.ac index 030aa32..a209fa1 100644 --- a/configure.ac +++ b/configure.ac @@ -988,11 +988,12 @@ wine-installed: main.o *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;; esac ]) - AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH]) - if test "x$PRELINK" = xfalse - then - WINE_WARNING([prelink not found, base address of core dlls won't be set correctly.]) - fi + WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000],[:], + [AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH]) + if test "x$PRELINK" = xfalse + then + WINE_WARNING([prelink not found and linker does not support relocation, base address of core dlls won't be set correctly.]) + fi]) ;; esac diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 3b2794e..ad139f5 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -776,6 +776,7 @@ static void build(struct options* opts) char *output_file; const char *spec_o_name; const char *output_name, *spec_file, *lang; + const char *prelink = NULL; int generate_app_loader = 1; int fake_module = 0; unsigned int j; @@ -1134,6 +1135,13 @@ static void build(struct options* opts) } break; default: + if (opts->image_base) + { + if (!try_link(opts->prefix, link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base))) + strarray_add(link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base)); + else + prelink = PRELINK; + } break; } @@ -1167,10 +1175,9 @@ static void build(struct options* opts) spawn(opts->prefix, link_args, 0); strarray_free (link_args); - /* set the base address */ - if (opts->image_base && !opts->target) + /* set the base address with prelink if linker support is not present */ + if (prelink && !opts->target) { - const char *prelink = PRELINK; if (prelink[0] && strcmp(prelink,"false")) { strarray *prelink_args = strarray_alloc();

1 0

Riccardo Bortolato : d3d9: Avoid using a wined3d_surface in get_desc calls inside d3d9_device_StretchRect.
by Alexandre Julliard Oct. 22, 2015

Oct. 22, 2015

Module: wine Branch: master Commit: 46b717c509f0c92a768ef3f3b192ad6a20c4697a URL: http://source.winehq.org/git/wine.git/?a=commit;h=46b717c509f0c92a768ef3f3b… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Oct 21 15:09:45 2015 +0200 d3d9: Avoid using a wined3d_surface in get_desc calls inside d3d9_device_StretchRect. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f8ce284..4af6ffb 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1302,17 +1302,17 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect struct d3d9_surface *dst = unsafe_impl_from_IDirect3DSurface9(dst_surface); HRESULT hr = D3DERR_INVALIDCALL; struct wined3d_resource_desc src_desc, dst_desc; - struct wined3d_resource *wined3d_resource; + struct wined3d_resource *sub_resource; TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_rect %p, filter %#x.\n", iface, src_surface, src_rect, dst_surface, dst_rect, filter); wined3d_mutex_lock(); - wined3d_resource = wined3d_surface_get_resource(dst->wined3d_surface); - wined3d_resource_get_desc(wined3d_resource, &dst_desc); + sub_resource = wined3d_texture_get_sub_resource(dst->wined3d_texture, dst->sub_resource_idx); + wined3d_resource_get_desc(sub_resource, &dst_desc); - wined3d_resource = wined3d_surface_get_resource(src->wined3d_surface); - wined3d_resource_get_desc(wined3d_resource, &src_desc); + sub_resource = wined3d_texture_get_sub_resource(src->wined3d_texture, src->sub_resource_idx); + wined3d_resource_get_desc(sub_resource, &src_desc); if (src_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) {

1 0

Matteo Bruni : wined3d: Add a format fixup for INTZ on core profile.
by Alexandre Julliard Oct. 22, 2015

Oct. 22, 2015

Module: wine Branch: master Commit: 59cb65b1531962b4e5eaa98292c9b82c88bf4b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59cb65b1531962b4e5eaa9829… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 22 00:20:57 2015 +0200 wined3d: Add a format fixup for INTZ on core profile. 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/utils.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9c4fdd9..e7f9cbd 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2533,6 +2533,13 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].height_scale.denominator = 2; gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_NV12); + if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + { + idx = getFmtIdx(WINED3DFMT_INTZ); + gl_info->formats[idx].color_fixup = create_color_fixup_desc( + 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X); + } + if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { idx = getFmtIdx(WINED3DFMT_P8_UINT);

1 0