Skip to content

Remove uses of PAL's swprintf_s from mono. #77284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AaronRobinsonMSFT merged 3 commits into from
Oct 20, 2022
Merged

Remove uses of PAL's swprintf_s from mono. #77284

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6af78d1
Remove uses of PAL's swprintf_s from mono.
AaronRobinsonMSFT Oct 20, 2022
db56ceb
Remove use of `W()` macro.
AaronRobinsonMSFT Oct 20, 2022
a4c1882
Fix build
AaronRobinsonMSFT Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/mono/dlls/dbgshim/dbgshim.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ typedef HRESULT (STDAPICALLTYPE *FPCoreCLRCreateCordbObject)(
HMODULE hmodTargetCLR,
IUnknown **ppCordb);

HRESULT RunAndroidCmd(char* c_android_adb_path, LPCWSTR w_command_to_execute)
static HRESULT RunAndroidCmd(char* c_android_adb_path, char const* c_command_to_execute)
{
PROCESS_INFORMATION processInfo;
STARTUPINFOW startupInfo;
Expand All @@ -57,11 +57,11 @@ HRESULT RunAndroidCmd(char* c_android_adb_path, LPCWSTR w_command_to_execute)
startupInfo.cb = sizeof(startupInfo);

LPWSTR w_android_run_adb_command = (LPWSTR)malloc(2048 * sizeof(WCHAR));
LPWSTR w_android_adb_path = (LPWSTR)malloc(2048 * sizeof(WCHAR));
char* c_android_run_adb_command = (char*)malloc(2048 * sizeof(char));

MultiByteToWideChar(CP_UTF8, 0, c_android_adb_path, -1, w_android_adb_path, 2048);
sprintf_s(c_android_run_adb_command, 2048, "%s %s", c_android_adb_path, c_command_to_execute);

swprintf_s(w_android_run_adb_command, 2048, W("%ws %ws"), w_android_adb_path, w_command_to_execute);
MultiByteToWideChar(CP_UTF8, 0, c_android_run_adb_command, -1, w_android_run_adb_command, 2048);
BOOL result = CreateProcessW(
NULL,
w_android_run_adb_command,
Expand All @@ -75,11 +75,11 @@ HRESULT RunAndroidCmd(char* c_android_adb_path, LPCWSTR w_command_to_execute)
&processInfo);

if (!result) {
free(c_android_run_adb_command);
free(w_android_run_adb_command);
free(w_android_adb_path);
return HRESULT_FROM_WIN32(GetLastError());
}
free(w_android_adb_path);
free(c_android_run_adb_command);
free(w_android_run_adb_command);
return S_OK;
}
Expand Down Expand Up @@ -111,7 +111,7 @@ CreateProcessForLaunch(
char* c_android_adb_path = getenv("ANDROID_ADB_PATH");

if (strlen(c_android_adb_path) > 0) {
HRESULT ret = RunAndroidCmd(c_android_adb_path, W("shell setprop debug.mono.extra \"debug=10.0.2.2:56000,loglevel=10,timeout=100000000000000\""));
HRESULT ret = RunAndroidCmd(c_android_adb_path, "shell setprop debug.mono.extra \"debug=10.0.2.2:56000,loglevel=10,timeout=100000000000000\"");
if (ret != S_OK) {
*pProcessId = 0;
*pResumeHandle = NULL;
Expand Down