Module: wine Branch: refs/heads/master Commit: d6865383a69368b18b45a620ca55a6493481c1b8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d6865383a69368b18b45a620...
Author: Ken Thomases ken@codeweavers.com Date: Thu Jan 19 12:43:45 2006 +0100
user: Fixed the lifetime of MDICREATESTRUCT variables.
---
dlls/user/win.c | 2 +- dlls/user/winproc.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/user/win.c b/dlls/user/win.c index dbdb7e5..4dd37eb 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -833,6 +833,7 @@ static HWND WIN_CreateWindowEx( CREATEST WND *wndPtr; HWND hwnd, parent, owner, top_child = 0; 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", (type == WIN_PROC_32W) ? debugstr_w((LPCWSTR)cs->lpszName) : debugstr_a(cs->lpszName), @@ -848,7 +849,6 @@ static HWND WIN_CreateWindowEx( CREATEST /* Fix the styles for MDI children */ if (cs->dwExStyle & WS_EX_MDICHILD) { - MDICREATESTRUCTA mdi_cs; UINT flags = 0;
wndPtr = WIN_GetPtr(cs->hwndParent); diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 7cfc077..51f0ab8 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -3017,6 +3017,7 @@ static BOOL WINPROC_CallProc32WTo32A_fas char *cls = buffer, *name; CREATESTRUCTW *csW = (CREATESTRUCTW *)lParam; CREATESTRUCTA csA = *(CREATESTRUCTA *)csW; + MDICREATESTRUCTA mdi_cs; DWORD name_lenA, name_lenW, class_lenA, class_lenW;
class_lenW = strlenW(csW->lpszClass) * sizeof(WCHAR); @@ -3050,8 +3051,6 @@ static BOOL WINPROC_CallProc32WTo32A_fas
if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD) { - MDICREATESTRUCTA mdi_cs; - mdi_cs = *(MDICREATESTRUCTA *)csW->lpCreateParams; mdi_cs.szTitle = csA.lpszName; mdi_cs.szClass = csA.lpszClass;