Huw Davies : user32: Initialize length before calling GetWindowPlacement() .

Alexandre Julliard julliard at winehq.org
Tue Oct 31 13:16:02 CDT 2017


Module: wine
Branch: master
Commit: 9933a0fc8601b6121251c9b046b7c24e0823f566
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9933a0fc8601b6121251c9b046b7c24e0823f566

Author: Huw Davies <huw at codeweavers.com>
Date:   Mon Oct 30 10:29:16 2017 +0000

user32: Initialize length before calling GetWindowPlacement().

Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/user32/misc.c   | 1 +
 dlls/user32/winpos.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c
index fa0502e..895ccce 100644
--- a/dlls/user32/misc.c
+++ b/dlls/user32/misc.c
@@ -415,6 +415,7 @@ HMONITOR WINAPI MonitorFromWindow(HWND hWnd, DWORD dwFlags)
 
     TRACE("(%p, 0x%08x)\n", hWnd, dwFlags);
 
+    wp.length = sizeof(wp);
     if (IsIconic(hWnd) && GetWindowPlacement(hWnd, &wp))
         return MonitorFromRect( &wp.rcNormalPosition, dwFlags );
 
diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c
index 6b6b26a..10f0fd0 100644
--- a/dlls/user32/winpos.c
+++ b/dlls/user32/winpos.c
@@ -1255,6 +1255,8 @@ UINT WINAPI GetInternalWindowPos( HWND hwnd, LPRECT rectWnd,
                                       LPPOINT ptIcon )
 {
     WINDOWPLACEMENT wndpl;
+
+    wndpl.length = sizeof(wndpl);
     if (GetWindowPlacement( hwnd, &wndpl ))
     {
 	if (rectWnd) *rectWnd = wndpl.rcNormalPosition;




More information about the wine-cvs mailing list