ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user: Fixed the lifetime of MDICREATESTRUCT variables.

This commit is contained in:
Ken Thomases 2006-01-19 12:43:45 +01:00 committed by Alexandre Julliard
parent 265c8a5d73
commit d6865383a6
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/user/win.c
View File

@ -833,6 +833,7 @@ static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, ATOM classAtom,
WND *wndPtr; WND *wndPtr;
HWND hwnd, parent, owner, top_child = 0; HWND hwnd, parent, owner, top_child = 0;
BOOL unicode = (type == WIN_PROC_32W); BOOL unicode = (type == WIN_PROC_32W);
MDICREATESTRUCTA mdi_cs;
TRACE("%s %s ex=%08lx style=%08lx %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", TRACE("%s %s ex=%08lx style=%08lx %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n",
(type == WIN_PROC_32W) ? debugstr_w((LPCWSTR)cs->lpszName) : debugstr_a(cs->lpszName), (type == WIN_PROC_32W) ? debugstr_w((LPCWSTR)cs->lpszName) : debugstr_a(cs->lpszName),
@ -848,7 +849,6 @@ static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, ATOM classAtom,
/* Fix the styles for MDI children */ /* Fix the styles for MDI children */
if (cs->dwExStyle & WS_EX_MDICHILD) if (cs->dwExStyle & WS_EX_MDICHILD)
{ {
MDICREATESTRUCTA mdi_cs;
UINT flags = 0; UINT flags = 0;
wndPtr = WIN_GetPtr(cs->hwndParent); wndPtr = WIN_GetPtr(cs->hwndParent);

3
dlls/user/winproc.c
View File

@ -3017,6 +3017,7 @@ static BOOL WINPROC_CallProc32WTo32A_fast( WNDPROC func, HWND hwnd,
char *cls = buffer, *name; char *cls = buffer, *name;
CREATESTRUCTW *csW = (CREATESTRUCTW *)lParam; CREATESTRUCTW *csW = (CREATESTRUCTW *)lParam;
CREATESTRUCTA csA = *(CREATESTRUCTA *)csW; CREATESTRUCTA csA = *(CREATESTRUCTA *)csW;
MDICREATESTRUCTA mdi_cs;
DWORD name_lenA, name_lenW, class_lenA, class_lenW; DWORD name_lenA, name_lenW, class_lenA, class_lenW;
class_lenW = strlenW(csW->lpszClass) * sizeof(WCHAR); class_lenW = strlenW(csW->lpszClass) * sizeof(WCHAR);
@ -3050,8 +3051,6 @@ static BOOL WINPROC_CallProc32WTo32A_fast( WNDPROC func, HWND hwnd,
if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD) if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD)
{ {
MDICREATESTRUCTA mdi_cs;
mdi_cs = *(MDICREATESTRUCTA *)csW->lpCreateParams; mdi_cs = *(MDICREATESTRUCTA *)csW->lpCreateParams;
mdi_cs.szTitle = csA.lpszName; mdi_cs.szTitle = csA.lpszName;
mdi_cs.szClass = csA.lpszClass; mdi_cs.szClass = csA.lpszClass;