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

Alexandre Julliard : ver: Build with msvcrt.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 928104d3e26b24bd5c6ec0943fb2be6392531d0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=928104d3e26b24bd5c6ec094… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:38:54 2019 +0200 ver: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ver.dll16/Makefile.in | 2 +- dlls/ver.dll16/version.c | 27 ++++++++++----------------- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/ver.dll16/Makefile.in b/dlls/ver.dll16/Makefile.in index 1c68dfc..1465132 100644 --- a/dlls/ver.dll16/Makefile.in +++ b/dlls/ver.dll16/Makefile.in @@ -1,6 +1,6 @@ MODULE = ver.dll16 IMPORTS = version lz32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,version.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,version.dll C_SRCS = version.c diff --git a/dlls/ver.dll16/version.c b/dlls/ver.dll16/version.c index aa7b49b..269e2c9 100644 --- a/dlls/ver.dll16/version.c +++ b/dlls/ver.dll16/version.c @@ -32,17 +32,10 @@ #include "winternl.h" #include "winver.h" #include "lzexpand.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ver); -#ifndef SEEK_SET -#define SEEK_SET 0 -#define SEEK_CUR 1 -#define SEEK_END 2 -#endif - /********************************************************************** * find_entry_by_id * @@ -121,7 +114,7 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_name( const IMAGE_RESOURCE_ { pos = (min + max) / 2; str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const char *)root + entry[pos].u.s.NameOffset); - res = strncmpiW( nameW, str->NameString, str->Length ); + res = wcsnicmp( nameW, str->NameString, str->Length ); if (!res && namelen == str->Length) { ret = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s2.OffsetToDirectory); @@ -144,17 +137,17 @@ static int read_xx_header( HFILE lzfd ) IMAGE_DOS_HEADER mzh; char magic[3]; - LZSeek( lzfd, 0, SEEK_SET ); + LZSeek( lzfd, 0, FILE_BEGIN ); if ( sizeof(mzh) != LZRead( lzfd, (LPSTR)&mzh, sizeof(mzh) ) ) return 0; if ( mzh.e_magic != IMAGE_DOS_SIGNATURE ) return 0; - LZSeek( lzfd, mzh.e_lfanew, SEEK_SET ); + LZSeek( lzfd, mzh.e_lfanew, FILE_BEGIN ); if ( 2 != LZRead( lzfd, magic, 2 ) ) return 0; - LZSeek( lzfd, mzh.e_lfanew, SEEK_SET ); + LZSeek( lzfd, mzh.e_lfanew, FILE_BEGIN ); if ( magic[0] == 'N' && magic[1] == 'E' ) return IMAGE_OS2_SIGNATURE; @@ -181,7 +174,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, int count; /* Read in NE header */ - nehdoffset = LZSeek( lzfd, 0, SEEK_CUR ); + nehdoffset = LZSeek( lzfd, 0, FILE_CURRENT ); if ( sizeof(nehd) != LZRead( lzfd, (LPSTR)&nehd, sizeof(nehd) ) ) return FALSE; resTabSize = nehd.ne_restab - nehd.ne_rsrctab; @@ -195,7 +188,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, resTab = HeapAlloc( GetProcessHeap(), 0, resTabSize ); if ( !resTab ) return FALSE; - LZSeek( lzfd, nehd.ne_rsrctab + nehdoffset, SEEK_SET ); + LZSeek( lzfd, nehd.ne_rsrctab + nehdoffset, FILE_BEGIN ); if ( resTabSize != LZRead( lzfd, (char*)resTab, resTabSize ) ) { HeapFree( GetProcessHeap(), 0, resTab ); @@ -284,7 +277,7 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, BOOL ret = FALSE; /* Read in PE header */ - pehdoffset = LZSeek( lzfd, 0, SEEK_CUR ); + pehdoffset = LZSeek( lzfd, 0, FILE_CURRENT ); if ( sizeof(pehd) != LZRead( lzfd, (LPSTR)&pehd, sizeof(pehd) ) ) return FALSE; resDataDir = pehd.OptionalHeader.DataDirectory+IMAGE_DIRECTORY_ENTRY_RESOURCE; @@ -303,7 +296,7 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, LZSeek( lzfd, pehdoffset + sizeof(DWORD) + /* Signature */ sizeof(IMAGE_FILE_HEADER) + - pehd.FileHeader.SizeOfOptionalHeader, SEEK_SET ); + pehd.FileHeader.SizeOfOptionalHeader, FILE_BEGIN ); if ( nSections * sizeof(IMAGE_SECTION_HEADER) != LZRead( lzfd, (LPSTR)sections, nSections * sizeof(IMAGE_SECTION_HEADER) ) ) @@ -335,7 +328,7 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, return FALSE; } - LZSeek( lzfd, sections[i].PointerToRawData, SEEK_SET ); + LZSeek( lzfd, sections[i].PointerToRawData, FILE_BEGIN ); if ( resSectionSize != LZRead( lzfd, (char*)resSection, resSectionSize ) ) goto done; /* Find resource */ @@ -458,7 +451,7 @@ DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType, } } - LZSeek( lzfd, dwFileOffset, SEEK_SET ); + LZSeek( lzfd, dwFileOffset, FILE_BEGIN ); reslen = LZRead( lzfd, lpvData, min( reslen, dwResLen ) ); LZClose( lzfd );

1 0

Alexandre Julliard : vdmdbg: Build with msvcrt.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: a8e5a6109914ad6280a30c534a45a3981a1c5569 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8e5a6109914ad6280a30c53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:38:43 2019 +0200 vdmdbg: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vdmdbg/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/vdmdbg/Makefile.in b/dlls/vdmdbg/Makefile.in index 605eef4..d9294b6 100644 --- a/dlls/vdmdbg/Makefile.in +++ b/dlls/vdmdbg/Makefile.in @@ -1,5 +1,7 @@ MODULE = vdmdbg.dll IMPORTLIB = vdmdbg +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ vdmdbg.c

1 0

Alexandre Julliard : vdhcp.vxd: Build with msvcrt.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 5153645ff6447070cf2bb1d56cd309cb5596868a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5153645ff6447070cf2bb1d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:38:30 2019 +0200 vdhcp.vxd: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vdhcp.vxd/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/vdhcp.vxd/Makefile.in b/dlls/vdhcp.vxd/Makefile.in index b27d520..dc3111a 100644 --- a/dlls/vdhcp.vxd/Makefile.in +++ b/dlls/vdhcp.vxd/Makefile.in @@ -1,4 +1,6 @@ MODULE = vdhcp.vxd +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ vdhcp.c

1 0

Alexandre Julliard : uxtheme: Build with msvcrt.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 21a19fb4e35f4b8c61958ba25b0058c1e090f2b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21a19fb4e35f4b8c61958ba2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:35:03 2019 +0200 uxtheme: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/Makefile.in | 2 ++ dlls/uxtheme/buffer.c | 2 -- dlls/uxtheme/draw.c | 2 -- dlls/uxtheme/main.c | 2 -- dlls/uxtheme/metric.c | 2 -- dlls/uxtheme/msstyles.c | 17 +++++++---------- dlls/uxtheme/property.c | 2 -- dlls/uxtheme/stylemap.c | 2 -- dlls/uxtheme/system.c | 2 -- dlls/uxtheme/uxini.c | 2 -- 10 files changed, 9 insertions(+), 26 deletions(-) diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in index c3fff30..61817ee 100644 --- a/dlls/uxtheme/Makefile.in +++ b/dlls/uxtheme/Makefile.in @@ -3,6 +3,8 @@ IMPORTLIB = uxtheme IMPORTS = user32 gdi32 advapi32 DELAYIMPORTS = msimg32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ buffer.c \ draw.c \ diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index 32d341c..b07284f 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdlib.h> #include <stdarg.h> diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 69c53b9..3dcc582 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdlib.h> #include <stdarg.h> diff --git a/dlls/uxtheme/main.c b/dlls/uxtheme/main.c index 73894e8..5e5610a 100644 --- a/dlls/uxtheme/main.c +++ b/dlls/uxtheme/main.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c index 073422f..2d5a09d 100644 --- a/dlls/uxtheme/metric.c +++ b/dlls/uxtheme/metric.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index bc8eca7..cee5aaf 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <stdlib.h> @@ -34,7 +32,6 @@ #include "msstyles.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/heap.h" @@ -352,7 +349,7 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR *iStateId = 0; comp = sec; /* Get the application name */ - tmp = strchrW(comp, ':'); + tmp = wcschr(comp, ':'); if(tmp) { *tmp++ = 0; tmp++; @@ -360,19 +357,19 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR comp = tmp; } - tmp = strchrW(comp, '.'); + tmp = wcschr(comp, '.'); if(tmp) { *tmp++ = 0; lstrcpynW(szClassName, comp, MAX_THEME_CLASS_NAME); comp = tmp; /* now get the part & state */ - tmp = strchrW(comp, '('); + tmp = wcschr(comp, '('); if(tmp) { *tmp++ = 0; lstrcpynW(part, comp, ARRAY_SIZE(part)); comp = tmp; /* now get the state */ - tmp = strchrW(comp, ')'); + tmp = wcschr(comp, ')'); if (!tmp) return FALSE; *tmp = 0; @@ -383,13 +380,13 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR } } else { - tmp = strchrW(comp, '('); + tmp = wcschr(comp, '('); if(tmp) { *tmp++ = 0; lstrcpynW(szClassName, comp, MAX_THEME_CLASS_NAME); comp = tmp; /* now get the state */ - tmp = strchrW(comp, ')'); + tmp = wcschr(comp, ')'); if (!tmp) return FALSE; *tmp = 0; @@ -1012,7 +1009,7 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList) } start = pszClassList; - while((end = strchrW(start, ';'))) { + while((end = wcschr(start, ';'))) { len = end-start; lstrcpynW(szClassName, start, min(len+1, ARRAY_SIZE(szClassName))); start = end+1; diff --git a/dlls/uxtheme/property.c b/dlls/uxtheme/property.c index 0e077ae..93a72ab 100644 --- a/dlls/uxtheme/property.c +++ b/dlls/uxtheme/property.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 19e3c93..149ee0e 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index c898ad3..6e9c0f2 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <stdio.h> diff --git a/dlls/uxtheme/uxini.c b/dlls/uxtheme/uxini.c index 1581ff4..361e7f1 100644 --- a/dlls/uxtheme/uxini.c +++ b/dlls/uxtheme/uxini.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Zhiyi Zhang : dxgi/tests: Add more IDXGISwapChain_Present() tests.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 9b668792a936e89acdc3310aecf1820c0df8f3ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b668792a936e89acdc3310a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 25 02:47:46 2019 +0430 dxgi/tests: Add more IDXGISwapChain_Present() tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 222 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 222 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9b668792a936e89acdc3…

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_init_transform_feedback ().
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 3484871f2cef3ba430f2010752e66a2da1ea124f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3484871f2cef3ba430f20107… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 25 02:47:26 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_init_transform_feedback(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4b31656..e0220d1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -938,11 +938,11 @@ static BOOL shader_glsl_generate_transform_feedback_varyings(struct wined3d_stri return have_varyings_to_record; } -static void shader_glsl_init_transform_feedback(const struct wined3d_context *context, +static void shader_glsl_init_transform_feedback(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, GLuint program_id, struct wined3d_shader *shader) { const struct wined3d_stream_output_desc *so_desc = &shader->u.gs.so_desc; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_string_buffer *buffer; unsigned int i, count, length; const char **varyings; @@ -10342,7 +10342,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const GL_EXTCALL(glAttachShader(program_id, gs_id)); checkGLcall("glAttachShader"); - shader_glsl_init_transform_feedback(context, priv, program_id, gshader); + shader_glsl_init_transform_feedback(context_gl, priv, program_id, gshader); list_add_head(&gshader->linked_programs, &entry->gs.shader_entry); }

1 0

Jactry Zeng : ddraw/tests: Add tests for 32-bit depth format support.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: db0dd1561848e50b3e0628dffd04846bc88aa8ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=db0dd1561848e50b3e0628df… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Jun 25 02:47:44 2019 +0430 ddraw/tests: Add tests for 32-bit depth format support. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 50 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 50 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 214 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=db0dd1561848e50b3e06…

1 0

Jactry Zeng : d3d9/tests: Add tests for 32-bit depth format support.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: f090548ef251662c5a856d86fae2060dc5b17879 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f090548ef251662c5a856d86… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Jun 25 02:47:43 2019 +0430 d3d9/tests: Add tests for 32-bit depth format support. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index f5c8972..c59b1f7 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11833,6 +11833,16 @@ static void test_check_device_format(void) } } + hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, D3DFMT_D32); + todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + "Got unexpected hr %#x.\n", hr); + + hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_R5G6B5, D3DFMT_D32); + todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + "Got unexpected hr %#x.\n", hr); + IDirect3D9_Release(d3d); }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_buffer_gl_destroy_buffer_object ().
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 633cd82a3dc8c0eb0461b070179122ffc6bb605d URL: https://source.winehq.org/git/wine.git/?a=commit;h=633cd82a3dc8c0eb0461b070… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 25 02:47:24 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_buffer_gl_destroy_buffer_object(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 5aca952..2ed3984 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -140,11 +140,10 @@ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct w /* Context activation is done by the caller. */ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, - struct wined3d_context *context) + struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_resource *resource = &buffer_gl->b.resource; - const struct wined3d_gl_info *gl_info = context->gl_info; if (!buffer_gl->buffer_object) return; @@ -172,7 +171,7 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu if (resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) { device_invalidate_state(resource->device, STATE_STREAM_OUTPUT); - if (context->transform_feedback_active) + if (context_gl->c.transform_feedback_active) { /* We have to make sure that transform feedback is not active * when deleting a potentially bound transform feedback buffer. @@ -269,7 +268,7 @@ fail: /* Clean up all BO init, but continue because we can work without a BO :-) */ ERR("Failed to create a buffer object. Continuing, but performance issues may occur.\n"); buffer_gl->b.flags &= ~WINED3D_BUFFER_USE_BO; - wined3d_buffer_gl_destroy_buffer_object(buffer_gl, &context_gl->c); + wined3d_buffer_gl_destroy_buffer_object(buffer_gl, context_gl); buffer_clear_dirty_areas(&buffer_gl->b); return FALSE; } @@ -758,7 +757,7 @@ static void buffer_unload(struct wined3d_resource *resource) wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); - wined3d_buffer_gl_destroy_buffer_object(wined3d_buffer_gl(buffer), context); + wined3d_buffer_gl_destroy_buffer_object(wined3d_buffer_gl(buffer), wined3d_context_gl(context)); buffer_clear_dirty_areas(buffer); context_release(context); @@ -787,7 +786,7 @@ static void wined3d_buffer_gl_destroy_object(void *object) if (buffer_gl->buffer_object) { context = context_acquire(buffer_gl->b.resource.device, NULL, 0); - wined3d_buffer_gl_destroy_buffer_object(buffer_gl, context); + wined3d_buffer_gl_destroy_buffer_object(buffer_gl, wined3d_context_gl(context)); context_release(context); heap_free(buffer_gl->b.conversion_map);

1 0

Jactry Zeng : d3d8/tests: Add tests for 32-bit depth format support.
by Alexandre Julliard June 25, 2019

June 25, 2019

Module: wine Branch: master Commit: 1ae07c048a8256dcd64bd8ab3963839f2e58a4fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ae07c048a8256dcd64bd8ab… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Jun 25 02:47:42 2019 +0430 d3d8/tests: Add tests for 32-bit depth format support. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b0a279b..03eb695 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8261,6 +8261,16 @@ static void test_check_device_format(void) D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, D3DFMT_D32); + todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + "Got unexpected hr %#x.\n", hr); + + hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_R5G6B5, D3DFMT_D32); + todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + "Got unexpected hr %#x.\n", hr); + IDirect3D8_Release(d3d); }

1 0