``` With GCC 14.2 on Debian 11: $ i686-w64-mingw32-gcc --version i686-w64-mingw32-gcc (GCC) 14.2.0 Copyright (C) 2024 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
The following error happens: In file included from ~/src/wine/dlls/krnl386.exe16/file.c:33: In function 'lstrcpyA', inlined from 'GetSystemDirectory16' at ~/src/wine/dlls/krnl386.exe16/file.c:648:9, inlined from 'get_search_path' at ~/src/wine/dlls/krnl386.exe16/file.c:192:12: ~/src/wine/include/winbase.h:2939:12: error: argument 1 null where non-null expected [-Werror=nonnull] 2939 | return strcpy( dst, src ); | ^~~~~~~~~~~~~~~~~~ In file included from ~/src/wine/dlls/krnl386.exe16/file.c:28: ~/src/wine/include/msvcrt/string.h: In function 'get_search_path': ~/src/wine/include/msvcrt/string.h:53:26: note: in a call to function 'strcpy' declared 'nonnull' 53 | _ACRTIMP char* __cdecl strcpy(char*,const char*); | ^~~~~~ In function 'lstrcatA', inlined from 'GetSystemDirectory16' at ~/src/wine/dlls/krnl386.exe16/file.c:649:9, inlined from 'get_search_path' at ~/src/wine/dlls/krnl386.exe16/file.c:192:12: ~/src/wine/include/winbase.h:2952:12: error: argument 1 null where non-null expected [-Werror=nonnull] 2952 | return strcat( dst, src ); | ^~~~~~~~~~~~~~~~~~ ~/src/wine/include/winbase.h:2952:12: note: in a call to built-in function '__builtin_strlen'
(built using --with-mingw and --enable-werror to turn it into an error)
The warning doesn't really matter as get_search_path() calls GetSystemDirectory16(NULL, 0) to get the size for allocation.
`if (count >= len)` in the latter saves us from ever atempting to strcpy() onto NULL, but the compiler is not smart enough to figure out that len will be greater than 0.
This change mimics kernel32's GetSystemDirectoryW(). ```
From: Arkadiusz Hiler ahiler@codeweavers.com
With GCC 14.2 on Debian 11: $ i686-w64-mingw32-gcc --version i686-w64-mingw32-gcc (GCC) 14.2.0 Copyright (C) 2024 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
The following error happens: In file included from ~/src/wine/dlls/krnl386.exe16/file.c:33: In function 'lstrcpyA', inlined from 'GetSystemDirectory16' at ~/src/wine/dlls/krnl386.exe16/file.c:648:9, inlined from 'get_search_path' at ~/src/wine/dlls/krnl386.exe16/file.c:192:12: ~/src/wine/include/winbase.h:2939:12: error: argument 1 null where non-null expected [-Werror=nonnull] 2939 | return strcpy( dst, src ); | ^~~~~~~~~~~~~~~~~~ In file included from ~/src/wine/dlls/krnl386.exe16/file.c:28: ~/src/wine/include/msvcrt/string.h: In function 'get_search_path': ~/src/wine/include/msvcrt/string.h:53:26: note: in a call to function 'strcpy' declared 'nonnull' 53 | _ACRTIMP char* __cdecl strcpy(char*,const char*); | ^~~~~~ In function 'lstrcatA', inlined from 'GetSystemDirectory16' at ~/src/wine/dlls/krnl386.exe16/file.c:649:9, inlined from 'get_search_path' at ~/src/wine/dlls/krnl386.exe16/file.c:192:12: ~/src/wine/include/winbase.h:2952:12: error: argument 1 null where non-null expected [-Werror=nonnull] 2952 | return strcat( dst, src ); | ^~~~~~~~~~~~~~~~~~ ~/src/wine/include/winbase.h:2952:12: note: in a call to built-in function '__builtin_strlen'
(built using --with-mingw and --enable-werror to turn it into an error)
The warning doesn't really matter as get_search_path() calls GetSystemDirectory16(NULL, 0) to get the size for allocation.
`if (count >= len)` in the latter saves us from ever atempting to strcpy() onto NULL, but the compiler is not smart enough to figure out that len will be greater than 0.
This change mimics kernel32's GetSystemDirectoryW(). --- dlls/krnl386.exe16/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index 5eab0559883..01cf4ac657a 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -643,7 +643,7 @@ UINT16 WINAPI GetSystemDirectory16( LPSTR path, UINT16 count ) UINT16 len;
len = GetWindowsDirectory16(windir, sizeof(windir) - sizeof(system16) + 1) + sizeof(system16); - if (count >= len) + if (path && count >= len) { lstrcpyA(path, windir); lstrcatA(path, system16);
-
Arek Hiler (＠ivyl) -
Arkadiusz Hiler