wine-commits February 2013

wine-commits@winehq.org

2 participants
459 discussions

Michael Stefaniuc : ddraw/tests: Use assignment instead of memcpy to copy structs.
by Alexandre Julliard 05 Feb '13

05 Feb '13

Module: wine Branch: master Commit: 7d0ab835aeb0403f5f5dbc8cf923711eee7847e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d0ab835aeb0403f5f5dbc8cf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 5 13:18:04 2013 +0100 ddraw/tests: Use assignment instead of memcpy to copy structs. --- dlls/ddraw/tests/dsurface.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index c8f90c9..4e08224 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3872,13 +3872,13 @@ static void CreateSurfaceBadCapsSizeTest(void) ddsd_ok.dwWidth = 64; ddsd_ok.dwHeight = 64; ddsd_ok.ddsCaps.dwCaps = caps; - memcpy(&ddsd_bad1, &ddsd_ok, sizeof(ddsd_bad1)); + ddsd_bad1 = ddsd_ok; ddsd_bad1.dwSize--; - memcpy(&ddsd_bad2, &ddsd_ok, sizeof(ddsd_bad2)); + ddsd_bad2 = ddsd_ok; ddsd_bad2.dwSize++; - memcpy(&ddsd_bad3, &ddsd_ok, sizeof(ddsd_bad3)); + ddsd_bad3 = ddsd_ok; ddsd_bad3.dwSize = 0; - memcpy(&ddsd_bad4, &ddsd_ok, sizeof(ddsd_bad4)); + ddsd_bad4 = ddsd_ok; ddsd_bad4.dwSize = sizeof(DDSURFACEDESC2); memset(&ddsd2_ok, 0, sizeof(ddsd2_ok)); @@ -3887,13 +3887,13 @@ static void CreateSurfaceBadCapsSizeTest(void) ddsd2_ok.dwWidth = 64; ddsd2_ok.dwHeight = 64; ddsd2_ok.ddsCaps.dwCaps = caps; - memcpy(&ddsd2_bad1, &ddsd2_ok, sizeof(ddsd2_bad1)); + ddsd2_bad1 = ddsd2_ok; ddsd2_bad1.dwSize--; - memcpy(&ddsd2_bad2, &ddsd2_ok, sizeof(ddsd2_bad2)); + ddsd2_bad2 = ddsd2_ok; ddsd2_bad2.dwSize++; - memcpy(&ddsd2_bad3, &ddsd2_ok, sizeof(ddsd2_bad3)); + ddsd2_bad3 = ddsd2_ok; ddsd2_bad3.dwSize = 0; - memcpy(&ddsd2_bad4, &ddsd2_ok, sizeof(ddsd2_bad4)); + ddsd2_bad4 = ddsd2_ok; ddsd2_bad4.dwSize = sizeof(DDSURFACEDESC); hr = IDirectDraw_CreateSurface(lpDD, &ddsd_ok, &surf, NULL);

1 0

Alexandre Julliard : winemac: Don' t move off-screen windows to a random position.
by Alexandre Julliard 05 Feb '13

05 Feb '13

Module: wine Branch: master Commit: e1b6dc57ac1ac3b67e5844e7e635363d84dd352f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b6dc57ac1ac3b67e5844e7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 5 13:09:43 2013 +0100 winemac: Don't move off-screen windows to a random position. --- dlls/winemac.drv/window.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index cb9ed9a..9d63912 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1398,7 +1398,11 @@ void macdrv_window_frame_changed(HWND hwnd, CGRect frame) if (!hwnd) return; if (!(data = get_win_data(hwnd))) return; - if (!data->on_screen) goto done; + if (!data->on_screen) + { + release_win_data(data); + return; + } /* Get geometry */ @@ -1427,7 +1431,6 @@ void macdrv_window_frame_changed(HWND hwnd, CGRect frame) TRACE("%p resizing from (%dx%d) to (%dx%d)\n", hwnd, data->window_rect.right - data->window_rect.left, data->window_rect.bottom - data->window_rect.top, width, height); -done: release_win_data(data); if (!(flags & SWP_NOSIZE) || !(flags & SWP_NOMOVE))

1 0

Erich Hoover : advapi32: Support registry objects in SetNamedSecurityInfo.
by Alexandre Julliard 05 Feb '13

05 Feb '13

Module: wine Branch: master Commit: 5915954ef1770cc0b377312bbea961c0bb629762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5915954ef1770cc0b377312bb… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sat Feb 2 08:53:17 2013 -0700 advapi32: Support registry objects in SetNamedSecurityInfo. --- dlls/advapi32/security.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 825d02e..0d5aba7 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4049,6 +4049,13 @@ DWORD WINAPI SetNamedSecurityInfoW(LPWSTR pObjectName, CloseServiceHandle( handle ); } break; + case SE_REGISTRY_KEY: + if (!(err = get_security_regkey( pObjectName, access, &handle ))) + { + err = SetSecurityInfo( handle, ObjectType, SecurityInfo, psidOwner, psidGroup, pDacl, pSacl ); + RegCloseKey( handle ); + } + break; case SE_FILE_OBJECT: if (!(err = get_security_file( pObjectName, access, &handle ))) {

1 0

Erich Hoover : advapi32: Support registry objects in GetNamedSecurityInfo.
by Alexandre Julliard 05 Feb '13

05 Feb '13

Module: wine Branch: master Commit: 5368301a482d3b48b5b3aae10c426f992e8ba919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5368301a482d3b48b5b3aae10… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sat Feb 2 08:52:04 2013 -0700 advapi32: Support registry objects in GetNamedSecurityInfo. --- dlls/advapi32/security.c | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 474c522..825d02e 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -436,6 +436,31 @@ static inline DWORD get_security_service( LPWSTR full_service_name, DWORD access return err; } +/* helper function for SE_REGISTRY_KEY objects in [Get|Set]NamedSecurityInfo */ +static inline DWORD get_security_regkey( LPWSTR full_key_name, DWORD access, HANDLE *key ) +{ + WCHAR classes_rootW[] = {'C','L','A','S','S','E','S','_','R','O','O','T',0}; + WCHAR current_userW[] = {'C','U','R','R','E','N','T','_','U','S','E','R',0}; + WCHAR machineW[] = {'M','A','C','H','I','N','E',0}; + WCHAR usersW[] = {'U','S','E','R','S',0}; + LPWSTR p = strchrW(full_key_name, '\\'); + int len = p-full_key_name; + HKEY hParent; + + if (!p) return ERROR_INVALID_PARAMETER; + if (strncmpW( full_key_name, classes_rootW, len ) == 0) + hParent = HKEY_CLASSES_ROOT; + else if (strncmpW( full_key_name, current_userW, len ) == 0) + hParent = HKEY_CURRENT_USER; + else if (strncmpW( full_key_name, machineW, len ) == 0) + hParent = HKEY_LOCAL_MACHINE; + else if (strncmpW( full_key_name, usersW, len ) == 0) + hParent = HKEY_USERS; + else + return ERROR_INVALID_PARAMETER; + return RegOpenKeyExW( hParent, p+1, 0, access, (HKEY *)key ); +} + #define WINE_SIZE_OF_WORLD_ACCESS_ACL (sizeof(ACL) + sizeof(ACCESS_ALLOWED_ACE) + sizeof(sidWorld) - sizeof(DWORD)) static void GetWorldAccessACL(PACL pACL) @@ -5578,14 +5603,21 @@ DWORD WINAPI GetNamedSecurityInfoW( LPWSTR name, SE_OBJECT_TYPE type, switch (type) { case SE_SERVICE: - if (!(err = get_security_service( name, access, &handle))) + if (!(err = get_security_service( name, access, &handle ))) { err = GetSecurityInfo( handle, type, info, owner, group, dacl, sacl, descriptor ); CloseServiceHandle( handle ); } break; + case SE_REGISTRY_KEY: + if (!(err = get_security_regkey( name, access, &handle ))) + { + err = GetSecurityInfo( handle, type, info, owner, group, dacl, sacl, descriptor ); + RegCloseKey( handle ); + } + break; case SE_FILE_OBJECT: - if (!(err = get_security_file( name, access, &handle))) + if (!(err = get_security_file( name, access, &handle ))) { err = GetSecurityInfo( handle, type, info, owner, group, dacl, sacl, descriptor ); CloseHandle( handle );

1 0

Vijay Kiran Kamuju : msvcr90: Update the manifest version.
by Alexandre Julliard 05 Feb '13

05 Feb '13

Module: wine Branch: master Commit: a044165b27ef1e7f721294b165439d779692890d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a044165b27ef1e7f721294b16… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Feb 4 10:49:31 2013 +0000 msvcr90: Update the manifest version. --- dlls/msvcr90/msvcr90.manifest | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/msvcr90.manifest b/dlls/msvcr90/msvcr90.manifest index 0effe99..588a0fd 100644 --- a/dlls/msvcr90/msvcr90.manifest +++ b/dlls/msvcr90/msvcr90.manifest @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.4148" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/> + <assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.6161" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/> <file name="msvcr90.dll"/> <file name="msvcp90.dll"/> <file name="msvcm90.dll"/>

1 0

Ken Thomases : winemac: Ignore Cocoa' s window frame adjustments for off-screen windows.
by Alexandre Julliard 05 Feb '13

05 Feb '13

Module: wine Branch: master Commit: 0757a6636013cf5ac3c46164ea7bf0d07769a94e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0757a6636013cf5ac3c46164e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 4 08:46:00 2013 -0600 winemac: Ignore Cocoa's window frame adjustments for off-screen windows. --- dlls/winemac.drv/cocoa_window.m | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 38bc176..4d69674 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -265,10 +265,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [window setContentView:contentView]; - /* In case Cocoa adjusted the frame we tried to set, generate a frame-changed - event. The back end will ignore it if nothing actually changed. */ - [window windowDidResize:nil]; - return window; } @@ -424,9 +420,12 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self setFrame:frame display:YES]; } - /* In case Cocoa adjusted the frame we tried to set, generate a frame-changed - event. The back end will ignore it if nothing actually changed. */ - [self windowDidResize:nil]; + if (on_screen) + { + /* In case Cocoa adjusted the frame we tried to set, generate a frame-changed + event. The back end will ignore it if nothing actually changed. */ + [self windowDidResize:nil]; + } return on_screen; }

1 0

Ken Thomases : winemac: Implement ToUnicodeEx().
by Alexandre Julliard 05 Feb '13

05 Feb '13

Module: wine Branch: master Commit: 3ab66a6916bba96e88ee5b4b05d50759107ad3f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ab66a6916bba96e88ee5b4b0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 3 17:20:26 2013 -0600 winemac: Implement ToUnicodeEx(). --- dlls/winemac.drv/keyboard.c | 213 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 2 + dlls/winemac.drv/window.c | 4 + dlls/winemac.drv/winemac.drv.spec | 1 + 4 files changed, 220 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ab66a6916bba96e88ee5…

1 0

Ken Thomases : user32: In TranslateMessage, handle ToUnicode returning 2 or more chars.
by Alexandre Julliard 05 Feb '13

05 Feb '13

Module: wine Branch: master Commit: 5fb543f6e2a9a40fee88ae51d7660295a7f7451e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb543f6e2a9a40fee88ae51d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 3 17:20:22 2013 -0600 user32: In TranslateMessage, handle ToUnicode returning 2 or more chars. --- dlls/user32/message.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 79066a8..b0bf176 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3803,8 +3803,9 @@ BOOL WINAPI IsDialogMessageA( HWND hwndDlg, LPMSG pmsg ) BOOL WINAPI TranslateMessage( const MSG *msg ) { UINT message; - WCHAR wp[2]; + WCHAR wp[8]; BYTE state[256]; + INT len; if (msg->message < WM_KEYFIRST || msg->message > WM_KEYLAST) return FALSE; if (msg->message != WM_KEYDOWN && msg->message != WM_SYSKEYDOWN) return TRUE; @@ -3826,22 +3827,23 @@ BOOL WINAPI TranslateMessage( const MSG *msg ) } GetKeyboardState( state ); - /* FIXME : should handle ToUnicode yielding 2 */ - switch (ToUnicode(msg->wParam, HIWORD(msg->lParam), state, wp, 2, 0)) + len = ToUnicode(msg->wParam, HIWORD(msg->lParam), state, wp, sizeof(wp)/sizeof(WCHAR), 0); + if (len == -1) { - case 1: - message = (msg->message == WM_KEYDOWN) ? WM_CHAR : WM_SYSCHAR; - TRACE_(key)("1 -> PostMessageW(%p,%s,%04x,%08lx)\n", - msg->hwnd, SPY_GetMsgName(message, msg->hwnd), wp[0], msg->lParam); - PostMessageW( msg->hwnd, message, wp[0], msg->lParam ); - break; - - case -1: message = (msg->message == WM_KEYDOWN) ? WM_DEADCHAR : WM_SYSDEADCHAR; TRACE_(key)("-1 -> PostMessageW(%p,%s,%04x,%08lx)\n", msg->hwnd, SPY_GetMsgName(message, msg->hwnd), wp[0], msg->lParam); PostMessageW( msg->hwnd, message, wp[0], msg->lParam ); - break; + } + else if (len > 0) + { + INT i; + + message = (msg->message == WM_KEYDOWN) ? WM_CHAR : WM_SYSCHAR; + TRACE_(key)("%d -> PostMessageW(%p,%s,<x>,%08lx) for <x> in %s\n", len, msg->hwnd, + SPY_GetMsgName(message, msg->hwnd), msg->lParam, debugstr_wn(wp, len)); + for (i = 0; i < len; i++) + PostMessageW( msg->hwnd, message, wp[i], msg->lParam ); } return TRUE; }

1 0

Ken Thomases : winemac: Generate KEY_PRESS/ RELEASE events from Cocoa key events.
by Alexandre Julliard 05 Feb '13

05 Feb '13

Module: wine Branch: master Commit: 77de57683f3fb7ce8d1663b529b25657f933a618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77de57683f3fb7ce8d1663b52… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 3 17:20:18 2013 -0600 winemac: Generate KEY_PRESS/RELEASE events from Cocoa key events. --- dlls/winemac.drv/cocoa_app.h | 4 + dlls/winemac.drv/cocoa_app.m | 21 +++++- dlls/winemac.drv/cocoa_window.h | 2 + dlls/winemac.drv/cocoa_window.m | 158 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/event.c | 10 +++ dlls/winemac.drv/keyboard.c | 57 ++++++++++++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 7 ++ 8 files changed, 259 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77de57683f3fb7ce8d166…

1 0

Ken Thomases : winemac: Rebuild key map when Mac keyboard layout changes.
by Alexandre Julliard 05 Feb '13

05 Feb '13

Module: wine Branch: master Commit: d0e1a0251583d5fb9ea199268d670b8f81b72abc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e1a0251583d5fb9ea199268… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 3 17:20:15 2013 -0600 winemac: Rebuild key map when Mac keyboard layout changes. --- dlls/winemac.drv/cocoa_app.m | 50 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/cocoa_event.m | 3 ++ dlls/winemac.drv/event.c | 7 +++++ dlls/winemac.drv/keyboard.c | 22 +++++++++++++++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 6 ++++ 6 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 3751eef..a3a8cb5 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -177,6 +177,47 @@ int macdrv_err_on; } } + - (void) keyboardSelectionDidChange + { + TISInputSourceRef inputSource; + + inputSource = TISCopyCurrentKeyboardLayoutInputSource(); + if (inputSource) + { + CFDataRef uchr; + uchr = TISGetInputSourceProperty(inputSource, + kTISPropertyUnicodeKeyLayoutData); + if (uchr) + { + macdrv_event event; + WineEventQueue* queue; + + event.type = KEYBOARD_CHANGED; + event.window = NULL; + event.keyboard_changed.keyboard_type = self.keyboardType; + event.keyboard_changed.iso_keyboard = (KBGetLayoutType(self.keyboardType) == kKeyboardISO); + event.keyboard_changed.uchr = CFDataCreateCopy(NULL, uchr); + + if (event.keyboard_changed.uchr) + { + [eventQueuesLock lock]; + + for (queue in eventQueues) + { + CFRetain(event.keyboard_changed.uchr); + [queue postEvent:&event]; + } + + [eventQueuesLock unlock]; + + CFRelease(event.keyboard_changed.uchr); + } + } + + CFRelease(inputSource); + } + } + /* * ---------- NSApplicationDelegate methods ---------- @@ -218,6 +259,15 @@ int macdrv_err_on; [keyWindows removeObjectIdenticalTo:window]; }]; + [nc addObserver:self + selector:@selector(keyboardSelectionDidChange) + name:NSTextInputContextKeyboardSelectionDidChangeNotification + object:nil]; + + /* The above notification isn't sent unless the NSTextInputContext + class has initialized itself. Poke it. */ + [NSTextInputContext self]; + self.keyboardType = LMGetKbdType(); } diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index d5e927d..98b4445 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -277,6 +277,9 @@ void macdrv_cleanup_event(macdrv_event *event) switch (event->type) { + case KEYBOARD_CHANGED: + CFRelease(event->keyboard_changed.uchr); + break; case WINDOW_GOT_FOCUS: [(NSMutableSet*)event->window_got_focus.tried_windows release]; break; diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 616f398..fb00260 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", + "KEYBOARD_CHANGED", "MOUSE_BUTTON", "WINDOW_CLOSE_REQUESTED", "WINDOW_DID_MINIMIZE", @@ -56,6 +57,9 @@ static macdrv_event_mask get_event_mask(DWORD mask) if ((mask & QS_ALLINPUT) == QS_ALLINPUT) return -1; + if (mask & QS_KEY) + event_mask |= event_mask_for_type(KEYBOARD_CHANGED); + if (mask & QS_MOUSEBUTTON) event_mask |= event_mask_for_type(MOUSE_BUTTON); @@ -94,6 +98,9 @@ void macdrv_handle_event(macdrv_event *event) case APP_DEACTIVATED: macdrv_app_deactivated(); break; + case KEYBOARD_CHANGED: + macdrv_keyboard_changed(event); + break; case MOUSE_BUTTON: macdrv_mouse_button(hwnd, event); break; diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index d81cdd2..3591521 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -661,3 +661,25 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) TRACE("keyc 0x%04x -> vkey 0x%04x (spare vkey)\n", keyc, vkey); } } + + +/*********************************************************************** + * macdrv_keyboard_changed + * + * Handler for KEYBOARD_CHANGED events. + */ +void macdrv_keyboard_changed(const macdrv_event *event) +{ + struct macdrv_thread_data *thread_data = macdrv_thread_data(); + + TRACE("new keyboard layout uchr data %p, type %u, iso %d\n", event->keyboard_changed.uchr, + event->keyboard_changed.keyboard_type, event->keyboard_changed.iso_keyboard); + + if (thread_data->keyboard_layout_uchr) + CFRelease(thread_data->keyboard_layout_uchr); + thread_data->keyboard_layout_uchr = CFDataCreateCopy(NULL, event->keyboard_changed.uchr); + thread_data->keyboard_type = event->keyboard_changed.keyboard_type; + thread_data->iso_keyboard = event->keyboard_changed.iso_keyboard; + + macdrv_compute_keyboard_layout(thread_data); +} diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 6b50b3d..d30c7ae 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -134,5 +134,6 @@ extern void macdrv_window_did_unminimize(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_mouse_button(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) DECLSPEC_HIDDEN; +extern void macdrv_keyboard_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 61dae50..d49992f 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -125,6 +125,7 @@ extern void macdrv_free_displays(struct macdrv_display* displays) DECLSPEC_HIDDE /* event */ enum { APP_DEACTIVATED, + KEYBOARD_CHANGED, MOUSE_BUTTON, WINDOW_CLOSE_REQUESTED, WINDOW_DID_MINIMIZE, @@ -142,6 +143,11 @@ typedef struct macdrv_event { macdrv_window window; union { struct { + CFDataRef uchr; + CGEventSourceKeyboardType keyboard_type; + int iso_keyboard; + } keyboard_changed; + struct { int button; int pressed; int x;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2013