August 2013 - Wine-commits - list.winehq.org

Henri Verbeet : d3dx9: Simplify D3DXGetImageInfoFromResourceA().
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: aaff163ae0150cf584ef48a769384545cd2ed625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaff163ae0150cf584ef48a76… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 27 08:45:00 2013 +0200 d3dx9: Simplify D3DXGetImageInfoFromResourceA(). --- dlls/d3dx9_36/surface.c | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index f5c954f..efcf09c 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -947,28 +947,23 @@ HRESULT WINAPI D3DXGetImageInfoFromFileW(LPCWSTR file, D3DXIMAGE_INFO *info) * if we fail to load resource * */ -HRESULT WINAPI D3DXGetImageInfoFromResourceA(HMODULE module, LPCSTR resource, D3DXIMAGE_INFO *info) +HRESULT WINAPI D3DXGetImageInfoFromResourceA(HMODULE module, const char *resource, D3DXIMAGE_INFO *info) { HRSRC resinfo; + void *buffer; + DWORD size; - TRACE("(%p, %s, %p)\n", module, debugstr_a(resource), info); - - resinfo = FindResourceA(module, resource, (const char *)RT_RCDATA); - if (!resinfo) /* Try loading the resource as bitmap data (which is in DIB format D3DXIFF_DIB) */ - resinfo = FindResourceA(module, resource, (const char *)RT_BITMAP); + TRACE("module %p, resource %s, info %p.\n", module, debugstr_a(resource), info); - if (resinfo) - { - LPVOID buffer; - HRESULT hr; - DWORD size; + if (!(resinfo = FindResourceA(module, resource, (const char *)RT_RCDATA)) + /* Try loading the resource as bitmap data (which is in DIB format D3DXIFF_DIB) */ + && !(resinfo = FindResourceA(module, resource, (const char *)RT_BITMAP))) + return D3DXERR_INVALIDDATA; - hr = load_resource_into_memory(module, resinfo, &buffer, &size); - if(FAILED(hr)) return D3DXERR_INVALIDDATA; - return D3DXGetImageInfoFromFileInMemory(buffer, size, info); - } + if (FAILED(load_resource_into_memory(module, resinfo, &buffer, &size))) + return D3DXERR_INVALIDDATA; - return D3DXERR_INVALIDDATA; + return D3DXGetImageInfoFromFileInMemory(buffer, size, info); } HRESULT WINAPI D3DXGetImageInfoFromResourceW(HMODULE module, LPCWSTR resource, D3DXIMAGE_INFO *info)

1 0

Henri Verbeet : d3dx9: Simplify D3DXGetImageInfoFromResourceW().
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: 4c850f0e7964df9da5c8b557e0c0b4624e0720f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c850f0e7964df9da5c8b557e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 27 08:45:01 2013 +0200 d3dx9: Simplify D3DXGetImageInfoFromResourceW(). --- dlls/d3dx9_36/surface.c | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index efcf09c..4b86f1c 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -966,28 +966,23 @@ HRESULT WINAPI D3DXGetImageInfoFromResourceA(HMODULE module, const char *resourc return D3DXGetImageInfoFromFileInMemory(buffer, size, info); } -HRESULT WINAPI D3DXGetImageInfoFromResourceW(HMODULE module, LPCWSTR resource, D3DXIMAGE_INFO *info) +HRESULT WINAPI D3DXGetImageInfoFromResourceW(HMODULE module, const WCHAR *resource, D3DXIMAGE_INFO *info) { HRSRC resinfo; + void *buffer; + DWORD size; - TRACE("(%p, %s, %p)\n", module, debugstr_w(resource), info); - - resinfo = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA); - if (!resinfo) /* Try loading the resource as bitmap data (which is in DIB format D3DXIFF_DIB) */ - resinfo = FindResourceW(module, resource, (const WCHAR *)RT_BITMAP); + TRACE("module %p, resource %s, info %p.\n", module, debugstr_w(resource), info); - if (resinfo) - { - LPVOID buffer; - HRESULT hr; - DWORD size; + if (!(resinfo = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA)) + /* Try loading the resource as bitmap data (which is in DIB format D3DXIFF_DIB) */ + && !(resinfo = FindResourceW(module, resource, (const WCHAR *)RT_BITMAP))) + return D3DXERR_INVALIDDATA; - hr = load_resource_into_memory(module, resinfo, &buffer, &size); - if(FAILED(hr)) return D3DXERR_INVALIDDATA; - return D3DXGetImageInfoFromFileInMemory(buffer, size, info); - } + if (FAILED(load_resource_into_memory(module, resinfo, &buffer, &size))) + return D3DXERR_INVALIDDATA; - return D3DXERR_INVALIDDATA; + return D3DXGetImageInfoFromFileInMemory(buffer, size, info); } /************************************************************

1 0

Alexandre Julliard : kernel32/tests: Increase some wait timeouts.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: b0153951f4e92db8ed777e1cde011fa926941315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0153951f4e92db8ed777e1cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 27 11:50:45 2013 +0200 kernel32/tests: Increase some wait timeouts. --- dlls/kernel32/tests/loader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 0018d67..3b72cc8 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1101,9 +1101,9 @@ static DWORD WINAPI mutex_thread_proc(void *param) wait_list[2] = peb_lock_event; wait_list[3] = heap_lock_event; + trace("%04u: mutex_thread_proc: starting\n", GetCurrentThreadId()); while (1) { - trace("%04u: mutex_thread_proc: still alive\n", GetCurrentThreadId()); ret = WaitForMultipleObjects(sizeof(wait_list)/sizeof(wait_list[0]), wait_list, FALSE, 50); if (ret == WAIT_OBJECT_0) break; else if (ret == WAIT_OBJECT_0 + 1) @@ -1702,9 +1702,9 @@ static void child_process(const char *dll_name, DWORD target_offset) } else { - ret = WaitForSingleObject(attached_thread[0], 100); + ret = WaitForSingleObject(attached_thread[0], 1000); ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); - ret = WaitForSingleObject(attached_thread[1], 100); + ret = WaitForSingleObject(attached_thread[1], 1000); ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); }

1 0

Andrew Eikum : oleaut32: Resize 32-bit typeinfos when loaded in 64-bit.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: 56aa7d015d559dc8dafed52c4456673a3974dac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56aa7d015d559dc8dafed52c4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 26 12:39:48 2013 -0500 oleaut32: Resize 32-bit typeinfos when loaded in 64-bit. --- dlls/oleaut32/typelib.c | 172 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 163 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 118e1f0..8985a02 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1909,6 +1909,120 @@ static TLBString *TLB_append_str(struct list *string_list, BSTR new_str) return str; } +static HRESULT TLB_get_size_from_hreftype(ITypeInfoImpl *info, HREFTYPE href, + ULONG *size, WORD *align) +{ + ITypeInfo *other; + TYPEATTR *attr; + HRESULT hr; + + hr = ITypeInfo2_GetRefTypeInfo(&info->ITypeInfo2_iface, href, &other); + if(FAILED(hr)) + return hr; + + hr = ITypeInfo_GetTypeAttr(other, &attr); + if(FAILED(hr)){ + ITypeInfo_Release(other); + return hr; + } + + if(size) + *size = attr->cbSizeInstance; + if(align) + *align = attr->cbAlignment; + + ITypeInfo_ReleaseTypeAttr(other, attr); + ITypeInfo_Release(other); + + return S_OK; +} + +static HRESULT TLB_size_instance(ITypeInfoImpl *info, SYSKIND sys, + TYPEDESC *tdesc, ULONG *size, WORD *align) +{ + ULONG i, sub, ptr_size; + HRESULT hr; + + ptr_size = get_ptr_size(sys); + + switch(tdesc->vt){ + case VT_VOID: + *size = 0; + break; + case VT_I1: + case VT_UI1: + *size = 1; + break; + case VT_I2: + case VT_BOOL: + case VT_UI2: + *size = 2; + break; + case VT_I4: + case VT_R4: + case VT_ERROR: + case VT_UI4: + case VT_INT: + case VT_UINT: + case VT_HRESULT: + *size = 4; + break; + case VT_R8: + case VT_I8: + case VT_UI8: + *size = 8; + break; + case VT_BSTR: + case VT_DISPATCH: + case VT_UNKNOWN: + case VT_PTR: + case VT_SAFEARRAY: + case VT_LPSTR: + case VT_LPWSTR: + *size = ptr_size; + break; + case VT_DATE: + *size = sizeof(DATE); + break; + case VT_VARIANT: + *size = sizeof(VARIANT); +#ifdef _WIN64 + if(sys == SYS_WIN32) + *size -= 8; /* 32-bit VARIANT is 8 bytes smaller than 64-bit VARIANT */ +#endif + break; + case VT_DECIMAL: + *size = sizeof(DECIMAL); + break; + case VT_CY: + *size = sizeof(CY); + break; + case VT_CARRAY: + *size = 0; + for(i = 0; i < tdesc->u.lpadesc->cDims; ++i) + *size += tdesc->u.lpadesc->rgbounds[i].cElements; + hr = TLB_size_instance(info, sys, &tdesc->u.lpadesc->tdescElem, &sub, align); + if(FAILED(hr)) + return hr; + *size *= sub; + return S_OK; + case VT_USERDEFINED: + return TLB_get_size_from_hreftype(info, tdesc->u.hreftype, size, align); + default: + FIXME("Unsized VT: 0x%x\n", tdesc->vt); + return E_FAIL; + } + + if(align){ + if(*size < 4) + *align = *size; + else + *align = 4; + } + + return S_OK; +} + /********************************************************************** * * Functions for reading MSFT typelibs (those created by CreateTypeLib2) @@ -2512,6 +2626,47 @@ static void MSFT_DoImplTypes(TLBContext *pcx, ITypeInfoImpl *pTI, int count, ++pImpl; } } + +#ifdef _WIN64 +/* when a 32-bit typelib is loaded in 64-bit mode, we need to resize pointers + * and some structures, and fix the alignment */ +static void TLB_fix_32on64_typeinfo(ITypeInfoImpl *info) +{ + if(info->typekind == TKIND_ALIAS){ + switch(info->tdescAlias.vt){ + case VT_BSTR: + case VT_DISPATCH: + case VT_UNKNOWN: + case VT_PTR: + case VT_SAFEARRAY: + case VT_LPSTR: + case VT_LPWSTR: + info->cbSizeInstance = sizeof(void*); + info->cbAlignment = sizeof(void*); + break; + case VT_CARRAY: + case VT_USERDEFINED: + TLB_size_instance(info, SYS_WIN64, &info->tdescAlias, &info->cbSizeInstance, &info->cbAlignment); + break; + case VT_VARIANT: + info->cbSizeInstance = sizeof(VARIANT); + info->cbAlignment = 8; + default: + if(info->cbSizeInstance < sizeof(void*)) + info->cbAlignment = info->cbSizeInstance; + else + info->cbAlignment = sizeof(void*); + break; + } + }else if(info->typekind == TKIND_INTERFACE || + info->typekind == TKIND_DISPATCH || + info->typekind == TKIND_COCLASS){ + info->cbSizeInstance = sizeof(void*); + info->cbAlignment = sizeof(void*); + } +} +#endif + /* * process a typeinfo record */ @@ -2537,18 +2692,10 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( ptiRet->lcid=pLibInfo->set_lcid; /* FIXME: correct? */ ptiRet->lpstrSchema=NULL; /* reserved */ ptiRet->cbSizeInstance=tiBase.size; -#ifdef _WIN64 - if(pLibInfo->syskind == SYS_WIN32) - ptiRet->cbSizeInstance=sizeof(void*); -#endif ptiRet->typekind=tiBase.typekind & 0xF; ptiRet->cFuncs=LOWORD(tiBase.cElement); ptiRet->cVars=HIWORD(tiBase.cElement); ptiRet->cbAlignment=(tiBase.typekind >> 11 )& 0x1F; /* there are more flags there */ -#ifdef _WIN64 - if(pLibInfo->syskind == SYS_WIN32) - ptiRet->cbAlignment = 8; -#endif ptiRet->wTypeFlags=tiBase.flags; ptiRet->wMajorVerNum=LOWORD(tiBase.version); ptiRet->wMinorVerNum=HIWORD(tiBase.version); @@ -3318,6 +3465,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) MSFT_Header tlbHeader; MSFT_SegDir tlbSegDir; ITypeLibImpl * pTypeLibImpl; + int i; TRACE("%p, TLB length = %d\n", pLib, dwTLBLength); @@ -3503,7 +3651,6 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) if(tlbHeader.nrtypeinfos >= 0 ) { ITypeInfoImpl **ppTI; - int i; ppTI = pTypeLibImpl->typeinfos = heap_alloc_zero(sizeof(ITypeInfoImpl*) * tlbHeader.nrtypeinfos); @@ -3516,6 +3663,13 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) } } +#ifdef _WIN64 + if(pTypeLibImpl->syskind == SYS_WIN32){ + for(i = 0; i < pTypeLibImpl->TypeInfoCount; ++i) + TLB_fix_32on64_typeinfo(pTypeLibImpl->typeinfos[i]); + } +#endif + TRACE("(%p)\n", pTypeLibImpl); return &pTypeLibImpl->ITypeLib2_iface; }

1 0

Andrew Eikum : oleaut32: Implement ICreateTypeInfo::SetTypeDescAlias.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: 810ec233c0bffe4a4bd0cac4e36c1f72b9079190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=810ec233c0bffe4a4bd0cac4e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 26 12:40:08 2013 -0500 oleaut32: Implement ICreateTypeInfo::SetTypeDescAlias. --- dlls/oleaut32/tests/typelib.c | 341 ++++++++++++++++++++++++++++++++++++++++- dlls/oleaut32/typelib.c | 82 +++++++---- 2 files changed, 393 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=810ec233c0bffe4a4bd0c…

1 0

Huw Davies : winegcc: Set the LDDLLFLAGS according to the target platform.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: 2374cd52a72d685d4f7ddb88456a846e6396415f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2374cd52a72d685d4f7ddb884… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 27 10:03:42 2013 +0100 winegcc: Set the LDDLLFLAGS according to the target platform. --- configure | 113 --------------------------------------------- configure.ac | 19 -------- tools/winegcc/Makefile.in | 1 - tools/winegcc/utils.c | 3 +- tools/winegcc/utils.h | 2 +- tools/winegcc/winegcc.c | 68 ++++++++++++++++++++++++++- 6 files changed, 70 insertions(+), 136 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2374cd52a72d685d4f7dd…

1 0

Huw Davies : winegcc: Don't use DLLFLAGS in winegcc.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: wine Branch: master Commit: 5a8ca9e2e8f5e1b6e1d7d1b0f1baa4833870a785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a8ca9e2e8f5e1b6e1d7d1b0f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 27 10:03:43 2013 +0100 winegcc: Don't use DLLFLAGS in winegcc. --- tools/winegcc/Makefile.in | 1 - tools/winegcc/winegcc.c | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index 37f28fb..3e8bfdd 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -2,7 +2,6 @@ DEFS = \ -DINCLUDEDIR="\"$(includedir)\"" \ -DDLLDIR="\"$(dlldir)\"" \ -DLIBDIR="\"$(libdir)\"" \ - -DDLLFLAGS="\"@DLLFLAGS@\"" \ -DCC="\"$(CC)\"" \ -DCPP="\"@CPPBIN@\"" \ -DCXX="\"@CXX@\"" \ diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 7328a04..969da3e 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -511,7 +511,8 @@ static void compile(struct options* opts, const char* lang) strarray_add(comp_args, "-fshort-wchar"); strarray_add(comp_args, "-DWINE_UNICODE_NATIVE"); } - strarray_addall(comp_args, strarray_fromstring(DLLFLAGS, " ")); + strarray_add(comp_args, "-D_REENTRANT"); + strarray_add(comp_args, "-fPIC"); } if (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64) @@ -1010,7 +1011,8 @@ static void build(struct options* opts) spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); - strarray_addall(spec_args, strarray_fromstring(DLLFLAGS, " ")); + strarray_add(spec_args, "-D_REENTRANT"); + strarray_add(spec_args, "-fPIC"); strarray_add(spec_args, opts->shared ? "--dll" : "--exe"); if (fake_module) {

1 0

Frédéric Delanoy : winedev: Assorted formatting & tagging fixes.
by Alexandre Julliard 27 Aug '13

27 Aug '13

Module: docs Branch: master Commit: e99940531ede2bf66d69c2634a2f2d6c93cb9fed URL: http://source.winehq.org/git/docs.git/?a=commit;h=e99940531ede2bf66d69c2634… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Aug 26 22:21:55 2013 +0200 winedev: Assorted formatting & tagging fixes. A couple typos as well. --- en/winedev-architecture.sgml | 18 ++-- en/winedev-coding.sgml | 52 ++++++------ en/winedev-ddraw.sgml | 92 ++++++++++--------- en/winedev-debugger.sgml | 196 ++++++++++++++++++++++------------------- en/winedev-debugging.sgml | 21 +++-- en/winedev-documentation.sgml | 106 +++++++++++----------- en/winedev-kernel.sgml | 79 +++++++++-------- en/winedev-multimedia.sgml | 53 ++++++------ en/winedev-opengl.sgml | 12 ++-- en/winedev-otherdebug.sgml | 22 +++--- en/winedev-testing.sgml | 128 ++++++++++++++------------- en/winedev-windowing.sgml | 8 +- 12 files changed, 408 insertions(+), 379 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=e99940531ede2bf66d69c…

1 0

Stefan Dösinger : wined3d: Use PBOs for dynamic volumes.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: 8c708486c3654afce76326204d7d7bc441ba22f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c708486c3654afce76326204… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 8 16:42:29 2013 +0200 wined3d: Use PBOs for dynamic volumes. --- dlls/wined3d/utils.c | 1 + dlls/wined3d/volume.c | 168 ++++++++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 7 +- 3 files changed, 157 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c708486c3654afce7632…

1 0

Stefan Dösinger : wined3d: Implement NOOVERWRITE and DISCARD volume maps.
by Alexandre Julliard 26 Aug '13

26 Aug '13

Module: wine Branch: master Commit: bd866c02949890ca77c7058a00562fbd16375533 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd866c02949890ca77c7058a0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 26 02:01:28 2013 +0200 wined3d: Implement NOOVERWRITE and DISCARD volume maps. --- dlls/wined3d/buffer.c | 54 +-------------------------------------- dlls/wined3d/resource.c | 50 +++++++++++++++++++++++++++++++++++++ dlls/wined3d/volume.c | 39 ++++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 3 ++ 4 files changed, 85 insertions(+), 61 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b3f760b..8178604 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -922,56 +922,6 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) context_release(context); } -static DWORD buffer_sanitize_flags(const struct wined3d_buffer *buffer, DWORD flags) -{ - /* Not all flags make sense together, but Windows never returns an error. - * Catch the cases that could cause issues. */ - if (flags & WINED3D_MAP_READONLY) - { - if (flags & WINED3D_MAP_DISCARD) - { - WARN("WINED3D_MAP_READONLY combined with WINED3D_MAP_DISCARD, ignoring flags.\n"); - return 0; - } - if (flags & WINED3D_MAP_NOOVERWRITE) - { - WARN("WINED3D_MAP_READONLY combined with WINED3D_MAP_NOOVERWRITE, ignoring flags.\n"); - return 0; - } - } - else if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) - == (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) - { - WARN("WINED3D_MAP_DISCARD and WINED3D_MAP_NOOVERWRITE used together, ignoring.\n"); - return 0; - } - else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE) - && !(buffer->resource.usage & WINED3DUSAGE_DYNAMIC)) - { - WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n"); - return 0; - } - - return flags; -} - -static GLbitfield buffer_gl_map_flags(DWORD d3d_flags) -{ - GLbitfield ret = 0; - - if (!(d3d_flags & WINED3D_MAP_READONLY)) - ret |= GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; - if (!(d3d_flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE))) - ret |= GL_MAP_READ_BIT; - - if (d3d_flags & WINED3D_MAP_DISCARD) - ret |= GL_MAP_INVALIDATE_BUFFER_BIT; - if (d3d_flags & WINED3D_MAP_NOOVERWRITE) - ret |= GL_MAP_UNSYNCHRONIZED_BIT; - - return ret; -} - struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffer *buffer) { TRACE("buffer %p.\n", buffer); @@ -986,7 +936,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN TRACE("buffer %p, offset %u, size %u, data %p, flags %#x\n", buffer, offset, size, data, flags); - flags = buffer_sanitize_flags(buffer, flags); + flags = wined3d_resource_sanitize_map_flags(&buffer->resource, flags); count = ++buffer->resource.map_count; if (buffer->buffer_object) @@ -1017,7 +967,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - GLbitfield mapflags = buffer_gl_map_flags(flags); + GLbitfield mapflags = wined3d_resource_gl_map_flags(flags); buffer->resource.allocatedMemory = GL_EXTCALL(glMapBufferRange(buffer->buffer_type_hint, 0, buffer->resource.size, mapflags)); checkGLcall("glMapBufferRange"); diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 59fced9..ca322b2 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -358,3 +358,53 @@ void wined3d_resource_free_sysmem(void *mem) HeapFree(GetProcessHeap(), 0, *(--p)); } + +DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, DWORD flags) +{ + /* Not all flags make sense together, but Windows never returns an error. + * Catch the cases that could cause issues. */ + if (flags & WINED3D_MAP_READONLY) + { + if (flags & WINED3D_MAP_DISCARD) + { + WARN("WINED3D_MAP_READONLY combined with WINED3D_MAP_DISCARD, ignoring flags.\n"); + return 0; + } + if (flags & WINED3D_MAP_NOOVERWRITE) + { + WARN("WINED3D_MAP_READONLY combined with WINED3D_MAP_NOOVERWRITE, ignoring flags.\n"); + return 0; + } + } + else if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + == (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + { + WARN("WINED3D_MAP_DISCARD and WINED3D_MAP_NOOVERWRITE used together, ignoring.\n"); + return 0; + } + else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE) + && !(resource->usage & WINED3DUSAGE_DYNAMIC)) + { + WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n"); + return 0; + } + + return flags; +} + +GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) +{ + GLbitfield ret = 0; + + if (!(d3d_flags & WINED3D_MAP_READONLY)) + ret |= GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT; + if (!(d3d_flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE))) + ret |= GL_MAP_READ_BIT; + + if (d3d_flags & WINED3D_MAP_DISCARD) + ret |= GL_MAP_INVALIDATE_BUFFER_BIT; + if (d3d_flags & WINED3D_MAP_NOOVERWRITE) + ret |= GL_MAP_UNSYNCHRONIZED_BIT; + + return ret; +} diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 3f1563c..1813a31 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -469,6 +469,7 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, map_desc->data = NULL; return WINED3DERR_INVALIDCALL; } + flags = wined3d_resource_sanitize_map_flags(&volume->resource, flags); if (volume->flags & WINED3D_VFLAG_PBO) { @@ -476,10 +477,25 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, gl_info = context->gl_info; wined3d_volume_prepare_pbo(volume, context); - wined3d_volume_load_location(volume, context, WINED3D_LOCATION_BUFFER); + if (flags & WINED3D_MAP_DISCARD) + wined3d_volume_validate_location(volume, WINED3D_LOCATION_BUFFER); + else + wined3d_volume_load_location(volume, context, WINED3D_LOCATION_BUFFER); GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, volume->pbo)); - base_memory = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + + if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + { + GLbitfield mapflags = wined3d_resource_gl_map_flags(flags); + mapflags &= ~GL_MAP_FLUSH_EXPLICIT_BIT; + base_memory = GL_EXTCALL(glMapBufferRange(GL_PIXEL_UNPACK_BUFFER_ARB, + 0, volume->resource.size, mapflags)); + } + else + { + base_memory = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + } + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); checkGLcall("Map PBO"); @@ -487,14 +503,19 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, } else { - if (!(volume->locations & WINED3D_LOCATION_SYSMEM)) + if (!volume_prepare_system_memory(volume)) + { + WARN("Out of memory.\n"); + map_desc->data = NULL; + return E_OUTOFMEMORY; + } + + if (flags & WINED3D_MAP_DISCARD) + { + wined3d_volume_validate_location(volume, WINED3D_LOCATION_SYSMEM); + } + else if (!(volume->locations & WINED3D_LOCATION_SYSMEM)) { - if (!volume_prepare_system_memory(volume)) - { - WARN("Out of memory.\n"); - map_desc->data = NULL; - return E_OUTOFMEMORY; - } context = context_acquire(device, NULL); wined3d_volume_load_location(volume, context, WINED3D_LOCATION_SYSMEM); context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1773ba7..4db7600 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1968,6 +1968,9 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; DWORD resource_set_priority(struct wined3d_resource *resource, DWORD priority) DECLSPEC_HIDDEN; void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; +DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, + DWORD flags) DECLSPEC_HIDDEN; +GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; /* Tests show that the start address of resources is 32 byte aligned */ #define RESOURCE_ALIGNMENT 16

1 0