wine-commits April 2018

wine-commits@winehq.org

2 participants
542 discussions

Józef Kucia : wined3d: Simplify geometry_shader_init( ).
by Alexandre Julliard 23 Apr '18

23 Apr '18

Module: wine Branch: master Commit: 9d70df6a40b7830c67bcd078902e0ab6cc63a15f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d70df6a40b7830c67bcd078… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 23 16:20:15 2018 +0200 wined3d: Simplify geometry_shader_init(). 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 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8934c4f..cda812a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3730,7 +3730,7 @@ static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3 const struct wined3d_shader_desc *desc, const struct wined3d_stream_output_desc *so_desc, void *parent, const struct wined3d_parent_ops *parent_ops) { - struct wined3d_stream_output_element *elements = NULL; + struct wined3d_stream_output_element *elements; enum wined3d_shader_type shader_type; HRESULT hr; @@ -3748,17 +3748,17 @@ static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3 } } - if (so_desc && !(elements = heap_calloc(so_desc->element_count, sizeof(*elements)))) - return E_OUTOFMEMORY; - if (FAILED(hr = shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_GEOMETRY, parent, parent_ops))) - { - heap_free(elements); return hr; - } if (so_desc) { + if (!(elements = heap_calloc(so_desc->element_count, sizeof(*elements)))) + { + shader_cleanup(shader); + return E_OUTOFMEMORY; + } + shader->u.gs.so_desc = *so_desc; shader->u.gs.so_desc.elements = elements; memcpy(elements, so_desc->elements, so_desc->element_count * sizeof(*elements));

1 0

Józef Kucia : wined3d: Introduce helper function to get shader type from byte code.
by Alexandre Julliard 23 Apr '18

23 Apr '18

Module: wine Branch: master Commit: 319abecc41d36e9c4d31ec9bf463b1d7ac4aa51e URL: https://source.winehq.org/git/wine.git/?a=commit;h=319abecc41d36e9c4d31ec9b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 23 16:20:14 2018 +0200 wined3d: Introduce helper function to get shader type from byte code. 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 | 24 +++++++++++++++ dlls/wined3d/shader_sm4.c | 69 +++++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 4 +++ 3 files changed, 70 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c20c1da..8934c4f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -419,6 +419,15 @@ static const struct wined3d_shader_frontend *shader_select_frontend(enum wined3d } } +static enum wined3d_shader_type shader_get_shader_type(const struct wined3d_shader_desc *desc) +{ + if (desc->format == WINED3D_SHADER_BYTE_CODE_FORMAT_SM4) + return wined3d_get_sm4_shader_type(desc->byte_code, desc->byte_code_size); + + FIXME("Could not get shader type for byte code format %#x.\n", desc->format); + return WINED3D_SHADER_TYPE_INVALID; +} + void string_buffer_clear(struct wined3d_string_buffer *buffer) { buffer->buffer[0] = '\0'; @@ -3722,8 +3731,23 @@ static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3 void *parent, const struct wined3d_parent_ops *parent_ops) { struct wined3d_stream_output_element *elements = NULL; + enum wined3d_shader_type shader_type; HRESULT hr; + if (so_desc) + { + shader_type = shader_get_shader_type(desc); + switch (shader_type) + { + case WINED3D_SHADER_TYPE_VERTEX: + case WINED3D_SHADER_TYPE_DOMAIN: + FIXME("Stream output not supported for %s.\n", debug_shader_type(shader_type)); + return E_NOTIMPL; + default: + break; + } + } + if (so_desc && !(elements = heap_calloc(so_desc->element_count, sizeof(*elements)))) return E_OUTOFMEMORY; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 8eac746..f11af76 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1218,6 +1218,43 @@ static enum wined3d_data_type map_data_type(char t) } } +enum wined3d_shader_type wined3d_get_sm4_shader_type(const DWORD *byte_code, size_t byte_code_size) +{ + DWORD shader_type; + + if (byte_code_size / sizeof(*byte_code) < 1) + { + WARN("Invalid byte code size %lu.\n", (long)byte_code_size); + return WINED3D_SHADER_TYPE_INVALID; + } + + shader_type = byte_code[0] >> 16; + switch (shader_type) + { + case WINED3D_SM4_PS: + return WINED3D_SHADER_TYPE_PIXEL; + break; + case WINED3D_SM4_VS: + return WINED3D_SHADER_TYPE_VERTEX; + break; + case WINED3D_SM4_GS: + return WINED3D_SHADER_TYPE_GEOMETRY; + break; + case WINED3D_SM5_HS: + return WINED3D_SHADER_TYPE_HULL; + break; + case WINED3D_SM5_DS: + return WINED3D_SHADER_TYPE_DOMAIN; + break; + case WINED3D_SM5_CS: + return WINED3D_SHADER_TYPE_COMPUTE; + break; + default: + FIXME("Unrecognised shader type %#x.\n", shader_type); + return WINED3D_SHADER_TYPE_INVALID; + } +} + static void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, const struct wined3d_shader_signature *output_signature) { @@ -1251,35 +1288,13 @@ static void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, priv->start = &byte_code[2]; priv->end = &byte_code[token_count]; - switch (version_token >> 16) + priv->shader_version.type = wined3d_get_sm4_shader_type(byte_code, byte_code_size); + if (priv->shader_version.type == WINED3D_SHADER_TYPE_INVALID) { - case WINED3D_SM4_PS: - priv->shader_version.type = WINED3D_SHADER_TYPE_PIXEL; - break; - - case WINED3D_SM4_VS: - priv->shader_version.type = WINED3D_SHADER_TYPE_VERTEX; - break; - - case WINED3D_SM4_GS: - priv->shader_version.type = WINED3D_SHADER_TYPE_GEOMETRY; - break; - - case WINED3D_SM5_HS: - priv->shader_version.type = WINED3D_SHADER_TYPE_HULL; - break; - - case WINED3D_SM5_DS: - priv->shader_version.type = WINED3D_SHADER_TYPE_DOMAIN; - break; - - case WINED3D_SM5_CS: - priv->shader_version.type = WINED3D_SHADER_TYPE_COMPUTE; - break; - - default: - FIXME("Unrecognised shader type %#x.\n", version_token >> 16); + heap_free(priv); + return NULL; } + priv->shader_version.major = WINED3D_SM4_VERSION_MAJOR(version_token); priv->shader_version.minor = WINED3D_SM4_VERSION_MINOR(version_token); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e9e3f86..9ab1843 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -929,6 +929,7 @@ enum wined3d_shader_type WINED3D_SHADER_TYPE_COMPUTE = WINED3D_SHADER_TYPE_GRAPHICS_COUNT, WINED3D_SHADER_TYPE_COUNT, + WINED3D_SHADER_TYPE_INVALID = WINED3D_SHADER_TYPE_COUNT, }; struct wined3d_shader_version @@ -1265,6 +1266,9 @@ struct wined3d_shader_frontend extern const struct wined3d_shader_frontend sm1_shader_frontend DECLSPEC_HIDDEN; extern const struct wined3d_shader_frontend sm4_shader_frontend DECLSPEC_HIDDEN; +enum wined3d_shader_type wined3d_get_sm4_shader_type(const DWORD *byte_code, + size_t byte_code_size) DECLSPEC_HIDDEN; + typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *); #define WINED3D_SHADER_CAP_VS_CLIPPING 0x00000001

1 0

Zebediah Figura : d3dx10/tests: Remove todo_wine from succeeding tests.
by Alexandre Julliard 23 Apr '18

23 Apr '18

Module: wine Branch: master Commit: 94756f24001adbbb79a16426f5c9dbf6c695f81d URL: https://source.winehq.org/git/wine.git/?a=commit;h=94756f24001adbbb79a16426… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 21 14:48:25 2018 -0500 d3dx10/tests: Remove todo_wine from succeeding tests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index ac0852b..0baba65 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -526,15 +526,14 @@ float4 main(float4 color : COLOR) : SV_TARGET wine_dbgstr_rect(&tmp_rect[i]), i); } ID3D10Device_RSGetViewports(device, &count, NULL); - todo_wine ok(count == D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, + ok(count == D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, "Got unexpected viewport count %u.\n", count); memset(tmp_viewport, 0x55, sizeof(tmp_viewport)); count = D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ID3D10Device_RSGetViewports(device, &count, tmp_viewport); for (i = 0; i < D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ++i) { - todo_wine_if(i) - ok(tmp_viewport[i].TopLeftX == i * 3 + ok(tmp_viewport[i].TopLeftX == i * 3 && tmp_viewport[i].TopLeftY == i * 4 && tmp_viewport[i].Width == 3 && tmp_viewport[i].Height == 4

1 0

Hugh McMaster : reg: Null terminate hex-formatted REG_SZ data if necessary.
by Alexandre Julliard 23 Apr '18

23 Apr '18

Module: wine Branch: master Commit: 65717d67260fb6f723dcfe9bf9008d249348c2e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65717d67260fb6f723dcfe9b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 23 13:37:28 2018 +0000 reg: Null terminate hex-formatted REG_SZ data if necessary. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/import.c | 3 ++- programs/reg/tests/reg.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/reg/import.c b/programs/reg/import.c index f2ce80e..779ea28 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -409,7 +409,8 @@ static void free_parser_data(struct parser *parser) static void prepare_hex_string_data(struct parser *parser) { - if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ) + if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ || + parser->data_type == REG_SZ) { if (parser->is_unicode) { diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 5004414..aba71b7 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4668,7 +4668,7 @@ static void test_export(void) err = RegQueryValueExA(hkey, "Wine4d", NULL, &type, (BYTE *)&buffer, &size); ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); ok(type == REG_SZ, "got wrong type %u, expected %u\n", type, REG_SZ); - todo_wine ok(size == 5 || broken(size == 4) /* WinXP */, "got wrong size %u, expected 5\n", size); + ok(size == 5 || broken(size == 4) /* WinXP */, "got wrong size %u, expected 5\n", size); ok(memcmp(buffer, "\0abc", size) == 0, "got wrong data\n"); dword = 0x100; verify_reg(hkey, "Wine4e", REG_DWORD, &dword, sizeof(dword), 0);

1 0

Hugh McMaster : regedit: Null terminate hex-formatted REG_SZ data if necessary.
by Alexandre Julliard 23 Apr '18

23 Apr '18

Module: wine Branch: master Commit: 829c0ced694df890b7770a40ada9bcab4d1e17c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=829c0ced694df890b7770a40… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 23 13:37:27 2018 +0000 regedit: Null terminate hex-formatted REG_SZ data if necessary. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 3 ++- programs/regedit/tests/regedit.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 35b0322..84a16f9 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -507,7 +507,8 @@ static void free_parser_data(struct parser *parser) static void prepare_hex_string_data(struct parser *parser) { - if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ) + if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ || + parser->data_type == REG_SZ) { if (parser->is_unicode) { diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 41712a1..845ab00 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -3679,7 +3679,7 @@ static void test_export(void) verify_reg(hkey, "Wine4a", REG_DWORD, &dword, sizeof(dword), 0); verify_reg(hkey, "Wine4b", REG_SZ, "\0\0\0\0\0\0\0", 4, 0); verify_reg(hkey, "Wine4c", REG_SZ, "Value", 6, 0); - verify_reg(hkey, "Wine4d", REG_SZ, "\0abc", 5, TODO_REG_SIZE); + verify_reg(hkey, "Wine4d", REG_SZ, "\0abc", 5, 0); dword = 0x100; verify_reg(hkey, "Wine4e", REG_DWORD, &dword, sizeof(dword), 0); verify_reg(hkey, "Wine4f", REG_SZ, "\0Value", 7, 0);

1 0

Nikolay Sivov : include: Add more DXGI swapchain flags.
by Alexandre Julliard 23 Apr '18

23 Apr '18

Module: wine Branch: master Commit: 3cc1e2315ffa82c3128d9d440325865c24281cec URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cc1e2315ffa82c3128d9d44… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 23 17:22:04 2018 +0430 include: Add more DXGI swapchain flags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxgi.idl | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index 0626315..b724770 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -108,10 +108,21 @@ typedef struct DXGI_ADAPTER_DESC { LUID AdapterLuid; } DXGI_ADAPTER_DESC; -typedef enum DXGI_SWAP_CHAIN_FLAG { - DXGI_SWAP_CHAIN_FLAG_NONPREROTATED = 1, - DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH = 2, - DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE = 4 +typedef enum DXGI_SWAP_CHAIN_FLAG +{ + DXGI_SWAP_CHAIN_FLAG_NONPREROTATED = 0x0001, + DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH = 0x0002, + DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE = 0x0004, + DXGI_SWAP_CHAIN_FLAG_RESTRICTED_CONTEXT = 0x0008, + DXGI_SWAP_CHAIN_FLAG_RESTRICT_SHARED_RESOURCE_DRIVER = 0x0010, + DXGI_SWAP_CHAIN_FLAG_DISPLAY_ONLY = 0x0020, + DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT = 0x0040, + DXGI_SWAP_CHAIN_FLAG_FOREGROUND_LAYER = 0x0080, + DXGI_SWAP_CHAIN_FLAG_FULLSCREEN_VIDEO = 0x0100, + DXGI_SWAP_CHAIN_FLAG_YUV_VIDEO = 0x0200, + DXGI_SWAP_CHAIN_FLAG_HW_PROTECTED = 0x0400, + DXGI_SWAP_CHAIN_FLAG_ALLOW_TEARING = 0x0800, + DXGI_SWAP_CHAIN_FLAG_RESTRICTED_TO_ALL_HOLOGRAPHIC_DISPLAYS = 0x1000, } DXGI_SWAP_CHAIN_FLAG; typedef struct DXGI_SWAP_CHAIN_DESC {

1 0

Nikolay Sivov : wined3d: Add support for setting multiple scissor rectangles.
by Alexandre Julliard 23 Apr '18

23 Apr '18

Module: wine Branch: master Commit: 409497ee8439479278f04a7c28f35013630f5b1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=409497ee8439479278f04a7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 23 17:22:03 2018 +0430 wined3d: Add support for setting multiple scissor rectangles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 4 ++-- dlls/d3d9/device.c | 2 +- dlls/wined3d/context.c | 4 ++++ dlls/wined3d/cs.c | 34 ++++++++++++++++++------------ dlls/wined3d/device.c | 45 +++++++++++++++++++++++++-------------- dlls/wined3d/state.c | 48 ++++++++++++++++++++++++++++++++---------- dlls/wined3d/stateblock.c | 17 ++++++++++----- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 6 ++++-- include/wine/wined3d.h | 3 ++- 10 files changed, 113 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=409497ee8439479278f0…

1 0

Valentin Gabriel Mitrea : d3d10: Implement D3D10CompileEffectFromMemory().
by Alexandre Julliard 23 Apr '18

23 Apr '18

Module: wine Branch: master Commit: 9dd88e31efd753ff0c6f0c5ac077773464519cc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dd88e31efd753ff0c6f0c5a… Author: Valentin Gabriel Mitrea <mitrea.valentin(a)gmail.com> Date: Sun Apr 22 23:27:20 2018 +0300 d3d10: Implement D3D10CompileEffectFromMemory(). Signed-off-by: Valentin Gabriel Mitrea <mitrea.valentin(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_main.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index f2fbb41..7c8bee7 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -253,17 +253,13 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const const D3D10_SHADER_MACRO *defines, ID3D10Include *include, UINT hlsl_flags, UINT fx_flags, ID3D10Blob **effect, ID3D10Blob **errors) { - FIXME("data %p, data_size %lu, filename %s, defines %p, include %p," - " hlsl_flags %#x, fx_flags %#x, effect %p, errors %p stub!\n", + TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, " + "hlsl_flags %#x, fx_flags %#x, effect %p, errors %p.\n", data, data_size, wine_dbgstr_a(filename), defines, include, hlsl_flags, fx_flags, effect, errors); - if (effect) - *effect = NULL; - if (errors) - *errors = NULL; - - return E_NOTIMPL; + return D3DCompile(data, data_size, filename, defines, include, + NULL, "fx_4_0", hlsl_flags, fx_flags, effect, errors); } HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UINT fx_flags,

1 0

Jacek Caban : d3d11.idl: Fixed a typo in CD3D11_BLEND_DESC constructor.
by Alexandre Julliard 23 Apr '18

23 Apr '18

Module: wine Branch: master Commit: 51c9aaf58499ff59c1f46f6f728dd384e54821a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51c9aaf58499ff59c1f46f6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 20 17:32:58 2018 +0200 d3d11.idl: Fixed a typo in CD3D11_BLEND_DESC constructor. Spotted by Tom Ritter. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/d3d11.idl b/include/d3d11.idl index b4cc3be..78b4f33 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -1371,7 +1371,9 @@ cpp_quote(" explicit CD3D11_BLEND_DESC(const D3D11_BLEND_DESC &o) : D3D11_BLE cpp_quote(" explicit CD3D11_BLEND_DESC(CD3D11_DEFAULT) {") cpp_quote(" AlphaToCoverageEnable = FALSE;") cpp_quote(" IndependentBlendEnable = FALSE;") -cpp_quote(" for(D3D11_RENDER_TARGET_BLEND_DESC *target; target < RenderTarget+D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; target++) {") +cpp_quote(" for(D3D11_RENDER_TARGET_BLEND_DESC *target = RenderTarget;") +cpp_quote(" target < RenderTarget + D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT;") +cpp_quote(" target++) {") cpp_quote(" target->BlendEnable = FALSE;") cpp_quote(" target->SrcBlend = target->SrcBlendAlpha = D3D11_BLEND_ONE;") cpp_quote(" target->DestBlend = target->DestBlendAlpha = D3D11_BLEND_ZERO;")

1 0

Zebediah Figura : msi: Avoid returning an uninitialized variable.
by Alexandre Julliard 23 Apr '18

23 Apr '18

Module: wine Branch: master Commit: 859f455cb95a37e11f1187731be530fc9b48da8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=859f455cb95a37e11f118773… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 22 09:53:10 2018 -0500 msi: Avoid returning an uninitialized variable. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/record.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 5804046..a7d5588 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -1059,7 +1059,7 @@ UINT copy_remote_record(const struct wire_record *in, MSIHANDLE out) { MSIRECORD *rec; unsigned int i; - UINT r; + UINT r = ERROR_SUCCESS; if (!(rec = msihandle2msiinfo(out, MSIHANDLETYPE_RECORD))) return ERROR_INVALID_HANDLE;

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2018