February 2013 - Wine-Commits

Andrew Talbot : msvcp90: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 51a79287c0dd7327e55796e26ed6fe10f8ea3f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a79287c0dd7327e55796e26… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 16 21:09:21 2013 +0000 msvcp90: Avoid signed-unsigned integer comparisons. --- dlls/msvcp90/ios.c | 2 +- dlls/msvcp90/misc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index eab867b..87ad06e 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -2533,7 +2533,7 @@ FILE* __cdecl _Fiopen_wchar(const wchar_t *name, int mode, int prot) }; int real_mode = mode & ~(OPENMODE_ate|OPENMODE__Nocreate|OPENMODE__Noreplace|OPENMODE_binary); - int mode_idx; + unsigned int mode_idx; FILE *f = NULL; TRACE("(%s %d %d)\n", debugstr_w(name), mode, prot); diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 8b3df21..bacf26c 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -195,7 +195,7 @@ unsigned short __cdecl wctype(const char *property) { "upper", _UPPER }, { "xdigit", _HEX } }; - int i; + unsigned int i; for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) if(!strcmp(property, properties[i].name))

1 0

Alexandre Julliard : rpcrt4/tests: Define the required Windows version before including anything.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 38e8f6d83f78e18a3bf9529c7af8ee629730d16c URL: http://source.winehq.org/git/wine.git/?a=commit;h=38e8f6d83f78e18a3bf9529c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 12:31:58 2013 +0100 rpcrt4/tests: Define the required Windows version before including anything. --- dlls/rpcrt4/tests/ndr_marshall.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index ac3bacc..cc3e1d3 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -18,12 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - #define _WIN32_WINNT 0x0500 #define NTDDI_WIN2K 0x05000000 #define NTDDI_VERSION NTDDI_WIN2K /* for some MIDL_STUB_MESSAGE fields */ +#include <stdarg.h> + #include "wine/test.h" #include <windef.h> #include <winbase.h>

1 0

Dmitry Timoshkov : include/gdiplusenums.h: Add FlatnessDefault definition.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 9bcd1cdd3141dbfaa47432f92a309c4109080ad8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bcd1cdd3141dbfaa47432f92… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 18 17:31:48 2013 +0800 include/gdiplusenums.h: Add FlatnessDefault definition. --- include/gdiplusenums.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index d0fc11b..c730a0c 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -704,6 +704,8 @@ enum EmfPlusRecordType { EmfPlusRecordTypeMin = EmfPlusRecordTypeHeader }; +#define FlatnessDefault 0.25f + #ifndef __cplusplus typedef enum Unit Unit;

1 0

Ken Thomases : winemac: Implement ChangeDisplaySettingsEx().
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: d26a6bf45120865e696c1f68e59f8c60f7eb0716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d26a6bf45120865e696c1f68e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 17 19:28:49 2013 -0600 winemac: Implement ChangeDisplaySettingsEx(). --- dlls/winemac.drv/cocoa_app.h | 3 + dlls/winemac.drv/cocoa_app.m | 167 +++++++++++++++++++++++++- dlls/winemac.drv/cocoa_window.h | 2 + dlls/winemac.drv/cocoa_window.m | 11 ++- dlls/winemac.drv/display.c | 241 ++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/macdrv_cocoa.h | 5 + dlls/winemac.drv/winemac.drv.spec | 1 + 7 files changed, 422 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d26a6bf45120865e696c1…

1 0

Ken Thomases : winemac: Implement EnumDisplaySettingsEx().
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 4f4ac0cafcf0a1db61939bd146d8f6d077b3be7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f4ac0cafcf0a1db61939bd14… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 17 19:28:42 2013 -0600 winemac: Implement EnumDisplaySettingsEx(). --- dlls/winemac.drv/display.c | 221 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 222 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 2a96631..afa0646 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -23,10 +23,22 @@ #include "macdrv.h" #include "winuser.h" +#include "winreg.h" WINE_DEFAULT_DEBUG_CHANNEL(display); +static CFArrayRef modes; +static CRITICAL_SECTION modes_section; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &modes_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": modes_section") } +}; +static CRITICAL_SECTION modes_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + + static inline HMONITOR display_id_to_monitor(CGDirectDisplayID display_id) { return (HMONITOR)(UINT_PTR)display_id; @@ -38,6 +50,73 @@ static inline CGDirectDisplayID monitor_to_display_id(HMONITOR handle) } +static BOOL get_display_device_reg_key(char *key, unsigned len) +{ + static const char display_device_guid_prop[] = "__wine_display_device_guid"; + static const char video_path[] = "System\\CurrentControlSet\\Control\\Video\\{"; + static const char display0[] = "}\\0000"; + ATOM guid_atom; + + assert(len >= sizeof(video_path) + sizeof(display0) + 40); + + guid_atom = HandleToULong(GetPropA(GetDesktopWindow(), display_device_guid_prop)); + if (!guid_atom) return FALSE; + + memcpy(key, video_path, sizeof(video_path)); + + if (!GlobalGetAtomNameA(guid_atom, key + strlen(key), 40)) + return FALSE; + + strcat(key, display0); + + TRACE("display device key %s\n", wine_dbgstr_a(key)); + return TRUE; +} + + +static BOOL read_registry_settings(DEVMODEW *dm) +{ + char wine_mac_reg_key[128]; + HKEY hkey; + DWORD type, size; + BOOL ret = TRUE; + + dm->dmFields = 0; + + if (!get_display_device_reg_key(wine_mac_reg_key, sizeof(wine_mac_reg_key))) + return FALSE; + + if (RegOpenKeyExA(HKEY_CURRENT_CONFIG, wine_mac_reg_key, 0, KEY_READ, &hkey)) + return FALSE; + +#define query_value(name, data) \ + size = sizeof(DWORD); \ + if (RegQueryValueExA(hkey, name, 0, &type, (LPBYTE)(data), &size) || \ + type != REG_DWORD || size != sizeof(DWORD)) \ + ret = FALSE + + query_value("DefaultSettings.BitsPerPel", &dm->dmBitsPerPel); + dm->dmFields |= DM_BITSPERPEL; + query_value("DefaultSettings.XResolution", &dm->dmPelsWidth); + dm->dmFields |= DM_PELSWIDTH; + query_value("DefaultSettings.YResolution", &dm->dmPelsHeight); + dm->dmFields |= DM_PELSHEIGHT; + query_value("DefaultSettings.VRefresh", &dm->dmDisplayFrequency); + dm->dmFields |= DM_DISPLAYFREQUENCY; + query_value("DefaultSettings.Flags", &dm->dmDisplayFlags); + dm->dmFields |= DM_DISPLAYFLAGS; + query_value("DefaultSettings.XPanning", &dm->dmPosition.x); + query_value("DefaultSettings.YPanning", &dm->dmPosition.y); + query_value("DefaultSettings.Orientation", &dm->dmDisplayOrientation); + query_value("DefaultSettings.FixedOutput", &dm->dmDisplayFixedOutput); + +#undef query_value + + RegCloseKey(hkey); + return ret; +} + + static int display_mode_bits_per_pixel(CGDisplayModeRef display_mode) { CFStringRef pixel_encoding; @@ -144,6 +223,148 @@ BOOL CDECL macdrv_EnumDisplayMonitors(HDC hdc, LPRECT rect, MONITORENUMPROC proc /*********************************************************************** + * EnumDisplaySettingsEx (MACDRV.@) + * + */ +BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, + LPDEVMODEW devmode, DWORD flags) +{ + static const WCHAR dev_name[CCHDEVICENAME] = + { 'W','i','n','e',' ','M','a','c',' ','d','r','i','v','e','r',0 }; + struct macdrv_display *displays = NULL; + int num_displays; + CGDisplayModeRef display_mode; + double rotation; + uint32_t io_flags; + + TRACE("%s, %u, %p + %hu, %08x\n", debugstr_w(devname), mode, devmode, devmode->dmSize, flags); + + memcpy(devmode->dmDeviceName, dev_name, sizeof(dev_name)); + devmode->dmSpecVersion = DM_SPECVERSION; + devmode->dmDriverVersion = DM_SPECVERSION; + devmode->dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); + devmode->dmDriverExtra = 0; + memset(&devmode->dmFields, 0, devmode->dmSize - FIELD_OFFSET(DEVMODEW, dmFields)); + + if (mode == ENUM_REGISTRY_SETTINGS) + { + TRACE("mode %d (registry) -- getting default mode\n", mode); + return read_registry_settings(devmode); + } + + if (macdrv_get_displays(&displays, &num_displays)) + goto failed; + + if (mode == ENUM_CURRENT_SETTINGS) + { + TRACE("mode %d (current) -- getting current mode\n", mode); + display_mode = CGDisplayCopyDisplayMode(displays[0].displayID); + } + else + { + EnterCriticalSection(&modes_section); + + if (mode == 0 || !modes) + { + if (modes) CFRelease(modes); + modes = CGDisplayCopyAllDisplayModes(displays[0].displayID, NULL); + } + + display_mode = NULL; + if (modes) + { + if (flags & EDS_RAWMODE) + { + if (mode < CFArrayGetCount(modes)) + display_mode = (CGDisplayModeRef)CFRetain(CFArrayGetValueAtIndex(modes, mode)); + } + else + { + DWORD count, i, safe_modes = 0; + count = CFArrayGetCount(modes); + for (i = 0; i < count; i++) + { + CGDisplayModeRef candidate = (CGDisplayModeRef)CFArrayGetValueAtIndex(modes, i); + io_flags = CGDisplayModeGetIOFlags(candidate); + if ((io_flags & kDisplayModeValidFlag) && + (io_flags & kDisplayModeSafeFlag)) + { + safe_modes++; + if (safe_modes > mode) + { + display_mode = (CGDisplayModeRef)CFRetain(candidate); + break; + } + } + } + } + } + + LeaveCriticalSection(&modes_section); + } + + if (!display_mode) + goto failed; + + /* We currently only report modes for the primary display, so it's at (0, 0). */ + devmode->dmPosition.x = 0; + devmode->dmPosition.y = 0; + devmode->dmFields |= DM_POSITION; + + rotation = CGDisplayRotation(displays[0].displayID); + devmode->dmDisplayOrientation = ((int)((rotation / 90) + 0.5)) % 4; + devmode->dmFields |= DM_DISPLAYORIENTATION; + + io_flags = CGDisplayModeGetIOFlags(display_mode); + if (io_flags & kDisplayModeStretchedFlag) + devmode->dmDisplayFixedOutput = DMDFO_STRETCH; + else + devmode->dmDisplayFixedOutput = DMDFO_CENTER; + devmode->dmFields |= DM_DISPLAYFIXEDOUTPUT; + + devmode->dmBitsPerPel = display_mode_bits_per_pixel(display_mode); + if (devmode->dmBitsPerPel) + devmode->dmFields |= DM_BITSPERPEL; + + devmode->dmPelsWidth = CGDisplayModeGetWidth(display_mode); + devmode->dmPelsHeight = CGDisplayModeGetHeight(display_mode); + devmode->dmFields |= DM_PELSWIDTH | DM_PELSHEIGHT; + + devmode->dmDisplayFlags = 0; + if (io_flags & kDisplayModeInterlacedFlag) + devmode->dmDisplayFlags |= DM_INTERLACED; + devmode->dmFields |= DM_DISPLAYFLAGS; + + devmode->dmDisplayFrequency = CGDisplayModeGetRefreshRate(display_mode); + if (!devmode->dmDisplayFrequency) + devmode->dmDisplayFrequency = 60; + devmode->dmFields |= DM_DISPLAYFREQUENCY; + + CFRelease(display_mode); + macdrv_free_displays(displays); + + TRACE("mode %d -- %dx%dx%dbpp @%d Hz", mode, + devmode->dmPelsWidth, devmode->dmPelsHeight, devmode->dmBitsPerPel, + devmode->dmDisplayFrequency); + if (devmode->dmDisplayOrientation) + TRACE(" rotated %u degrees", devmode->dmDisplayOrientation * 90); + if (devmode->dmDisplayFixedOutput == DMDFO_STRETCH) + TRACE(" stretched"); + if (devmode->dmDisplayFlags & DM_INTERLACED) + TRACE(" interlaced"); + TRACE("\n"); + + return TRUE; + +failed: + TRACE("mode %d -- not present\n", mode); + if (displays) macdrv_free_displays(displays); + SetLastError(ERROR_NO_MORE_FILES); + return FALSE; +} + + +/*********************************************************************** * GetMonitorInfo (MACDRV.@) */ BOOL CDECL macdrv_GetMonitorInfo(HMONITOR monitor, LPMONITORINFO info) diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 57b1e5a..d841283 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -10,6 +10,7 @@ @ cdecl CreateWindow(long) macdrv_CreateWindow @ cdecl DestroyWindow(long) macdrv_DestroyWindow @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors +@ cdecl EnumDisplaySettingsEx(ptr long ptr long) macdrv_EnumDisplaySettingsEx @ cdecl GetKeyboardLayout(long) macdrv_GetKeyboardLayout @ cdecl GetKeyboardLayoutName(ptr) macdrv_GetKeyboardLayoutName @ cdecl GetKeyNameText(long ptr long) macdrv_GetKeyNameText

1 0

Ken Thomases : winemac: Implement DISPLAYS_CHANGED event for when display configuration has changed .
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: bc75a9baffd889deef00a2acfdb19ae4bdce29ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc75a9baffd889deef00a2acf… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 17 19:28:34 2013 -0600 winemac: Implement DISPLAYS_CHANGED event for when display configuration has changed. --- dlls/winemac.drv/cocoa_app.m | 15 +++++++++ dlls/winemac.drv/display.c | 65 ++++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/event.c | 5 +++ dlls/winemac.drv/gdi.c | 10 +++++- dlls/winemac.drv/macdrv.h | 6 +++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 33 ++++++++++++++++++++ 7 files changed, 133 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 2651cfc..479b4d0 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -312,6 +312,20 @@ int macdrv_err_on; } } + - (void) sendDisplaysChanged + { + macdrv_event event; + WineEventQueue* queue; + + event.type = DISPLAYS_CHANGED; + event.window = NULL; + + [eventQueuesLock lock]; + for (queue in eventQueues) + [queue postEvent:&event]; + [eventQueuesLock unlock]; + } + /* * ---------- NSApplication method overrides ---------- @@ -340,6 +354,7 @@ int macdrv_err_on; - (void)applicationDidChangeScreenParameters:(NSNotification *)notification { primaryScreenHeightValid = FALSE; + [self sendDisplaysChanged]; } - (void)applicationDidResignActive:(NSNotification *)notification diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index a1bea38..2a96631 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -2,7 +2,7 @@ * MACDRV display settings * * Copyright 2003 Alexander James Pasadyn - * Copyright 2011, 2012 Ken Thomases for CodeWeavers Inc. + * Copyright 2011, 2012, 2013 Ken Thomases for CodeWeavers Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -38,6 +38,42 @@ static inline CGDirectDisplayID monitor_to_display_id(HMONITOR handle) } +static int display_mode_bits_per_pixel(CGDisplayModeRef display_mode) +{ + CFStringRef pixel_encoding; + int bits_per_pixel = 0; + + pixel_encoding = CGDisplayModeCopyPixelEncoding(display_mode); + if (pixel_encoding) + { + if (CFEqual(pixel_encoding, CFSTR(kIO32BitFloatPixels))) + bits_per_pixel = 128; + else if (CFEqual(pixel_encoding, CFSTR(kIO16BitFloatPixels))) + bits_per_pixel = 64; + else if (CFEqual(pixel_encoding, CFSTR(kIO64BitDirectPixels))) + bits_per_pixel = 64; + else if (CFEqual(pixel_encoding, CFSTR(kIO30BitDirectPixels))) + bits_per_pixel = 30; + else if (CFEqual(pixel_encoding, CFSTR(IO32BitDirectPixels))) + bits_per_pixel = 32; + else if (CFEqual(pixel_encoding, CFSTR(IO16BitDirectPixels))) + bits_per_pixel = 16; + else if (CFEqual(pixel_encoding, CFSTR(IO8BitIndexedPixels))) + bits_per_pixel = 8; + else if (CFEqual(pixel_encoding, CFSTR(IO4BitIndexedPixels))) + bits_per_pixel = 4; + else if (CFEqual(pixel_encoding, CFSTR(IO2BitIndexedPixels))) + bits_per_pixel = 2; + else if (CFEqual(pixel_encoding, CFSTR(IO1BitIndexedPixels))) + bits_per_pixel = 1; + + CFRelease(pixel_encoding); + } + + return bits_per_pixel; +} + + /*********************************************************************** * EnumDisplayMonitors (MACDRV.@) */ @@ -156,3 +192,30 @@ BOOL CDECL macdrv_GetMonitorInfo(HMONITOR monitor, LPMONITORINFO info) macdrv_free_displays(displays); return (i < num_displays); } + + +/*********************************************************************** + * macdrv_displays_changed + * + * Handler for DISPLAYS_CHANGED events. + */ +void macdrv_displays_changed(const macdrv_event *event) +{ + HWND hwnd = GetDesktopWindow(); + + /* A system display change will get delivered to all GUI-attached threads, + so the desktop-window-owning thread will get it and all others should + ignore it. */ + if (GetWindowThreadProcessId(hwnd, NULL) == GetCurrentThreadId()) + { + CGDirectDisplayID mainDisplay = CGMainDisplayID(); + CGDisplayModeRef mode = CGDisplayCopyDisplayMode(mainDisplay); + size_t width = CGDisplayModeGetWidth(mode); + size_t height = CGDisplayModeGetHeight(mode); + int mode_bpp = display_mode_bits_per_pixel(mode); + + CGDisplayModeRelease(mode); + SendMessageW(hwnd, WM_MACDRV_UPDATE_DESKTOP_RECT, mode_bpp, + MAKELPARAM(width, height)); + } +} diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index f03fef4..b9131f7 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -33,6 +33,7 @@ static const char *dbgstr_event(int type) { static const char * const event_names[] = { "APP_DEACTIVATED", + "DISPLAYS_CHANGED", "KEY_PRESS", "KEY_RELEASE", "KEYBOARD_CHANGED", @@ -84,6 +85,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) if (mask & QS_POSTMESSAGE) { event_mask |= event_mask_for_type(APP_DEACTIVATED); + event_mask |= event_mask_for_type(DISPLAYS_CHANGED); event_mask |= event_mask_for_type(WINDOW_CLOSE_REQUESTED); event_mask |= event_mask_for_type(WINDOW_DID_MINIMIZE); event_mask |= event_mask_for_type(WINDOW_DID_UNMINIMIZE); @@ -116,6 +118,9 @@ void macdrv_handle_event(macdrv_event *event) case APP_DEACTIVATED: macdrv_app_deactivated(); break; + case DISPLAYS_CHANGED: + macdrv_displays_changed(event); + break; case KEY_PRESS: case KEY_RELEASE: macdrv_key_event(hwnd, event); diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 333cb0c..6ded900 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -2,7 +2,7 @@ * Mac graphics driver initialisation functions * * Copyright 1996 Alexandre Julliard - * Copyright 2011, 2012 Ken Thomases for CodeWeavers, Inc. + * Copyright 2011, 2012, 2013 Ken Thomases for CodeWeavers, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -200,6 +200,14 @@ static void device_init(void) } +void macdrv_reset_device_metrics(void) +{ + EnterCriticalSection(&device_data_section); + device_data_valid = FALSE; + LeaveCriticalSection(&device_data_section); +} + + static MACDRV_PDEVICE *create_mac_physdev(void) { MACDRV_PDEVICE *physDev; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 8c4ce54..113cda1 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -68,6 +68,7 @@ static inline const char *wine_dbgstr_cgrect(CGRect cgrect) */ extern CGRect macdrv_get_desktop_rect(void) DECLSPEC_HIDDEN; +extern void macdrv_reset_device_metrics(void) DECLSPEC_HIDDEN; /************************************************************************** @@ -78,6 +79,9 @@ extern CGRect macdrv_get_desktop_rect(void) DECLSPEC_HIDDEN; enum macdrv_window_messages { WM_MACDRV_SET_WIN_REGION = 0x80001000, + WM_MACDRV_UPDATE_DESKTOP_RECT, + WM_MACDRV_RESET_DEVICE_METRICS, + WM_MACDRV_DISPLAYCHANGE, }; struct macdrv_thread_data @@ -142,4 +146,6 @@ extern void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_dat extern void macdrv_keyboard_changed(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_key_event(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; +extern void macdrv_displays_changed(const macdrv_event *event) DECLSPEC_HIDDEN; + #endif /* __WINE_MACDRV_H */ diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 23f0edf..5ffd7c7 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -126,6 +126,7 @@ extern void macdrv_free_displays(struct macdrv_display* displays) DECLSPEC_HIDDE /* event */ enum { APP_DEACTIVATED, + DISPLAYS_CHANGED, KEY_PRESS, KEY_RELEASE, KEYBOARD_CHANGED, diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 65f7955..c7513f0 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1192,6 +1192,39 @@ LRESULT CDECL macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) release_win_data(data); } return 0; + case WM_MACDRV_UPDATE_DESKTOP_RECT: + if (hwnd == GetDesktopWindow()) + { + CGRect new_desktop_rect; + RECT current_desktop_rect; + + macdrv_reset_device_metrics(); + new_desktop_rect = macdrv_get_desktop_rect(); + if (!GetWindowRect(hwnd, &current_desktop_rect) || + !CGRectEqualToRect(cgrect_from_rect(current_desktop_rect), new_desktop_rect)) + { + SendMessageTimeoutW(HWND_BROADCAST, WM_MACDRV_RESET_DEVICE_METRICS, 0, 0, + SMTO_ABORTIFHUNG, 2000, NULL); + SetWindowPos(hwnd, 0, CGRectGetMinX(new_desktop_rect), CGRectGetMinY(new_desktop_rect), + CGRectGetWidth(new_desktop_rect), CGRectGetHeight(new_desktop_rect), + SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE); + SendMessageTimeoutW(HWND_BROADCAST, WM_MACDRV_DISPLAYCHANGE, wp, lp, + SMTO_ABORTIFHUNG, 2000, NULL); + } + } + return 0; + case WM_MACDRV_RESET_DEVICE_METRICS: + macdrv_reset_device_metrics(); + return 0; + case WM_MACDRV_DISPLAYCHANGE: + if ((data = get_win_data(hwnd))) + { + if (data->cocoa_window && data->on_screen) + sync_window_position(data, SWP_NOZORDER | SWP_NOACTIVATE); + release_win_data(data); + } + SendMessageW(hwnd, WM_DISPLAYCHANGE, wp, lp); + return 0; } FIXME("unrecognized window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp);

1 0

Ken Thomases : winemac: Implement support for full-screen windows.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: be6af9a169cac983a0b51531097899cfd7312bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be6af9a169cac983a0b515310… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 17 19:28:30 2013 -0600 winemac: Implement support for full-screen windows. --- dlls/winemac.drv/cocoa_app.m | 23 ++++++- dlls/winemac.drv/cocoa_window.h | 4 + dlls/winemac.drv/cocoa_window.m | 139 +++++++++++++++++++++++++++++++++++++-- 3 files changed, 159 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be6af9a169cac983a0b51…

1 0

Ken Thomases : winemac: Track Cocoa windows in a z-ordered list.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: ba86e67792c7056580ce7fefe64d9671ea4f1334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba86e67792c7056580ce7fefe… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 17 19:28:27 2013 -0600 winemac: Track Cocoa windows in a z-ordered list. --- dlls/winemac.drv/cocoa_app.h | 7 ++++ dlls/winemac.drv/cocoa_app.m | 64 ++++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/cocoa_window.m | 39 +++++++++++++++++++++++ 3 files changed, 109 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 1166087..f215b11 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -46,10 +46,13 @@ CGFloat primaryScreenHeight; BOOL primaryScreenHeightValid; + + NSMutableArray* orderedWineWindows; } @property (nonatomic) CGEventSourceKeyboardType keyboardType; @property (readonly, copy, nonatomic) NSEvent* lastFlagsChanged; +(a)property (readonly, nonatomic) NSArray* orderedWineWindows; - (void) transformProcessToForeground; @@ -63,6 +66,10 @@ - (void) keyboardSelectionDidChange; + - (void) wineWindow:(WineWindow*)window + ordered:(NSWindowOrderingMode)order + relativeTo:(WineWindow*)otherWindow; + @end void OnMainThread(dispatch_block_t block); diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index ae2353b..d26682e 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -38,6 +38,7 @@ int macdrv_err_on; @implementation WineApplication @synthesize keyboardType, lastFlagsChanged; + @synthesize orderedWineWindows; - (id) init { @@ -48,8 +49,9 @@ int macdrv_err_on; eventQueuesLock = [[NSLock alloc] init]; keyWindows = [[NSMutableArray alloc] init]; + orderedWineWindows = [[NSMutableArray alloc] init]; - if (!eventQueues || !eventQueuesLock || !keyWindows) + if (!eventQueues || !eventQueuesLock || !keyWindows || !orderedWineWindows) { [self release]; return nil; @@ -60,6 +62,7 @@ int macdrv_err_on; - (void) dealloc { + [orderedWineWindows release]; [keyWindows release]; [eventQueues release]; [eventQueuesLock release]; @@ -251,6 +254,64 @@ int macdrv_err_on; return point; } + - (void) wineWindow:(WineWindow*)window + ordered:(NSWindowOrderingMode)order + relativeTo:(WineWindow*)otherWindow + { + NSUInteger index; + + switch (order) + { + case NSWindowAbove: + [window retain]; + [orderedWineWindows removeObjectIdenticalTo:window]; + if (otherWindow) + { + index = [orderedWineWindows indexOfObjectIdenticalTo:otherWindow]; + if (index == NSNotFound) + index = 0; + } + else + { + index = 0; + for (otherWindow in orderedWineWindows) + { + if ([otherWindow level] <= [window level]) + break; + index++; + } + } + [orderedWineWindows insertObject:window atIndex:index]; + [window release]; + break; + case NSWindowBelow: + [window retain]; + [orderedWineWindows removeObjectIdenticalTo:window]; + if (otherWindow) + { + index = [orderedWineWindows indexOfObjectIdenticalTo:otherWindow]; + if (index == NSNotFound) + index = [orderedWineWindows count]; + } + else + { + index = 0; + for (otherWindow in orderedWineWindows) + { + if ([otherWindow level] < [window level]) + break; + index++; + } + } + [orderedWineWindows insertObject:window atIndex:index]; + [window release]; + break; + case NSWindowOut: + default: + break; + } + } + /* * ---------- NSApplication method overrides ---------- @@ -307,6 +368,7 @@ int macdrv_err_on; usingBlock:^(NSNotification *note){ NSWindow* window = [note object]; [keyWindows removeObjectIdenticalTo:window]; + [orderedWineWindows removeObjectIdenticalTo:window]; }]; [nc addObserver:self diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d8ea9ed..b3ccb92 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -380,12 +380,19 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [NSApp transformProcessToForeground]; if (prev) + { [self orderWindow:NSWindowBelow relativeTo:[prev windowNumber]]; + [NSApp wineWindow:self ordered:NSWindowBelow relativeTo:prev]; + } else + { [self orderWindow:NSWindowAbove relativeTo:[next windowNumber]]; + [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:next]; + } if (latentParentWindow) { [latentParentWindow addChildWindow:self ordered:NSWindowAbove]; + [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:latentParentWindow]; self.latentParentWindow = nil; } @@ -407,6 +414,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [latentParentWindow removeChildWindow:self]; forceNextMouseMoveAbsolute = TRUE; [self orderOut:nil]; + [NSApp wineWindow:self ordered:NSWindowOut relativeTo:nil]; [NSApp removeWindowsItem:self]; } @@ -467,7 +475,10 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [[self parentWindow] removeChildWindow:self]; self.latentParentWindow = nil; if ([self isVisible] && parent) + { [parent addChildWindow:self ordered:NSWindowAbove]; + [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:parent]; + } else self.latentParentWindow = parent; } @@ -556,12 +567,14 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) } [self orderFront:nil]; + [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:nil]; causing_becomeKeyWindow = TRUE; [self makeKeyWindow]; causing_becomeKeyWindow = FALSE; if (latentParentWindow) { [latentParentWindow addChildWindow:self ordered:NSWindowAbove]; + [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:latentParentWindow]; self.latentParentWindow = nil; } if (![self isExcludedFromWindowsMenu]) @@ -700,6 +713,9 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) { if ([event type] == NSLeftMouseDown) { + NSWindowButton windowButton; + BOOL broughtWindowForward = TRUE; + /* Since our windows generally claim they can't be made key, clicks in their title bars are swallowed by the theme frame stuff. So, we hook directly into the event stream and assume that any click @@ -707,6 +723,27 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) accept. */ if (![self isKeyWindow] && !self.disabled && !self.noActivate) [NSApp windowGotFocus:self]; + + /* Any left-click on our window anyplace other than the close or + minimize buttons will bring it forward. */ + for (windowButton = NSWindowCloseButton; + windowButton <= NSWindowMiniaturizeButton; + windowButton++) + { + NSButton* button = [[event window] standardWindowButton:windowButton]; + if (button) + { + NSPoint point = [button convertPoint:[event locationInWindow] fromView:nil]; + if ([button mouse:point inRect:[button bounds]]) + { + broughtWindowForward = FALSE; + break; + } + } + } + + if (broughtWindowForward) + [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:nil]; } [super sendEvent:event]; @@ -908,6 +945,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) } ignore_windowDeminiaturize = FALSE; + + [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:nil]; } - (void)windowDidMove:(NSNotification *)notification

1 0

Piotr Caban : msvcp90: Prefer builtin version.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: cfec148b8baeb86ee9d775f9cf527b80e043f5a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfec148b8baeb86ee9d775f9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 18 10:26:17 2013 +0100 msvcp90: Prefer builtin version. --- dlls/msvcp90/msvcp90_main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index cb6377f..7a7aafe 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -84,8 +84,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: init_cxx_funcs(); init_lockit();

1 0

Ken Thomases : winemac: Discard old frame changed events when setting frame for off-screen windows , too.
by Alexandre Julliard Feb. 18, 2013

Feb. 18, 2013

Module: wine Branch: master Commit: 47352930d8a7caa74d658b8267f3a4add317cd4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=47352930d8a7caa74d658b826… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 17 19:28:16 2013 -0600 winemac: Discard old frame changed events when setting frame for off-screen windows, too. --- dlls/winemac.drv/cocoa_window.m | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 4371110..2247d32 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -445,6 +445,14 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) event. The back end will ignore it if nothing actually changed. */ [self windowDidResize:nil]; } + else + { + /* The back end is establishing a new window size and position. It's + not interested in any stale events regarding those that may be sitting + in the queue. */ + [queue discardEventsMatchingMask:event_mask_for_type(WINDOW_FRAME_CHANGED) + forWindow:self]; + } return on_screen; }

1 0