jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GC'ed wide strings for windows

Browse source
This commit is contained in:
Araq 2013-05-20 02:17:24 +02:00
commit baf89e3d66
7 changed files with 155 additions and 297 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/pure/osproc.nim
View file

@ -361,14 +361,12 @@ when defined(Windows) and not defined(useNimRtl):
if env != nil: e = buildEnv(env)
if poEchoCmd in options: echo($cmdl)
when useWinUnicode:
var tmp = allocWideCString(cmdl)
var ee = allocWideCString(e)
var wwd = allocWideCString(wd)
var tmp = newWideCString(cmdl)
var ee = newWideCString(e)
var wwd = newWideCString(wd)
success = winlean.CreateProcessW(nil,
tmp, nil, nil, 1, NORMAL_PRIORITY_CLASS, ee, wwd, SI, ProcInfo)
if tmp != nil: dealloc tmp
if ee != nil: dealloc ee
if wwd != nil: dealloc wwd
tmp, nil, nil, 1, NORMAL_PRIORITY_CLASS or CREATE_UNICODE_ENVIRONMENT,
ee, wwd, SI, ProcInfo)
else:
success = winlean.CreateProcessA(nil,
cmdl, nil, nil, 1, NORMAL_PRIORITY_CLASS, e, wd, SI, ProcInfo)
@ -445,10 +443,9 @@ when defined(Windows) and not defined(useNimRtl):
SI.hStdInput = GetStdHandle(STD_INPUT_HANDLE)
SI.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE)
when useWinUnicode:
var c = allocWideCString(command)
var c = newWideCString(command)
var res = winlean.CreateProcessW(nil, c, nil, nil, 0,
NORMAL_PRIORITY_CLASS, nil, nil, SI, ProcInfo)
dealloc c
else:
var res = winlean.CreateProcessA(nil, command, nil, nil, 0,
NORMAL_PRIORITY_CLASS, nil, nil, SI, ProcInfo)