Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-25 21:29:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USER32] Sync mdi.c with Wine Staging 1.7.55. CORE-10536

Browse source 
svn path=/trunk/; revision=70189
This commit is contained in:
Amine Khaldi 2015-11-28 18:51:17 +00:00
parent 50df902b08
commit f9c8e766ac
2 changed files with 31 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/media/doc/README.WINE
View file

@ -314,7 +314,7 @@ User32 -
reactos/win32ss/user/user32/windows/cursoricon # Forked from Wine-1.2-rc7 reactos/win32ss/user/user32/windows/cursoricon # Forked from Wine-1.2-rc7
reactos/win32ss/user/user32/windows/defwnd.c # Forked reactos/win32ss/user/user32/windows/defwnd.c # Forked
reactos/win32ss/user/user32/windows/draw.c # Forked at Wine-20020904 (uitools.c) reactos/win32ss/user/user32/windows/draw.c # Forked at Wine-20020904 (uitools.c)
reactos/win32ss/user/user32/windows/mdi.c # Synced to Wine-1_1_40 reactos/win32ss/user/user32/windows/mdi.c # Synced to WineStaging-1.7.55
reactos/win32ss/user/user32/windows/menu.c # Forked reactos/win32ss/user/user32/windows/menu.c # Forked
reactos/win32ss/user/user32/windows/messagebox.c # Forked reactos/win32ss/user/user32/windows/messagebox.c # Forked
reactos/win32ss/user/user32/windows/rect.c # Forked (uitools.c) reactos/win32ss/user/user32/windows/rect.c # Forked (uitools.c)
@ -328,7 +328,7 @@ schannel.c
reactos/dll/win32/schannel/secur32_wine.c # partial sync to wine-1.7.17 (secur32/secur32.c) reactos/dll/win32/schannel/secur32_wine.c # partial sync to wine-1.7.17 (secur32/secur32.c)
secur32 - secur32 -
reactos/dll/win32/secur32/sspi.c # Partially synced to wine-1.7.55 (secur32.c) reactos/dll/win32/secur32/sspi.c # Partially synced to WineStaging-1.7.55 (secur32.c)
reactos/dll/win32/secur32/thunks.c # Synced to WineStaging-1.7.37 reactos/dll/win32/secur32/thunks.c # Synced to WineStaging-1.7.37
reactos/dll/win32/secur32/wrapper.c # Synced to WineStaging-1.7.37 reactos/dll/win32/secur32/wrapper.c # Synced to WineStaging-1.7.37

14
reactos/win32ss/user/user32/windows/mdi.c
View file

@ -28,7 +28,7 @@
* *
* When we have more than 9 opened windows, a "More Windows..." * When we have more than 9 opened windows, a "More Windows..."
* option appears in the "Windows" menu. Each child window has * option appears in the "Windows" menu. Each child window has
* a WND* associated with it, accesible via the children list of * a WND* associated with it, accessible via the children list of
* the parent window. This WND* has a wIDmenu member, which reflects * the parent window. This WND* has a wIDmenu member, which reflects
* the position of the child in the window list. For example, with * the position of the child in the window list. For example, with
* 9 child windows, we could have the following pattern: * 9 child windows, we could have the following pattern:
@ -263,7 +263,7 @@ static BOOL is_close_enabled(HWND hwnd, HMENU hSysMenu)
/********************************************************************** /**********************************************************************
* MDI_GetWindow * MDI_GetWindow
* *
* returns "activateable" child different from the current or zero * returns "activatable" child different from the current or zero
*/ */
static HWND MDI_GetWindow(MDICLIENTINFO *clientInfo, HWND hWnd, BOOL bNext, static HWND MDI_GetWindow(MDICLIENTINFO *clientInfo, HWND hWnd, BOOL bNext,
DWORD dwStyleMask ) DWORD dwStyleMask )
@ -339,7 +339,7 @@ static LRESULT MDISetMenu( HWND hwnd, HMENU hmenuFrame,
MDICLIENTINFO *ci; MDICLIENTINFO *ci;
HWND hwndFrame = GetParent(hwnd); HWND hwndFrame = GetParent(hwnd);
TRACE("%p %p %p\n", hwnd, hmenuFrame, hmenuWindow); TRACE("%p, frame menu %p, window menu %p\n", hwnd, hmenuFrame, hmenuWindow);
if (hmenuFrame && !IsMenu(hmenuFrame)) if (hmenuFrame && !IsMenu(hmenuFrame))
{ {
@ -925,7 +925,8 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild )
if (!hIcon) if (!hIcon)
hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICON); hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICON);
if (!hIcon) if (!hIcon)
hIcon = LoadImageW(0, (LPWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); hIcon = LoadImageW(0, (LPWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON),
GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR);
if (hIcon) if (hIcon)
{ {
HDC hMemDC; HDC hMemDC;
@ -1520,6 +1521,7 @@ LRESULT WINAPI DefMDIChildProcA( HWND hwnd, UINT message,
MDICLIENTINFO *ci = get_client_info( client ); MDICLIENTINFO *ci = get_client_info( client );
TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam);
hwnd = WIN_GetFullHandle( hwnd ); hwnd = WIN_GetFullHandle( hwnd );
if (!ci) return DefWindowProcA( hwnd, message, wParam, lParam ); if (!ci) return DefWindowProcA( hwnd, message, wParam, lParam );
@ -1529,6 +1531,7 @@ LRESULT WINAPI DefMDIChildProcA( HWND hwnd, UINT message,
DefWindowProcA(hwnd, message, wParam, lParam); DefWindowProcA(hwnd, message, wParam, lParam);
if( ci->hwndChildMaximized == hwnd ) if( ci->hwndChildMaximized == hwnd )
MDI_UpdateFrameText( GetParent(client), client, TRUE, NULL ); MDI_UpdateFrameText( GetParent(client), client, TRUE, NULL );
MDI_RefreshMenu( ci );
return 1; /* success. FIXME: check text length */ return 1; /* success. FIXME: check text length */
case WM_GETMINMAXINFO: case WM_GETMINMAXINFO:
@ -1569,6 +1572,7 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message,
DefWindowProcW(hwnd, message, wParam, lParam); DefWindowProcW(hwnd, message, wParam, lParam);
if( ci->hwndChildMaximized == hwnd ) if( ci->hwndChildMaximized == hwnd )
MDI_UpdateFrameText( GetParent(client), client, TRUE, NULL ); MDI_UpdateFrameText( GetParent(client), client, TRUE, NULL );
MDI_RefreshMenu( ci );
return 1; /* success. FIXME: check text length */ return 1; /* success. FIXME: check text length */
case WM_GETMINMAXINFO: case WM_GETMINMAXINFO:
@ -2001,6 +2005,7 @@ CascadeWindows (HWND hwndParent, UINT wFlags, LPCRECT lpRect,
return 0; return 0;
} }
/*********************************************************************** /***********************************************************************
* CascadeChildWindows (USER32.@) * CascadeChildWindows (USER32.@)
*/ */
@ -2025,6 +2030,7 @@ TileWindows (HWND hwndParent, UINT wFlags, LPCRECT lpRect,
return 0; return 0;
} }
/*********************************************************************** /***********************************************************************
* TileChildWindows (USER32.@) * TileChildWindows (USER32.@)
*/ */