February 2019 - Wine-devel - list.winehq.org

[PATCH v2] setupapi: Search for substituted strings in SetupFindNextMatchLine().
by Zebediah Figura 26 Feb '19

26 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/parser.c | 4 +++- dlls/setupapi/tests/parser.c | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index bc5dba0454..5cde5ebcfa 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1557,6 +1557,7 @@ BOOL WINAPI SetupFindNextMatchLineW( PINFCONTEXT context_in, PCWSTR key, PINFCONTEXT context_out ) { struct inf_file *file = context_in->CurrentInf; + WCHAR buffer[MAX_STRING_LEN + 1]; struct section *section; struct line *line; unsigned int i; @@ -1570,7 +1571,8 @@ BOOL WINAPI SetupFindNextMatchLineW( PINFCONTEXT context_in, PCWSTR key, for (i = context_in->Line+1, line = &section->lines[i]; i < section->nb_lines; i++, line++) { if (line->key_field == -1) continue; - if (!strcmpiW( key, file->fields[line->key_field].text )) + PARSER_string_substW( file, file->fields[line->key_field].text, buffer, ARRAY_SIZE(buffer) ); + if (!strcmpiW( key, buffer )) { if (context_out != context_in) *context_out = *context_in; context_out->Line = i; diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 07dcaafd55..06c674aa16 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -428,6 +428,16 @@ static void test_key_names(void) ok( hinf != INVALID_HANDLE_VALUE, "line %u: open failed err %u\n", i, GetLastError() ); if (hinf == INVALID_HANDLE_VALUE) continue; + ret = SetupFindFirstLineA( hinf, "Test", key_names[i].key, &context ); + ok(ret, "Test %d: failed to find key %s\n", i, key_names[i].key); + + if (!strncmp( key_names[i].data, "%foo%", strlen( "%foo%" ) )) + { + ret = SetupFindFirstLineA( hinf, "Test", "%foo%", &context ); + ok(!ret, "SetupFindFirstLine() should not match unsubstituted keys\n"); + ok(GetLastError() == ERROR_LINE_NOT_FOUND, "got wrong error %u\n", GetLastError()); + } + ret = SetupFindFirstLineA( hinf, "Test", 0, &context ); ok(ret, "SetupFindFirstLineA failed: le=%u\n", GetLastError()); if (!ret) -- 2.20.1

1 0

[PATCH] setupapi: Search for substituted strings in SetupFindNextMatchLine().
by Zebediah Figura 26 Feb '19

26 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/parser.c | 4 +++- dlls/setupapi/tests/parser.c | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index bc5dba0454..5cde5ebcfa 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1557,6 +1557,7 @@ BOOL WINAPI SetupFindNextMatchLineW( PINFCONTEXT context_in, PCWSTR key, PINFCONTEXT context_out ) { struct inf_file *file = context_in->CurrentInf; + WCHAR buffer[MAX_STRING_LEN + 1]; struct section *section; struct line *line; unsigned int i; @@ -1570,7 +1571,8 @@ BOOL WINAPI SetupFindNextMatchLineW( PINFCONTEXT context_in, PCWSTR key, for (i = context_in->Line+1, line = &section->lines[i]; i < section->nb_lines; i++, line++) { if (line->key_field == -1) continue; - if (!strcmpiW( key, file->fields[line->key_field].text )) + PARSER_string_substW( file, file->fields[line->key_field].text, buffer, ARRAY_SIZE(buffer) ); + if (!strcmpiW( key, buffer )) { if (context_out != context_in) *context_out = *context_in; context_out->Line = i; diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 07dcaafd55..53a497407c 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -428,6 +428,16 @@ static void test_key_names(void) ok( hinf != INVALID_HANDLE_VALUE, "line %u: open failed err %u\n", i, GetLastError() ); if (hinf == INVALID_HANDLE_VALUE) continue; + ret = SetupFindFirstLineA( hinf, "Test", key_names[i].key, &context ); + ok(ret, "Test %d: failed to find key %s\n", i, key_names[i].key); + + if (!strncmp( key_names[i].key, "%foo%", strlen( "%foo%" ) )) + { + ret = SetupFindFirstLineA( hinf, "Test", "%foo%", &context ); + ok(!ret, "SetupFindFirstLine() should not match unsubstituted keys\n"); + ok(GetLastError() == ERROR_LINE_NOT_FOUND, "got wrong error %u\n", GetLastError()); + } + ret = SetupFindFirstLineA( hinf, "Test", 0, &context ); ok(ret, "SetupFindFirstLineA failed: le=%u\n", GetLastError()); if (!ret) -- 2.20.1

2 1

[PATCH 1/5] quartz/filesource: Set the sample length in IAsyncReader_SyncReadAligned().
by Zebediah Figura 26 Feb '19

26 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filesource.c | 5 +++++ dlls/quartz/tests/filesource.c | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 71724af700..9e3605757b 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1292,6 +1292,8 @@ static BOOL sync_read(HANDLE file, LONGLONG offset, LONG length, BYTE *buffer, D ovl.u.s.Offset = (DWORD)offset; ovl.u.s.OffsetHigh = offset >> 32; + *read_len = 0; + ret = ReadFile(file, buffer, length, NULL, &ovl); if (ret || GetLastError() == ERROR_IO_PENDING) ret = GetOverlappedResult(file, &ovl, read_len, TRUE); @@ -1331,6 +1333,9 @@ static HRESULT WINAPI FileAsyncReader_SyncReadAligned(IAsyncReader *iface, IMedi hr = HRESULT_FROM_WIN32(GetLastError()); } + if (SUCCEEDED(hr)) + IMediaSample_SetActualDataLength(sample, read_len); + return hr; } diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 340d1c4e2e..36a25395cd 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -687,7 +687,6 @@ static void test_sync_read_aligned(IAsyncReader *reader, IMemAllocator *allocato ok(hr == S_OK, "Got hr %#x.\n", hr); len = IMediaSample_GetActualDataLength(sample); -todo_wine ok(len == 512, "Got length %d.\n", len); for (i = 0; i < 512; i++) @@ -702,7 +701,6 @@ todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); len = IMediaSample_GetActualDataLength(sample); -todo_wine ok(len == 88, "Got length %d.\n", len); for (i = 0; i < 88; i++) @@ -717,7 +715,6 @@ todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); len = IMediaSample_GetActualDataLength(sample); -todo_wine ok(len == 0, "Got length %d.\n", len); IMediaSample_Release(sample); -- 2.20.1

1 4

[PATCH v3] po: Update Sinhala translation.
by Isira Seneviratne 26 Feb '19

26 Feb '19

1 0

[PATCH] msi: Check the package's assembly cache instead of using a global variable in msi_init_assembly_caches().
by Zebediah Figura 26 Feb '19

26 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46719 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- It's also possible that the cache itself doesn't need to be a package-specific variable; I don't know enough about fusion to guess whether this is the case. dlls/msi/assembly.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 73977ee8ac..9052dd46bd 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -40,7 +40,6 @@ static HRESULT (WINAPI *pCreateAssemblyNameObject)( IAssemblyName **, LPCWSTR, D static HRESULT (WINAPI *pCreateAssemblyEnum)( IAssemblyEnum **, IUnknown *, IAssemblyName *, DWORD, LPVOID ); static HMODULE hfusion10, hfusion11, hfusion20, hfusion40, hmscoree; -static BOOL assembly_caches_initialized; static BOOL init_function_pointers( void ) { @@ -83,7 +82,7 @@ static BOOL init_function_pointers( void ) BOOL msi_init_assembly_caches( MSIPACKAGE *package ) { - if (assembly_caches_initialized) return TRUE; + if (package->cache_sxs) return TRUE; if (!init_function_pointers()) return FALSE; if (CreateAssemblyCache( &package->cache_sxs, 0 ) != S_OK) return FALSE; @@ -92,7 +91,6 @@ BOOL msi_init_assembly_caches( MSIPACKAGE *package ) if (pCreateAssemblyCacheNet20) pCreateAssemblyCacheNet20( &package->cache_net[CLR_VERSION_V20], 0 ); if (pCreateAssemblyCacheNet40) pCreateAssemblyCacheNet40( &package->cache_net[CLR_VERSION_V40], 0 ); - assembly_caches_initialized = TRUE; return TRUE; } -- 2.20.1

1 0

[PATCH v2 1/3] opengl32: add wrapper for wglCreateContext
by Stefan Riesenberger 25 Feb '19

25 Feb '19

v2: make functions static v1: This prevents a stack overflow when using Reshade, which hooks these functions. Signed-off-by: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> --- dlls/opengl32/wgl.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 92410053d5..c6018b0c7b 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -398,9 +398,9 @@ HDC WINAPI wglGetCurrentDC(void) } /*********************************************************************** - * wglCreateContext (OPENGL32.@) + * wgl_create_context wrapper for hooking */ -HGLRC WINAPI wglCreateContext(HDC hdc) +static HGLRC wgl_create_context(HDC hdc) { HGLRC ret = 0; struct wgl_context *drv_ctx; @@ -419,6 +419,14 @@ HGLRC WINAPI wglCreateContext(HDC hdc) return ret; } +/*********************************************************************** + * wglCreateContext (OPENGL32.@) + */ +HGLRC WINAPI wglCreateContext(HDC hdc) +{ + return wgl_create_context(hdc); +} + /*********************************************************************** * wglGetCurrentContext (OPENGL32.@) */ @@ -667,7 +675,7 @@ HGLRC WINAPI wglCreateLayerContext(HDC hdc, TRACE("(%p,%d)\n", hdc, iLayerPlane); if (iLayerPlane == 0) { - return wglCreateContext(hdc); + return wgl_create_context(hdc); } FIXME("no handler for layer %d\n", iLayerPlane); @@ -1212,8 +1220,8 @@ BOOL WINAPI wglUseFontBitmapsW(HDC hdc, DWORD first, DWORD count, DWORD listBase static void fixed_to_double(POINTFX fixed, UINT em_size, GLdouble vertex[3]) { - vertex[0] = (fixed.x.value + (GLdouble)fixed.x.fract / (1 << 16)) / em_size; - vertex[1] = (fixed.y.value + (GLdouble)fixed.y.fract / (1 << 16)) / em_size; + vertex[0] = (fixed.x.value + (GLdouble)fixed.x.fract / (1 << 16)) / em_size; + vertex[1] = (fixed.y.value + (GLdouble)fixed.y.fract / (1 << 16)) / em_size; vertex[2] = 0.0; } @@ -1393,7 +1401,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, lpgmf->gmfCellIncY = (float)gm.gmCellIncY / em_size; TRACE("%fx%f at %f,%f inc %f,%f\n", lpgmf->gmfBlackBoxX, lpgmf->gmfBlackBoxY, - lpgmf->gmfptGlyphOrigin.x, lpgmf->gmfptGlyphOrigin.y, lpgmf->gmfCellIncX, lpgmf->gmfCellIncY); + lpgmf->gmfptGlyphOrigin.x, lpgmf->gmfptGlyphOrigin.y, lpgmf->gmfCellIncX, lpgmf->gmfCellIncY); lpgmf++; } -- 2.20.1

3 6

[PATCH 2/2] d3d11: Use better name for current entry variable in validate_stream_output_entries().
by Józef Kucia 25 Feb '19

25 Feb '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/shader.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 9a4f1a87b1a5..2276dd72ef0a 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -961,53 +961,53 @@ static HRESULT validate_stream_output_entries(const D3D11_SO_DECLARATION_ENTRY * for (i = 0; i < entry_count; ++i) { - const D3D11_SO_DECLARATION_ENTRY *f = &entries[i]; + const D3D11_SO_DECLARATION_ENTRY *e = &entries[i]; TRACE("Stream: %u, semantic: %s, semantic idx: %u, start component: %u, " "component count %u, output slot %u.\n", - f->Stream, debugstr_a(f->SemanticName), f->SemanticIndex, - f->StartComponent, f->ComponentCount, f->OutputSlot); + e->Stream, debugstr_a(e->SemanticName), e->SemanticIndex, + e->StartComponent, e->ComponentCount, e->OutputSlot); - if (f->Stream >= D3D11_SO_STREAM_COUNT) + if (e->Stream >= D3D11_SO_STREAM_COUNT) { - WARN("Invalid stream %u.\n", f->Stream); + WARN("Invalid stream %u.\n", e->Stream); return E_INVALIDARG; } - if (f->Stream && feature_level < D3D_FEATURE_LEVEL_11_0) + if (e->Stream && feature_level < D3D_FEATURE_LEVEL_11_0) { - WARN("Invalid stream %u for feature level %#x.\n", f->Stream, feature_level); + WARN("Invalid stream %u for feature level %#x.\n", e->Stream, feature_level); return E_INVALIDARG; } - if (f->Stream) + if (e->Stream) { FIXME("Streams not implemented yet.\n"); return E_INVALIDARG; } - if (f->OutputSlot >= D3D11_SO_BUFFER_SLOT_COUNT) + if (e->OutputSlot >= D3D11_SO_BUFFER_SLOT_COUNT) { - WARN("Invalid output slot %u.\n", f->OutputSlot); + WARN("Invalid output slot %u.\n", e->OutputSlot); return E_INVALIDARG; } - if (!f->SemanticName) + if (!e->SemanticName) { - if (f->SemanticIndex) + if (e->SemanticIndex) { - WARN("Invalid semantic idx %u for stream output gap.\n", f->SemanticIndex); + WARN("Invalid semantic idx %u for stream output gap.\n", e->SemanticIndex); return E_INVALIDARG; } - if (f->StartComponent || !f->ComponentCount) + if (e->StartComponent || !e->ComponentCount) { - WARN("Invalid stream output gap %u-%u.\n", f->StartComponent, f->ComponentCount); + WARN("Invalid stream output gap %u-%u.\n", e->StartComponent, e->ComponentCount); return E_INVALIDARG; } } else { - if (f->StartComponent > 3 || f->ComponentCount > 4 || !f->ComponentCount - || f->StartComponent + f->ComponentCount > 4) + if (e->StartComponent > 3 || e->ComponentCount > 4 || !e->ComponentCount + || e->StartComponent + e->ComponentCount > 4) { - WARN("Invalid component range %u-%u.\n", f->StartComponent, f->ComponentCount); + WARN("Invalid component range %u-%u.\n", e->StartComponent, e->ComponentCount); return E_INVALIDARG; } } -- 2.19.2

3 2

[PATCH 1/2] wined3d: Add new registry setting to select shader backend.
by Józef Kucia 25 Feb '19

25 Feb '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 16 +++++++++++----- dlls/wined3d/wined3d_main.c | 31 +++++++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 10 +++++++++- 3 files changed, 45 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index acfed24b53d4..803ebda37556 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1983,22 +1983,28 @@ static const struct fragment_pipeline *select_fragment_implementation(const stru static const struct wined3d_shader_backend_ops *select_shader_backend(const struct wined3d_gl_info *gl_info) { - BOOL glsl = wined3d_settings.use_glsl && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 20); - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && !wined3d_settings.use_glsl) + BOOL glsl = wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_AUTO + || wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_GLSL; + BOOL arb = wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_AUTO + || wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_ARB; + + if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && !glsl) { - ERR_(winediag)("Ignoring the UseGLSL registry key. " + ERR_(winediag)("Ignoring the shader backend registry key. " "GLSL is the only shader backend available on core profile contexts. " "You need to explicitly set GL version to use legacy contexts.\n"); glsl = TRUE; } + glsl = glsl && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 20); + if (glsl && gl_info->supported[ARB_VERTEX_SHADER] && gl_info->supported[ARB_FRAGMENT_SHADER]) return &glsl_shader_backend; - if (gl_info->supported[ARB_VERTEX_PROGRAM] && gl_info->supported[ARB_FRAGMENT_PROGRAM]) + if (arb && gl_info->supported[ARB_VERTEX_PROGRAM] && gl_info->supported[ARB_FRAGMENT_PROGRAM]) return &arb_program_shader_backend; if (glsl && (gl_info->supported[ARB_VERTEX_SHADER] || gl_info->supported[ARB_FRAGMENT_SHADER])) return &glsl_shader_backend; - if (gl_info->supported[ARB_VERTEX_PROGRAM] || gl_info->supported[ARB_FRAGMENT_PROGRAM]) + if (arb && (gl_info->supported[ARB_VERTEX_PROGRAM] || gl_info->supported[ARB_FRAGMENT_PROGRAM])) return &arb_program_shader_backend; return &none_shader_backend; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index ca83d0ae0d96..1b64d2cf5dc4 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -74,7 +74,6 @@ struct wined3d_settings wined3d_settings = { TRUE, /* Multithreaded CS by default. */ MAKEDWORD_VERSION(4, 4), /* Default to OpenGL 4.4 */ - TRUE, /* Use of GLSL enabled by default */ ORM_FBO, /* Use FBOs to do offscreen rendering */ PCI_VENDOR_NONE,/* PCI Vendor ID */ PCI_DEVICE_NONE,/* PCI Device ID */ @@ -90,6 +89,7 @@ struct wined3d_settings wined3d_settings = ~0U, /* No PS shader model limit by default. */ ~0u, /* No CS shader model limit by default. */ FALSE, /* 3D support enabled by default. */ + WINED3D_SHADER_BACKEND_AUTO, }; struct wined3d * CDECL wined3d_create(DWORD flags) @@ -218,14 +218,33 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) tmpvalue >> 16, tmpvalue & 0xffff); wined3d_settings.max_gl_version = tmpvalue; } - if ( !get_config_key( hkey, appkey, "UseGLSL", buffer, size) ) + if (!get_config_key(hkey, appkey, "ShaderBackend", buffer, size)) { - if (!strcmp(buffer,"disabled")) + if (!strcasecmp(buffer, "glsl")) { - ERR_(winediag)("The GLSL shader backend has been disabled. You get to keep all the pieces if it breaks.\n"); - TRACE("Use of GL Shading Language disabled.\n"); - wined3d_settings.use_glsl = FALSE; + ERR_(winediag)("Using the GLSL shader backend.\n"); + wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_GLSL; } + else if (!strcasecmp(buffer, "arb")) + { + ERR_(winediag)("Using the ARB shader backend.\n"); + wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_ARB; + } + else if (!strcasecmp(buffer, "none")) + { + ERR_(winediag)("Disabling shader backends.\n"); + wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_NONE; + } + } + else if (!get_config_key(hkey, appkey, "UseGLSL", buffer, size) && !strcmp(buffer, "disabled")) + { + wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_ARB; + } + if (wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_ARB + || wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_NONE) + { + ERR_(winediag)("The GLSL shader backend has been disabled. You get to keep all the pieces if it breaks.\n"); + TRACE("Use of GL Shading Language disabled.\n"); } if (!get_config_key(hkey, appkey, "OffscreenRenderingMode", buffer, size) && !strcmp(buffer,"backbuffer")) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cd49789c1b3d..b3f3847045dd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -375,13 +375,20 @@ static inline void wined3d_pause(void) #define PCI_VENDOR_NONE 0xffff /* e.g. 0x8086 for Intel and 0x10de for Nvidia */ #define PCI_DEVICE_NONE 0xffff /* e.g. 0x14f for a Geforce6200 */ +enum wined3d_shader_backend +{ + WINED3D_SHADER_BACKEND_AUTO, + WINED3D_SHADER_BACKEND_GLSL, + WINED3D_SHADER_BACKEND_ARB, + WINED3D_SHADER_BACKEND_NONE, +}; + /* NOTE: When adding fields to this structure, make sure to update the default * values in wined3d_main.c as well. */ struct wined3d_settings { unsigned int cs_multithreaded; DWORD max_gl_version; - BOOL use_glsl; int offscreen_rendering_mode; unsigned short pci_vendor_id; unsigned short pci_device_id; @@ -398,6 +405,7 @@ struct wined3d_settings unsigned int max_sm_ps; unsigned int max_sm_cs; BOOL no_3d; + enum wined3d_shader_backend shader_backend; }; extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN; -- 2.19.2

2 1

[PATCH 1/3] opengl32: add wrapper for wglCreateContext
by Stefan Riesenberger 25 Feb '19

25 Feb '19

This prevents a stack overflow when using Reshade, which hooks these functions. Signed-off-by: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> --- dlls/opengl32/wgl.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 92410053d5..1d1a944bae 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -398,9 +398,9 @@ HDC WINAPI wglGetCurrentDC(void) } /*********************************************************************** - * wglCreateContext (OPENGL32.@) + * wgl_create_context wrapper for hooking */ -HGLRC WINAPI wglCreateContext(HDC hdc) +HGLRC wgl_create_context(HDC hdc) { HGLRC ret = 0; struct wgl_context *drv_ctx; @@ -419,6 +419,14 @@ HGLRC WINAPI wglCreateContext(HDC hdc) return ret; } +/*********************************************************************** + * wglCreateContext (OPENGL32.@) + */ +HGLRC WINAPI wglCreateContext(HDC hdc) +{ + return wgl_create_context(hdc); +} + /*********************************************************************** * wglGetCurrentContext (OPENGL32.@) */ @@ -667,7 +675,7 @@ HGLRC WINAPI wglCreateLayerContext(HDC hdc, TRACE("(%p,%d)\n", hdc, iLayerPlane); if (iLayerPlane == 0) { - return wglCreateContext(hdc); + return wgl_create_context(hdc); } FIXME("no handler for layer %d\n", iLayerPlane); -- 2.20.1

3 5

[PATCH vkd3d 8/9] include: Add typedefs for vkd3d-shader function pointers.
by Józef Kucia 25 Feb '19

25 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 86 +++++++++++++++++++++++++++++------------- 1 file changed, 60 insertions(+), 26 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index fef058cb4c97..ed4c0a0075a6 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1,5 +1,5 @@ /* - * Copyright 2017 Józef Kucia for CodeWeavers + * Copyright 2017-2019 Józef Kucia for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -222,12 +222,6 @@ struct vkd3d_shader_domain_shader_compile_arguments enum vkd3d_tessellator_output_primitive partitioning; }; -int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_code *spirv, unsigned int compiler_options, - const struct vkd3d_shader_interface_info *shader_interface_info, - const struct vkd3d_shader_compile_arguments *compile_args); -void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); - enum vkd3d_filter { VKD3D_FILTER_MIN_MAG_MIP_POINT = 0x0, @@ -405,10 +399,6 @@ struct vkd3d_root_signature_desc enum vkd3d_root_signature_flags flags; }; -int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_root_signature_desc *root_signature); -void vkd3d_shader_free_root_signature(struct vkd3d_root_signature_desc *root_signature); - enum vkd3d_root_signature_version { VKD3D_ROOT_SIGNATURE_VERSION_1_0 = 0x1, @@ -416,10 +406,6 @@ enum vkd3d_root_signature_version VKD3D_FORCE_32_BIT_ENUM(VKD3D_ROOT_SIGNATURE_VERSION), }; -/* FIXME: Add support for returning error messages (ID3DBlob). */ -int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc *root_signature, - enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); - /* FIXME: Add support for 64 UAV bind slots. */ #define VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS 8 @@ -434,9 +420,6 @@ struct vkd3d_shader_scan_info bool use_vocp; }; -int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_scan_info *scan_info); - enum vkd3d_component_type { VKD3D_TYPE_VOID = 0, @@ -489,27 +472,78 @@ struct vkd3d_shader_signature unsigned int element_count; }; -int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_signature *signature); -struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( - const struct vkd3d_shader_signature *signature, const char *semantic_name, - unsigned int semantic_index, unsigned int stream_index); -void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature); - /* swizzle bits fields: wwzzyyxx */ #define VKD3D_SWIZZLE_X (0u) #define VKD3D_SWIZZLE_Y (1u) #define VKD3D_SWIZZLE_Z (2u) #define VKD3D_SWIZZLE_W (3u) + #define VKD3D_SWIZZLE_MASK (0x3u) #define VKD3D_SWIZZLE_SHIFT(idx) (2u * (idx)) -#define VKD3D_SWIZZLE(x, y, z, w) (((x & VKD3D_SWIZZLE_MASK) << VKD3D_SWIZZLE_SHIFT(0)) \ + +#define VKD3D_SWIZZLE(x, y, z, w) \ + (((x & VKD3D_SWIZZLE_MASK) << VKD3D_SWIZZLE_SHIFT(0)) \ | ((y & VKD3D_SWIZZLE_MASK) << VKD3D_SWIZZLE_SHIFT(1)) \ | ((z & VKD3D_SWIZZLE_MASK) << VKD3D_SWIZZLE_SHIFT(2)) \ | ((w & VKD3D_SWIZZLE_MASK) << VKD3D_SWIZZLE_SHIFT(3))) + #define VKD3D_NO_SWIZZLE \ VKD3D_SWIZZLE(VKD3D_SWIZZLE_X, VKD3D_SWIZZLE_Y, VKD3D_SWIZZLE_Z, VKD3D_SWIZZLE_W) +#ifndef VKD3D_SHADER_NO_PROTOTYPES + +int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, + struct vkd3d_shader_code *spirv, unsigned int compiler_options, + const struct vkd3d_shader_interface_info *shader_interface_info, + const struct vkd3d_shader_compile_arguments *compile_args); +void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); + +int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, + struct vkd3d_root_signature_desc *root_signature); +void vkd3d_shader_free_root_signature(struct vkd3d_root_signature_desc *root_signature); + +/* FIXME: Add support for returning error messages (ID3DBlob). */ +int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc *root_signature, + enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); + +int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, + struct vkd3d_shader_scan_info *scan_info); + +int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, + struct vkd3d_shader_signature *signature); +struct vkd3d_shader_signature_element *vkd3d_shader_find_signature_element( + const struct vkd3d_shader_signature *signature, const char *semantic_name, + unsigned int semantic_index, unsigned int stream_index); +void vkd3d_shader_free_shader_signature(struct vkd3d_shader_signature *signature); + +#endif /* VKD3D_SHADER_NO_PROTOTYPES */ + +/* + * Function pointer typedefs for vkd3d-shader functions. + */ +typedef int (*PFN_vkd3d_shader_compile_dxbc)(const struct vkd3d_shader_code *dxbc, + struct vkd3d_shader_code *spirv, unsigned int compiler_options, + const struct vkd3d_shader_interface_info *shader_interface_info, + const struct vkd3d_shader_compile_arguments *compile_args); +typedef void (*PFN_vkd3d_shader_free_shader_code)(struct vkd3d_shader_code *code); + +typedef int (*PFN_vkd3d_shader_parse_root_signature)(const struct vkd3d_shader_code *dxbc, + struct vkd3d_root_signature_desc *root_signature); +typedef void (*PFN_vkd3d_shader_free_root_signature)(struct vkd3d_root_signature_desc *root_signature); + +typedef int (*PFN_vkd3d_shader_serialize_root_signature)(const struct vkd3d_root_signature_desc *root_signature, + enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); + +typedef int (*PFN_vkd3d_shader_scan_dxbc)(const struct vkd3d_shader_code *dxbc, + struct vkd3d_shader_scan_info *scan_info); + +typedef int (*PFN_vkd3d_shader_parse_input_signature)(const struct vkd3d_shader_code *dxbc, + struct vkd3d_shader_signature *signature); +typedef struct vkd3d_shader_signature_element * (*PFN_vkd3d_shader_find_signature_element)( + const struct vkd3d_shader_signature *signature, const char *semantic_name, + unsigned int semantic_index, unsigned int stream_index); +typedef void (*PFN_vkd3d_shader_free_shader_signature)(struct vkd3d_shader_signature *signature); + #ifdef __cplusplus } #endif /* __cplusplus */ -- 2.19.2

2 1