[PATCH 2/2] winemac.drv: Activate window when restoring.

[Zhiyi Zhang]

Signed-off-by: Zhiyi Zhang 
---
 dlls/winemac.drv/window.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c
index b7a09634ee..605c0c87f1 100644
--- a/dlls/winemac.drv/window.c
+++ b/dlls/winemac.drv/window.c
@@ -2452,6 +2452,7 @@ void macdrv_window_did_unminimize(HWND hwnd)
     {
         TRACE("restoring win %p/%p\n", hwnd, data->cocoa_window);
         release_win_data(data);
+        SetActiveWindow(hwnd);
         SendMessageW(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0);
         return;
     }

[Ken Thomases]

On May 15, 2019, at 4:36 AM, Zhiyi Zhang  wrote:
> Signed-off-by: Zhiyi Zhang
>
> dlls/winemac.drv/window.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c
> index b7a09634ee..605c0c87f1 100644
> --- a/dlls/winemac.drv/window.c
> +++ b/dlls/winemac.drv/window.c
> @@ -2452,6 +2452,7 @@ void macdrv_window_did_unminimize(HWND hwnd)
>     {
>         TRACE("restoring win %p/%p\n", hwnd, data->cocoa_window);
>         release_win_data(data);
> -
>    SetActiveWindow(hwnd);
>   SendMessageW(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0);
>   return;
> }

I was wondering if, as Dmitry suggested in regards to the other patch, DefWindowProc() should handle this where it handles WM_SYSCOMMAND/SC_RESTORE.  Can you test that?

-Ken

[Zhiyi Zhang]

On 5/15/19 11:19 PM, Ken Thomases wrote:
> On May 15, 2019, at 4:36 AM, Zhiyi Zhang  wrote:
> > Signed-off-by: Zhiyi Zhang
> >
> > dlls/winemac.drv/window.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c
> > index b7a09634ee..605c0c87f1 100644
> > --- a/dlls/winemac.drv/window.c
> > +++ b/dlls/winemac.drv/window.c
> > @@ -2452,6 +2452,7 @@ void macdrv_window_did_unminimize(HWND hwnd)
> >     {
> >         TRACE("restoring win %p/%p\n", hwnd, data->cocoa_window);
> >         release_win_data(data);
> > -
> >    SetActiveWindow(hwnd);
> >   SendMessageW(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0);
> >   return;
> > }
>
> I was wondering if, as Dmitry suggested in regards to the other patch, DefWindowProc() should handle this where it handles WM_SYSCOMMAND/SC_RESTORE.  Can you test that?
>
> -Ken

Yes. That's what I will do. Thank you all for the review.