- Wine-Commits - list.winehq.org

Francisco Casas : vkd3d-shader/hlsl: Handle resource components individually for SM 5.0.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: vkd3d Branch: master Commit: c58d666d1b1945cff32e85426eff25e0a9718c4b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c58d666d1b1945cff32e85426eff2… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon May 29 19:51:10 2023 -0400 vkd3d-shader/hlsl: Handle resource components individually for SM 5.0. --- libs/vkd3d-shader/hlsl.c | 70 ++++++++++++++++++++ libs/vkd3d-shader/hlsl.h | 4 ++ libs/vkd3d-shader/tpf.c | 141 ++++++++++++++++++++++++++--------------- tests/hlsl/cbuffer.shader_test | 6 +- 4 files changed, 166 insertions(+), 55 deletions(-)

1 0

Francisco Casas : tests: Pass D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY when compiling with the shader-runner.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: vkd3d Branch: master Commit: ab37b27a7d08a5a0fbc900e434fb540ec93d255b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ab37b27a7d08a5a0fbc900e434fb5… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Jul 13 13:45:09 2023 -0400 tests: Pass D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY when compiling with the shader-runner. --- tests/shader_runner.c | 4 +++- tests/shader_runner_d3d11.c | 4 +++- tests/shader_runner_d3d12.c | 4 +++- tests/shader_runner_d3d9.c | 3 ++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 89137355..8a4b7138 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -753,6 +753,7 @@ static void compile_shader(struct shader_runner *runner, const char *source, siz { ID3D10Blob *blob = NULL, *errors = NULL; char profile[7]; + UINT flags = 0; HRESULT hr; static const char *const shader_models[] = @@ -765,8 +766,9 @@ static void compile_shader(struct shader_runner *runner, const char *source, siz [SHADER_MODEL_5_1] = "5_1", }; + flags |= D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; sprintf(profile, "%s_%s", type, shader_models[runner->minimum_shader_model]); - hr = D3DCompile(source, len, NULL, NULL, NULL, "main", profile, 0, 0, &blob, &errors); + hr = D3DCompile(source, len, NULL, NULL, NULL, "main", profile, flags, 0, &blob, &errors); hr = map_unidentified_hrs(hr); ok(hr == expect, "Got unexpected hr %#x.\n", hr); if (hr == S_OK) diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 3907e785..a5e0b92b 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -76,6 +76,7 @@ static ID3D10Blob *compile_shader(const char *source, const char *type, enum sha { ID3D10Blob *blob = NULL, *errors = NULL; char profile[7]; + UINT flags = 0; HRESULT hr; static const char *const shader_models[] = @@ -88,8 +89,9 @@ static ID3D10Blob *compile_shader(const char *source, const char *type, enum sha [SHADER_MODEL_5_1] = "5_1", }; + flags |= D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; sprintf(profile, "%s_%s", type, shader_models[shader_model]); - hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", profile, 0, 0, &blob, &errors); + hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", profile, flags, 0, &blob, &errors); ok(hr == S_OK, "Failed to compile shader, hr %#lx.\n", hr); if (errors) { diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 6765c5ce..d95851ba 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -60,6 +60,7 @@ static ID3D10Blob *compile_shader(const struct d3d12_shader_runner *runner, cons { ID3D10Blob *blob = NULL, *errors = NULL; char profile[7]; + UINT flags = 0; HRESULT hr; static const char *const shader_models[] = @@ -72,8 +73,9 @@ static ID3D10Blob *compile_shader(const struct d3d12_shader_runner *runner, cons [SHADER_MODEL_5_1] = "5_1", }; + flags |= D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; sprintf(profile, "%s_%s", type, shader_models[runner->r.minimum_shader_model]); - hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", profile, 0, 0, &blob, &errors); + hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", profile, flags, 0, &blob, &errors); ok(FAILED(hr) == !blob, "Got unexpected hr %#x, blob %p.\n", hr, blob); if (errors) { diff --git a/tests/shader_runner_d3d9.c b/tests/shader_runner_d3d9.c index 15a5ab3e..4245c6e3 100644 --- a/tests/shader_runner_d3d9.c +++ b/tests/shader_runner_d3d9.c @@ -60,6 +60,7 @@ static ID3D10Blob *compile_shader(const char *source, const char *type, enum sha { ID3D10Blob *blob = NULL, *errors = NULL; char profile[7]; + UINT flags = 0; HRESULT hr; static const char *const shader_models[] = @@ -69,7 +70,7 @@ static ID3D10Blob *compile_shader(const char *source, const char *type, enum sha }; sprintf(profile, "%s_%s", type, shader_models[shader_model]); - hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", profile, 0, 0, &blob, &errors); + hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", profile, flags, 0, &blob, &errors); ok(hr == S_OK, "Failed to compile shader, hr %#lx.\n", hr); if (errors) {

1 0

Francisco Casas : vkd3d-shader/tpf: Introduce struct extern_resource.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: vkd3d Branch: master Commit: 8f8c7a02ee0744c6203e742c3a9616a3b96d6a85 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8f8c7a02ee0744c6203e742c3a961… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri May 26 20:10:39 2023 -0400 vkd3d-shader/tpf: Introduce struct extern_resource. This struct is required for handling both whole-variable resources for SM < 5 and single-component resources for SM 5 in the same way, when writting the RDEF block and resource declarations within the shader. --- libs/vkd3d-shader/tpf.c | 147 +++++++++++++++++++++++++++++++----------------- 1 file changed, 94 insertions(+), 53 deletions(-)

1 0

Francisco Casas : vkd3d-shader/hlsl: Allow derefs to provide the data_type.
by Alexandre Julliard July 17, 2023

July 17, 2023

Module: vkd3d Branch: master Commit: ae6bc398d6f2d90bc6bf87bdfc8e5096df7669f7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ae6bc398d6f2d90bc6bf87bdfc8e5… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon May 29 17:34:03 2023 -0400 vkd3d-shader/hlsl: Allow derefs to provide the data_type. After lowering the derefs path to a single offset node, there was no way of knowing the type of the referenced part of the variable. This little modification allows to avoid having to pass the data type everywhere and it is required for supporting instructions that reference objects components within struct types. Since deref->data_type allows us to retrieve the type of the deref, deref->offset_regset is no longer necessary. --- libs/vkd3d-shader/hlsl.c | 4 ++- libs/vkd3d-shader/hlsl.h | 6 ++-- libs/vkd3d-shader/hlsl_codegen.c | 14 +++++---- libs/vkd3d-shader/tpf.c | 61 ++++++++++++++++++++-------------------- 4 files changed, 46 insertions(+), 39 deletions(-)

1 0

Tim Clem : wmp: Don't release a NULL typelib.
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: 424994c933c690d2ac5ac7fdf56857e1344f73b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/424994c933c690d2ac5ac7fdf56857… Author: Tim Clem <tclem(a)codeweavers.com> Date: Thu Jul 13 14:16:24 2023 -0700 wmp: Don't release a NULL typelib. --- dlls/wmp/wmp_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wmp/wmp_main.c b/dlls/wmp/wmp_main.c index 1f2afd8b244..2edaaf46df2 100644 --- a/dlls/wmp/wmp_main.c +++ b/dlls/wmp/wmp_main.c @@ -89,7 +89,8 @@ static void release_typelib(void) if (typeinfos[i]) ITypeInfo_Release(typeinfos[i]); - ITypeLib_Release(typelib); + if (typelib) + ITypeLib_Release(typelib); } static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) @@ -154,6 +155,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) wmp_instance = hInstDLL; break; case DLL_PROCESS_DETACH: + if (lpv) break; unregister_wmp_class(); unregister_player_msg_class(); release_typelib();

1 0

Tim Clem : wmp: Release filter graph and interfaces if WMPControls::play fails.
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: 2238658e2f87506c9ccb67de0376f3e3920550db URL: https://gitlab.winehq.org/wine/wine/-/commit/2238658e2f87506c9ccb67de0376f3… Author: Tim Clem <tclem(a)codeweavers.com> Date: Thu Jul 13 14:21:40 2023 -0700 wmp: Release filter graph and interfaces if WMPControls::play fails. --- dlls/wmp/player.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 254d04d23f8..583f5847907 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -1509,6 +1509,35 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface) hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IBasicAudio, (void**)&This->basic_audio); if (SUCCEEDED(hres)) hres = IWMPSettings_put_volume(&This->IWMPSettings_iface, This->volume); + + if (FAILED(hres)) + { + if (This->filter_graph) + { + IGraphBuilder_Release(This->filter_graph); + This->filter_graph = NULL; + } + if (This->media_control) + { + IMediaControl_Release(This->media_control); + This->media_control = NULL; + } + if (This->media_seeking) + { + IMediaSeeking_Release(This->media_seeking); + This->media_seeking = NULL; + } + if (This->media_event) + { + IMediaEvent_Release(This->media_event); + This->media_event = NULL; + } + if (This->basic_audio) + { + IBasicAudio_Release(This->basic_audio); + This->basic_audio = NULL; + } + } } update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsTransitioning);

1 0

Tim Clem : shell32: Don't fall back to $HOME for missing user special folders.
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: 710eec8fac7952679e2ddb4eba54367b50c47930 URL: https://gitlab.winehq.org/wine/wine/-/commit/710eec8fac7952679e2ddb4eba5436… Author: Tim Clem <tclem(a)codeweavers.com> Date: Thu Jul 13 10:27:20 2023 -0700 shell32: Don't fall back to $HOME for missing user special folders. Fall through in create_link and allow SHGetFolderPathAndSubDirW to create an empty folder in place if the alternatives are not available. Creating a link back to $HOME makes a recursive directory structure, which results in crashes in programs that naively search %USERPROFILE% (e.g. Quicken). --- dlls/shell32/shellpath.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 5dd9f4b6310..8328477fc2c 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2767,10 +2767,7 @@ static void create_link( const WCHAR *path, const char *xdg_name, const char *de { if (link_folder( mgr, &nt_name, target )) goto done; } - if (link_folder( mgr, &nt_name, default_name )) goto done; - - /* fall back to HOME */ - link_folder( mgr, &nt_name, "$HOME" ); + link_folder( mgr, &nt_name, default_name ); done: RtlFreeUnicodeString( &nt_name );

1 0

Biswapriyo Nath : include: Add ID2D1DeviceContext4 in d2d1_3.idl.
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: 788a61222c3e5ce420b756df30596078919e77aa URL: https://gitlab.winehq.org/wine/wine/-/commit/788a61222c3e5ce420b756df305960… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Jul 14 21:12:22 2023 +0530 include: Add ID2D1DeviceContext4 in d2d1_3.idl. --- include/d2d1_3.idl | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index a746a17c7c6..9ca42e661e1 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -19,6 +19,8 @@ import "d2d1_2.idl"; import "d2d1effects_2.idl"; +interface IDWriteFontFace; + typedef enum D2D1_INK_NIB_SHAPE { D2D1_INK_NIB_SHAPE_ROUND = 0x0, @@ -76,6 +78,13 @@ typedef enum D2D1_SPRITE_OPTIONS D2D1_SPRITE_OPTIONS_FORCE_DWORD = 0xffffffff } D2D1_SPRITE_OPTIONS; +typedef enum D2D1_COLOR_BITMAP_GLYPH_SNAP_OPTION +{ + D2D1_COLOR_BITMAP_GLYPH_SNAP_OPTION_DEFAULT = 0x0, + D2D1_COLOR_BITMAP_GLYPH_SNAP_OPTION_DISABLE = 0x1, + D2D1_COLOR_BITMAP_GLYPH_SNAP_OPTION_FORCE_DWORD = 0xffffffff +} D2D1_COLOR_BITMAP_GLYPH_SNAP_OPTION; + typedef struct D2D1_INK_POINT { float x; @@ -424,6 +433,78 @@ interface ID2D1DeviceContext3 : ID2D1DeviceContext2 ); } +[ + object, + uuid(8c427831-3d90-4476-b647-c4fae349e4db), + local, +] +interface ID2D1DeviceContext4 : ID2D1DeviceContext3 +{ + HRESULT CreateSvgGlyphStyle( + [out] ID2D1SvgGlyphStyle **svg_glyph_style + ); + void DrawText( + [in] const WCHAR *string, + [in] UINT32 string_length, + [in] IDWriteTextFormat *text_format, + [in] const D2D1_RECT_F *layout_rect, + [in, optional] ID2D1Brush *default_fill_brush, + [in, optional] ID2D1SvgGlyphStyle *svg_glyph_style, + [in, optional] UINT32 color_palette_index, + [in] D2D1_DRAW_TEXT_OPTIONS options, + [in] DWRITE_MEASURING_MODE measuring_mode + ); + void DrawTextLayout( + [in] D2D1_POINT_2F origin, + [in] IDWriteTextLayout *text_layout, + [in, optional] ID2D1Brush *default_fill_brush, + [in, optional] ID2D1SvgGlyphStyle *svg_glyph_style, + [in, optional] UINT32 color_palette_index, + [in] D2D1_DRAW_TEXT_OPTIONS options + ); + void DrawColorBitmapGlyphRun( + [in] DWRITE_GLYPH_IMAGE_FORMATS glyph_image_format, + [in] D2D1_POINT_2F baseline_origin, + [in] const DWRITE_GLYPH_RUN *glyph_run, + [in] DWRITE_MEASURING_MODE measuring_mode, + [in] D2D1_COLOR_BITMAP_GLYPH_SNAP_OPTION bitmap_snap_option + ); + void DrawSvgGlyphRun( + [in] D2D1_POINT_2F baseline_origin, + [in] const DWRITE_GLYPH_RUN *glyph_run, + [in, optional] ID2D1Brush *default_fill_brush, + [in, optional] ID2D1SvgGlyphStyle *svg_glyph_style, + [in, optional]UINT32 color_palette_index, + [in] DWRITE_MEASURING_MODE measuring_mode + ); + HRESULT GetColorBitmapGlyphImage( + [in] DWRITE_GLYPH_IMAGE_FORMATS glyph_image_format, + [in] D2D1_POINT_2F glyph_origin, + [in] IDWriteFontFace *font_face, + [in] FLOAT font_em_size, + [in] UINT16 glyph_index, + [in] BOOL is_sideways, + [in, optional] const D2D1_MATRIX_3X2_F *world_transform, + [in] FLOAT dpi_x, + [in] FLOAT dpi_y, + [out] D2D1_MATRIX_3X2_F *glyph_transform, + [out] ID2D1Image **glyph_image + ); + HRESULT GetSvgGlyphImage( + [in] D2D1_POINT_2F glyph_origin, + [in] IDWriteFontFace *font_face, + [in] FLOAT font_em_size, + [in] UINT16 glyph_index, + [in] BOOL is_sideways, + [in, optional] const D2D1_MATRIX_3X2_F *world_transform, + [in, optional] ID2D1Brush *default_fill_brush, + [in, optional] ID2D1SvgGlyphStyle *svg_glyph_style, + [in] UINT32 color_palette_index, + [out] D2D1_MATRIX_3X2_F *glyph_transform, + [out] ID2D1CommandList **glyph_image + ); +} + [ object, uuid(a44472e1-8dfb-4e60-8492-6e2861c9ca8b),

1 0

Biswapriyo Nath : include: Add ID2D1DeviceContext3 in d2d1_3.idl.
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: a66504de8f53c23792502503a945d7b40a5ec2bd URL: https://gitlab.winehq.org/wine/wine/-/commit/a66504de8f53c23792502503a945d7… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Jul 14 21:12:21 2023 +0530 include: Add ID2D1DeviceContext3 in d2d1_3.idl. --- include/d2d1_3.idl | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index 830c196a484..a746a17c7c6 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -404,6 +404,26 @@ interface ID2D1DeviceContext2 : ID2D1DeviceContext1 ); } +[ + object, + uuid(235a7496-8351-414c-bcd4-6672ab2d8e00), + local, +] +interface ID2D1DeviceContext3 : ID2D1DeviceContext2 +{ + HRESULT CreateSpriteBatch( + [out] ID2D1SpriteBatch **sprite_batch + ); + void DrawSpriteBatch( + [in] ID2D1SpriteBatch *sprite_batch, + [in] UINT32 start_index, + [in] UINT32 sprite_count, + [in] ID2D1Bitmap *bitmap, + [in] D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode, + [in] D2D1_SPRITE_OPTIONS sprite_options + ); +} + [ object, uuid(a44472e1-8dfb-4e60-8492-6e2861c9ca8b),

1 0

Biswapriyo Nath : include: Add ID2D1SpriteBatch in d2d1_3.idl.
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: 70eb577f3e400b2ffad73a85b9ded2a4908db48b URL: https://gitlab.winehq.org/wine/wine/-/commit/70eb577f3e400b2ffad73a85b9ded2… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Jul 14 21:12:19 2023 +0530 include: Add ID2D1SpriteBatch in d2d1_3.idl. --- include/d2d1_3.idl | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index 29bcc8df56d..c88226b4136 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -19,8 +19,6 @@ import "d2d1_2.idl"; import "d2d1effects_2.idl"; -interface ID2D1SpriteBatch; - typedef enum D2D1_INK_NIB_SHAPE { D2D1_INK_NIB_SHAPE_ROUND = 0x0, @@ -269,6 +267,48 @@ interface ID2D1LookupTable3D : ID2D1Resource { } +[ + object, + uuid(4dc583bf-3a10-438a-8722-e9765224f1f1), + local, +] +interface ID2D1SpriteBatch : ID2D1Resource +{ + HRESULT AddSprites( + [in] UINT32 sprite_count, + [in] const D2D1_RECT_F *destination_rectangles, + [in] const D2D1_RECT_U *source_rectangles, + [in] const D2D1_COLOR_F *colors, + [in] const D2D1_MATRIX_3X2_F *transforms, + [in] UINT32 destination_rectangles_stride, + [in] UINT32 source_rectangles_stride, + [in] UINT32 colors_stride, + [in] UINT32 transforms_stride + ); + HRESULT SetSprites( + [in] UINT32 start_index, + [in] UINT32 sprite_count, + [in] const D2D1_RECT_F *destination_rectangles, + [in] const D2D1_RECT_U *source_rectangles, + [in] const D2D1_COLOR_F *colors, + [in] const D2D1_MATRIX_3X2_F *transforms, + [in] UINT32 destination_rectangles_stride, + [in] UINT32 source_rectangles_stride, + [in] UINT32 colors_stride, + [in] UINT32 transforms_stride + ); + HRESULT GetSprites( + [in] UINT32 start_index, + [in] UINT32 sprite_count, + [out, optional] D2D1_RECT_F *destination_rectangles, + [out, optional] D2D1_RECT_U *source_rectangles, + [out, optional] D2D1_COLOR_F *colors, + [out, optional] D2D1_MATRIX_3X2_F *transforms + ); + UINT32 GetSpriteCount(void); + void Clear(void); +} + [ object, uuid(394ea6a3-0c34-4321-950b-6ca20f0be6c7),

1 0