December 2017 - Wine-Commits

Matteo Bruni : wined3d: Implement manual mipmap generation.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: 0daea6d2a08b76ff3548d8e16c44cf629d8afa9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0daea6d2a08b76ff3548d8e16… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 4 18:07:31 2017 +0100 wined3d: Implement manual mipmap generation. 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/wined3d/cs.c | 30 ++++++++++++ dlls/wined3d/texture.c | 11 ----- dlls/wined3d/view.c | 102 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 2 + include/wine/wined3d.h | 2 +- 6 files changed, 136 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0daea6d2a08b76ff3548d…

1 0

Józef Kucia : wined3d: Store only supported user clip planes.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: 7225e601086f0cb9e33d10acf400253abe354763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7225e601086f0cb9e33d10acf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 5 00:26:35 2017 +0100 wined3d: Store only supported user clip planes. 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/device.c | 10 ++-------- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d_private.h | 4 +--- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7340488..d57758d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1757,7 +1757,7 @@ HRESULT CDECL wined3d_device_set_clip_plane(struct wined3d_device *device, { TRACE("device %p, plane_idx %u, plane %p.\n", device, plane_idx, plane); - if (plane_idx >= WINED3D_MAX_USER_CLIP_PLANES) + if (plane_idx >= device->adapter->gl_info.limits.user_clip_distances) { TRACE("Application has requested clipplane this device doesn't support.\n"); return WINED3DERR_INVALIDCALL; @@ -1774,12 +1774,6 @@ HRESULT CDECL wined3d_device_set_clip_plane(struct wined3d_device *device, device->update_state->clip_planes[plane_idx] = *plane; - if (plane_idx >= device->adapter->gl_info.limits.user_clip_distances) - { - WARN("Clip plane %u is not supported.\n", plane_idx); - return WINED3D_OK; - } - if (!device->recording) wined3d_cs_emit_set_clip_plane(device->cs, plane_idx, plane); @@ -1791,7 +1785,7 @@ HRESULT CDECL wined3d_device_get_clip_plane(const struct wined3d_device *device, { TRACE("device %p, plane_idx %u, plane %p.\n", device, plane_idx, plane); - if (plane_idx >= WINED3D_MAX_USER_CLIP_PLANES) + if (plane_idx >= device->adapter->gl_info.limits.user_clip_distances) { TRACE("Application has requested clipplane this device doesn't support.\n"); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index f80b875..9d61360 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -218,7 +218,7 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, stateblock_set_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1); for (i = 0; i < MAX_TEXTURES; ++i) states->textureState[i] = 0x3ffff; for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3ffe; - states->clipplane = 0xffffffff; + states->clipplane = (1u << MAX_CLIP_DISTANCES) - 1; states->pixelShaderConstantsB = 0xffff; states->pixelShaderConstantsI = 0xffff; states->vertexShaderConstantsB = 0xffff; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0e72aac..2321b41 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -259,8 +259,6 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup return complex_fixup; } -#define WINED3D_MAX_USER_CLIP_PLANES 32 - /* Device caps */ #define MAX_STREAMS 16 #define MAX_TEXTURES 8 @@ -2829,7 +2827,7 @@ struct wined3d_state DWORD texture_states[MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1]; - struct wined3d_vec4 clip_planes[WINED3D_MAX_USER_CLIP_PLANES]; + struct wined3d_vec4 clip_planes[MAX_CLIP_DISTANCES]; struct wined3d_material material; struct wined3d_viewport viewport; RECT scissor_rect;

1 0

Józef Kucia : d3d11/tests: Add test for combined clip and cull distances.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: 6eaebedc51c86d924e11c8b9e568996a10b53e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eaebedc51c86d924e11c8b9e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 5 00:26:32 2017 +0100 d3d11/tests: Add test for combined clip and cull distances. 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/d3d11/tests/d3d11.c | 209 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 209 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6eaebedc51c86d924e11c…

1 0

Matteo Bruni : d3d11: Implement GenerateMips().
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: bb3b55ce22f96d443c2053f6b1eb24e087ca1377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb3b55ce22f96d443c2053f6b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 4 18:36:46 2017 +0100 d3d11: Implement GenerateMips(). 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/d3d11/device.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7a8f3df..5281792 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1135,7 +1135,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearDepthStencilView(ID3D static void STDMETHODCALLTYPE d3d11_immediate_context_GenerateMips(ID3D11DeviceContext *iface, ID3D11ShaderResourceView *view) { - FIXME("iface %p, view %p stub!\n", iface, view); + struct d3d_shader_resource_view *srv = unsafe_impl_from_ID3D11ShaderResourceView(view); + + TRACE("iface %p, view %p.\n", iface, view); + + wined3d_mutex_lock(); + wined3d_shader_resource_view_generate_mipmaps(srv->wined3d_view); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_SetResourceMinLOD(ID3D11DeviceContext *iface, @@ -4193,9 +4199,15 @@ static void STDMETHODCALLTYPE d3d10_device_ClearDepthStencilView(ID3D10Device1 * } static void STDMETHODCALLTYPE d3d10_device_GenerateMips(ID3D10Device1 *iface, - ID3D10ShaderResourceView *shader_resource_view) + ID3D10ShaderResourceView *view) { - FIXME("iface %p, shader_resource_view %p stub!\n", iface, shader_resource_view); + struct d3d_shader_resource_view *srv = unsafe_impl_from_ID3D10ShaderResourceView(view); + + TRACE("iface %p, view %p.\n", iface, view); + + wined3d_mutex_lock(); + wined3d_shader_resource_view_generate_mipmaps(srv->wined3d_view); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_device_ResolveSubresource(ID3D10Device1 *iface,

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: 019d48f53bd61ef78020169d8e98231e386cec47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=019d48f53bd61ef78020169d8… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Dec 5 08:42:41 2017 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/po/lt.po b/po/lt.po index c8045ad..b85f823 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-11-18 20:45+0300\n" +"PO-Revision-Date: 2017-12-05 08:41+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -12019,17 +12019,6 @@ msgid "Icons (*.ico)" msgstr "Piktogramos (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12045,7 +12034,7 @@ msgstr "" " REG [operacija] [parametrai]\n" "\n" "Palaikomos operacijos:\n" -" ADD | DELETE | IMPORT | QUERY\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" "Pagalbai apie specifinę operaciją, įrašykite:\n" " REG [operacija] /?\n" @@ -12186,22 +12175,16 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Neatpažinta kaitos seka [\\%1!c!]\n" #: reg.rc:70 -#, fuzzy -#| msgid "REG IMPORT file.reg\n" msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG IMPORT failas.reg\n" +msgstr "REG EXPORT rakto_vardas failas.reg [/y]\n" #: reg.rc:71 -#, fuzzy -#| msgid "regedit: Invalid system key [%1]\n" msgid "reg: Invalid system key [%1]\n" -msgstr "regedit: Netinkamas sisteminis raktas [%1]\n" +msgstr "reg: Netinkamas sisteminis raktas [%1]\n" #: reg.rc:72 -#, fuzzy -#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "Registro reikšmė „%1“ jau egzistuoja. Ar norite ją perrašyti?" +msgstr "Failas „%1“ jau egzistuoja. Ar norite jį perrašyti?" #: regedit.rc:34 msgid "&Registry"

1 0

Hugh McMaster : reg: Allow switches to be uppercase or lowercase.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: a0a12d9f417266d3b86b32de44e6f8e0fa066174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0a12d9f417266d3b86b32de4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 5 11:25:19 2017 +0000 reg: Allow switches to be uppercase or lowercase. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 12 ++++++++++-- programs/reg/tests/reg.c | 10 +++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index f3718ed..8d510f7 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -890,12 +890,20 @@ BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long return TRUE; } -static BOOL is_help_switch(const WCHAR *s) +static BOOL is_switch(const WCHAR *s, const WCHAR c) { if (strlenW(s) > 2) return FALSE; - if ((s[0] == '/' || s[0] == '-') && (s[1] == 'h' || s[1] == '?')) + if ((s[0] == '/' || s[0] == '-') && (s[1] == c || s[1] == toupperW(c))) + return TRUE; + + return FALSE; +} + +static BOOL is_help_switch(const WCHAR *s) +{ + if (is_switch(s, '?') || is_switch(s, 'h')) return TRUE; return FALSE; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 04c995e..50fae7f 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -231,7 +231,7 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg add -H", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); @@ -618,7 +618,7 @@ static void test_delete(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg delete -H", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); add_value(hkey, "foo", REG_DWORD, &deadbeef, sizeof(deadbeef)); @@ -676,7 +676,7 @@ static void test_query(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg query -H", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); /* Create a test key */ add_key(HKEY_CURRENT_USER, KEY_BASE, &key); @@ -870,7 +870,7 @@ static void test_import(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg import -H", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg import missing.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -4419,7 +4419,7 @@ static void test_export(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg export -H", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg export \\\\remote-pc\\HKLM\\Wine file.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);

1 0

Hugh McMaster : reg/tests: Test capitalisation of switches.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: 1818267639232d4ed98269ea1ad9eeffbf8ef3cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1818267639232d4ed98269ea1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 5 11:25:17 2017 +0000 reg/tests: Test capitalisation of switches. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 81c9495..04c995e 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -227,6 +227,12 @@ static void test_add(void) run_reg_exe("reg add /?", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + run_reg_exe("reg add /h", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg add -H", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); @@ -608,6 +614,12 @@ static void test_delete(void) run_reg_exe("reg delete /?", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + run_reg_exe("reg delete /h", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg delete -H", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); add_value(hkey, "foo", REG_DWORD, &deadbeef, sizeof(deadbeef)); add_value(hkey, "bar", REG_DWORD, &deadbeef, sizeof(deadbeef)); @@ -660,6 +672,12 @@ static void test_query(void) run_reg_exe("reg query /?", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + run_reg_exe("reg query /h", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg query -H", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + /* Create a test key */ add_key(HKEY_CURRENT_USER, KEY_BASE, &key); @@ -848,6 +866,12 @@ static void test_import(void) run_reg_exe("reg import /?", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + run_reg_exe("reg import /h", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg import -H", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + run_reg_exe("reg import missing.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -4391,6 +4415,12 @@ static void test_export(void) run_reg_exe("reg export /?", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + run_reg_exe("reg export /h", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg export -H", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + run_reg_exe("reg export \\\\remote-pc\\HKLM\\Wine file.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);

1 0

Hugh McMaster : reg: Define MAX_SUBKEY_LEN in reg.h.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: 853493549230a2999a6ddd5da0b817943a10fbc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=853493549230a2999a6ddd5da… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 5 11:25:16 2017 +0000 reg: Define MAX_SUBKEY_LEN in reg.h. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/export.c | 2 -- programs/reg/reg.c | 2 -- programs/reg/reg.h | 1 + 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index ac570a6..39001c8 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -236,8 +236,6 @@ static void export_key_name(HANDLE hFile, WCHAR *name) heap_free(buf); } -#define MAX_SUBKEY_LEN 257 - static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path) { LONG rc; diff --git a/programs/reg/reg.c b/programs/reg/reg.c index fa2fa7b..f3718ed 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -651,8 +651,6 @@ WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD static unsigned int num_values_found = 0; -#define MAX_SUBKEY_LEN 257 - static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) { LONG rc; diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 2132e92..eb792bb 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -22,6 +22,7 @@ #include "resource.h" #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) +#define MAX_SUBKEY_LEN 257 /* reg.c */ void *heap_xalloc(size_t size);

1 0

Matteo Bruni : d3d11: Validate buffer MiscFlags.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: 8c3019ca711cef6b87d9482fd12f10984acad3f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3019ca711cef6b87d9482fd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 4 18:07:28 2017 +0100 d3d11: Validate buffer MiscFlags. 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/d3d11/buffer.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 8233742..3ccccc8 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -422,6 +422,12 @@ static BOOL validate_buffer_desc(D3D11_BUFFER_DESC *desc) desc->StructureByteStride = 0; } + if (desc->MiscFlags & D3D11_RESOURCE_MISC_GENERATE_MIPS) + { + WARN("Buffer with the D3D11_RESOURCE_MISC_GENERATE_MIPS flag.\n"); + return FALSE; + } + return TRUE; }

1 0

Matteo Bruni : d3d11: Validate MiscFlags for 3D textures.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: 72a60e445512a8580beaf580e1fc499908357b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72a60e445512a8580beaf580e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 4 18:07:27 2017 +0100 d3d11: Validate MiscFlags for 3D textures. 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/d3d11/texture.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 12186dc..e8870d5 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -942,6 +942,14 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi unsigned int levels; HRESULT hr; + if (desc->MiscFlags & D3D11_RESOURCE_MISC_GENERATE_MIPS + && (~desc->BindFlags & (D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE))) + { + WARN("D3D11_RESOURCE_MISC_GENERATE_MIPS used without D3D11_BIND_RENDER_TARGET " + "and D3D11_BIND_SHADER_RESOURCE.\n"); + return E_INVALIDARG; + } + texture->ID3D11Texture3D_iface.lpVtbl = &d3d11_texture3d_vtbl; texture->ID3D10Texture3D_iface.lpVtbl = &d3d10_texture3d_vtbl; texture->refcount = 1;

1 0