Alexandre Julliard : user32: Fix a slightly incorrect assert.

Alexandre Julliard julliard at winehq.org
Tue Oct 30 08:32:50 CDT 2007


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Oct 30 14:11:44 2007 +0100

user32: Fix a slightly incorrect assert.

---

 dlls/user32/win.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/user32/win.c b/dlls/user32/win.c
index 6aea6c9..3c077c9 100644
--- a/dlls/user32/win.c
+++ b/dlls/user32/win.c
@@ -148,8 +148,8 @@ static WND *create_window_handle( HWND parent, HWND owner, ATOM atom,
     {
         struct user_thread_info *thread_info = get_user_thread_info();
 
-        assert( !thread_info->desktop );
-        thread_info->desktop = full_parent ? full_parent : handle;
+        if (!thread_info->desktop) thread_info->desktop = full_parent ? full_parent : handle;
+        else assert( full_parent == thread_info->desktop );
         if (full_parent && !USER_Driver->pCreateDesktopWindow( thread_info->desktop ))
             ERR( "failed to create desktop window\n" );
     }




More information about the wine-cvs mailing list