suyu/Yucom
25
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lsteamclient: Fix _GetAppInstallDir() return value.

Browse source 
CW-Bug-Id: #21864
This commit is contained in:
Paul Gofman 2023-02-01 20:49:14 -06:00 committed by Arkadiusz Hiler
parent 36f8ada2cd
commit b59a3040d9
1 changed files with 46 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
lsteamclient/steamclient_main.c
View file

@ -103,51 +103,74 @@ void sync_environment(void)
} }
} }
/* returns the number of bytes written to dst, not including the NUL terminator */ /* Returns:
* - if successful, the number of bytes written to dst, including the NULL terminator;
* - 0 if failed;
* - PATH_MAX if insufficient output buffer (TODO: should be actual required length including NULL terminator). */
unsigned int steamclient_unix_path_to_dos_path(bool api_result, const char *src, char *dst, uint32 dst_bytes, int is_url) unsigned int steamclient_unix_path_to_dos_path(bool api_result, const char *src, char *dst, uint32 dst_bytes, int is_url)
{ {
static const char file_prot[] = "file://";
WCHAR *dosW; WCHAR *dosW;
uint32 r; uint32 r;
static const char file_prot[] = "file://"; if (!api_result)
{
if(!dst || !dst_bytes) if (dst && dst_bytes)
return PATH_MAX - 1;
if(!src || !*src || !api_result){
*dst = 0; *dst = 0;
return 0; return 0;
} }
if(is_url){ if (!dst || !dst_bytes)
/* convert only file: URLs */ return PATH_MAX;
if(strncmp(src, file_prot, 7) != 0){
strcpy(dst, src); if (!src || !*src)
return strlen(dst); {
*dst = 0;
return PATH_MAX;
} }
if (is_url)
{
/* convert only file: URLs */
if (strncmp(src, file_prot, 7))
{
r = strlen(src) + 1;
if (r > dst_bytes)
*dst = 0;
else
memmove(dst, src, r);
return r;
}
if (dst_bytes < sizeof(file_prot))
{
*dst = 0;
return PATH_MAX;
}
memmove(dst, src, 7);
src += 7; src += 7;
memcpy(dst, file_prot, sizeof(file_prot));
if(dst_bytes < sizeof(file_prot))
return 0;
dst += 7; dst += 7;
dst_bytes -= 7; dst_bytes -= 7;
} }
dosW = wine_get_dos_file_name(src); dosW = wine_get_dos_file_name(src);
*dst = 0;
if(!dosW){ if (!dosW)
WARN("Unable to convert unix filename to DOS: %s\n", src); {
WARN("Unable to convert unix filename to DOS: %s.\n", src);
*dst = 0;
return 0; return 0;
} }
r = WideCharToMultiByte(CP_ACP, 0, dosW, -1, dst, dst_bytes, r = WideCharToMultiByte(CP_ACP, 0, dosW, -1, dst, dst_bytes,
NULL, NULL); NULL, NULL);
if (!r)
{
*dst = 0;
if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
r = PATH_MAX;
}
HeapFree(GetProcessHeap(), 0, dosW); HeapFree(GetProcessHeap(), 0, dosW);
return r;
return r == 0 ? 0 : r - 1;
} }
#define IS_ABSOLUTE(x) (*x == '/' || *x == '\\' || (*x && *(x + 1) == ':')) #define IS_ABSOLUTE(x) (*x == '/' || *x == '\\' || (*x && *(x + 1) == ':'))