December 2013 - Wine-Commits

Piotr Caban : msvcrt: Don' t write to buffer in ungetc if _IOSTRG flag is specified.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: ed2d53a36aa413e00c577e11772915bc5de4161e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed2d53a36aa413e00c577e117… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 30 16:55:59 2013 +0100 msvcrt: Don't write to buffer in ungetc if _IOSTRG flag is specified. --- dlls/msvcrt/file.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 4665e6b..04651fb 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4713,7 +4713,15 @@ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) file->_ptr++; if(file->_ptr>file->_base) { file->_ptr--; - *file->_ptr=c; + if(file->_flag & MSVCRT__IOSTRG) { + if(*file->_ptr != c) { + file->_ptr++; + MSVCRT__unlock_file(file); + return MSVCRT_EOF; + } + }else { + *file->_ptr = c; + } file->_cnt++; MSVCRT_clearerr(file); MSVCRT__unlock_file(file);

1 0

Dmitry Timoshkov : advapi32/tests: Test generic access mapping for a pipe.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 683a1dc943866b77bd9f67366ae53befd769b3ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=683a1dc943866b77bd9f67366… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 26 16:34:18 2013 +0900 advapi32/tests: Test generic access mapping for a pipe. --- dlls/advapi32/tests/security.c | 55 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b69a5ac..cce1339 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4678,11 +4678,22 @@ todo_wine #define WINE_TEST_PIPE "\\\\.\\pipe\\WineTestPipe" static void test_named_pipe_security(HANDLE token) { - HANDLE pipe, file; + DWORD ret, i, access; + HANDLE pipe, file, dup; GENERIC_MAPPING mapping = { FILE_GENERIC_READ, FILE_GENERIC_WRITE, FILE_GENERIC_EXECUTE, STANDARD_RIGHTS_ALL | FILE_ALL_ACCESS }; + static const struct + { + int todo, generic, mapped; + } map[] = + { + { 1, GENERIC_READ, FILE_GENERIC_READ }, + { 1, GENERIC_WRITE, FILE_GENERIC_WRITE }, + { 1, GENERIC_EXECUTE, FILE_GENERIC_EXECUTE }, + { 1, GENERIC_ALL, STANDARD_RIGHTS_ALL | FILE_ALL_ACCESS } + }; SetLastError(0xdeadbeef); pipe = CreateNamedPipeA(WINE_TEST_PIPE, PIPE_ACCESS_DUPLEX | FILE_FLAG_FIRST_PIPE_INSTANCE, @@ -4695,13 +4706,53 @@ static void test_named_pipe_security(HANDLE token) SetLastError(0xdeadbeef); file = CreateFileA(WINE_TEST_PIPE, FILE_ALL_ACCESS, 0, NULL, OPEN_EXISTING, 0, 0); ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); - CloseHandle(file); + access = get_obj_access(file); + ok(access == FILE_ALL_ACCESS, "expected FILE_ALL_ACCESS, got %#x\n", access); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), file, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + + CloseHandle(dup); + } + + CloseHandle(file); CloseHandle(pipe); SetLastError(0xdeadbeef); file = CreateFileA("\\\\.\\pipe\\", FILE_ALL_ACCESS, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); ok(file != INVALID_HANDLE_VALUE || broken(file == INVALID_HANDLE_VALUE) /* before Vista */, "CreateFile error %d\n", GetLastError()); + + if (file != INVALID_HANDLE_VALUE) + { + access = get_obj_access(file); + ok(access == FILE_ALL_ACCESS, "expected FILE_ALL_ACCESS, got %#x\n", access); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), file, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + if (map[i].todo) +todo_wine + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + else + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + + CloseHandle(dup); + } + } + CloseHandle(file); }

1 0

Dmitry Timoshkov : advapi32/tests: Test generic access mapping for an event .
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 3fa43b6b651de1d4df80150643aeb8098271cd1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa43b6b651de1d4df8015064… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 26 16:34:10 2013 +0900 advapi32/tests: Test generic access mapping for an event. --- dlls/advapi32/tests/security.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 0727130..10eea5f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4567,11 +4567,22 @@ todo_wine static void test_event_security(HANDLE token) { - HANDLE event; + DWORD ret, i, access; + HANDLE event, dup; GENERIC_MAPPING mapping = { STANDARD_RIGHTS_READ | EVENT_QUERY_STATE | SYNCHRONIZE, STANDARD_RIGHTS_WRITE | EVENT_MODIFY_STATE | SYNCHRONIZE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, STANDARD_RIGHTS_ALL | EVENT_ALL_ACCESS }; + static const struct + { + int todo, generic, mapped; + } map[] = + { + { 1, GENERIC_READ, STANDARD_RIGHTS_READ | EVENT_QUERY_STATE }, + { 1, GENERIC_WRITE, STANDARD_RIGHTS_WRITE | EVENT_MODIFY_STATE }, + { 1, GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE }, + { 0, GENERIC_ALL, STANDARD_RIGHTS_ALL | EVENT_QUERY_STATE | EVENT_MODIFY_STATE } + }; SetLastError(0xdeadbeef); event = OpenEventA(0, FALSE, "WineTestEvent"); @@ -4582,6 +4593,26 @@ static void test_event_security(HANDLE token) event = CreateEventA(NULL, FALSE, FALSE, "WineTestEvent"); ok(event != 0, "CreateEvent error %d\n", GetLastError()); + access = get_obj_access(event); + ok(access == EVENT_ALL_ACCESS, "expected EVENT_ALL_ACCESS, got %#x\n", access); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), event, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + if (map[i].todo) +todo_wine + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + else + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + + CloseHandle(dup); + } + test_default_handle_security(token, event, &mapping); CloseHandle(event);

1 0

Alexandre Julliard : gdi32: Trigger the display driver load for CreateCompatibleDC(0).
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 200eb1d30b8801ad022c4f5dfd32f0e19c313774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=200eb1d30b8801ad022c4f5df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 30 17:43:29 2013 +0100 gdi32: Trigger the display driver load for CreateCompatibleDC(0). --- dlls/gdi32/dc.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index ba869f1..9500de2 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -739,7 +739,7 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) { DC *dc, *origDC; HDC ret; - const struct gdi_dc_funcs *funcs = &null_driver; + const struct gdi_dc_funcs *funcs; PHYSDEV physDev = NULL; GDI_CheckNotLock(); @@ -751,6 +751,7 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) funcs = physDev->funcs; release_dc_ptr( origDC ); } + else funcs = DRIVER_load_driver( displayW ); if (!(dc = alloc_dc_ptr( OBJ_MEMDC ))) return 0; @@ -765,7 +766,7 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) ret = dc->hSelf; - if (!funcs->pCreateCompatibleDC( physDev, &dc->physDev )) + if (funcs->pCreateCompatibleDC && !funcs->pCreateCompatibleDC( physDev, &dc->physDev )) { WARN("creation aborted by device\n"); free_dc_ptr( dc );

1 0

Alexandre Julliard : gdi32: Don' t bother returning the driver module from DRIVER_load_driver.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 7c3bb6070a844fa9336c67d58d95fe28ad4778c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c3bb6070a844fa9336c67d58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 30 17:42:48 2013 +0100 gdi32: Don't bother returning the driver module from DRIVER_load_driver. --- dlls/gdi32/dc.c | 3 +-- dlls/gdi32/driver.c | 17 +++++------------ dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 9d3af57..ba869f1 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -625,7 +625,6 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, HDC hdc; DC * dc; const struct gdi_dc_funcs *funcs; - HMODULE module; WCHAR buf[300]; GDI_CheckNotLock(); @@ -640,7 +639,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, strcpyW(buf, driver); } - if (!(funcs = DRIVER_load_driver( buf, &module ))) + if (!(funcs = DRIVER_load_driver( buf ))) { ERR( "no driver found for %s\n", debugstr_w(buf) ); return 0; diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 750ef11..31703fe 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -91,7 +91,7 @@ static struct graphics_driver *create_driver( HMODULE module ) * * Special case for loading the display driver: get the name from the config file */ -static const struct gdi_dc_funcs *get_display_driver( HMODULE *module_ret ) +static const struct gdi_dc_funcs *get_display_driver(void) { if (!display_driver) { @@ -104,8 +104,6 @@ static const struct gdi_dc_funcs *get_display_driver( HMODULE *module_ret ) __wine_set_display_driver( 0 ); } } - - *module_ret = display_driver->module; return display_driver->funcs; } @@ -113,7 +111,7 @@ static const struct gdi_dc_funcs *get_display_driver( HMODULE *module_ret ) /********************************************************************** * DRIVER_load_driver */ -const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name, HMODULE *module_ret ) +const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) { HMODULE module; struct graphics_driver *driver, *new_driver; @@ -121,16 +119,12 @@ const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name, HMODULE *module_ret static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; /* display driver is a special case */ - if (!strcmpiW( name, displayW ) || !strcmpiW( name, display1W )) - return get_display_driver( module_ret ); + if (!strcmpiW( name, displayW ) || !strcmpiW( name, display1W )) return get_display_driver(); if ((module = GetModuleHandleW( name ))) { - if (display_driver && display_driver->module == module) - { - *module_ret = module; - return display_driver->funcs; - } + if (display_driver && display_driver->module == module) return display_driver->funcs; + EnterCriticalSection( &driver_section ); LIST_FOR_EACH_ENTRY( driver, &drivers, struct graphics_driver, entry ) { @@ -160,7 +154,6 @@ const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name, HMODULE *module_ret list_add_head( &drivers, &driver->entry ); TRACE( "loaded driver %p for %s\n", driver, debugstr_w(name) ); done: - *module_ret = driver->module; LeaveCriticalSection( &driver_section ); return driver->funcs; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 1d90f6c..430e652 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -268,7 +268,7 @@ extern const struct gdi_dc_funcs null_driver DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs dib_driver DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs path_driver DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs *font_driver DECLSPEC_HIDDEN; -extern const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name, HMODULE *module ) DECLSPEC_HIDDEN; +extern const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HIDDEN; extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DECLSPEC_HIDDEN; /* enhmetafile.c */

1 0

Ken Thomases : winemac: Implement support for maximizing windows.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 66736b4ab31d5a6ba7163876e3a5ae2de8cba327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66736b4ab31d5a6ba7163876e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 29 21:34:48 2013 -0600 winemac: Implement support for maximizing windows. The user is prevented from moving or resizing a maximized window. The zoom button is still present and enabled for a maximized window but requests that it be restored rather than simply resizing it, which is what it does for normal windows. If a window is not resizable (lacks WS_THICKFRAME) but has a maximize box (WS_MAXIMIZEBOX), then the zoom button requests that it be maximized rather than resizing it. --- dlls/winemac.drv/cocoa_window.h | 2 + dlls/winemac.drv/cocoa_window.m | 47 +++++++++++++++++++++++++++++++++----- dlls/winemac.drv/event.c | 10 ++++++++ dlls/winemac.drv/macdrv.h | 2 + dlls/winemac.drv/macdrv_cocoa.h | 4 +++ dlls/winemac.drv/window.c | 26 ++++++++++++++++++++- 6 files changed, 83 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66736b4ab31d5a6ba7163…

1 0

Ken Thomases : winemac: Extract some duplicated code to a new perform_window_command() function.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 2d1396af32f8897c11dec2771b9a912b5348dfda URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d1396af32f8897c11dec2771… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 29 21:33:14 2013 -0600 winemac: Extract some duplicated code to a new perform_window_command() function. This also changes to posting rather than sending WM_SYSCOMMAND/SC_MINIMIZE. --- dlls/winemac.drv/event.c | 2 +- dlls/winemac.drv/window.c | 127 +++++++++++++++++++++------------------------ 2 files changed, 61 insertions(+), 68 deletions(-) diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 13f55f5..7caff22 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -104,7 +104,6 @@ static macdrv_event_mask get_event_mask(DWORD mask) event_mask |= event_mask_for_type(IM_SET_TEXT); event_mask |= event_mask_for_type(STATUS_ITEM_MOUSE_BUTTON); event_mask |= event_mask_for_type(STATUS_ITEM_MOUSE_MOVE); - event_mask |= event_mask_for_type(WINDOW_CLOSE_REQUESTED); event_mask |= event_mask_for_type(WINDOW_DID_UNMINIMIZE); event_mask |= event_mask_for_type(WINDOW_FRAME_CHANGED); event_mask |= event_mask_for_type(WINDOW_GOT_FOCUS); @@ -116,6 +115,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) event_mask |= event_mask_for_type(QUERY_EVENT); event_mask |= event_mask_for_type(RELEASE_CAPTURE); event_mask |= event_mask_for_type(WINDOW_BROUGHT_FORWARD); + event_mask |= event_mask_for_type(WINDOW_CLOSE_REQUESTED); event_mask |= event_mask_for_type(WINDOW_DRAG_BEGIN); event_mask |= event_mask_for_type(WINDOW_DRAG_END); event_mask |= event_mask_for_type(WINDOW_MINIMIZE_REQUESTED); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 91a1d4d..715d5a3 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1164,6 +1164,50 @@ static LRESULT move_window(HWND hwnd, WPARAM wparam) } +/*********************************************************************** + * perform_window_command + */ +static void perform_window_command(HWND hwnd, DWORD style_any, DWORD style_none, WORD command, WORD hittest) +{ + DWORD style; + + TRACE("win %p style_any 0x%08x style_none 0x%08x command 0x%04x hittest 0x%04x\n", + hwnd, style_any, style_none, command, hittest); + + style = GetWindowLongW(hwnd, GWL_STYLE); + if ((style_any && !(style & style_any)) || (style & (WS_DISABLED | style_none))) + { + TRACE("not changing win %p style 0x%08x\n", hwnd, style); + return; + } + + if (GetActiveWindow() != hwnd) + { + LRESULT ma = SendMessageW(hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor(hwnd, GA_ROOT), + MAKELPARAM(hittest, WM_NCLBUTTONDOWN)); + switch (ma) + { + case MA_NOACTIVATEANDEAT: + case MA_ACTIVATEANDEAT: + TRACE("not changing win %p mouse-activate result %ld\n", hwnd, ma); + return; + case MA_NOACTIVATE: + break; + case MA_ACTIVATE: + case 0: + SetActiveWindow(hwnd); + break; + default: + WARN("unknown WM_MOUSEACTIVATE code %ld\n", ma); + break; + } + } + + TRACE("changing win %p\n", hwnd); + PostMessageW(hwnd, WM_SYSCOMMAND, command, 0); +} + + /********************************************************************** * CreateDesktopWindow (MACDRV.@) */ @@ -1850,45 +1894,26 @@ done: */ void macdrv_window_close_requested(HWND hwnd) { - /* Ignore the delete window request if the window has been disabled. This - * is to disallow applications from being closed while in a modal state. - */ - if (IsWindowEnabled(hwnd)) + HMENU sysmenu; + + if (GetClassLongW(hwnd, GCL_STYLE) & CS_NOCLOSE) { - HMENU hSysMenu; + TRACE("not closing win %p class style CS_NOCLOSE\n", hwnd); + return; + } - if (GetClassLongW(hwnd, GCL_STYLE) & CS_NOCLOSE) return; - hSysMenu = GetSystemMenu(hwnd, FALSE); - if (hSysMenu) - { - UINT state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND); - if (state == 0xFFFFFFFF || (state & (MF_DISABLED | MF_GRAYED))) - return; - } - if (GetActiveWindow() != hwnd) + sysmenu = GetSystemMenu(hwnd, FALSE); + if (sysmenu) + { + UINT state = GetMenuState(sysmenu, SC_CLOSE, MF_BYCOMMAND); + if (state == 0xFFFFFFFF || (state & (MF_DISABLED | MF_GRAYED))) { - LRESULT ma = SendMessageW(hwnd, WM_MOUSEACTIVATE, - (WPARAM)GetAncestor(hwnd, GA_ROOT), - MAKELPARAM(HTCLOSE, WM_NCLBUTTONDOWN)); - switch(ma) - { - case MA_NOACTIVATEANDEAT: - case MA_ACTIVATEANDEAT: - return; - case MA_NOACTIVATE: - break; - case MA_ACTIVATE: - case 0: - SetActiveWindow(hwnd); - break; - default: - WARN("unknown WM_MOUSEACTIVATE code %d\n", (int) ma); - break; - } + TRACE("not closing win %p menu state 0x%08x\n", hwnd, state); + return; } - - PostMessageW(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0); } + + perform_window_command(hwnd, 0, 0, SC_CLOSE, HTCLOSE); } @@ -2036,39 +2061,7 @@ void macdrv_app_deactivated(void) */ void macdrv_window_minimize_requested(HWND hwnd) { - DWORD style; - - style = GetWindowLongW(hwnd, GWL_STYLE); - if (!(style & WS_MINIMIZEBOX) || (style & (WS_DISABLED | WS_MINIMIZE))) - { - TRACE("not minimizing win %p style 0x%08x\n", hwnd, style); - return; - } - - if (GetActiveWindow() != hwnd) - { - LRESULT ma = SendMessageW(hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor(hwnd, GA_ROOT), - MAKELPARAM(HTMINBUTTON, WM_NCLBUTTONDOWN)); - switch (ma) - { - case MA_NOACTIVATEANDEAT: - case MA_ACTIVATEANDEAT: - TRACE("not minimizing win %p mouse-activate result %ld\n", hwnd, ma); - return; - case MA_NOACTIVATE: - break; - case MA_ACTIVATE: - case 0: - SetActiveWindow(hwnd); - break; - default: - WARN("unknown WM_MOUSEACTIVATE code %ld\n", ma); - break; - } - } - - TRACE("minimizing win %p\n", hwnd); - SendMessageW(hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0); + perform_window_command(hwnd, WS_MINIMIZEBOX, WS_MINIMIZE, SC_MINIMIZE, HTMINBUTTON); }

1 0

Ken Thomases : winemac: Prevent disabled windows from being moved.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 8876751e9356f0852eb3bd397c22dee3f1b6611b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8876751e9356f0852eb3bd397… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 29 21:33:30 2013 -0600 winemac: Prevent disabled windows from being moved. This won't be enforced if AllowImmovableWindows=n is set in the registry. --- dlls/winemac.drv/cocoa_window.m | 3 +++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/macdrv_main.c | 4 ++++ 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index bb2da55..c8c1e90 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -642,6 +642,9 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [self setContentMaxSize:savedContentMaxSize]; [self setContentMinSize:savedContentMinSize]; } + + if (allow_immovable_windows) + [self setMovable:!disabled]; } - (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 5073db8..743757e 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -146,6 +146,7 @@ extern int topmost_float_inactive DECLSPEC_HIDDEN; extern int capture_displays_for_fullscreen DECLSPEC_HIDDEN; extern int left_option_is_alt DECLSPEC_HIDDEN; extern int right_option_is_alt DECLSPEC_HIDDEN; +extern int allow_immovable_windows DECLSPEC_HIDDEN; extern int macdrv_start_cocoa_app(unsigned long long tickcount) DECLSPEC_HIDDEN; extern void macdrv_window_rejected_focus(const struct macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 2c3ec23..1aab785 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -54,6 +54,7 @@ int left_option_is_alt = 0; int right_option_is_alt = 0; BOOL allow_software_rendering = FALSE; BOOL disable_window_decorations = FALSE; +int allow_immovable_windows = TRUE; HMODULE macdrv_module = 0; @@ -171,6 +172,9 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "Decorated", buffer, sizeof(buffer))) disable_window_decorations = !IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "AllowImmovableWindows", buffer, sizeof(buffer))) + allow_immovable_windows = IS_OPTION_TRUE(buffer[0]); + if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); }

1 0

Ken Thomases : winemac: Move some state-based feature adjustment into the -adjustFeaturesForState method .
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 5f7b30aee28e70463311ed7f24fe8a58f600cbcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f7b30aee28e70463311ed7f2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 29 21:33:20 2013 -0600 winemac: Move some state-based feature adjustment into the -adjustFeaturesForState method. --- dlls/winemac.drv/cocoa_window.m | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 06647d9..bb2da55 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -630,6 +630,18 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif if ([self collectionBehavior] & NSWindowCollectionBehaviorFullScreenPrimary) [[self standardWindowButton:NSWindowFullScreenButton] setEnabled:!self.disabled]; } + + if (disabled) + { + NSSize size = [self contentRectForFrameRect:[self frame]].size; + [self setContentMinSize:size]; + [self setContentMaxSize:size]; + } + else + { + [self setContentMaxSize:savedContentMaxSize]; + [self setContentMinSize:savedContentMinSize]; + } } - (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior @@ -1275,18 +1287,6 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif { disabled = newValue; [self adjustFeaturesForState]; - - if (disabled) - { - NSSize size = [self contentRectForFrameRect:[self frame]].size; - [self setContentMinSize:size]; - [self setContentMaxSize:size]; - } - else - { - [self setContentMaxSize:savedContentMaxSize]; - [self setContentMinSize:savedContentMinSize]; - } } }

1 0

Ken Thomases : winemac: Allow programmatic changes of the window frame even if a window is disabled (prevented from resizing).
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 0137b07973d86d288265a25a1f55956c6b0cbe3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0137b07973d86d288265a25a1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 29 21:33:36 2013 -0600 winemac: Allow programmatic changes of the window frame even if a window is disabled (prevented from resizing). --- dlls/winemac.drv/cocoa_window.m | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index c8c1e90..f051934 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1231,6 +1231,16 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif BOOL equalSizes = NSEqualSizes(frame.size, oldFrame.size); BOOL needEnableScreenUpdates = FALSE; + if (disabled) + { + // Allow the following calls to -setFrame:display: to work even + // if they would violate the content size constraints. This + // shouldn't be necessary since the content size constraints are + // documented to not constrain that method, but it seems to be. + [self setContentMinSize:NSZeroSize]; + [self setContentMaxSize:NSMakeSize(FLT_MAX, FLT_MAX)]; + } + if (equalSizes && [[self childWindows] count]) { // If we change the window frame such that the origin moves @@ -1249,6 +1259,11 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif } [self setFrame:frame display:YES]; + if (disabled) + { + [self setContentMinSize:contentRect.size]; + [self setContentMaxSize:contentRect.size]; + } if (needEnableScreenUpdates) NSEnableScreenUpdates();

1 0