system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-20 23:34:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cabarc: Use wide-char string literals.

Browse source 
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2020-10-05 23:22:47 +02:00 committed by Alexandre Julliard
parent 283dfa0f27
commit 28df672666
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
programs/cabarc/cabarc.c
View file

@ -470,7 +470,6 @@ static BOOL add_file( HFCI fci, WCHAR *name )
static BOOL add_directory( HFCI fci, WCHAR *dir ) static BOOL add_directory( HFCI fci, WCHAR *dir )
{ {
static const WCHAR wildcardW[] = {'*',0};
WCHAR *p, *buffer; WCHAR *p, *buffer;
HANDLE handle; HANDLE handle;
WIN32_FIND_DATAW data; WIN32_FIND_DATAW data;
@ -480,7 +479,7 @@ static BOOL add_directory( HFCI fci, WCHAR *dir )
lstrcpyW( buffer, dir ); lstrcpyW( buffer, dir );
p = buffer + lstrlenW( buffer ); p = buffer + lstrlenW( buffer );
if (p > buffer && p[-1] != '\\') *p++ = '\\'; if (p > buffer && p[-1] != '\\') *p++ = '\\';
lstrcpyW( p, wildcardW ); lstrcpyW( p, L"*" );
if ((handle = FindFirstFileW( buffer, &data )) != INVALID_HANDLE_VALUE) if ((handle = FindFirstFileW( buffer, &data )) != INVALID_HANDLE_VALUE)
{ {
@ -524,7 +523,6 @@ static BOOL add_file_or_directory( HFCI fci, WCHAR *name )
static int new_cabinet( char *cab_dir ) static int new_cabinet( char *cab_dir )
{ {
static const WCHAR plusW[] = {'+',0};
WCHAR **file; WCHAR **file;
ERF erf; ERF erf;
BOOL ret = FALSE; BOOL ret = FALSE;
@ -550,7 +548,7 @@ static int new_cabinet( char *cab_dir )
for (file = opt_files; *file; file++) for (file = opt_files; *file; file++)
{ {
if (!lstrcmpW( *file, plusW )) if (!lstrcmpW( *file, L"+" ))
FCIFlushFolder( fci, fci_get_next_cab, fci_status ); FCIFlushFolder( fci, fci_get_next_cab, fci_status );
else else
if (!(ret = add_file_or_directory( fci, *file ))) break; if (!(ret = add_file_or_directory( fci, *file ))) break;
@ -586,9 +584,6 @@ static void usage( void )
int __cdecl wmain( int argc, WCHAR *argv[] ) int __cdecl wmain( int argc, WCHAR *argv[] )
{ {
static const WCHAR noneW[] = {'n','o','n','e',0};
static const WCHAR mszipW[] = {'m','s','z','i','p',0};
WCHAR *p, *command; WCHAR *p, *command;
char buffer[MAX_PATH]; char buffer[MAX_PATH];
char filename[MAX_PATH]; char filename[MAX_PATH];
@ -617,8 +612,8 @@ int __cdecl wmain( int argc, WCHAR *argv[] )
break; break;
case 'm': case 'm':
argv++; argc--; argv++; argc--;
if (!wcscmp( argv[1], noneW )) opt_compression = tcompTYPE_NONE; if (!wcscmp( argv[1], L"none" )) opt_compression = tcompTYPE_NONE;
else if (!wcscmp( argv[1], mszipW )) opt_compression = tcompTYPE_MSZIP; else if (!wcscmp( argv[1], L"mszip" )) opt_compression = tcompTYPE_MSZIP;
else else
{ {
WINE_MESSAGE( "cabarc: Unknown compression type %s\n", debugstr_w(argv[1])); WINE_MESSAGE( "cabarc: Unknown compression type %s\n", debugstr_w(argv[1]));