Skip to content
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

Fixed the incorrect environment variable when creating a process under Windows #15

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fixed the incorrect environment variable when creating a process under Windows #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4c2ced
fix createProcess errorcode 82 when environment is NULL
HalfMoon1532 Jun 20, 2024
d9c34fc
Fixed the problem that the parent environment variable block was not …
HalfMoon1532 Jun 21, 2024
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
34 changes: 30 additions & 4 deletions src/flutter_pty_win.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ static LPWSTR build_environment(char **environment)
environment_block_length += (int)strlen(environment[i]) + 1;
i++;
}
}

environment_block = malloc((environment_block_length + 1) * sizeof(WCHAR));
environment_block = malloc((environment_block_length + 1) * sizeof(WCHAR));
}

if (environment_block != NULL)
{
Expand Down Expand Up @@ -317,7 +317,7 @@ FFI_PLUGIN_EXPORT PtyHandle *pty_create(PtyOptions *options)
return NULL;
}

STARTUPINFOEX startupInfo;
STARTUPINFOEXW startupInfo;

ZeroMemory(&startupInfo, sizeof(startupInfo));
startupInfo.StartupInfo.cb = sizeof(startupInfo);
Expand Down Expand Up @@ -361,8 +361,34 @@ FFI_PLUGIN_EXPORT PtyHandle *pty_create(PtyOptions *options)

PROCESS_INFORMATION processInfo;
ZeroMemory(&processInfo, sizeof(processInfo));
// merge parent environment
if (environment_block != NULL)
{
LPWSTR temp = environment_block;
environment_block = NULL;
LPWSTR parentEnvBlock = GetEnvironmentStringsW();
int parent_envBlock_size = 0;
LPWSTR env = parentEnvBlock;
while (*env)
{
parent_envBlock_size += wcslen(env) + 1;
env += wcslen(env) + 1;
}
int new_env_size = 0;
LPWSTR new_env = temp;
while (*new_env)
{
new_env_size += wcslen(new_env) + 1;
new_env += wcslen(new_env) + 1;
}
int _malloc_size = sizeof(WCHAR) * (parent_envBlock_size + new_env_size + 1);
environment_block = malloc(_malloc_size);
memset(environment_block, 0, _malloc_size);

Sleep(1000);
memcpy(environment_block, parentEnvBlock, sizeof(WCHAR) * parent_envBlock_size);
memcpy(environment_block + parent_envBlock_size, temp, sizeof(WCHAR) * new_env_size);
}
// Sleep(1000);

ok = CreateProcessW(NULL,
command,
Expand Down
Loading