October 2022 - Wine-commits

Francisco Casas : tests: Set ULPs to 2 in normalize() test.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 3bae0c92c7e6eeb21acebd60e9229bb23dc8998d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3bae0c92c7e6eeb21acebd60e9229… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Oct 10 20:55:15 2022 -0300 tests: Set ULPs to 2 in normalize() test. Otherwise the test fails on a NVIDIA GeForce GTX 1050 Ti GPU. The error being: shader_runner:535:Section [test], line 9: Test failed: Got {2.72165507e-01, 4.08248246e-01, 5.44331014e-01, 6.80413783e-01}, expected {2.72165537e-01, 4.08248305e-01, 5.44331074e-01, 6.80413842e-01} at (0, 0). --- tests/hlsl-normalize.shader_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/hlsl-normalize.shader_test b/tests/hlsl-normalize.shader_test index 71b900e8..359a7590 100644 --- a/tests/hlsl-normalize.shader_test +++ b/tests/hlsl-normalize.shader_test @@ -9,7 +9,7 @@ float4 main() : SV_TARGET [test] uniform 0 float4 2.0 3.0 4.0 5.0 draw quad -probe all rgba (0.272165537, 0.408248305, 0.544331074, 0.680413842) 1 +probe all rgba (0.272165537, 0.408248305, 0.544331074, 0.680413842) 2 [pixel shader] uniform float3 x;

1 0

Francisco Casas : tests: Rename structs for readability in broadcast test.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 791f8a8faa6c2c3fa9bda293f4982bef407bdc6e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/791f8a8faa6c2c3fa9bda293f4982… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Oct 14 11:09:36 2022 -0300 tests: Rename structs for readability in broadcast test. --- tests/cast-broadcast.shader_test | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/cast-broadcast.shader_test b/tests/cast-broadcast.shader_test index 02d14c0b..26ae7997 100644 --- a/tests/cast-broadcast.shader_test +++ b/tests/cast-broadcast.shader_test @@ -1,21 +1,20 @@ [pixel shader] - -struct foo +struct apple { float3 aa; float4 bb; }; -struct bar +struct banana { - struct foo aa; + struct apple aa; int2 bb; int4 cc[8]; }; float4 main() : SV_TARGET { - struct bar p = (struct bar)42; + struct banana p = (struct banana)42; return p.aa.bb + p.cc[5]; }

1 0

Francisco Casas : tests: Test for invalid complex broadcasts.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: e56db9bda5d11acd746449552da3aae9f5feb81b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e56db9bda5d11acd746449552da3a… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Oct 10 19:23:00 2022 -0300 tests: Test for invalid complex broadcasts. --- tests/cast-broadcast.shader_test | 47 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/tests/cast-broadcast.shader_test b/tests/cast-broadcast.shader_test index 26ae7997..f60eb758 100644 --- a/tests/cast-broadcast.shader_test +++ b/tests/cast-broadcast.shader_test @@ -21,3 +21,50 @@ float4 main() : SV_TARGET [test] todo draw quad todo probe all rgba (84.0, 84.0, 84.0, 84.0) + + +[pixel shader fail todo] +struct apple +{ + float3 aa; + float4 bb; +}; + +float4 main() : SV_TARGET +{ + struct apple f = 31; + return f.bb; +} + + +[pixel shader fail] +struct apple +{ + float3 aa; + float4 bb; +}; + +float4 fun(struct apple f) +{ + return f.bb; +} + +float4 main() : SV_TARGET +{ + return fun(31); +} + + +[pixel shader fail] +struct apple +{ + float4 foo; + Texture2D tex; +}; + +float4 PSMain() : SV_TARGET +{ + struct apple a1; + a1 = (struct apple)1; + return a1.foo; +}

1 0

Francisco Casas : vkd3d-shader/hlsl: Always go through implicit conversion in assignments.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 5a1b0dbf44dea826a3f95d2c1cad023207c491a5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5a1b0dbf44dea826a3f95d2c1cad0… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 12 14:43:26 2022 -0300 vkd3d-shader/hlsl: Always go through implicit conversion in assignments. Otherwise we silently skip some type checks. --- libs/vkd3d-shader/hlsl.y | 6 ++---- tests/cast-broadcast.shader_test | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b804b45c..03004c60 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1636,12 +1636,10 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in } if (lhs_type->type <= HLSL_CLASS_LAST_NUMERIC) - { writemask = (1 << lhs_type->dimx) - 1; - if (!(rhs = add_implicit_conversion(ctx, instrs, rhs, lhs_type, &rhs->loc))) - return NULL; - } + if (!(rhs = add_implicit_conversion(ctx, instrs, rhs, lhs_type, &rhs->loc))) + return NULL; while (lhs->type != HLSL_IR_LOAD) { diff --git a/tests/cast-broadcast.shader_test b/tests/cast-broadcast.shader_test index f60eb758..e21e65b0 100644 --- a/tests/cast-broadcast.shader_test +++ b/tests/cast-broadcast.shader_test @@ -23,7 +23,7 @@ todo draw quad todo probe all rgba (84.0, 84.0, 84.0, 84.0) -[pixel shader fail todo] +[pixel shader fail] struct apple { float3 aa;

1 0

Francisco Casas : tests: Test implicit casts between types that are equal component-wise.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 653b109d8f44dfc7287b5389d95a04c9bc732e21 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/653b109d8f44dfc7287b5389d95a0… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 12 12:39:06 2022 -0300 tests: Test implicit casts between types that are equal component-wise. --- Makefile.am | 1 + tests/cast-componentwise-equal.shader_test | 226 +++++++++++++++++++++++++++++ 2 files changed, 227 insertions(+) diff --git a/Makefile.am b/Makefile.am index a0cd584f..83f75d64 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,6 +58,7 @@ vkd3d_shader_tests = \ tests/arithmetic-uint.shader_test \ tests/bitwise.shader_test \ tests/cast-broadcast.shader_test \ + tests/cast-componentwise-equal.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ diff --git a/tests/cast-componentwise-equal.shader_test b/tests/cast-componentwise-equal.shader_test new file mode 100644 index 00000000..ac329112 --- /dev/null +++ b/tests/cast-componentwise-equal.shader_test @@ -0,0 +1,226 @@ +[pixel shader fail] +struct apple +{ + float3 aa; + float bb; +}; + +float4 main() : sv_target +{ + float4 f = {1, 2, 3, 4}; + struct apple a; + + a = f; + return a.aa.xyzx; +} + + +[pixel shader fail] +struct apple +{ + float aa; + float bb; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2}; + float2 f; + + f = a; + return f.xyxy; +} + + +[pixel shader] +struct apple +{ + float3 aa; + float bb; +}; + +float4 main() : sv_target +{ + float f[4] = {1, 2, 3, 4}; + struct apple a; + + a = f; + return a.aa.xyzx; +} + + +[test] +todo draw quad +todo probe all rgba (1.0, 2.0, 3.0, 1.0) + + +[pixel shader fail] +struct apple +{ + float3 aa; + int bb; +}; + +float4 main() : sv_target +{ + float f[4] = {1, 2, 3, 4}; + struct apple a; + + a = f; + return a.aa.xyzx; +} + + +[pixel shader] +struct apple +{ + float3 aa; + float bb; +}; + +float4 main() : sv_target +{ + struct apple a = {5, 6, 7, 8}; + float f[4]; + + f = a; + return float4(f); +} + + +[test] +todo draw quad +todo probe all rgba (5.0, 6.0, 7.0, 8.0) + + +[pixel shader] +Texture2D tex; + +struct apple +{ + int2 aa; + Texture2D bb; + float cc; +}; + +struct banana +{ + int aa[2]; + Texture2D bb; + float cc; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2, tex, 4}; + struct banana b; + + b = a; + return b.cc; +} + +[test] +todo draw quad +todo probe all rgba (4.0, 4.0, 4.0, 4.0) + + +[pixel shader] +Texture2D tex; + +struct apple +{ + int2 aa; + Texture2D bb; + float cc; +}; + +struct banana +{ + int aa[2]; + Texture2D bb; + float cc; +}; + +float4 fun(struct banana b) +{ + return b.cc; +} + +float4 main() : sv_target +{ + struct apple a = {1, 2, tex, 5}; + + return fun(a); +} + +[test] +todo draw quad +todo probe all rgba (5.0, 5.0, 5.0, 5.0) + + +[pixel shader] +struct apple +{ + float3 xx[2]; + int4 yy; +}; + +struct banana +{ + struct apple apples[2]; + int3 bb[2]; + int4 cc[3]; +}; + +struct cherry +{ + int2 xx; + int yy[3]; +}; + +struct donut +{ + float4 aa; + float2 bb; + int cc[4]; + float dd[6]; + struct cherry cherries[4]; + int2 ee; +}; + +float4 main() : sv_target +{ + struct banana b = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37}; + struct donut d; + + d = b; + return d.aa + d.cherries[3].yy[2] + d.ee.xyxx; +} + +[test] +todo draw quad +todo probe all rgba (71.0, 73.0, 73.0, 74.0) + + +[pixel shader fail] +struct apple +{ + float3 aa; + int bb; +}; + +struct banana +{ + float3 aa; + float bb; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2, 3, 4}; + struct banana b; + + b = a; + return b.bb; +}

1 0

Francisco Casas : tests: Test explicit casts between types that are component-wise compatible.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: vkd3d Branch: master Commit: 09d7442cb18340ee2e8f85aa67882abaf1528e1e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/09d7442cb18340ee2e8f85aa67882… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 12 17:01:26 2022 -0300 tests: Test explicit casts between types that are component-wise compatible. --- Makefile.am | 1 + tests/cast-componentwise-compatible.shader_test | 185 ++++++++++++++++++++++++ 2 files changed, 186 insertions(+) diff --git a/Makefile.am b/Makefile.am index 83f75d64..b9068728 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,6 +59,7 @@ vkd3d_shader_tests = \ tests/bitwise.shader_test \ tests/cast-broadcast.shader_test \ tests/cast-componentwise-equal.shader_test \ + tests/cast-componentwise-compatible.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ diff --git a/tests/cast-componentwise-compatible.shader_test b/tests/cast-componentwise-compatible.shader_test new file mode 100644 index 00000000..c6402cf5 --- /dev/null +++ b/tests/cast-componentwise-compatible.shader_test @@ -0,0 +1,185 @@ +[pixel shader] +struct apple +{ + float3 aa; + int bb; +}; + +float4 main() : sv_target +{ + float f[4] = {1, 2, 3, 4}; + struct apple a; + + a = (struct apple) f; + return a.aa.xyzx; +} + + +[test] +todo draw quad +todo probe all rgba (1.0, 2.0, 3.0, 1.0) + + +[pixel shader] +struct apple +{ + float3 aa; + int bb; + float cc; +}; + +float4 main() : sv_target +{ + struct apple a = {5, 6, 7, 8.8, 9.0}; + float f[4]; + + f = (float[4]) a; + return float4(f); +} + + +[test] +todo draw quad +todo probe all rgba (5.0, 6.0, 7.0, 8.0) + + +[pixel shader] +float4 main() : sv_target +{ + float f[6] = {1, 2, 3, 4, 5, 6}; + int i[4]; + + i = (int[4]) f; + return float4(i[0], i[1], i[2], i[3]); +} + + +[test] +todo draw quad +todo probe all rgba (1.0, 2.0, 3.0, 4.0) + + +[pixel shader] +Texture2D tex; + +struct apple +{ + int2 aa; + Texture2D bb; + float cc; +}; + +struct banana +{ + float aa[2]; + Texture2D bb; + int cc; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2, tex, 7.2}; + struct banana b; + + b = (struct banana) a; + return b.cc; +} + +[test] +todo draw quad +todo probe all rgba (7.0, 7.0, 7.0, 7.0) + + +[pixel shader] +Texture2D tex; + +struct apple +{ + int2 aa; + Texture2D bb; + float cc; + float4 dd; + Texture2D ee; +}; + +struct banana +{ + float aa[2]; + Texture2D bb; + int cc; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2, tex, 3, 4, 5, 6, 7, tex}; + struct banana b; + + b = (struct banana) a; + return b.cc; +} + +[test] +todo draw quad +todo probe all rgba (3.0, 3.0, 3.0, 3.0) + + +[pixel shader fail] +struct apple +{ + int2 aa; + float bb; +}; + +struct banana +{ + int2 aa; + float bb; + float cc; +}; + +float4 main() : sv_target +{ + struct apple a = {1, 2, 3}; + struct banana b; + + b = (struct banana) a; + return b.bb; +} + + +[pixel shader] +float4 main() : sv_target +{ + float4 v = float4(10.1, 20.2, 30.3, 40.4); + int i[3]; + + i = (int[3]) v; + return float4(i[0], i[1], i[2], i[2]); +} + + +[test] +todo draw quad +todo probe all rgba (10.0, 20.0, 30.0, 30.0) + + +[pixel shader] +struct apple +{ + int aa; + float bb[2]; +}; + +float4 main() : sv_target +{ + float4 f = {10.4, 11.4, 12.4, 13.4}; + struct apple a; + + a = (struct apple) f; + return float4(a.aa, a.aa, a.bb[0], a.bb[1]); +} + + +[test] +todo draw quad +todo probe all rgba (10.0, 10.0, 11.4, 12.4)

1 0

Alex Henrie : shell32: Move strndupW to dde.c.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 6664991f2471004b3166397f6e2c3895d58ffa81 URL: https://gitlab.winehq.org/wine/wine/-/commit/6664991f2471004b3166397f6e2c38… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Oct 14 09:51:08 2022 -0600 shell32: Move strndupW to dde.c. --- dlls/shell32/dde.c | 13 +++++++++++++ dlls/shell32/shell32_main.h | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 5ab63136092..cd956def797 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -54,6 +54,19 @@ static const char *debugstr_hsz( HSZ hsz ) return debugstr_w( buffer ); } +static WCHAR *strndupW(const WCHAR *src, DWORD len) +{ + WCHAR *dest; + if (!src) return NULL; + dest = heap_alloc((len + 1) * sizeof(*dest)); + if (dest) + { + memcpy(dest, src, len * sizeof(WCHAR)); + dest[len] = '\0'; + } + return dest; +} + static inline BOOL Dde_OnConnect(HSZ hszTopic, HSZ hszService) { if ((hszTopic == hszProgmanTopic) && (hszService == hszProgmanService)) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 7bb26e46a6e..33b85ee2726 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -241,19 +241,6 @@ static inline WCHAR *strdupW(const WCHAR *src) return dest; } -static inline WCHAR *strndupW(const WCHAR *src, DWORD len) -{ - WCHAR *dest; - if (!src) return NULL; - dest = heap_alloc((len + 1) * sizeof(*dest)); - if (dest) - { - memcpy(dest, src, len * sizeof(WCHAR)); - dest[len] = '\0'; - } - return dest; -} - static inline WCHAR *strdupAtoW(const char *str) { WCHAR *ret;

1 0

Alex Henrie : shell32: Use standard C functions for memory allocation in dde.c.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 0d90fa6348d0523a83bab91fc250ea684bc01239 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d90fa6348d0523a83bab91fc250ea… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Oct 14 09:51:08 2022 -0600 shell32: Use standard C functions for memory allocation in dde.c. --- dlls/shell32/dde.c | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index cd956def797..39e7de9c2c9 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -58,7 +58,7 @@ static WCHAR *strndupW(const WCHAR *src, DWORD len) { WCHAR *dest; if (!src) return NULL; - dest = heap_alloc((len + 1) * sizeof(*dest)); + dest = malloc((len + 1) * sizeof(*dest)); if (dest) { memcpy(dest, src, len * sizeof(WCHAR)); @@ -100,7 +100,7 @@ static WCHAR *get_programs_path(const WCHAR *name) SHGetKnownFolderPath(&FOLDERID_Programs, 0, NULL, &programs); len = lstrlenW(programs) + 1 + lstrlenW(name); - path = heap_alloc((len + 1) * sizeof(*path)); + path = malloc((len + 1) * sizeof(*path)); lstrcpyW(path, programs); lstrcatW(path, L"/"); lstrcatW(path, name); @@ -119,7 +119,7 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, WIN32_FIND_DATAW finddata; HANDLE hfind; int len = 1; - WCHAR *groups_data = heap_alloc(sizeof(WCHAR)); + WCHAR *groups_data = malloc(sizeof(WCHAR)); char *groups_dataA; HDDEDATA ret; @@ -134,7 +134,7 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, wcscmp(finddata.cFileName, L".") && wcscmp(finddata.cFileName, L"..")) { len += lstrlenW(finddata.cFileName) + 2; - groups_data = heap_realloc(groups_data, len * sizeof(WCHAR)); + groups_data = realloc(groups_data, len * sizeof(WCHAR)); lstrcatW(groups_data, finddata.cFileName); lstrcatW(groups_data, L"\r\n"); } @@ -143,13 +143,13 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, } len = WideCharToMultiByte(CP_ACP, 0, groups_data, -1, NULL, 0, NULL, NULL); - groups_dataA = heap_alloc(len * sizeof(WCHAR)); + groups_dataA = malloc(len * sizeof(WCHAR)); WideCharToMultiByte(CP_ACP, 0, groups_data, -1, groups_dataA, len, NULL, NULL); ret = DdeCreateDataHandle(dwDDEInst, (BYTE *)groups_dataA, len, 0, hszGroups, uFmt, 0); - heap_free(groups_dataA); - heap_free(groups_data); - heap_free(programs); + free(groups_dataA); + free(groups_data); + free(programs); return ret; } else if (hszTopic == hszProgmanTopic && hszItem == hszProgmanService && uFmt == CF_TEXT) @@ -180,7 +180,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) CreateDirectoryW(path, NULL); ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); - heap_free(last_group); + free(last_group); last_group = path; } else if (!wcsicmp(command, L"DeleteGroup")) @@ -193,7 +193,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) path = get_programs_path(argv[0]); - path2 = heap_alloc((lstrlenW(path) + 2) * sizeof(*path)); + path2 = malloc((lstrlenW(path) + 2) * sizeof(*path)); lstrcpyW(path2, path); path2[lstrlenW(path) + 1] = 0; @@ -203,8 +203,8 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) ret = SHFileOperationW(&shfos); - heap_free(path2); - heap_free(path); + free(path2); + free(path); if (ret || shfos.fAnyOperationsAborted) return DDE_FNOTPROCESSED; } @@ -220,7 +220,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); - heap_free(last_group); + free(last_group); last_group = path; } else if (!wcsicmp(command, L"AddItem")) @@ -242,10 +242,10 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) IShellLinkW_Release(link); return DDE_FNOTPROCESSED; } - path = heap_alloc(len * sizeof(WCHAR)); + path = malloc(len * sizeof(WCHAR)); SearchPathW(NULL, argv[0], L".exe", len, path, NULL); IShellLinkW_SetPath(link, path); - heap_free(path); + free(path); if (argc >= 2) IShellLinkW_SetDescription(link, argv[1]); if (argc >= 4) IShellLinkW_SetIconLocation(link, argv[2], wcstol(argv[3], NULL, 10)); @@ -266,19 +266,19 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (argc >= 2) { len = lstrlenW(last_group) + 1 + lstrlenW(argv[1]) + 5; - name = heap_alloc(len * sizeof(*name)); + name = malloc(len * sizeof(*name)); swprintf( name, len, L"%s/%s.lnk", last_group, argv[1] ); } else { const WCHAR *filename = PathFindFileNameW(argv[0]); len = PathFindExtensionW(filename) - filename; - name = heap_alloc((lstrlenW(last_group) + 1 + len + 5) * sizeof(*name)); + name = malloc((lstrlenW(last_group) + 1 + len + 5) * sizeof(*name)); swprintf( name, lstrlenW(last_group) + 1 + len + 5, L"%s/%.*s.lnk", last_group, len, filename ); } hres = IPersistFile_Save(file, name, TRUE); - heap_free(name); + free(name); IPersistFile_Release(file); IShellLinkW_Release(link); @@ -292,12 +292,12 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (argc < 1) return DDE_FNOTPROCESSED; len = lstrlenW(last_group) + 1 + lstrlenW(argv[0]) + 5; - name = heap_alloc(len * sizeof(*name)); + name = malloc(len * sizeof(*name)); swprintf( name, len, L"%s/%s.lnk", last_group, argv[0]); ret = DeleteFileW(name); - heap_free(name); + free(name); if (!ret) return DDE_FNOTPROCESSED; } @@ -326,7 +326,7 @@ static DWORD parse_dde_command(HSZ hszTopic, WCHAR *command) while (*command == '[') { argc = 0; - argv = heap_alloc(sizeof(*argv)); + argv = malloc(sizeof(*argv)); command++; while (*command == ' ') command++; @@ -355,7 +355,7 @@ static DWORD parse_dde_command(HSZ hszTopic, WCHAR *command) } argc++; - argv = heap_realloc(argv, argc * sizeof(*argv)); + argv = realloc(argv, argc * sizeof(*argv)); argv[argc-1] = strndupW(command, p - command); command = p; @@ -381,9 +381,9 @@ static DWORD parse_dde_command(HSZ hszTopic, WCHAR *command) ret = DDE_FNOTPROCESSED; } - heap_free(opcode); - for (i = 0; i < argc; i++) heap_free(argv[i]); - heap_free(argv); + free(opcode); + for (i = 0; i < argc; i++) free(argv[i]); + free(argv); if (ret == DDE_FNOTPROCESSED) break; } @@ -392,9 +392,9 @@ static DWORD parse_dde_command(HSZ hszTopic, WCHAR *command) error: ERR("failed to parse command %s\n", debugstr_w(original)); - heap_free(opcode); - for (i = 0; i < argc; i++) heap_free(argv[i]); - heap_free(argv); + free(opcode); + for (i = 0; i < argc; i++) free(argv[i]); + free(argv); return DDE_FNOTPROCESSED; } @@ -406,14 +406,14 @@ static DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata) len = DdeGetData(hdata, NULL, 0, 0); if (!len) return DDE_FNOTPROCESSED; - command = heap_alloc(len); + command = malloc(len); DdeGetData(hdata, (BYTE *)command, len, 0); TRACE("conv=%p topic=%s data=%s\n", hconv, debugstr_hsz(hszTopic), debugstr_w(command)); ret = parse_dde_command(hszTopic, command); - heap_free(command); + free(command); return ret; }

1 0

Alex Henrie : shell32: Introduce combine_path helper for DDE.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 6004f5b0da788c645535455a9ae6d4d2e3c163b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/6004f5b0da788c645535455a9ae6d4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Oct 14 09:51:08 2022 -0600 shell32: Introduce combine_path helper for DDE. --- dlls/shell32/dde.c | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 39e7de9c2c9..51aa8f88927 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -91,20 +91,30 @@ static inline BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService) return FALSE; } +static WCHAR *combine_path(const WCHAR *directory, const WCHAR *name, const WCHAR *extension) +{ + WCHAR *path; + int len; + + len = wcslen(directory) + 1 + wcslen(name); + if (extension) len += wcslen(extension); + path = malloc((len + 1) * sizeof(WCHAR)); + + PathCombineW(path, directory, name); + + if (extension) + wcscat(path, extension); + + return path; +} + /* Returned string must be freed by caller */ static WCHAR *get_programs_path(const WCHAR *name) { WCHAR *programs, *path; - int len; SHGetKnownFolderPath(&FOLDERID_Programs, 0, NULL, &programs); - - len = lstrlenW(programs) + 1 + lstrlenW(name); - path = malloc((len + 1) * sizeof(*path)); - lstrcpyW(path, programs); - lstrcatW(path, L"/"); - lstrcatW(path, name); - + path = combine_path(programs, name, NULL); CoTaskMemFree(programs); return path; @@ -265,16 +275,15 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) } if (argc >= 2) { - len = lstrlenW(last_group) + 1 + lstrlenW(argv[1]) + 5; - name = malloc(len * sizeof(*name)); - swprintf( name, len, L"%s/%s.lnk", last_group, argv[1] ); + name = combine_path(last_group, argv[1], L".lnk"); } else { - const WCHAR *filename = PathFindFileNameW(argv[0]); - len = PathFindExtensionW(filename) - filename; - name = malloc((lstrlenW(last_group) + 1 + len + 5) * sizeof(*name)); - swprintf( name, lstrlenW(last_group) + 1 + len + 5, L"%s/%.*s.lnk", last_group, len, filename ); + WCHAR *filename = wcsdup(PathFindFileNameW(argv[0])); + WCHAR *ext = PathFindExtensionW(filename); + *ext = '\0'; + name = combine_path(last_group, filename, L".lnk"); + free(filename); } hres = IPersistFile_Save(file, name, TRUE); @@ -291,12 +300,8 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (argc < 1) return DDE_FNOTPROCESSED; - len = lstrlenW(last_group) + 1 + lstrlenW(argv[0]) + 5; - name = malloc(len * sizeof(*name)); - swprintf( name, len, L"%s/%s.lnk", last_group, argv[0]); - + name = combine_path(last_group, argv[0], L".lnk"); ret = DeleteFileW(name); - free(name); if (!ret) return DDE_FNOTPROCESSED;

1 0

Alex Henrie : shell32: Sanitize Program Manager icon and group names.
by Alexandre Julliard 17 Oct '22

17 Oct '22

Module: wine Branch: master Commit: 52ffd611de9ec84727118b5caa5138dabeb69a68 URL: https://gitlab.winehq.org/wine/wine/-/commit/52ffd611de9ec84727118b5caa5138… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Oct 14 09:51:08 2022 -0600 shell32: Sanitize Program Manager icon and group names. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52506 --- dlls/shell32/dde.c | 40 ++++++++++++++++++++++++++++------------ dlls/shell32/tests/progman_dde.c | 3 +-- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 51aa8f88927..24482d2c33f 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -91,16 +91,32 @@ static inline BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService) return FALSE; } -static WCHAR *combine_path(const WCHAR *directory, const WCHAR *name, const WCHAR *extension) +static WCHAR *combine_path(const WCHAR *directory, const WCHAR *name, const WCHAR *extension, BOOL sanitize) { WCHAR *path; - int len; + int len, i; len = wcslen(directory) + 1 + wcslen(name); if (extension) len += wcslen(extension); path = malloc((len + 1) * sizeof(WCHAR)); - PathCombineW(path, directory, name); + if (sanitize) + { + WCHAR *sanitized_name = wcsdup(name); + + for (i = 0; i < wcslen(name); i++) + { + if (name[i] < ' ' || wcschr(L"*/:<>?\\|", name[i])) + sanitized_name[i] = '_'; + } + + PathCombineW(path, directory, sanitized_name); + free(sanitized_name); + } + else + { + PathCombineW(path, directory, name); + } if (extension) wcscat(path, extension); @@ -109,12 +125,12 @@ static WCHAR *combine_path(const WCHAR *directory, const WCHAR *name, const WCHA } /* Returned string must be freed by caller */ -static WCHAR *get_programs_path(const WCHAR *name) +static WCHAR *get_programs_path(const WCHAR *name, BOOL sanitize) { WCHAR *programs, *path; SHGetKnownFolderPath(&FOLDERID_Programs, 0, NULL, &programs); - path = combine_path(programs, name, NULL); + path = combine_path(programs, name, NULL, sanitize); CoTaskMemFree(programs); return path; @@ -134,7 +150,7 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, HDDEDATA ret; groups_data[0] = 0; - programs = get_programs_path(L"*"); + programs = get_programs_path(L"*", FALSE); hfind = FindFirstFileW(programs, &finddata); if (hfind) { @@ -185,7 +201,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (argc < 1) return DDE_FNOTPROCESSED; - path = get_programs_path(argv[0]); + path = get_programs_path(argv[0], TRUE); CreateDirectoryW(path, NULL); ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); @@ -201,7 +217,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (argc < 1) return DDE_FNOTPROCESSED; - path = get_programs_path(argv[0]); + path = get_programs_path(argv[0], TRUE); path2 = malloc((lstrlenW(path) + 2) * sizeof(*path)); lstrcpyW(path2, path); @@ -226,7 +242,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) * ignore its actual value. */ if (argc < 2) return DDE_FNOTPROCESSED; - path = get_programs_path(argv[0]); + path = get_programs_path(argv[0], TRUE); ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); @@ -275,14 +291,14 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) } if (argc >= 2) { - name = combine_path(last_group, argv[1], L".lnk"); + name = combine_path(last_group, argv[1], L".lnk", TRUE); } else { WCHAR *filename = wcsdup(PathFindFileNameW(argv[0])); WCHAR *ext = PathFindExtensionW(filename); *ext = '\0'; - name = combine_path(last_group, filename, L".lnk"); + name = combine_path(last_group, filename, L".lnk", TRUE); free(filename); } hres = IPersistFile_Save(file, name, TRUE); @@ -300,7 +316,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (argc < 1) return DDE_FNOTPROCESSED; - name = combine_path(last_group, argv[0], L".lnk"); + name = combine_path(last_group, argv[0], L".lnk", FALSE); ret = DeleteFileW(name); free(name); diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index cb1ff8ddb9f..5a7e8c912e5 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -459,8 +459,7 @@ static void test_name_sanitization(DWORD instance, HCONV hConv) error = dde_execute(instance, hConv, buf); ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); sprintf(buf, "Group%s", sanitized_name); - todo_wine ok(check_exists(buf), "directory not created\n"); - if (!check_exists(buf)) return; + ok(check_exists(buf), "directory not created\n"); ok(check_window_exists(buf), "window not created\n"); sprintf(buf, "[ShowGroup(\"Group%s\", 0)]", original_name);

1 0