October 2018 - Wine-Commits

Alex Henrie : d3dcompiler_43/tests: Avoid using GCC's typeof extension.
by Alexandre Julliard Oct. 4, 2018

Oct. 4, 2018

Module: wine Branch: master Commit: 451e4d326e595e246362505d7abeb4a84aca9c5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=451e4d326e595e246362505d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 19 22:43:13 2018 -0600 d3dcompiler_43/tests: Avoid using GCC's typeof extension. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/blob.c | 6 +++--- dlls/d3dcompiler_43/tests/reflection.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index cc629fa..443ed27 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -33,9 +33,9 @@ */ #define D3DERR_INVALIDCALL 0x8876086c -static typeof(D3DCreateBlob) *pD3DCreateBlob; -static typeof(D3DGetBlobPart) *pD3DGetBlobPart; -static typeof(D3DStripShader) *pD3DStripShader; +static HRESULT (WINAPI *pD3DCreateBlob)(SIZE_T, ID3DBlob **); +static HRESULT (WINAPI *pD3DGetBlobPart)(const void *, SIZE_T, D3D_BLOB_PART, UINT, ID3DBlob **); +static HRESULT (WINAPI *pD3DStripShader)(const void *, SIZE_T, UINT, ID3DBlob **); #define MAKE_TAG(ch0, ch1, ch2, ch3) \ ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 5a85159..2c1c902 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -38,7 +38,7 @@ */ #define D3DERR_INVALIDCALL 0x8876086c -static typeof(D3DReflect) *pD3DReflect; +static HRESULT (WINAPI *pD3DReflect)(const void *, SIZE_T, REFIID, void **); /* Creator string for comparison - Version 9.29.952.3111 (43) */ static DWORD shader_creator[] = {

1 0

Hans Leidekker : winhttp: Implement the WINHTTP_FLAG_ESCAPE_* flags.
by Alexandre Julliard Oct. 4, 2018

Oct. 4, 2018

Module: wine Branch: master Commit: ace7f05672d9759bdde842b74deddea6caf0f012 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ace7f05672d9759bdde842b7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 4 10:32:01 2018 +0200 winhttp: Implement the WINHTTP_FLAG_ESCAPE_* flags. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42677 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 12 ++-- dlls/winhttp/session.c | 67 +++++++++++++++------- dlls/winhttp/tests/url.c | 29 +++++++++- dlls/winhttp/tests/winhttp.c | 60 +++++++++++++++----- dlls/winhttp/url.c | 122 +++++++++++++++++------------------------ dlls/winhttp/winhttp_private.h | 10 +++- 6 files changed, 188 insertions(+), 112 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ace7f05672d9759bdde8…

1 0

Andrew Wesie : wined3d: Add fast-path for texture download blit.
by Alexandre Julliard Oct. 4, 2018

Oct. 4, 2018

Module: wine Branch: master Commit: 54a9e84952ce8f566f79ab92930faf84bad0cfc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54a9e84952ce8f566f79ab92… Author: Andrew Wesie <awesie(a)gmail.com> Date: Thu Oct 4 01:16:44 2018 -0500 wined3d: Add fast-path for texture download blit. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 28 +++++++++++++++++++++++++--- dlls/wined3d/texture.c | 22 ++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4942177..71693ad 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3257,6 +3257,29 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ return WINED3D_OK; } } + else if (!(src_sub_resource->locations & surface_simple_locations) + && (dst_sub_resource->locations & dst_texture->resource.map_binding)) + { + /* Download */ + if (scale) + TRACE("Not doing download because of scaling.\n"); + else if (convert) + TRACE("Not doing download because of format conversion.\n"); + else if (src_texture->resource.format->conv_byte_count) + TRACE("Not doing download because the source format needs conversion.\n"); + else if (is_multisample_location(src_texture, WINED3D_LOCATION_TEXTURE_RGB)) + TRACE("Not doing download because of multisample source.\n"); + else if (!texture2d_is_full_rect(src_texture, src_sub_resource_idx % src_texture->level_count, &src_rect)) + TRACE("Not doing download because of partial download (src).\n"); + else if (!texture2d_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_rect)) + TRACE("Not doing download because of partial download (dst).\n"); + else + { + wined3d_texture_download_from_texture(dst_texture, dst_sub_resource_idx, src_texture, + src_sub_resource_idx); + return WINED3D_OK; + } + } else if (dst_swapchain && dst_swapchain->back_buffers && dst_texture == dst_swapchain->front_buffer && src_texture == dst_swapchain->back_buffers[0]) @@ -3280,10 +3303,9 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ return WINED3D_OK; } - else if ((flags & WINED3D_BLT_RAW) || (!scale && !convert && !resolve)) - { + + if ((flags & WINED3D_BLT_RAW) || (blit_op == WINED3D_BLIT_OP_COLOR_BLIT && !scale && !convert && !resolve)) blit_op = WINED3D_BLIT_OP_RAW_BLIT; - } if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU) dst_location = dst_texture->resource.draw_binding; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0b11c94..400d367 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3806,3 +3806,25 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); } + +/* Partial downloads are not supported. */ +void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx) +{ + struct wined3d_context *context; + struct wined3d_bo_address data; + DWORD dst_location = dst_texture->resource.map_binding; + + context = context_acquire(src_texture->resource.device, NULL, 0); + + wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); + wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &data, dst_location); + wined3d_texture_bind_and_dirtify(src_texture, context, + !(src_texture->sub_resources[src_sub_resource_idx].locations & WINED3D_LOCATION_TEXTURE_RGB)); + wined3d_texture_download_data(src_texture, src_sub_resource_idx, context, &data); + + context_release(context); + + wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, dst_location); + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~dst_location); +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fadb607..9baefa6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3349,6 +3349,8 @@ HRESULT wined3d_texture_check_box_dimensions(const struct wined3d_texture *textu unsigned int level, const struct wined3d_box *box) DECLSPEC_HIDDEN; void wined3d_texture_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, const struct wined3d_bo_address *data) DECLSPEC_HIDDEN; +void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx) DECLSPEC_HIDDEN; GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_bo_address *data, DWORD locations) DECLSPEC_HIDDEN;

1 0

Serge Gautherie : credui: Use SecureZeroMemory().
by Alexandre Julliard Oct. 3, 2018

Oct. 3, 2018

Module: wine Branch: master Commit: adf451279837743a3b19787eb1e1b9c2b239bcd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adf451279837743a3b19787e… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Wed Oct 3 00:21:54 2018 +0200 credui: Use SecureZeroMemory(). Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/credui/credui_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index bf9f7d1..1b9c71b 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -89,7 +89,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) HeapFree(GetProcessHeap(), 0, entry->pszTargetName); HeapFree(GetProcessHeap(), 0, entry->pszUsername); - ZeroMemory(entry->pszPassword, (strlenW(entry->pszPassword) + 1) * sizeof(WCHAR)); + SecureZeroMemory(entry->pszPassword, strlenW(entry->pszPassword) * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, entry->pszPassword); HeapFree(GetProcessHeap(), 0, entry); } @@ -673,7 +673,7 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, { found = TRUE; HeapFree(GetProcessHeap(), 0, entry->pszUsername); - ZeroMemory(entry->pszPassword, (strlenW(entry->pszPassword) + 1) * sizeof(WCHAR)); + SecureZeroMemory(entry->pszPassword, strlenW(entry->pszPassword) * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, entry->pszPassword); } @@ -733,7 +733,7 @@ DWORD WINAPI CredUIConfirmCredentialsW(PCWSTR pszTargetName, BOOL bConfirm) HeapFree(GetProcessHeap(), 0, entry->pszTargetName); HeapFree(GetProcessHeap(), 0, entry->pszUsername); - ZeroMemory(entry->pszPassword, (strlenW(entry->pszPassword) + 1) * sizeof(WCHAR)); + SecureZeroMemory(entry->pszPassword, strlenW(entry->pszPassword) * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, entry->pszPassword); HeapFree(GetProcessHeap(), 0, entry);

1 0

Jacek Caban : mshtml: Use set_document_mode in process_document_response_headers.
by Alexandre Julliard Oct. 3, 2018

Oct. 3, 2018

Module: wine Branch: master Commit: 89f5a9df39d7310823e60d45f33140f35d7d0fa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89f5a9df39d7310823e60d45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 3 19:20:19 2018 +0200 mshtml: Use set_document_mode in process_document_response_headers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mutation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 6508270..dd46dd8 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -461,7 +461,7 @@ void process_document_response_headers(HTMLDocumentNode *doc, IBinding *binding) header = heap_strdupAtoW(buf); if(header && parse_ua_compatible(header, &document_mode)) { TRACE("setting document mode %d\n", document_mode); - doc->document_mode = document_mode; + set_document_mode(doc, document_mode, FALSE); } heap_free(header); }

1 0

Louis Lenders : ucrtbase: Add version resource.
by Alexandre Julliard Oct. 3, 2018

Oct. 3, 2018

Module: wine Branch: master Commit: 1622abbb081c1afe052d16769898976e90f98062 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1622abbb081c1afe052d1676… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Oct 3 19:35:33 2018 +0200 ucrtbase: Add version resource. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45928 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/Makefile.in | 2 ++ dlls/ucrtbase/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index d44b17a..23d8292 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -33,3 +33,5 @@ C_SRCS = \ time.c \ undname.c \ wcs.c + +RC_SRCS = version.rc diff --git a/dlls/ucrtbase/version.rc b/dlls/ucrtbase/version.rc new file mode 100644 index 0000000..f034bc3 --- /dev/null +++ b/dlls/ucrtbase/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2018 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine runtime library" +#define WINE_FILENAME_STR "ucrtbase.dll" +#define WINE_FILEVERSION 10,0,14393,2247 +#define WINE_FILEVERSION_STR "10.0.14393.2247" +#define WINE_PRODUCTVERSION 10,0,14393,2247 +#define WINE_PRODUCTVERSION_STR "10.0.14393.2247" + +#include "wine/wine_common_ver.rc"

1 0

Huw Davies : wineps: Leave passthrough mode at the end of the page.
by Alexandre Julliard Oct. 3, 2018

Oct. 3, 2018

Module: wine Branch: master Commit: cd9e63f7581c459b385cd20aa8d9b004de498d0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd9e63f7581c459b385cd20a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 3 11:39:21 2018 +0100 wineps: Leave passthrough mode at the end of the page. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/escape.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 7b90116..43bbe18 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -384,6 +384,8 @@ INT PSDRV_EndPage( PHYSDEV dev ) FIXME("Already ended a page?\n"); return 1; } + + passthrough_leave(dev); if(!PSDRV_WriteEndPage( dev )) return 0; PSDRV_EmptyDownloadList(dev, FALSE);

1 0

Huw Davies : wineps: Add helpers to enter and leave passthrough.
by Alexandre Julliard Oct. 3, 2018

Oct. 3, 2018

Module: wine Branch: master Commit: 187f90d89912959cefdfb55c015d81704d26b31a URL: https://source.winehq.org/git/wine.git/?a=commit;h=187f90d89912959cefdfb55c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 3 11:39:20 2018 +0100 wineps: Add helpers to enter and leave passthrough. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/escape.c | 10 +--------- dlls/wineps.drv/ps.c | 27 +++++++++++++++++++++++---- dlls/wineps.drv/psdrv.h | 3 +++ 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index f9616bc..7b90116 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -44,10 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); -static const char psbegindocument[] = -"%%BeginDocument: Wine passthrough\n"; - - DWORD write_spool( PHYSDEV dev, const void *data, DWORD num ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); @@ -269,11 +265,7 @@ INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, * length of the string, rather than 2 more. So we'll use the WORD at * in_data[0] instead. */ - if (physDev->job.passthrough_state == passthrough_none) - { - write_spool(dev, psbegindocument, sizeof(psbegindocument) - 1); - physDev->job.passthrough_state = passthrough_active; - } + passthrough_enter(dev); return write_spool(dev, ((char*)in_data) + 2, *(const WORD*)in_data); } diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 663cc23..4fd3c76 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -213,9 +213,31 @@ static const char psarrayput[] = static const char psarraydef[] = "/%s %d array def\n"; +static const char psbegindocument[] = +"%%BeginDocument: Wine passthrough\n"; static const char psenddocument[] = "\n%%EndDocument\n"; +void passthrough_enter(PHYSDEV dev) +{ + PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + + if (physDev->job.passthrough_state != passthrough_none) return; + + write_spool(dev, psbegindocument, sizeof(psbegindocument) - 1); + physDev->job.passthrough_state = passthrough_active; +} + +void passthrough_leave(PHYSDEV dev) +{ + PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + + if (physDev->job.passthrough_state == passthrough_none) return; + + write_spool(dev, psenddocument, sizeof(psenddocument) - 1); + physDev->job.passthrough_state = passthrough_none; +} + DWORD PSDRV_WriteSpool(PHYSDEV dev, LPCSTR lpData, DWORD cch) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); @@ -226,10 +248,7 @@ DWORD PSDRV_WriteSpool(PHYSDEV dev, LPCSTR lpData, DWORD cch) return 0; } - if(physDev->job.passthrough_state != passthrough_none) { /* Was in PASSTHROUGH mode */ - write_spool( dev, psenddocument, sizeof(psenddocument)-1 ); - physDev->job.passthrough_state = passthrough_none; - } + passthrough_leave(dev); if(physDev->job.OutOfPage) { /* Will get here after NEWFRAME Escape */ if( !PSDRV_StartPage(dev) ) diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index d92fbb3..9cbee65 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -578,6 +578,9 @@ extern void T42_free(TYPE42 *t42) DECLSPEC_HIDDEN; extern DWORD RLE_encode(BYTE *in_buf, DWORD len, BYTE *out_buf) DECLSPEC_HIDDEN; extern DWORD ASCII85_encode(BYTE *in_buf, DWORD len, BYTE *out_buf) DECLSPEC_HIDDEN; +extern void passthrough_enter(PHYSDEV dev) DECLSPEC_HIDDEN; +extern void passthrough_leave(PHYSDEV dev) DECLSPEC_HIDDEN; + #define push_lc_numeric(x) do { \ const char *tmplocale = setlocale(LC_NUMERIC,NULL); \ setlocale(LC_NUMERIC,x);

1 0

Józef Kucia : wined3d: Allow stream output with domain shaders.
by Alexandre Julliard Oct. 3, 2018

Oct. 3, 2018

Module: wine Branch: master Commit: 272414177f3b60528c92a39d7278af37f71c250a URL: https://source.winehq.org/git/wine.git/?a=commit;h=272414177f3b60528c92a39d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 3 12:32:20 2018 +0200 wined3d: Allow stream output with domain shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 32261a9..8e857b5 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3815,13 +3815,11 @@ static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader, switch (shader_version.type) { case WINED3D_SHADER_TYPE_VERTEX: + case WINED3D_SHADER_TYPE_DOMAIN: heap_free(shader->function); shader->function = NULL; shader->functionLength = 0; break; - case WINED3D_SHADER_TYPE_DOMAIN: - FIXME("Stream output not supported for %s.\n", debug_shader_type(shader_version.type)); - return E_NOTIMPL; case WINED3D_SHADER_TYPE_GEOMETRY: break; default:

1 0

Józef Kucia : wined3d: Set load_local_constsF in shader_set_function().
by Alexandre Julliard Oct. 3, 2018

Oct. 3, 2018

Module: wine Branch: master Commit: 11fc530ac9a6cd6036ac9191d21d80630925033c URL: https://source.winehq.org/git/wine.git/?a=commit;h=11fc530ac9a6cd6036ac9191… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Oct 3 12:32:16 2018 +0200 wined3d: Set load_local_constsF in shader_set_function(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 60e8174..a5b1486 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3390,6 +3390,8 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, return WINED3DERR_INVALIDCALL; } + shader->load_local_constsF = shader->lconst_inf_or_nan; + return WINED3D_OK; } @@ -3787,8 +3789,6 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device } } - shader->load_local_constsF = shader->lconst_inf_or_nan; - return hr; }

1 0