CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-17 21:03:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3805 from RaiKoHoff/Dev_RC

Browse Source 
Fix positioning multi instance launch
This commit is contained in:
Rainer Kottenhoff 2021-11-18 23:56:06 +01:00 committed by GitHub
commit 3c989ef499
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Dialogs.c
View File

@ -4538,7 +4538,7 @@ void DialogNewWindow(HWND hwnd, bool bSaveOnRunTools, LPCWSTR lpcwFilePath, WINI
WININFO const _wi = (Flags.bStickyWindowPosition ? g_IniWinInfo :
(wi ? *wi : GetMyWindowPlacement(hwnd, NULL, Settings2.LaunchInstanceWndPosOffset)));
StringCchPrintf(tch, COUNTOF(tch), L" -pos %i,%i,%i,%i,%i", _wi.x, _wi.y, _wi.cx, _wi.cy, _wi.max);
StringCchPrintf(tch, COUNTOF(tch), L" -pos %i,%i,%i,%i,%i", _wi.x, _wi.y, _wi.cx, _wi.cy, (int)_wi.max);
StringCchCat(szParameters, COUNTOF(szParameters), tch);
if (StrIsNotEmpty(lpcwFilePath)) {

43
src/Notepad3.c
View File

@ -11287,46 +11287,55 @@ bool LaunchNewInstance(HWND hwnd, LPCWSTR lpszParameter, LPCWSTR lpszFilePath)
//
bool RelaunchMultiInst()
{
if (Flags.MultiFileArg && (s_cFileList > 1)) {
LPWSTR lpCmdLineNew = StrDup(GetCommandLine());
size_t len = StringCchLen(lpCmdLineNew,0) + 1UL;
LPWSTR lp1 = AllocMem(sizeof(WCHAR)*len, HEAP_ZERO_MEMORY);
LPWSTR lp2 = AllocMem(sizeof(WCHAR)*len, HEAP_ZERO_MEMORY);
LPWSTR lpCmdLine = StrDup(GetCommandLine());
size_t len = StringCchLen(lpCmdLine, 0) + 1UL;
LPWSTR lpCmdLineNew = AllocMem(sizeof(WCHAR) * len, HEAP_ZERO_MEMORY);
StrTab2Space(lpCmdLineNew);
StringCchCopy(lpCmdLineNew + s_cchiFileList,2,L"");
StrTab2Space(lpCmdLine);
StringCchCopy(lpCmdLine + s_cchiFileList, 2, L"");
WCHAR* pwch = CharPrev(lpCmdLineNew,StrEnd(lpCmdLineNew,len));
WCHAR* pwch = CharPrev(lpCmdLine,StrEnd(lpCmdLine,len));
int k = 0;
while (*pwch == L' ' || *pwch == L'-' || *pwch == L'+') {
*pwch = L' ';
pwch = CharPrev(lpCmdLineNew,pwch);
pwch = CharPrev(lpCmdLine,pwch);
if (k++ > 1) {
s_cchiFileList--;
}
}
int const offset = Settings2.LaunchInstanceWndPosOffset;
for (int i = 0; i < s_cFileList; i++) {
StringCchCopy(lpCmdLineNew + s_cchiFileList,8,L" /n - ");
StringCchCat(lpCmdLineNew,len,s_lpFileList[i]);
WININFO wi = g_IniWinInfo;
wi.x += (i * offset);
wi.y += (i * offset);
WCHAR wchPos[80] = { L'\0' };
StringCchPrintf(wchPos, COUNTOF(wchPos), L" -pos %i,%i,%i,%i,%i", wi.x, wi.y, wi.cx, wi.cy, (int)wi.max);
size_t const pl = StringCchLen(wchPos, 80) + 1;
StringCchCopy(lpCmdLineNew, len, lpCmdLine);
StringCchCat(lpCmdLineNew, len, wchPos);
StringCchCopy(lpCmdLineNew + s_cchiFileList + pl, 8, L" /n - ");
StringCchCat(lpCmdLineNew,len, s_lpFileList[i]);
LocalFree(s_lpFileList[i]); // StrDup()
STARTUPINFO si = { sizeof(STARTUPINFO) };
PROCESS_INFORMATION pi = { 0 };
CreateProcess(NULL, lpCmdLineNew, NULL, NULL, false, CREATE_NEW_PROCESS_GROUP, NULL, Paths.WorkingDirectory, &si, &pi);
// don't wait for it to finish.
//::WaitForSingleObject(pi.hProcess, INFINITE);
//~WaitForSingleObject(pi.hProcess, INFINITE);
WaitForSingleObject(pi.hProcess, 125); // pause 125ms to start next
// free up resources...
CloseHandle(pi.hThread);
CloseHandle(pi.hProcess);
}
LocalFree(lpCmdLineNew); // StrDup()
FreeMem(lp1);
FreeMem(lp2);
LocalFree(lpCmdLine); // StrDup()
FreeMem(lpCmdLineNew);
s_lpFileArg[0] = L'\0';
return true;