ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

setupapi: Fix handling of inf paths that are quoted (due to spaces, typically).

This commit is contained in:
Francois Gouget 2006-08-09 19:20:48 +02:00 committed by Alexandre Julliard
parent 216171fe52
commit 3b7fb551ce
1 changed files with 52 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
dlls/setupapi/install.c
View File

@ -1001,23 +1001,61 @@ void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, LPCWSTR cmdline, I
#endif #endif
static const WCHAR nt_genericW[] = {'.','n','t',0}; static const WCHAR nt_genericW[] = {'.','n','t',0};
WCHAR *p, *path, section[MAX_PATH + sizeof(nt_platformW)/sizeof(WCHAR)]; WCHAR *s, *d, *path, section[MAX_PATH + sizeof(nt_platformW)/sizeof(WCHAR)];
void *callback_context; void *callback_context;
UINT mode; UINT mode, in_quotes, bcount;
HINF hinf; HINF hinf;
TRACE("hwnd %p, handle %p, cmdline %s\n", hwnd, handle, debugstr_w(cmdline)); TRACE("hwnd %p, handle %p, cmdline %s\n", hwnd, handle, debugstr_w(cmdline));
lstrcpynW( section, cmdline, MAX_PATH ); lstrcpynW( section, cmdline, MAX_PATH );
if (!(p = strchrW( section, ' ' ))) return; if (!(s = strchrW( section, ' ' ))) return;
*p++ = 0; *s++ = 0;
while (*p == ' ') p++; while (*s == ' ') s++;
mode = atoiW( p ); mode = atoiW( s );
if (!(p = strchrW( p, ' ' ))) return; if (!(s = strchrW( s, ' ' ))) return;
path = p + 1; while (*s == ' ') s++;
while (*path == ' ') path++;
/* The inf path may be quoted. Code adapted from CommandLineToArgvW() */
bcount=0;
in_quotes=0;
path=d=s;
while (*s)
{
if (*s==0 || ((*s=='\t' || *s==' ') && !in_quotes)) {
/* end of this command line argument */
break;
} else if (*s=='\\') {
/* '\\' */
*d++=*s++;
bcount++;
} else if (*s=='"') {
/* '"' */
if ((bcount & 1)==0) {
/* Preceded by an even number of '\', this is half that
* number of '\', plus a quote which we erase.
*/
d-=bcount/2;
in_quotes=!in_quotes;
s++;
} else {
/* Preceded by an odd number of '\', this is half that
* number of '\' followed by a '"'
*/
d=d-bcount/2-1;
*d++='"';
s++;
}
bcount=0;
} else {
/* a regular character */
*d++=*s++;
bcount=0;
}
}
*d=0;
hinf = SetupOpenInfFileW( path, NULL, INF_STYLE_WIN4, NULL ); hinf = SetupOpenInfFileW( path, NULL, INF_STYLE_WIN4, NULL );
if (hinf == INVALID_HANDLE_VALUE) return; if (hinf == INVALID_HANDLE_VALUE) return;
@ -1028,14 +1066,14 @@ void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, LPCWSTR cmdline, I
/* check for <section>.ntx86 (or corresponding name for the current platform) /* check for <section>.ntx86 (or corresponding name for the current platform)
* and then <section>.nt */ * and then <section>.nt */
p = section + strlenW(section); s = section + strlenW(section);
memcpy( p, nt_platformW, sizeof(nt_platformW) ); memcpy( s, nt_platformW, sizeof(nt_platformW) );
if (!(SetupFindFirstLineW( hinf, section, NULL, &context ))) if (!(SetupFindFirstLineW( hinf, section, NULL, &context )))
{ {
memcpy( p, nt_genericW, sizeof(nt_genericW) ); memcpy( s, nt_genericW, sizeof(nt_genericW) );
if (!(SetupFindFirstLineW( hinf, section, NULL, &context ))) *p = 0; if (!(SetupFindFirstLineW( hinf, section, NULL, &context ))) *s = 0;
} }
if (*p) TRACE( "using section %s instead\n", debugstr_w(section) ); if (*s) TRACE( "using section %s instead\n", debugstr_w(section) );
} }
callback_context = SetupInitDefaultQueueCallback( hwnd ); callback_context = SetupInitDefaultQueueCallback( hwnd );