ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winemac.drv: Handle display device change events. 

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Ken Thomases <ken@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zhiyi Zhang 2019-08-29 16:11:41 -05:00 committed by Alexandre Julliard
parent 83a2ff33b3
commit b8415e0310
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/winemac.drv/display.c
View File

@ -946,6 +946,8 @@ better:
SendMessageW(GetDesktopWindow(), WM_MACDRV_UPDATE_DESKTOP_RECT, mode_bpp,
MAKELPARAM(width, height));
ret = DISP_CHANGE_SUCCESSFUL;
macdrv_init_display_devices(TRUE);
}
else
{
@ -1452,6 +1454,8 @@ void macdrv_displays_changed(const macdrv_event *event)
free_display_mode_descriptor(desc);
CGDisplayModeRelease(mode);
macdrv_init_display_devices(TRUE);
if (is_original && retina_enabled)
{
width *= 2;
@ -1728,7 +1732,7 @@ static void cleanup_devices(void)
*
* Initialize display device registry data.
*/
void macdrv_init_display_devices(void)
void macdrv_init_display_devices(BOOL force)
{
static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0};
HANDLE mutex;
@ -1755,7 +1759,7 @@ void macdrv_init_display_devices(void)
}
/* Avoid unnecessary reinit */
if (disposition != REG_CREATED_NEW_KEY)
if (!force && disposition != REG_CREATED_NEW_KEY)
goto done;
TRACE("\n");

2
dlls/winemac.drv/macdrv.h
View File

@ -223,7 +223,7 @@ extern CGImageRef create_cgimage_from_icon_bitmaps(HDC hdc, HANDLE icon, HBITMAP
extern void macdrv_status_item_mouse_move(const macdrv_event *event) DECLSPEC_HIDDEN;
extern void check_retina_status(void) DECLSPEC_HIDDEN;
extern void macdrv_init_display_devices(void) DECLSPEC_HIDDEN;
extern void macdrv_init_display_devices(BOOL force) DECLSPEC_HIDDEN;
/**************************************************************************
* Mac IME driver

2
dlls/winemac.drv/macdrv_main.c
View File

@ -299,7 +299,7 @@ static BOOL process_attach(void)
return FALSE;
}
macdrv_init_display_devices();
macdrv_init_display_devices(FALSE);
return TRUE;
}