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

+ fixing problem memory initialization problem during InitInstance()

Browse Source
This commit is contained in:
Rainer Kottenhoff 2017-09-04 10:20:08 +02:00
parent 837f22c588
commit f35e6ec96d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Notepad3.c
View File

@ -204,7 +204,7 @@ typedef struct _wi
int max;
} WININFO;
WININFO wininfo;
static WININFO wininfo = { CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, 0 };
BOOL bStickyWinPos;
@ -770,7 +770,6 @@ BOOL InitApplication(HINSTANCE hInstance)
//
HWND InitInstance(HINSTANCE hInstance,LPSTR pszCmdLine,int nCmdShow)
{
RECT rc;
rc.left = wininfo.x; rc.top = wininfo.y; rc.right = wininfo.x + wininfo.cx; rc.bottom = wininfo.y + wininfo.cy;
RECT rc2;
@ -784,7 +783,6 @@ HWND InitInstance(HINSTANCE hInstance,LPSTR pszCmdLine,int nCmdShow)
wininfo.x = wininfo.y = wininfo.cx = wininfo.cy = CW_USEDEFAULT;
wininfo.max = 0;
}
else if (flagDefaultPos >= 4) {
SystemParametersInfo(SPI_GETWORKAREA,0,&rc,0);
if (flagDefaultPos & 8)
@ -6482,6 +6480,7 @@ void ParseCommandLine()
if (itok == 4 || itok == 5) { // scan successful
flagPosParam = 1;
flagDefaultPos = 0;
if (wininfo.cx < 1) wininfo.cx = CW_USEDEFAULT;
if (wininfo.cy < 1) wininfo.cy = CW_USEDEFAULT;
if (wininfo.max) wininfo.max = 1;