November 2013 - Wine-commits

Frédéric Delanoy : propsys/tests: Use BOOL type where appropriate.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: d51e50cbaf1c321f2b3800ddda8cf20ecbbc5712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d51e50cbaf1c321f2b3800ddd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 20 23:39:30 2013 +0100 propsys/tests: Use BOOL type where appropriate. --- dlls/propsys/tests/propsys.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index df4b8d7..0a81779 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -115,9 +115,9 @@ static void test_PSStringFromPropertyKey(void) UINT cch; HRESULT hr_expect; const WCHAR *buf_expect; - int hr_broken; + BOOL hr_broken; HRESULT hr2; - int buf_broken; + BOOL buf_broken; const WCHAR *buf2; } testcases[] = { @@ -125,15 +125,15 @@ static void test_PSStringFromPropertyKey(void) {&prop, NULL, 0, E_POINTER}, {&prop, NULL, PKEYSTR_MAX, E_POINTER}, {NULL, out, 0, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, - {NULL, out, PKEYSTR_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_fillerW, 0, 0, 1, fillerW}, + {NULL, out, PKEYSTR_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_fillerW, FALSE, 0, TRUE, fillerW}, {&prop, out, 0, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, {&prop, out, GUIDSTRING_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, {&prop, out, GUIDSTRING_MAX + 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, - {&prop, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncatedW, 1, S_OK, 1, truncatedW}, - {&prop, out, PKEYSTR_MAX - 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated2W, 1, S_OK, 1, truncated2W}, - {&prop, out, PKEYSTR_MAX - 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated3W, 1, S_OK, 1, truncated3W}, + {&prop, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncatedW, TRUE, S_OK, TRUE, truncatedW}, + {&prop, out, PKEYSTR_MAX - 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated2W, TRUE, S_OK, TRUE, truncated2W}, + {&prop, out, PKEYSTR_MAX - 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated3W, TRUE, S_OK, TRUE, truncated3W}, {&prop, out, PKEYSTR_MAX, S_OK, expectedW}, - {&prop2, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated4W, 1, S_OK, 1, truncated4W}, + {&prop2, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated4W, TRUE, S_OK, TRUE, truncated4W}, {&prop2, out, GUIDSTRING_MAX + 6, S_OK, expected2W}, {&prop2, out, PKEYSTR_MAX, S_OK, expected2W}, {&prop3, out, GUIDSTRING_MAX + 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW},

1 0

Frédéric Delanoy : propsys: Use BOOL type where appropriate.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: bb9d1986a957c934431e69608c0ff994fc2bd1c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb9d1986a957c934431e69608… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 20 23:39:31 2013 +0100 propsys: Use BOOL type where appropriate. --- dlls/propsys/propvar.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 69b2e60..fd22c9d 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -69,46 +69,46 @@ static HRESULT PROPVAR_ConvertFILETIME(PROPVARIANT *ppropvarDest, } static HRESULT PROPVAR_ConvertNumber(REFPROPVARIANT pv, int dest_bits, - int dest_signed, LONGLONG *res) + BOOL dest_signed, LONGLONG *res) { - int src_signed; + BOOL src_signed; switch (pv->vt) { case VT_I1: - src_signed = 1; + src_signed = TRUE; *res = pv->u.cVal; break; case VT_UI1: - src_signed = 0; + src_signed = FALSE; *res = pv->u.bVal; break; case VT_I2: - src_signed = 1; + src_signed = TRUE; *res = pv->u.iVal; break; case VT_UI2: - src_signed = 0; + src_signed = FALSE; *res = pv->u.uiVal; break; case VT_I4: - src_signed = 1; + src_signed = TRUE; *res = pv->u.lVal; break; case VT_UI4: - src_signed = 0; + src_signed = FALSE; *res = pv->u.ulVal; break; case VT_I8: - src_signed = 1; + src_signed = TRUE; *res = pv->u.hVal.QuadPart; break; case VT_UI8: - src_signed = 0; + src_signed = FALSE; *res = pv->u.uhVal.QuadPart; break; case VT_EMPTY: - src_signed = 0; + src_signed = FALSE; *res = 0; break; default: @@ -144,7 +144,7 @@ HRESULT WINAPI PropVariantToInt16(REFPROPVARIANT propvarIn, SHORT *ret) TRACE("%p,%p\n", propvarIn, ret); - hr = PROPVAR_ConvertNumber(propvarIn, 16, 1, &res); + hr = PROPVAR_ConvertNumber(propvarIn, 16, TRUE, &res); if (SUCCEEDED(hr)) *ret = (SHORT)res; return hr; } @@ -156,7 +156,7 @@ HRESULT WINAPI PropVariantToInt32(REFPROPVARIANT propvarIn, LONG *ret) TRACE("%p,%p\n", propvarIn, ret); - hr = PROPVAR_ConvertNumber(propvarIn, 32, 1, &res); + hr = PROPVAR_ConvertNumber(propvarIn, 32, TRUE, &res); if (SUCCEEDED(hr)) *ret = (LONG)res; return hr; } @@ -168,7 +168,7 @@ HRESULT WINAPI PropVariantToInt64(REFPROPVARIANT propvarIn, LONGLONG *ret) TRACE("%p,%p\n", propvarIn, ret); - hr = PROPVAR_ConvertNumber(propvarIn, 64, 1, &res); + hr = PROPVAR_ConvertNumber(propvarIn, 64, TRUE, &res); if (SUCCEEDED(hr)) *ret = (LONGLONG)res; return hr; } @@ -180,7 +180,7 @@ HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret) TRACE("%p,%p\n", propvarIn, ret); - hr = PROPVAR_ConvertNumber(propvarIn, 16, 0, &res); + hr = PROPVAR_ConvertNumber(propvarIn, 16, FALSE, &res); if (SUCCEEDED(hr)) *ret = (USHORT)res; return hr; } @@ -192,7 +192,7 @@ HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret) TRACE("%p,%p\n", propvarIn, ret); - hr = PROPVAR_ConvertNumber(propvarIn, 32, 0, &res); + hr = PROPVAR_ConvertNumber(propvarIn, 32, FALSE, &res); if (SUCCEEDED(hr)) *ret = (ULONG)res; return hr; } @@ -204,7 +204,7 @@ HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret) TRACE("%p,%p\n", propvarIn, ret); - hr = PROPVAR_ConvertNumber(propvarIn, 64, 0, &res); + hr = PROPVAR_ConvertNumber(propvarIn, 64, FALSE, &res); if (SUCCEEDED(hr)) *ret = (ULONGLONG)res; return hr; } @@ -497,10 +497,10 @@ HRESULT WINAPI VariantToGUID(const VARIANT *pvar, GUID *guid) } } -static int isemptyornull(const PROPVARIANT *propvar) +static BOOL isemptyornull(const PROPVARIANT *propvar) { if (propvar->vt == VT_EMPTY || propvar->vt == VT_NULL) - return 1; + return TRUE; if ((propvar->vt & VT_ARRAY) == VT_ARRAY) { int i; @@ -512,7 +512,7 @@ static int isemptyornull(const PROPVARIANT *propvar) return i == propvar->u.parray->cDims; } /* FIXME: vectors, byrefs, errors? */ - return 0; + return FALSE; } INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2,

1 0

Frédéric Delanoy : scrrun: Use BOOL type where appropriate.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: cfe12f96665233060eea9f914ed33b836eababea URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfe12f96665233060eea9f914… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 20 23:39:32 2013 +0100 scrrun: Use BOOL type where appropriate. --- dlls/scrrun/filesystem.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index ee89b76..0d360d3 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -89,12 +89,12 @@ static inline HRESULT create_error(DWORD err) } } -static int textstream_check_iomode(struct textstream *This, enum iotype type) +static BOOL textstream_check_iomode(struct textstream *This, enum iotype type) { if (type == IORead) return This->mode == ForWriting || This->mode == ForAppending; else - return 1; + return TRUE; } static HRESULT WINAPI textstream_QueryInterface(ITextStream *iface, REFIID riid, void **obj)

1 0

Henri Verbeet : wined3d: Merge texture2d_bind() and texture3d_bind() into wined3d_texture_bind().
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 6b90248aec898b232feb1a90b7af084b4af04dc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b90248aec898b232feb1a90b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 21 00:10:17 2013 +0100 wined3d: Merge texture2d_bind() and texture3d_bind() into wined3d_texture_bind(). --- dlls/wined3d/state.c | 2 +- dlls/wined3d/surface.c | 5 +-- dlls/wined3d/texture.c | 86 ++++++++++++---------------------------- dlls/wined3d/volume.c | 3 +- dlls/wined3d/wined3d_private.h | 4 +- 5 files changed, 30 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b90248aec898b232feb1…

1 0

Henri Verbeet : wined3d: Return early in wined3d_texture_bind() if the GL texture already has a name.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 2ca86bcab61a1be851dd2d5cedf1cce6d7f50663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ca86bcab61a1be851dd2d5ce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 21 00:10:18 2013 +0100 wined3d: Return early in wined3d_texture_bind() if the GL texture already has a name. --- dlls/wined3d/texture.c | 172 +++++++++++++++++++++++------------------------ 1 files changed, 84 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ca86bcab61a1be851dd2…

1 0

Henri Verbeet : wined3d: Get rid of surface_bind().
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 2e63e8f9cca29ffbdf418cca6e137c5b5c110418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e63e8f9cca29ffbdf418cca6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 21 00:10:19 2013 +0100 wined3d: Get rid of surface_bind(). --- dlls/wined3d/surface.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a339f02..a3877ce 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -595,14 +595,6 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) } /* Context activation is done by the caller. */ -static void surface_bind(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) -{ - TRACE("surface %p, context %p, srgb %#x.\n", surface, context, srgb); - - wined3d_texture_bind(surface->container, context, srgb); -} - -/* Context activation is done by the caller. */ static void surface_bind_and_dirtify(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { @@ -621,7 +613,7 @@ static void surface_bind_and_dirtify(struct wined3d_surface *surface, if (active_sampler != WINED3D_UNMAPPED_STAGE) context_invalidate_state(context, STATE_SAMPLER(active_sampler)); - surface_bind(surface, context, srgb); + wined3d_texture_bind(surface->container, context, srgb); } static void surface_force_reload(struct wined3d_surface *surface) @@ -2083,7 +2075,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P surface_prepare_texture(dst_surface, context, FALSE); else surface_load_location(dst_surface, SFLAG_INTEXTURE); - surface_bind(dst_surface, context, FALSE); + wined3d_texture_bind(dst_surface->container, context, FALSE); data.buffer_object = src_surface->pbo; data.addr = src_surface->resource.allocatedMemory;

1 0

Henri Verbeet : wined3d: Merge surface_bind_and_dirtify() and volume_bind_and_dirtify() into wined3d_texture_bind_and_dirtify().
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: f91eab6d3e4462357709080a4c9cbb74d93320a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91eab6d3e4462357709080a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 21 00:10:20 2013 +0100 wined3d: Merge surface_bind_and_dirtify() and volume_bind_and_dirtify() into wined3d_texture_bind_and_dirtify(). --- dlls/wined3d/surface.c | 34 ++++++---------------------------- dlls/wined3d/texture.c | 22 ++++++++++++++++++++++ dlls/wined3d/volume.c | 36 +++++++----------------------------- dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 37 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f91eab6d3e44623577090…

1 0

Huw Davies : winemac: Update the thread' s active_keyboard_layout on keyboard change.
by Alexandre Julliard 20 Nov '13

20 Nov '13

Module: wine Branch: master Commit: 22008f7fd99b01e5f63780311825cf4e403d2e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22008f7fd99b01e5f63780311… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 20 15:30:36 2013 +0000 winemac: Update the thread's active_keyboard_layout on keyboard change. --- dlls/winemac.drv/cocoa_app.m | 34 ++++++++++++++++------------------ dlls/winemac.drv/cocoa_event.m | 1 + dlls/winemac.drv/keyboard.c | 39 +++++++++++++++++++++++++-------------- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 4 +++- dlls/winemac.drv/macdrv_main.c | 5 ++++- 6 files changed, 50 insertions(+), 34 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 284023b..af56872 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -374,15 +374,15 @@ int macdrv_err_on; - (void) keyboardSelectionDidChange { - TISInputSourceRef inputSource; + TISInputSourceRef inputSourceLayout; inputSourceIsInputMethodValid = FALSE; - inputSource = TISCopyCurrentKeyboardLayoutInputSource(); - if (inputSource) + inputSourceLayout = TISCopyCurrentKeyboardLayoutInputSource(); + if (inputSourceLayout) { CFDataRef uchr; - uchr = TISGetInputSourceProperty(inputSource, + uchr = TISGetInputSourceProperty(inputSourceLayout, kTISPropertyUnicodeKeyLayoutData); if (uchr) { @@ -393,6 +393,7 @@ int macdrv_err_on; event->keyboard_changed.keyboard_type = self.keyboardType; event->keyboard_changed.iso_keyboard = (KBGetLayoutType(self.keyboardType) == kKeyboardISO); event->keyboard_changed.uchr = CFDataCreateCopy(NULL, uchr); + event->keyboard_changed.input_source = TISCopyCurrentKeyboardInputSource(); if (event->keyboard_changed.uchr) { @@ -407,7 +408,7 @@ int macdrv_err_on; macdrv_release_event(event); } - CFRelease(inputSource); + CFRelease(inputSourceLayout); } } @@ -2218,31 +2219,28 @@ void macdrv_window_rejected_focus(const macdrv_event *event) } /*********************************************************************** - * macdrv_get_keyboard_layout + * macdrv_get_input_source_info * - * Returns the keyboard layout uchr data. + * Returns the keyboard layout uchr data, keyboard type and input source. */ -CFDataRef macdrv_copy_keyboard_layout(CGEventSourceKeyboardType* keyboard_type, int* is_iso) +void macdrv_get_input_source_info(CFDataRef* uchr, CGEventSourceKeyboardType* keyboard_type, int* is_iso, TISInputSourceRef* input_source) { - __block CFDataRef result = NULL; - OnMainThread(^{ - TISInputSourceRef inputSource; + TISInputSourceRef inputSourceLayout; - inputSource = TISCopyCurrentKeyboardLayoutInputSource(); - if (inputSource) + inputSourceLayout = TISCopyCurrentKeyboardLayoutInputSource(); + if (inputSourceLayout) { - CFDataRef uchr = TISGetInputSourceProperty(inputSource, + CFDataRef data = TISGetInputSourceProperty(inputSourceLayout, kTISPropertyUnicodeKeyLayoutData); - result = CFDataCreateCopy(NULL, uchr); - CFRelease(inputSource); + *uchr = CFDataCreateCopy(NULL, data); + CFRelease(inputSourceLayout); *keyboard_type = [WineApplicationController sharedController].keyboardType; *is_iso = (KBGetLayoutType(*keyboard_type) == kKeyboardISO); + *input_source = TISCopyCurrentKeyboardInputSource(); } }); - - return result; } /*********************************************************************** diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 13f9695..00f6f8e 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -641,6 +641,7 @@ void macdrv_release_event(macdrv_event *event) break; case KEYBOARD_CHANGED: CFRelease(event->keyboard_changed.uchr); + CFRelease(event->keyboard_changed.input_source); break; case QUERY_EVENT: macdrv_release_query(event->query_event.query); diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 52f97da..cc0df4e 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -555,6 +555,28 @@ static void update_layout_list(void) } /*********************************************************************** + * macdrv_get_hkl_from_source + * + * Find the HKL associated with a given input source. + */ +HKL macdrv_get_hkl_from_source(TISInputSourceRef input) +{ + struct layout *layout; + HKL ret = 0; + + EnterCriticalSection(&layout_list_section); + + update_layout_list(); + layout = get_layout_from_source(input); + if (layout) ret = layout->hkl; + + LeaveCriticalSection(&layout_list_section); + + return ret; +} + + +/*********************************************************************** * macdrv_compute_keyboard_layout */ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) @@ -1027,6 +1049,7 @@ void macdrv_keyboard_changed(const macdrv_event *event) 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; + thread_data->active_keyboard_layout = macdrv_get_hkl_from_source(event->keyboard_changed.input_source); thread_data->dead_key_state = 0; macdrv_compute_keyboard_layout(thread_data); @@ -1327,22 +1350,10 @@ INT CDECL macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) */ HKL CDECL macdrv_GetKeyboardLayout(DWORD thread_id) { - if (!thread_id || thread_id == GetCurrentThreadId()) - { - struct macdrv_thread_data *thread_data = macdrv_thread_data(); - if (thread_data && thread_data->active_keyboard_layout) - return thread_data->active_keyboard_layout; - } - else + if (thread_id && thread_id != GetCurrentThreadId()) FIXME("couldn't return keyboard layout for thread %04x\n", thread_id); - /* FIXME: Use TISGetInputSourceProperty() and kTISPropertyInputSourceLanguages - * to get input source language ID string. Use - * CFLocaleGetWindowsLocaleCodeFromLocaleIdentifier() to convert that - * to a Windows locale ID and from there to a layout handle. - */ - - return get_locale_keyboard_layout(); + return macdrv_init_thread_data()->active_keyboard_layout; } diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index d49a3c0..120fa51 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -178,6 +178,7 @@ 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_hotkey_press(const macdrv_event *event) DECLSPEC_HIDDEN; +extern HKL macdrv_get_hkl_from_source(TISInputSourceRef input_source) DECLSPEC_HIDDEN; extern void macdrv_displays_changed(const macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 1c2277f..ca53507 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -241,6 +241,7 @@ typedef struct macdrv_event { CFDataRef uchr; CGEventSourceKeyboardType keyboard_type; int iso_keyboard; + TISInputSourceRef input_source; } keyboard_changed; struct { int button; @@ -411,7 +412,8 @@ extern int macdrv_send_text_input_event(int pressed, unsigned int flags, int rep /* keyboard */ -extern CFDataRef macdrv_copy_keyboard_layout(CGEventSourceKeyboardType* keyboard_type, int* is_iso) DECLSPEC_HIDDEN; +extern void macdrv_get_input_source_info(CFDataRef* uchr,CGEventSourceKeyboardType* keyboard_type, int* is_iso, + TISInputSourceRef* input_source) DECLSPEC_HIDDEN; extern CFArrayRef macdrv_create_input_source_list(void) DECLSPEC_HIDDEN; extern const CFStringRef macdrv_input_source_input_key DECLSPEC_HIDDEN; extern const CFStringRef macdrv_input_source_type_key DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 5cdd13c..ba15706 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -255,6 +255,7 @@ static void set_queue_display_fd(int fd) struct macdrv_thread_data *macdrv_init_thread_data(void) { struct macdrv_thread_data *data = macdrv_thread_data(); + TISInputSourceRef input_source; if (data) return data; @@ -270,7 +271,9 @@ struct macdrv_thread_data *macdrv_init_thread_data(void) ExitProcess(1); } - data->keyboard_layout_uchr = macdrv_copy_keyboard_layout(&data->keyboard_type, &data->iso_keyboard); + macdrv_get_input_source_info(&data->keyboard_layout_uchr, &data->keyboard_type, &data->iso_keyboard, &input_source); + data->active_keyboard_layout = macdrv_get_hkl_from_source(input_source); + CFRelease(input_source); macdrv_compute_keyboard_layout(data); set_queue_display_fd(macdrv_get_event_queue_fd(data->queue));

1 0

Huw Davies : winemac: Retrieve the real keyboard layout where appropriate.
by Alexandre Julliard 20 Nov '13

20 Nov '13

Module: wine Branch: master Commit: f6e2af6843c70e848390ea5706a57941af8a1a3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6e2af6843c70e848390ea570… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 20 15:30:37 2013 +0000 winemac: Retrieve the real keyboard layout where appropriate. --- dlls/winemac.drv/keyboard.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index cc0df4e..15a4c1b 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -395,6 +395,7 @@ static const struct { { VK_VOLUME_UP | 0x100, "Volume Up" }, }; +HKL CDECL macdrv_GetKeyboardLayout(DWORD); static BOOL char_matches_string(WCHAR wchar, UniChar *string, BOOL ignore_diacritics) { @@ -1239,7 +1240,7 @@ HKL CDECL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags) } oldHkl = thread_data->active_keyboard_layout; - if (!oldHkl) oldHkl = get_locale_keyboard_layout(); + if (!oldHkl) oldHkl = macdrv_GetKeyboardLayout(0); thread_data->active_keyboard_layout = hkl; @@ -1396,7 +1397,7 @@ BOOL CDECL macdrv_GetKeyboardLayoutName(LPWSTR name) static const WCHAR formatW[] = {'%','0','8','x',0}; DWORD layout; - layout = HandleToUlong(get_locale_keyboard_layout()); + layout = HandleToUlong(macdrv_GetKeyboardLayout(0)); if (HIWORD(layout) == LOWORD(layout)) layout = LOWORD(layout); sprintfW(name, formatW, layout); TRACE("returning %s\n", debugstr_w(name));

1 0

Huw Davies : winemac: Actually set the system's keyboard layout.
by Alexandre Julliard 20 Nov '13

20 Nov '13

Module: wine Branch: master Commit: c4761d800256bb487b6e9e5a53b09af938ca7183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4761d800256bb487b6e9e5a5… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 20 15:30:38 2013 +0000 winemac: Actually set the system's keyboard layout. --- dlls/winemac.drv/cocoa_app.m | 11 +++++ dlls/winemac.drv/keyboard.c | 80 ++++++++------------------------------ dlls/winemac.drv/macdrv_cocoa.h | 1 + 3 files changed, 29 insertions(+), 63 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index af56872..8ab8954 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -2503,3 +2503,14 @@ CFArrayRef macdrv_create_input_source_list(void) return ret; } + +int macdrv_select_input_source(TISInputSourceRef input_source) +{ + __block int ret = FALSE; + + OnMainThread(^{ + ret = (TISSelectInputSource(input_source) == noErr); + }); + + return ret; +} diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 15a4c1b..a46d324 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1115,48 +1115,6 @@ void macdrv_hotkey_press(const macdrv_event *event) /*********************************************************************** - * get_locale_keyboard_layout - */ -static HKL get_locale_keyboard_layout(void) -{ - ULONG_PTR layout; - LANGID langid; - - layout = GetUserDefaultLCID(); - - /* - * Microsoft Office expects this value to be something specific - * for Japanese and Korean Windows with an IME the value is 0xe001 - * We should probably check to see if an IME exists and if so then - * set this word properly. - */ - langid = PRIMARYLANGID(LANGIDFROMLCID(layout)); - if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) - layout |= 0xe001 << 16; /* IME */ - else - layout |= layout << 16; - - return (HKL)layout; -} - - -/*********************************************************************** - * match_keyboard_layout - */ -static BOOL match_keyboard_layout(HKL hkl) -{ - const DWORD isIME = 0xE0000000; - HKL current_hkl = get_locale_keyboard_layout(); - - /* if the layout is an IME, only match the low word (LCID) */ - if (((ULONG_PTR)hkl & isIME) == isIME) - return (LOWORD(hkl) == LOWORD(current_hkl)); - else - return (hkl == current_hkl); -} - - -/*********************************************************************** * macdrv_process_text_input */ BOOL macdrv_process_text_input(UINT vkey, UINT scan, UINT repeat, const BYTE *key_state, void *himc) @@ -1210,20 +1168,11 @@ HKL CDECL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags) { HKL oldHkl = 0; struct macdrv_thread_data *thread_data = macdrv_init_thread_data(); + struct layout *layout; - /* FIXME: Use Text Input Services or NSTextInputContext to actually - change the Mac keyboard input source. */ - - FIXME("hkl %p flags %04x: semi-stub!\n", hkl, flags); - if (flags & KLF_SETFORPROCESS) - { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - FIXME("KLF_SETFORPROCESS not supported\n"); - return 0; - } + TRACE("hkl %p flags %04x\n", hkl, flags); - if (flags) - FIXME("flags %x not supported\n",flags); + if (flags) FIXME("flags %x not supported\n",flags); if (hkl == (HKL)HKL_NEXT || hkl == (HKL)HKL_PREV) { @@ -1232,17 +1181,22 @@ HKL CDECL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags) return 0; } - if (!match_keyboard_layout(hkl)) + EnterCriticalSection(&layout_list_section); + update_layout_list(); + + LIST_FOR_EACH_ENTRY(layout, &layout_list, struct layout, entry) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - FIXME("setting keyboard of different locales not supported\n"); - return 0; + if (layout->hkl == hkl) + { + if (macdrv_select_input_source(layout->input_source)) + { + oldHkl = thread_data->active_keyboard_layout; + thread_data->active_keyboard_layout = hkl; + } + break; + } } - - oldHkl = thread_data->active_keyboard_layout; - if (!oldHkl) oldHkl = macdrv_GetKeyboardLayout(0); - - thread_data->active_keyboard_layout = hkl; + LeaveCriticalSection(&layout_list_section); return oldHkl; } diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index ca53507..f7ffc50 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -415,6 +415,7 @@ extern int macdrv_send_text_input_event(int pressed, unsigned int flags, int rep extern void macdrv_get_input_source_info(CFDataRef* uchr,CGEventSourceKeyboardType* keyboard_type, int* is_iso, TISInputSourceRef* input_source) DECLSPEC_HIDDEN; extern CFArrayRef macdrv_create_input_source_list(void) DECLSPEC_HIDDEN; +extern int macdrv_select_input_source(TISInputSourceRef input_source) DECLSPEC_HIDDEN; extern const CFStringRef macdrv_input_source_input_key DECLSPEC_HIDDEN; extern const CFStringRef macdrv_input_source_type_key DECLSPEC_HIDDEN; extern const CFStringRef macdrv_input_source_lang_key DECLSPEC_HIDDEN;

1 0