diff --git a/src/ilasm/asmman.cpp b/src/ilasm/asmman.cpp index 47dc6eb5c573..87456e5e3fba 100644 --- a/src/ilasm/asmman.cpp +++ b/src/ilasm/asmman.cpp @@ -965,8 +965,10 @@ HRESULT AsmMan::EmitManifest() for(j=0; (hFile == INVALID_HANDLE_VALUE)&&(pwzInputFiles[j] != NULL); j++) { wcscpy_s(wzFileName,2048,pwzInputFiles[j]); - pwz = wcsrchr(wzFileName,'\\'); + pwz = wcsrchr(wzFileName,DIRECTORY_SEPARATOR_CHAR_A); +#ifndef FEATURE_PAL if(pwz == NULL) pwz = wcsrchr(wzFileName,':'); +#endif if(pwz == NULL) pwz = &wzFileName[0]; else pwz++; wcscpy_s(pwz,2048-(pwz-wzFileName),wzUniBuf); diff --git a/src/ilasm/grammar_after.cpp b/src/ilasm/grammar_after.cpp index 7764c8d63ef7..14181208004d 100644 --- a/src/ilasm/grammar_after.cpp +++ b/src/ilasm/grammar_after.cpp @@ -845,7 +845,11 @@ int yylex() if(wzFile != NULL) { if((parser->wzIncludePath != NULL) - &&(wcschr(wzFile,'\\')==NULL)&&(wcschr(wzFile,':')==NULL)) + &&(wcschr(wzFile,DIRECTORY_SEPARATOR_CHAR_A)==NULL) +#ifndef FEATURE_PAL + &&(wcschr(wzFile,':')==NULL) +#endif + ) { PathString wzFullName; diff --git a/src/ilasm/main.cpp b/src/ilasm/main.cpp index 447d02107ed2..80158cd4ec96 100644 --- a/src/ilasm/main.cpp +++ b/src/ilasm/main.cpp @@ -67,7 +67,7 @@ void MakeProperSourceFileName(__in __nullterminated WCHAR* wzOrigName, { j--; if(wzProperName[j] == '.') break; - if((wzProperName[j] == '\\')||(j == 0)) + if((wzProperName[j] == DIRECTORY_SEPARATOR_CHAR_A)||(j == 0)) { wcscat_s(wzProperName,MAX_FILENAME_LENGTH,W(".il")); break; diff --git a/src/ilasm/writer.cpp b/src/ilasm/writer.cpp index 0958f027218a..c9787f783c4d 100644 --- a/src/ilasm/writer.cpp +++ b/src/ilasm/writer.cpp @@ -332,8 +332,10 @@ HRESULT Assembler::CreateExportDirectory() char* szOutputFileName = new char[Ldllname]; memset(szOutputFileName,0,wcslen(m_wzOutputFileName)*3+3); WszWideCharToMultiByte(CP_ACP,0,m_wzOutputFileName,-1,szOutputFileName,Ldllname,NULL,NULL); - pszDllName = strrchr(szOutputFileName,'\\'); + pszDllName = strrchr(szOutputFileName,DIRECTORY_SEPARATOR_CHAR_A); +#ifndef FEATURE_PAL if(pszDllName == NULL) pszDllName = strrchr(szOutputFileName,':'); +#endif if(pszDllName == NULL) pszDllName = szOutputFileName; Ldllname = (unsigned)strlen(pszDllName)+1; @@ -1100,8 +1102,10 @@ HRESULT Assembler::CreatePEFile(__in __nullterminated WCHAR *pwzOutputFilename) else { WCHAR* pwc; - if ((pwc = wcsrchr(m_wzOutputFileName, '\\')) != NULL) pwc++; + if ((pwc = wcsrchr(m_wzOutputFileName, DIRECTORY_SEPARATOR_CHAR_A)) != NULL) pwc++; +#ifndef FEATURE_PAL else if ((pwc = wcsrchr(m_wzOutputFileName, ':')) != NULL) pwc++; +#endif else pwc = m_wzOutputFileName; wcsncpy_s(wzScopeName, MAX_SCOPE_LENGTH, pwc, _TRUNCATE);