[PATCH 3/3] fusion/tests: Change sprintf to PathCombineA to avoid GCC warnings
Alex Henrie
alexhenrie24 at gmail.com
Sat Sep 7 13:25:52 CDT 2019
Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
dlls/fusion/tests/Makefile.in | 2 +-
dlls/fusion/tests/asmenum.c | 22 +++++++++++-----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/fusion/tests/Makefile.in b/dlls/fusion/tests/Makefile.in
index 02a6ae3970..04ddee8919 100644
--- a/dlls/fusion/tests/Makefile.in
+++ b/dlls/fusion/tests/Makefile.in
@@ -1,5 +1,5 @@
TESTDLL = fusion.dll
-IMPORTS = user32
+IMPORTS = user32 shlwapi
C_SRCS = \
asmcache.c \
diff --git a/dlls/fusion/tests/asmenum.c b/dlls/fusion/tests/asmenum.c
index 115089e674..fa9fb7c618 100644
--- a/dlls/fusion/tests/asmenum.c
+++ b/dlls/fusion/tests/asmenum.c
@@ -402,10 +402,10 @@ static void test_enumerate_name(void)
to_multibyte(gac, buf);
create_full_path(gac);
- sprintf(path, "%s\\Wine", gac);
+ PathCombineA(path, gac, "Wine");
CreateDirectoryA(path, NULL);
- sprintf(path, "%s\\Wine\\1.0.0.0__16a3fcd171e93a8d", gac);
+ PathCombineA(path, gac, "Wine\\1.0.0.0__16a3fcd171e93a8d");
CreateDirectoryA(path, NULL);
lstrcatA(path, "\\Wine.dll");
@@ -415,7 +415,7 @@ static void test_enumerate_name(void)
goto done;
}
- sprintf(path, "%s\\Wine\\1.0.1.2__16a3fcd171e93a8d", gac);
+ PathCombineA(path, gac, "Wine\\1.0.1.2__16a3fcd171e93a8d");
CreateDirectoryA(path, NULL);
lstrcatA(path, "\\Wine.dll");
@@ -425,7 +425,7 @@ static void test_enumerate_name(void)
goto done;
}
- sprintf(path, "%s\\Wine\\1.0.1.2__123456789abcdef0", gac);
+ PathCombineA(path, gac, "Wine\\1.0.1.2__123456789abcdef0");
CreateDirectoryA(path, NULL);
lstrcatA(path, "\\Wine.dll");
@@ -663,19 +663,19 @@ static void test_enumerate_name(void)
IAssemblyName_Release(asmname);
done:
- sprintf(path, "%s\\Wine\\1.0.0.0__16a3fcd171e93a8d\\Wine.dll", gac);
+ PathCombineA(path, gac, "Wine\\1.0.0.0__16a3fcd171e93a8d\\Wine.dll");
DeleteFileA(path);
- sprintf(path, "%s\\Wine\\1.0.1.2__16a3fcd171e93a8d\\Wine.dll", gac);
+ PathCombineA(path, gac, "Wine\\1.0.1.2__16a3fcd171e93a8d\\Wine.dll");
DeleteFileA(path);
- sprintf(path, "%s\\Wine\\1.0.1.2__123456789abcdef0\\Wine.dll", gac);
+ PathCombineA(path, gac, "Wine\\1.0.1.2__123456789abcdef0\\Wine.dll");
DeleteFileA(path);
- sprintf(path, "%s\\Wine\\1.0.0.0__16a3fcd171e93a8d", gac);
+ PathCombineA(path, gac, "Wine\\1.0.0.0__16a3fcd171e93a8d");
RemoveDirectoryA(path);
- sprintf(path, "%s\\Wine\\1.0.1.2__16a3fcd171e93a8d", gac);
+ PathCombineA(path, gac, "Wine\\1.0.1.2__16a3fcd171e93a8d");
RemoveDirectoryA(path);
- sprintf(path, "%s\\Wine\\1.0.1.2__123456789abcdef0", gac);
+ PathCombineA(path, gac, "Wine\\1.0.1.2__123456789abcdef0");
RemoveDirectoryA(path);
- sprintf(path, "%s\\Wine", gac);
+ PathCombineA(path, gac, "Wine");
RemoveDirectoryA(path);
}
--
2.23.0
More information about the wine-devel
mailing list