Commit graph

3275 commits

Author SHA1 Message Date
winesync d9ceaa2284 [WINESYNC] d3dx9: Correctly handle NULL constant state for objects on 64 bit arch.
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id aef11864a47a33830eca086de8bf337ee9b5114a by Paul Gofman <gofmanp@gmail.com>
2021-02-04 16:37:04 +01:00
winesync c7dd2e86e0 [WINESYNC] d3dx9: Turn unimplemented interface ERR into a WARN.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 5b66442bc95e42bcef2ca385168fc3d594182e4a by Matteo Bruni <mbruni@codeweavers.com>
2021-02-04 16:37:04 +01:00
winesync 7e7d7d48f9 [WINESYNC] d3dx9: Don't pass usage flags for staging texture in D3DXCreateVolumeTextureFromFileInMemoryEx().
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 29c02234eb2be9c8fa48cfc021d0d6f84de58add by Paul Gofman <gofmanp@gmail.com>
2021-02-04 16:37:04 +01:00
winesync ed59f01229 [WINESYNC] d3dx9: Use check_texture_requirements() in D3DXCheckVolumeTextureRequirements() with correct resource type.
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 0b03d21c8f89b3f9dbd68ac849f9923197095eb5 by Paul Gofman <gofmanp@gmail.com>
2021-02-04 16:37:04 +01:00
winesync 849074f0c6 [WINESYNC] d3dx9: Use check_texture_requirements() in D3DXCheckCubeTextureRequirements() with correct resource type.
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id e50873f504b4693c9efcf7113afcb633155babbc by Paul Gofman <gofmanp@gmail.com>
2021-02-04 16:37:04 +01:00
winesync be011791e1 [WINESYNC] d3dx9: Factor our check_texture_requirements() function.
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 92c8c0fc7fb95209fa9dec25234d16b1dbddcf2a by Paul Gofman <gofmanp@gmail.com>
2021-02-04 16:37:04 +01:00
winesync 28df0e9ba8 [WINESYNC] d3dx9: Return an error if no fallback format is found.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id fcdcd5d3cbb58a40894f661fd8a9285b81a55789 by Matteo Bruni <mbruni@codeweavers.com>
2021-02-04 16:37:04 +01:00
winesync 4053a5ada3 [WINESYNC] d3dx9: Don't pass usage flags for staging texture in D3DXCreateCubeTextureFromFileInMemoryEx().
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47974
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id a0840773f7ee00dc9373b4db825fec68d08ee53b by Paul Gofman <gofmanp@gmail.com>
2021-02-04 16:37:04 +01:00
winesync 03f8174d97 [WINESYNC] d3dx9: Correctly align texture dimensions to block size in D3DXCheckTextureRequirements().
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id f6f90daa3117cf493e0815c42bb0fa1740d31308 by Christian Costa <titan.costa@gmail.com>
2021-02-04 16:37:04 +01:00
winesync d2eac4cdbf [WINESYNC] d3dx9: Fix pitch passed to DXTn [de]compression functions.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47862
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 9069913dbba0914b80544ce4afb9e7285efad2a5 by Matteo Bruni <mbruni@codeweavers.com>
2021-02-04 16:37:04 +01:00
winesync 62751bc14e [WINESYNC] d3dx9: Add a trace to D3DXCreateBuffer.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id a172aead8d542b92709545d8bcd992f03ee19d82 by Matteo Bruni <mbruni@codeweavers.com>
2021-02-04 16:37:04 +01:00
winesync f2c536f5cc [WINESYNC] d3dx9: WARN when the file doesn't exist in D3DXCreateTextureFromFileExW().
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 81ababa864229a7e81abca76ef7e6a12fe5b256f by Matteo Bruni <mbruni@codeweavers.com>
2021-02-04 16:37:04 +01:00
winesync 4198c58dca [WINESYNC] d3dx9: Compute the correct source rect in D3DXLoadSurfaceFromFileInMemory().
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id f934ef1a14108aa535e76900b29cba0dd8253f80 by Matteo Bruni <mbruni@codeweavers.com>
2021-02-04 16:37:04 +01:00
winesync 497d1c4360 [WINESYNC] d3dx9: Don't pass the D3DLOCK_DISCARD flag when mapping a texture.
We aren't necessarily rewriting the whole surface (e.g. rect smaller than
the whole surface, color key).

Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 536fce7f3b887fcc087d4c00106ceb2f0ff93c01 by Matteo Bruni <mbruni@codeweavers.com>
2021-02-04 16:37:04 +01:00
winesync e219194369 [WINESYNC] d3dx9: Implement DXTn compression for offset destination rect.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id a838e144dcaa55e227d7e99566a59f7a31d97227 by Matteo Bruni <mbruni@codeweavers.com>
2021-02-04 16:37:04 +01:00
winesync 38d868820a [WINESYNC] d3dx9: Handle non-zero source rect position in D3DXLoadSurfaceFromMemory().
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41936
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 88d8ae383932ad1c292c74da7dcc19f00d8423f7 by Matteo Bruni <mbruni@codeweavers.com>
2021-02-04 16:37:04 +01:00
winesync 8c85a63a2b [WINESYNC] d3dx9: Move the source rect alignment check into the condition for simple copy.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id a9c158b72aae1efed159d40fde086cdc608bc62e by Matteo Bruni <mbruni@codeweavers.com>
2021-02-04 16:37:04 +01:00
winesync 882cc57c66 [WINESYNC] d3dx9: Handle compressed surfaces in D3DXLoadSurfaceFromMemory.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24983
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 376182062ff1ab8e7835fd67bc650da83c2cc75d by Matteo Bruni <mbruni@codeweavers.com>
2021-02-04 16:37:04 +01:00
winesync e639a7847f [WINESYNC] d3dx9: Add traces to filtering functions.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 1f9243c757589c6ff2333794c3a44327d64855ae by Matteo Bruni <mbruni@codeweavers.com>
2021-02-04 16:37:04 +01:00
winesync eaf1129b76 [WINESYNC] d3dx9: Relax a block alignment check.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id e371085aaf4424e6ef9b5b76ebf3107121d22f50 by Matteo Bruni <mbruni@codeweavers.com>
2021-02-04 16:37:04 +01:00
winesync 74df1d450b [WINESYNC] d3dx9: Simplify unsupported format check.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id b744a309ace15a8c5494cf7134294c5869d2dade by Matteo Bruni <mbruni@codeweavers.com>
2021-02-04 16:37:04 +01:00
winesync 3ff51fd68e [WINESYNC] d3dx9: Make qsort() callback functions cdecl.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 08b569d50599328df1531f20cceb5331bf718524 by Alexandre Julliard <julliard@winehq.org>
2021-02-04 16:37:04 +01:00
winesync 3b3672360f [WINESYNC] d3dx9: Get rid of unused unlock_surface() argument.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id eadc7b3128afdf59891c6f9a1c568077c4e6d087 by Matteo Bruni <mbruni@codeweavers.com>
2021-02-04 16:37:04 +01:00
winesync 8dcbf4645c [WINESYNC] d3dx9: Pass rectangle to {lock|unlock}_surface().
This fixes regressions introduced by commits
65956ae50a136fe8467a0332c7495f36617a16dc, 092c14b9d86ee1e96e465908cc524ec85988d0ff.
Surface source or destination rectangles were left behind.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47546
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 378204527e1f42ed1373a0cd7356770d235e319d by Paul Gofman <gofmanp@gmail.com>
2021-02-04 16:37:03 +01:00
winesync 224d70bd0c [WINESYNC] d3dx9: Build with msvcrt.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 9fb5745a7997bbfe033779650f1193d85369cef2 by Alexandre Julliard <julliard@winehq.org>
2021-02-04 16:37:03 +01:00
winesync 7240c0d945 [WINESYNC] d3dx9: Always free samplers (Valgrind).
Signed-off-by: Sven Baars <sven.wine@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 7dc42119b40ad39165d881dd8d0e410d3e84fe5a by Sven Baars <sven.wine@gmail.com>
2021-02-04 16:37:03 +01:00
winesync c2b534f4fd [WINESYNC] d3dx9: Release the full parameter name when a parameter is released (Valgrind).
Signed-off-by: Sven Baars <sven.wine@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 63443f249f4dfe748ce3872e74ecf5c1d8aa55d9 by Sven Baars <sven.wine@gmail.com>
2021-02-04 16:37:03 +01:00
winesync e4ffc986e5 [WINESYNC] d3dx9: Don't use strcasecmp.
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 5c5a8ae23ff7fe9c103de4e3dfce06bf1b8778c1 by Piotr Caban <piotr@codeweavers.com>
2021-02-04 16:37:03 +01:00
winesync 7fb747193a [WINESYNC] d3dx9: Fix argument type in convert_dib_to_bmp().
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 8bed853c4380ebf86220ffe2fd89d48d98a90921 by Matteo Bruni <mbruni@codeweavers.com>
2021-02-04 16:37:03 +01:00
winesync e6deaabfc6 [WINESYNC] d3dx9: Generate ID3DXSkinInfo in D3DXLoadSkinMeshFromXof() when needed.
Based on a patch by Michael Müller.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33904
Signed-off-by: Vijay Kiran Kamuju <infyquest@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 70d722340ad546ab988fffe4577e0c0ebe35a982 by Vijay Kiran Kamuju <infyquest@gmail.com>
2021-02-04 16:37:03 +01:00
winesync 256cd6a4cb [WINESYNC] include: Fix D3DXF_FILELOADMEMORY definition.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id c9c74b8b10116c3f0b3bd4d08724963245499a92 by Matteo Bruni <mbruni@codeweavers.com>
2021-02-04 16:37:03 +01:00
winesync 9add999c51 [WINESYNC] d3dx9: Secure against unsafe iface to COM object transitions.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id cd3e5020e4c87f49eb042fff9f607b6d745a5d55 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync 13aa089045 [WINESYNC] d3dx9: Get rid of struct d3dx9_base_effect.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 3b951b77f87ed9102fc7a2ccb0807b5592990147 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync b2df33e579 [WINESYNC] d3dx9: Move flags out of struct d3dx9_base_effect.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 7f16670edc3ed5c8ab5bdd88e88a00f8ba1853dc by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync 9fd48117e6 [WINESYNC] d3dx9: Avoid using This in d3dx_effect_Clone().
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id c56906599cdad729834a6807747ce2c928fc511d by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync 2c660479ae [WINESYNC] d3dx9: Merge the two pool fields of struct d3dx_effect.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id ef974e59856d702523ef04b5e315d0c980097c8d by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync 234a3a6389 [WINESYNC] d3dx9: Avoid using 'This' in d3dx_effect_GetPool().
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 3bd0fc3d6ad75ec723f2268e2d6de79be904de2c by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync eb06082f45 [WINESYNC] d3dx9: Simplify effect init.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 9a121f511533abb801ce49011e2a089b15265a44 by Matteo Bruni <mbruni@codeweavers.com>
2021-02-04 16:37:03 +01:00
winesync f336e915a2 [WINESYNC] d3dx9: Simplify effect cleanup.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 009279845d9503468d5d3d39e393ad2ffa00181d by Matteo Bruni <mbruni@codeweavers.com>
2021-02-04 16:37:03 +01:00
winesync 275bd75bd6 [WINESYNC] d3dx9: Move techniques out of struct d3dx9_base_effect.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 5fa06bbc302c0fdbf8a5e087b7f18445475add2a by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync f8ab5e6bfb [WINESYNC] d3dx9: Move parameters out of struct d3dx9_base_effect.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 4c134a66b0c3c10d4ed334477385a91440069024 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync 433f7dc030 [WINESYNC] d3dx9: Use get_version_counter_ptr() instead of open coding it.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 9438d031277cce1a1c21e0739e12d4c37f365467 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync 9931b438e9 [WINESYNC] d3dx9: Move technique_count out of struct d3dx9_base_effect.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 074e3232ee90c94f9a8e7c55988b29b40e1e3f0f by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync 515c280579 [WINESYNC] d3dx9: Pass a struct d3dx_effect to d3dx9_create_object().
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 92d2f6d99429df4b5f132eca2fa8a2c1eae4a6d0 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync 9ed5adb0c1 [WINESYNC] d3dx9: Don't pass a struct d3dx9_base_effect to d3dx9_base_effect_init().
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id de59a1297111dfd0be93dccaa2db31865c61b79a by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync a639b63404 [WINESYNC] d3dx9: Don't expose struct d3dx9_base_effect outside effect.c.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id baf4aaa359c75715e7840b4c045fdb22adf2bc8a by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync 81c4bfa714 [WINESYNC] d3dx9: Pass a struct d3dx_effect to get_parameter_element_by_name().
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 09770370c0b9159d3324684146544b6f441e4889 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync ee5b715bde [WINESYNC] d3dx9: Move full_name_tmp_size out of struct d3dx9_base_effect.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 0c6345322983ed3df9100b801aaa56367b37a501 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync 2493cdf262 [WINESYNC] d3dx9: Move full_name_tmp out of struct d3dx9_base_effect.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 3779ff07b048bfdaf67674db89aedaa1e4b1e810 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync 826d5b5fcb [WINESYNC] d3dx9: Move param_tree out of struct d3dx9_base_effect.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id adc1b5a8bc6bcce427e231485015da43d24ca5cb by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync 6d0bce396f [WINESYNC] d3dx9: Avoid double free on effect initialization failure.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id cffe35488dc16414c6938e0f1a0169fb59730c97 by Matteo Bruni <mbruni@codeweavers.com>
2021-02-04 16:37:03 +01:00
winesync 3b863b3693 [WINESYNC] d3dx9: Pass a struct d3dx_effect to d3dx9_base_effect_cleanup().
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 2f16d2f4ca86263571797d9544a9534e8aa29c16 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync e60679e844 [WINESYNC] d3dx9: Pass a struct d3dx_effect to get_annotation_by_name().
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 7738fec56b8d55f006babf4d9fb7a1b79cf363af by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync 6ff343ea9a [WINESYNC] d3dx9: Pass a struct d3dx_effect to add_param_to_tree().
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 62a26e1ad0e18b8de8ac8154cbce6c6f66f2249b by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync 7c212953a7 [WINESYNC] d3dx9: Pass a struct d3dx_effect to the version helpers.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id f9351bae3e22ac500c237ab5a0b0556561e913d6 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync ce95dc5813 [WINESYNC] d3dx9: Pass a struct d3dx_effect to get_valid_pass().
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 956b30dbf3899e3cd0ccccc17d99f01047caf634 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync 0c4e3081da [WINESYNC] d3dx9: Pass a struct d3dx_effect to get_valid_parameter().
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 6ecc2c51b3849d313ad670a4b0ff14ca50aeb26a by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync d14c6a9493 [WINESYNC] d3dx9: Merge the d3dx_effect_GetVertexShader() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 73a05456bf6eb1102c5e3cc361f906e65f62cfcf by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync 50aa6ee7ea [WINESYNC] d3dx9: Merge the d3dx_effect_SetVectorArray() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id a4ea70af146850d690e0de64436253aef098a86d by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync 492a1837b7 [WINESYNC] d3dx9: Merge the d3dx_effect_SetVector() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 6eb69d2cf6a9049a3fedc3ec71146b3745f17e2b by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync 329ee4ce80 [WINESYNC] d3dx9: Merge the d3dx_effect_GetVectorArray() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 4d978ec0812cd18960337d5709853d93d98a1f2e by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync 17776bdd0f [WINESYNC] d3dx9: Merge the d3dx_effect_GetVector() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 3754ba683f2d3ccb16354a75b530c317382929d8 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:03 +01:00
winesync a64947697d [WINESYNC] d3dx9: Merge the d3dx_effect_SetValue() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id bd731f6dd12d1e61daf3d6abefb3e01be35f5104 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync fce46567f7 [WINESYNC] d3dx9: Merge the d3dx_effect_GetValue() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id d4e39ee1d8a263d91bc291cacfe8938f81d447fc by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync e8b87e3799 [WINESYNC] d3dx9: Merge the d3dx_effect_SetTexture() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 918c13f48cab2fe9391148ae4281015c0e169378 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 13e4a05754 [WINESYNC] d3dx9: Merge the d3dx_effect_GetTexture() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id f06d6ab0858db398576e36bf295be581952d6209 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 598c2e03b2 [WINESYNC] d3dx9: Merge the d3dx_effect_SetString() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id e288158dec12f4f55aea01fb1e2879c6e9a18028 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync da7f239a06 [WINESYNC] d3dx9: Merge the d3dx_effect_GetString() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id ea45ed1751860905daa33af5e45d38cbbeadd0ad by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 6dec261847 [WINESYNC] d3dx9: Merge the d3dx_effect_GetPixelShader() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 7ce336969ca4f7adba33c45f5f746a8f656348cc by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 2a0486d854 [WINESYNC] d3dx9: Merge the d3dx_effect_GetParameterDesc() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 262238d46752700c2041cb9548724c66bd017eca by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 6d27669ad3 [WINESYNC] d3dx9: Merge the d3dx_effect_SetMatrixTransposePointerArray() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id f34f13825fd060fda40f0a5b02dc1b420e3a8e1e by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 7145cf23a4 [WINESYNC] d3dx9: Merge the d3dx_effect_SetMatrixTransposeArray() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 9f1ed4fcdd053647f7e2a7626ab95d0a1e8914eb by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 3f197f6fc7 [WINESYNC] d3dx9: Merge the d3dx_effect_SetMatrixTranspose() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 81203bdb0462ecce8f2791f1599cf1fedf318ad7 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync b74269badf [WINESYNC] d3dx9: Merge the d3dx_effect_GetMatrixTransposePointerArray() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 95a8cfad14f1d87b9f7512f96c5c06edba04ca70 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync e9177cf564 [WINESYNC] d3dx9: Merge the d3dx_effect_GetMatrixTransposeArray() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 29bf6988e3ae7451b46c3c73a4ba95b41c17dea0 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 43bb890af9 [WINESYNC] d3dx9: Merge the d3dx_effect_GetMatrixTranspose() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 2fdd724a41c137e7f82b9a4b042b68cef32ac281 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync efeffca80e [WINESYNC] d3dx9: Merge the d3dx_effect_SetMatrixPointerArray() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id c47355a3dc3685c44982ecb9944c0826c0b03526 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 09e5a68482 [WINESYNC] d3dx9: Merge the d3dx_effect_SetMatrixArray() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 96e2d0e018ba469599d50527f187c53f93b76216 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 3d9993c20a [WINESYNC] d3dx9: Merge the d3dx_effect_SetMatrix() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id b1621b2c28c57af09064d69e6cbe8573db88b555 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 99c88ea215 [WINESYNC] d3dx9: Merge the d3dx_effect_GetMatrixPointerArray() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id e39845ac9a7f363ca824ff6354ade6b6425a35e9 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 644faeeb7e [WINESYNC] d3dx9: Merge the d3dx_effect_GetMatrixArray() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 2d7430f7143acc9e14cd58d3bc598ca79f7bff5e by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 2bbbe62494 [WINESYNC] d3dx9: Merge the d3dx_effect_GetMatrix() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 636a2b5a39f81699bddd289b04de9644611b8987 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 122fe3ff58 [WINESYNC] d3dx9: Merge the d3dx_effect_SetIntArray() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 8ea0f9d4dd3e4d74af51df0a2dc2723f2be0da8c by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 6c31253e62 [WINESYNC] d3dx9: Merge the d3dx_effect_SetInt() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 2e771d77761a78b1b597144edfd69ae05b31561e by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync cdc0089c1c [WINESYNC] d3dx9: Merge the d3dx_effect_GetIntArray() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 570ae3b2aa2e7da3f14fbd59979a39e8f21763be by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 218bc69a38 [WINESYNC] d3dx9: Merge the d3dx_effect_GetInt() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 5015e2a7cf5fa3779fd651817058e03c94807088 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync b1ee53bf49 [WINESYNC] d3dx9: Merge the d3dx_effect_SetFloatArray() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 86dff681fc6c36a77b84ec7ded4dfc3f889e2882 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync b6b435e16c [WINESYNC] d3dx9: Merge the d3dx_effect_SetFloat() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 2543e78b828f842813066827b5b2fb4565a51f7e by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 0e01a12034 [WINESYNC] d3dx9: Merge the d3dx_effect_GetFloatArray() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id cf4c22bd712594f3589070c493fc550770ebc899 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 6450fd6db3 [WINESYNC] d3dx9: Merge the d3dx_effect_GetFloat() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 460fd21ccc6785172167553e6dd124fdec020d11 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync ab91d0f28e [WINESYNC] d3dx9: Merge the d3dx_effect_SetBoolArray() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id e435a1442d6499f358168d8a0ca974b43ccd9140 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 022ce2f70b [WINESYNC] d3dx9: Merge the d3dx_effect_SetBool() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id b4bc9ea7b711c03b93d15bb2ba04dfbbb9d70f72 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 3c49040030 [WINESYNC] d3dx9: Merge the d3dx_effect_GetBoolArray() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id ab7756619c1b16c761618a68d1b6a06ad437cbe8 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 706fd8dde3 [WINESYNC] d3dx9: Merge the d3dx_effect_GetBool() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id cca43ca090ccb27c5e3d3564dbe69a424f0c9872 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 9a5e0c591c [WINESYNC] d3dx9: Move objects out of struct d3dx9_base_effect.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id f0d7dd0761fc0b6a45b3d3ae136339d3c3bf8075 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync bd5f74314c [WINESYNC] d3dx9: Merge the d3dx_effect_GetPassDesc() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 52c2092fa92cd06ea2c1074072be4cadd872f083 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 2b9f231acf [WINESYNC] d3dx9: Pass a struct d3dx_effect to d3dx9_copy_data().
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 26b9b04e7f40c7a2011684f01ff07be91047b492 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 44ec74a6a4 [WINESYNC] d3dx9: Move object_count out of struct d3dx9_base_effect.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 54bdc66acf4abe1f1fa38238ed824c2372e1ff91 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 8237867116 [WINESYNC] d3dx9: Pass a struct d3dx_effect to the get technique helpers.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 42839d15e3ec829f939fe1f99ac6b025f64b18de by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync f23b53d642 [WINESYNC] d3dx9: Merge the d3dx_effect_GetTechnique() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id a33b20a0604e29c4b502a0d77e8828e926b09a62 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 570dd1c48a [WINESYNC] d3dx9: Merge the d3dx_effect_GetTechniqueByName() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id a2e0046fc52c4e08a64cbe76c78f184e7d5b27d2 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 97475aa65c [WINESYNC] d3dx9: Merge the d3dx_effect_GetTechniqueDesc() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 10aa0819138f4aaf0f872de74eaf953326afe997 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 43d0a88291 [WINESYNC] d3dx9: Merge the d3dx_effect_GetPassByName() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 730e44ebe224c1b70e9f6eaf6a9aaeb8bc38a20b by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 862292231b [WINESYNC] d3dx9: Merge the d3dx_effect_GetPass() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id e419ac91ba5bd295b596f334951657b54dba3e99 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 3d7d27f805 [WINESYNC] d3dx9: Pass a struct d3dx_effect to get_annotation_from_object().
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 89941842affb0fec7068a8bd7adca77d8c036032 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync de908e3bd1 [WINESYNC] d3dx9: Merge the d3dx_effect_GetAnnotationByName() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 1dd9104724b333fe27c2a1b7e57b31c29a252420 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:02 +01:00
winesync 3a9af49488 [WINESYNC] d3dx9: Merge the d3dx_effect_GetAnnotation() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 7a1df2b0069bde1a9a022c6454fb8b3e06181fd0 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:01 +01:00
winesync f3d009fd46 [WINESYNC] d3dx9: Remove an unneeded forward declaration.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 45e7e2f2d501d92436a00f97edec660a2f7a2927 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:01 +01:00
winesync 773ed3502e [WINESYNC] d3dx9: Move parameter_count out of struct d3dx9_base_effect.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 58b87b0f3eb156718e297df6a64b96ff1f4e8621 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:01 +01:00
winesync aa84d04a66 [WINESYNC] d3dx9: Merge the d3dx_effect_GetParameterElement() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 3899e79fc429b0c668166ccc98efbd60f5c63aa4 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:01 +01:00
winesync c45448a2ef [WINESYNC] d3dx9: Merge the d3dx_effect_GetParameterBySemantic() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 04c838fa605fe586e850b4ef2dd4f9f80d5daa2e by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:01 +01:00
winesync 2573aa0af9 [WINESYNC] d3dx9: Merge the d3dx_effect_GetParameter() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 2f1ba910d133b93a3da55de4d0b3577936fd8224 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:01 +01:00
winesync 265ca68eb5 [WINESYNC] d3dx9: Merge the d3dx_effect_GetParameterByName() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 78e067b0d0113f8f37c48366bda88d2454c8f841 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:01 +01:00
winesync 684130bdd9 [WINESYNC] d3dx9: Pass a struct d3dx_effect to the d3dx_parse helpers.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id d265afcd8fb15438961d26f0160103846144a58e by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:01 +01:00
winesync ed2023fc76 [WINESYNC] d3dx9: Get rid of the ID3DXEffectImpl #define.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id d18fb86134d40ccee8df84ce7ccc4e1bdcb2d481 by Matteo Bruni <mbruni@codeweavers.com>
2021-02-04 16:37:01 +01:00
winesync 74a0f6629e [WINESYNC] d3dx9: Merge the d3dx9_effect_GetDesc() helper.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 4b85165cdc297f97a3609cfab2d64d87e435397e by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:01 +01:00
winesync 280deff8df [WINESYNC] d3dx9: Merge the stub ID3DXBaseEffect methods.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 715b932768d1f34815c6b0db18554e0d734bbec6 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:01 +01:00
winesync da833f59a6 [WINESYNC] d3dx9: Rename the ID3DXEffect object and methods.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 612196b64c6b17d694831b92e7182afe9b2d9aca by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:01 +01:00
winesync 0a939c57a8 [WINESYNC] d3dx9: Simplify get_parameter_by_name().
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 4a9fe7a8a092095420532ae734ebce9978b1e608 by Matteo Bruni <mbruni@codeweavers.com>
2021-02-04 16:37:01 +01:00
winesync 393ec322ef [WINESYNC] d3dx9: Remove redundant "not NULL" checks (coccinellery).
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id be30aab1e21e5b6811470a351ec0d6100e6e7687 by Michael Stefaniuc <mstefani@winehq.org>
2021-02-04 16:37:01 +01:00
Jérôme Gardou 6760065ef2 [D3DX9_xx] Reduce diff to wine 2021-02-04 16:37:01 +01:00
Jérôme Gardou edca86dadb [D3DX9_XX] Use a common header for every file 2021-02-04 16:37:01 +01:00
Jérôme Gardou 7b1049c8fd [WINESYNC]: revert wine-staging patchset for d3dx9 2021-02-04 16:37:01 +01:00
Tibor Lajos Füzi 2608f280ea [TRANSLATION] update hungarian translation of cpl/timedate, cpl/main, cpl/desk 2021-02-03 06:52:45 +01:00
Joachim Henze d0c237a6ab [SYSDM] Fix sunrise regression CORE-17451
This fixes a regression with the AlphaBlending on single left-click
on the ros logo in general tab.
That regression was introduced by
0.4.15-dev-178-g d635ce0cc0

So it can be seen as an addendum to (#2707).

We luckily did not have any affected releases yet.
2021-02-01 21:13:59 +01:00
Joachim Henze 2a321f6e3f [SYSDM] Fix a glitch in ja-JP that was introduced by (#3442)
Remove an unintended control that was
introduced by 0.4.15-dev-1676-g 50a01ed170
2021-02-01 16:14:39 +01:00
Colin Finck 1509f0e536 [SYSDM] Increase label width for all languages 2021-02-01 07:32:14 +01:00
Colin Finck 50a01ed170 [SYSDM] Introduce KERNEL_VERSION_REVISION_RC and align system uptime string 2021-02-01 07:32:14 +01:00
Colin Finck 39b6643030 [SYSDM] Move IDS_DEVS to the LANG_NEUTRAL resources to deduplicate it.
It should still be updated at some point, maybe automatically, but this should serve us well for the moment.

Use UTF-8 for the deduplicated string.
2021-02-01 07:32:14 +01:00
Colin Finck 1adbae9bae [SYSDM] Restore actual fix from 9a0246ef65 2021-02-01 07:32:14 +01:00
Colin Finck c1356e8d47 Revert "[SYSDM] Fix version string cutoff CORE-17429"
This reverts commit be2518704e.
2021-02-01 07:32:14 +01:00
Joachim Henze f91efe1502 [SYSDM] Delete 2 forgotten defines
Addendum to 0.4.15-dev-1630-g be25187 (CORE-17429)
2021-01-30 20:07:30 +01:00
Eric Kohl 86a65fccb6 [SYSSETUP] Refactor ApplyAccountSettings() and add NewAdministratorName and NewGuestName options 2021-01-30 13:52:14 +01:00
Eric Kohl 0edaeba452 [SYSSETUP][INF] Add account settings
- Add EnableAdminAccount and EnableGuestAccount options
- Fix typo: TICKS_PER_SECOND --> TICKS_PER_MINUTE
2021-01-30 09:38:00 +01:00
Hervé Poussineau ae4ce99e00 [ASM x64] Fix usage of macro .allocstack
.allocstack only accepts one 'size' parameter."
2021-01-28 20:31:16 +01:00
Victor Perevertkin 5375e33490
[CMAKE] Generate Flex and Bison files at build time
We have Flex and Bison distributed along with RosBE 2.2 so this should
not be a problem
2021-01-28 06:43:05 +03:00
Victor Perevertkin e468da06be
[SETUPAPI] Set the CONFIGFLAG_FAILEDINSTALL flag in SetupDiInstallDevice
The code follows the comment now. The fix may be wrong, but DNF_DISABLED
is a kernel flag and should definitely not be used in a dll.
2021-01-27 05:15:14 +03:00
Victor Perevertkin 0b81691806
[DEVMGR] Remove no longer needed hack CORE-5643
This reverts commit f9739601b3.
2021-01-27 05:15:03 +03:00
Eric Kohl c0caa5c0ae [SYSSETUP][INF] Add lockout setup to the security profile 2021-01-24 21:35:33 +01:00
Eric Kohl 83f3bd8bd6 [SYSSETUP][INF] Add password setup to the security profile 2021-01-24 15:28:23 +01:00
Joachim Henze 4e289ce0cc [SYSDM] Addendum CORE-17429
This define in resource.h is also not needed anymore.
2021-01-20 03:42:39 +01:00
Joachim Henze 9a0246ef65 [SYSDM] Improve de-DE Uptime format translation
I tried initially to use Tag(e) but that does look too
crowded with the stuff after it. Since Windows is also not
consistent with the () for singular vs plural, I did chose
always plural "Tage".
Most often people will see "0 Tage" anyway, and that fits well.
2021-01-20 03:16:07 +01:00
Joachim Henze be2518704e [SYSDM] Fix version string cutoff CORE-17429
The version string cutoff started to happen when we switched from SVN
with its short revision number to git with the longer hashes.
0.4.7-dev-502-gc2c66af was the first git-only rev (2017-Oct-03)

This brings the dialogs layout closer to XP.
Also fixes some other truncations for specific languages.
And unifies the touched text controls sizes for all languages.

The credits have been moved to readme.txt where they are more present and
we can avoid having to groom all languages files each time we want to add
a new dev (and sysdm.cpl to grow each time). Less maintenance.

0.4.15-dev-1629-g9aa73da gcc 8.4.0 dbg RosBE2.2.1 I18N=all binary size
sysdm.cpl before: 925.696bytes  after: 705.024bytes
readme.txt still fits into a single NTFS cluster afterwards with 3702bytes
2021-01-20 02:45:44 +01:00
Victor Perevertkin 46ca069e42
[XDK] Remove UNREFERENCE_LOCAL_VARIABLE macro
Change UNREFERENCED_PARAMETER to (VOID)P to support const parameters
2021-01-19 00:15:02 +03:00
Eric Kohl 9011382e28 [SYSSETUP][INF] Add audit events setup 2021-01-17 11:46:34 +01:00
Eric Kohl baf9ff45bb [SYSETUP][INF] Add name support for account privilege setup 2021-01-16 13:18:08 +01:00
Hervé Poussineau ff7035d940 [ASM x64] Change ; by /* */ for comments
Syntax with semi-colon is not supported by gas.
2021-01-07 21:12:11 +01:00
Hervé Poussineau 4bb7bd1f50 [FRAMEDYN] Fix an x64 export (probably wrong copy/paste from x86 version) 2021-01-07 21:12:11 +01:00
Mas Ahmad Muhammad 4ca7926093
[TRANSLATION] Fix format for Indonesian translation (#3418)
- USETUP: Fix alignment on translation.
- SHELL32: Update and fix translation.
2021-01-07 18:47:10 +01:00
Joachim Henze 1e9547e0d0 [SHELL32] Improve German (de-DE) translation 2021-01-06 00:41:45 +01:00