[PATCH] winemac.drv: fix compile with pre macOS 10.12 SDKs
From 10392f7f4f469f266016542b1d3c0b7d39d59bbc Mon Sep 17 00:00:00 2001 From: Dean M Greer <gcenx83(a)gmail.com> Date: Sun, 23 Jan 2022 13:58:38 -0500 Subject: [PATCH] winemac.drv: fix compile with pre macOS 10.12 SDKs
Fixes a regression introduced by https://source.winehq.org/git/wine.git/commit/e58b1a2b395b56859157e7dd8d08cc... Signed-off-by: Dean M Greer <gcenx83(a)gmail.com> --- dlls/winemac.drv/cocoa_app.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index e5caad00a870..52c91c0621f1 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -56,6 +56,7 @@ #define NSWindowStyleMaskResizable NSResizableWindowMask #define NSWindowStyleMaskTitled NSTitledWindowMask #define NSWindowStyleMaskUtilityWindow NSUtilityWindowMask +#define NSWindowStyleMaskNonactivatingPanel NSNonactivatingPanelMask #endif #define ERR(...) do { if (macdrv_err_on) LogError(__func__, __VA_ARGS__); } while (false) --
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=105695 Your paranoid android. === debian11 (build log) === error: patch failed: dlls/winemac.drv/cocoa_app.h:56 Task: Patch failed to apply === debian11 (build log) === error: patch failed: dlls/winemac.drv/cocoa_app.h:56 Task: Patch failed to apply
On Sun, Jan 23, 2022 at 2:08 PM Dean Greer <gcenx83(a)gmail.com> wrote:
From 10392f7f4f469f266016542b1d3c0b7d39d59bbc Mon Sep 17 00:00:00 2001 From: Dean M Greer <gcenx83(a)gmail.com> Date: Sun, 23 Jan 2022 13:58:38 -0500 Subject: [PATCH] winemac.drv: fix compile with pre macOS 10.12 SDKs
Fixes a regression introduced by https://source.winehq.org/git/wine.git/commit/e58b1a2b395b56859157e7dd8d08cc...
Signed-off-by: Dean M Greer <gcenx83(a)gmail.com> --- dlls/winemac.drv/cocoa_app.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index e5caad00a870..52c91c0621f1 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -56,6 +56,7 @@ #define NSWindowStyleMaskResizable NSResizableWindowMask #define NSWindowStyleMaskTitled NSTitledWindowMask #define NSWindowStyleMaskUtilityWindow NSUtilityWindowMask +#define NSWindowStyleMaskNonactivatingPanel NSNonactivatingPanelMask #endif
#define ERR(...) do { if (macdrv_err_on) LogError(__func__, __VA_ARGS__); } while (false) --
For what it's worth: Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Though I wonder if Tim Clem, who wrote the original patch in question, ought to sign off on this himself.
Whoa, sorry, my mail filters hid this from me. Thanks for the catch, Dean! January 23, 2022 9:34 PM, "Chip Davis" <cdavis(a)codeweavers.com> wrote:
For what it's worth:
Signed-off-by: Chip Davis <cdavis(a)codeweavers.com>
Though I wonder if Tim Clem, who wrote the original patch in question, ought to sign off on this himself.
That was an easy one to catch so no problem. Still winemac.drv is broken for none Metal GPUs still even though I’d marked the bug as a blocker sigh… On Thu, Feb 10, 2022 at 1:39 PM Tim Clem <tclem(a)codeweavers.com> wrote:
Whoa, sorry, my mail filters hid this from me. Thanks for the catch, Dean!
January 23, 2022 9:34 PM, "Chip Davis" <cdavis(a)codeweavers.com> wrote:
For what it's worth:
Signed-off-by: Chip Davis <cdavis(a)codeweavers.com>
Though I wonder if Tim Clem, who wrote the original patch in question, ought to sign off on this himself.
participants (4)
-
Chip Davis -
Dean Greer -
Marvin -
Tim Clem