November 2013 - Wine-Commits

Piotr Caban : include: Add IPersistMediaPropertyBag definition.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: 9ea983dcecec2ad8da01c72bbe869f131779f9ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea983dcecec2ad8da01c72bb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 20 22:42:48 2013 +0100 include: Add IPersistMediaPropertyBag definition. --- include/axextend.idl | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/include/axextend.idl b/include/axextend.idl index 4523e4f..8c7d8dc 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -1141,6 +1141,45 @@ interface IKsPropertySet : IUnknown cpp_quote("#endif /* _IKsPropertySet_ */") [ + local, + object, + uuid(6025a880-c0d5-11d0-bd4e-00a0c911ce86), + pointer_default(unique) +] +interface IMediaPropertyBag : IPropertyBag +{ + typedef IMediaPropertyBag *LPMEDIAPROPERTYBAG; + + HRESULT EnumProperty( + [in] ULONG iProperty, + [in, out] VARIANT *pvarPropertyName, + [in, out] VARIANT *pvarPropertyValue); +} + + +[ + local, + object, + uuid(5738e040-b67f-11d0-bd4d-00a0c911ce86), + pointer_default(unique) +] +interface IPersistMediaPropertyBag : IPersist +{ + HRESULT InitNew(void); + + HRESULT Load( + [in] IMediaPropertyBag *pPropBag, + [in] IErrorLog *pErrorLog); + + HRESULT Save( + [in] IMediaPropertyBag *pPropBag, + [in] BOOL fClearDirty, + [in] BOOL fSaveAllProperties); + + typedef IPersistMediaPropertyBag *LPPERSISTMEDIAPROPERTYBAG; +} + +[ object, uuid(36b73883-c2c8-11cf-8b46-00805f6cef60), pointer_default(unique)

1 0

Piotr Caban : include: Add IConfigInterleaving definition.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: 7365eafd367fb8636229e93ac0a45ba9f9c47e8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7365eafd367fb8636229e93ac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 20 22:42:33 2013 +0100 include: Add IConfigInterleaving definition. --- include/axextend.idl | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/include/axextend.idl b/include/axextend.idl index a10be14..4523e4f 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -757,6 +757,36 @@ interface IConfigAviMux : IUnknown [ local, object, + uuid(bee3d220-157b-11d0-bd23-00a0c911ce86), + pointer_default(unique) +] +interface IConfigInterleaving : IUnknown +{ + typedef enum InterleavingMode { + INTERLEAVE_NONE, + INTERLEAVE_CAPTURE, + INTERLEAVE_FULL, + INTERLEAVE_NONE_BUFFERED + } InterleavingMode; + + HRESULT put_Mode( + [in] InterleavingMode mode); + + HRESULT get_Mode( + [out] InterleavingMode *pMode); + + HRESULT put_Interleaving( + [in] const REFERENCE_TIME *prtInterleave, + [in] const REFERENCE_TIME *prtPreroll); + + HRESULT get_Interleaving( + [out] REFERENCE_TIME *prtInterleave, + [out] REFERENCE_TIME *prtPreroll); +} + +[ + local, + object, uuid(9fd52741-176d-4b36-8f51-ca8f933223be), pointer_default(unique) ]

1 0

Piotr Caban : include: Add IConfigAviMux definition.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: 391bea5460a583af7ea4ad0ab9677541ab671c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=391bea5460a583af7ea4ad0ab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 20 22:42:16 2013 +0100 include: Add IConfigAviMux definition. --- include/axextend.idl | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/include/axextend.idl b/include/axextend.idl index 3610d81..a10be14 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -736,6 +736,27 @@ interface ICaptureGraphBuilder2 : IUnknown [ local, object, + uuid(5acd6aa0-f482-11ce-8b67-00aa00a3f1a6), + pointer_default(unique) +] +interface IConfigAviMux : IUnknown +{ + HRESULT SetMasterStream( + [in] LONG iStream); + + HRESULT GetMasterStream( + [out] LONG *pStream); + + HRESULT SetOutputCompatibilityIndex( + [in] BOOL fOldIndex); + + HRESULT GetOutputCompatibilityIndex( + [out] BOOL *pfOldIndex); +} + +[ + local, + object, uuid(9fd52741-176d-4b36-8f51-ca8f933223be), pointer_default(unique) ] @@ -746,7 +767,7 @@ interface IAMClockSlave : IUnknown HRESULT GetErrorTolerance( [out] DWORD *pdwTolerance); -}; +} typedef struct _AMCOPPSignature { BYTE Signature[256];

1 0

Ken Thomases : winemac: Defer attaching OpenGL context to a view which is zero-sized or outside its window 's bounds.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: 682ed91017e6aa043feaf0c70a34118445e65d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=682ed91017e6aa043feaf0c70… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 20 15:35:37 2013 -0600 winemac: Defer attaching OpenGL context to a view which is zero-sized or outside its window's bounds. That fails with the dread "invalid drawable" message. --- dlls/winemac.drv/cocoa_opengl.m | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index b678cae..45799db 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -123,14 +123,15 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) context.needsUpdate = FALSE; if (view) { - __block BOOL windowHasDevice; + __block BOOL viewIsValidDrawable; macdrv_add_view_opengl_context(v, c); OnMainThread(^{ - windowHasDevice = [[view window] windowNumber] > 0; + viewIsValidDrawable = [[view window] windowNumber] > 0 && + !NSIsEmptyRect([view visibleRect]); }); - if (windowHasDevice) + if (viewIsValidDrawable) { [context setView:view]; [context setLatentView:nil];

1 0

Vincent Povirk : mscoree: Fix runtime shutdown code.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: 3a2e88534e8dbd3917e35b540b3df73982d2ed24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a2e88534e8dbd3917e35b540… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 20 15:20:50 2013 -0600 mscoree: Fix runtime shutdown code. --- dlls/mscoree/corruntimehost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 9626662..b0a8b9d 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -254,7 +254,7 @@ void RuntimeHost_ExitProcess(RuntimeHost *This, INT exitcode) return; } - method = mono_class_get_method_from_name(klass, "Exit", 0); + method = mono_class_get_method_from_name(klass, "Exit", 1); if (!method) { ERR("Couldn't get method from class\n");

1 0

Ken Thomases : winemac: Make macdrv_set_cocoa_window_frame() synchronous again.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: 19862b4138f0a2b4584a46375bb69d8d65171f99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19862b4138f0a2b4584a46375… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 20 14:01:29 2013 -0600 winemac: Make macdrv_set_cocoa_window_frame() synchronous again. It has a non-object pointer from the caller, so it can't allow the caller to continue until it's finished with it. Also, it discards events from the event queue and we don't want the caller to process them first. Fixes brokenness introduced by 784a9139. --- dlls/winemac.drv/cocoa_window.m | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 8b44fec..a29f20e 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -2085,7 +2085,7 @@ void macdrv_set_cocoa_window_frame(macdrv_window w, const CGRect* new_frame) { WineWindow* window = (WineWindow*)w; - OnMainThreadAsync(^{ + OnMainThread(^{ [window setFrameFromWine:NSRectFromCGRect(*new_frame)]; }); }

1 0

Frédéric Delanoy : oleaut32: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 21, 2013

Nov. 21, 2013

Module: wine Branch: master Commit: 128e4575e5126e6e79f537693b1dae10a684f7d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=128e4575e5126e6e79f537693… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 20 23:39:29 2013 +0100 oleaut32: Use BOOL type where appropriate. --- dlls/oleaut32/olepicture.c | 22 +++++++++++----------- dlls/oleaut32/tmarshal.c | 11 ++++------- dlls/oleaut32/typelib.c | 2 +- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 2772a2f..5e81766 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1527,9 +1527,9 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) return hr; } -static int serializeBMP(HBITMAP hBitmap, void ** ppBuffer, unsigned int * pLength) +static BOOL serializeBMP(HBITMAP hBitmap, void ** ppBuffer, unsigned int * pLength) { - int iSuccess = 0; + BOOL success = FALSE; HDC hDC; BITMAPINFO * pInfoBitmap; int iNumPaletteEntries; @@ -1585,17 +1585,17 @@ static int serializeBMP(HBITMAP hBitmap, void ** ppBuffer, unsigned int * pLengt sizeof(BITMAPINFOHEADER) + iNumPaletteEntries * sizeof(RGBQUAD), pPixelData, pInfoBitmap->bmiHeader.biSizeImage); - iSuccess = 1; + success = TRUE; HeapFree(GetProcessHeap(), 0, pPixelData); HeapFree(GetProcessHeap(), 0, pInfoBitmap); - return iSuccess; + return success; } -static int serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) +static BOOL serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) { ICONINFO infoIcon; - int iSuccess = 0; + BOOL success = FALSE; *ppBuffer = NULL; *pLength = 0; if (GetIconInfo(hIcon, &infoIcon)) { @@ -1717,7 +1717,7 @@ static int serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) /* Write out everything produced so far to the stream */ *ppBuffer = pIconData; *pLength = iDataSize; - iSuccess = 1; + success = TRUE; } else { /* printf("ERROR: unable to get bitmap information via GetDIBits() (error %u)\n", @@ -1740,7 +1740,7 @@ static int serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) printf("ERROR: Unable to get icon information (error %u)\n", GetLastError()); } - return iSuccess; + return success; } static HRESULT WINAPI OLEPictureImpl_Save( @@ -1751,7 +1751,7 @@ static HRESULT WINAPI OLEPictureImpl_Save( unsigned int iDataSize; DWORD header[2]; ULONG dummy; - int iSerializeResult = 0; + BOOL serializeResult = FALSE; OLEPictureImpl *This = impl_from_IPersistStream(iface); TRACE("%p %p %d\n", This, pStm, fClearDirty); @@ -1785,7 +1785,7 @@ static HRESULT WINAPI OLEPictureImpl_Save( if (This->bIsDirty || !This->data) { switch (This->keepOrigFormat ? This->loadtime_format : BITMAP_FORMAT_BMP) { case BITMAP_FORMAT_BMP: - iSerializeResult = serializeBMP(This->desc.u.bmp.hbitmap, &pIconData, &iDataSize); + serializeResult = serializeBMP(This->desc.u.bmp.hbitmap, &pIconData, &iDataSize); break; case BITMAP_FORMAT_JPEG: FIXME("(%p,%p,%d), PICTYPE_BITMAP (format JPEG) not implemented!\n",This,pStm,fClearDirty); @@ -1801,7 +1801,7 @@ static HRESULT WINAPI OLEPictureImpl_Save( break; } - if (!iSerializeResult) + if (!serializeResult) { hResult = E_FAIL; break; diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 3856f32..0dec7e7 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -647,14 +647,11 @@ _xsize(const TYPEDESC *td, ITypeInfo *tinfo) { } /* Whether we pass this type by reference or by value */ -static int +static BOOL _passbyref(const TYPEDESC *td, ITypeInfo *tinfo) { - if (td->vt == VT_USERDEFINED || - td->vt == VT_VARIANT || - td->vt == VT_PTR) - return 1; - - return 0; + return (td->vt == VT_USERDEFINED || + td->vt == VT_VARIANT || + td->vt == VT_PTR); } static HRESULT diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0dd3f64..1ebc38b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3137,7 +3137,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, /* Read in NE header */ nehdoffset = LZSeek( lzfd, 0, SEEK_CUR ); - if ( sizeof(nehd) != LZRead( lzfd, (LPSTR)&nehd, sizeof(nehd) ) ) return 0; + if ( sizeof(nehd) != LZRead( lzfd, (LPSTR)&nehd, sizeof(nehd) ) ) return FALSE; resTabSize = nehd.ne_restab - nehd.ne_rsrctab; if ( !resTabSize )

1 0

Zhenbo Li : shell32/tests: Delete a nonexistent file in an existent dir or a nonexistent dir.
by Alexandre Julliard Nov. 20, 2013

Nov. 20, 2013

Module: wine Branch: master Commit: fa8e8c258c62c5aa54285e09687b37fd72935c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa8e8c258c62c5aa54285e096… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Wed Nov 20 07:15:57 2013 +0800 shell32/tests: Delete a nonexistent file in an existent dir or a nonexistent dir. --- dlls/shell32/tests/shlfileop.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index cd93ce5..14ace24 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -660,6 +660,22 @@ static void test_delete(void) ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); ok(file_exists("test2.txt"), "Expected test2.txt to exist\n"); + /* delete a nonexistent file in an existent dir or a nonexistent dir */ + init_shfo_tests(); + shfo.pFrom = "testdir2\\nonexistent.txt\0"; + ret = SHFileOperationA(&shfo); + todo_wine + ok(ret == ERROR_FILE_NOT_FOUND || /* Vista */ + broken(ret == 0x402) || /* XP */ + broken(ret == ERROR_SUCCESS), /* NT4 */ + "Expected 0x402 or ERROR_FILE_NOT_FOUND, got %x\n", ret); + shfo.pFrom = "nonexistent\\one.txt\0"; + ret = SHFileOperationA(&shfo); + todo_wine + ok(ret == DE_INVALIDFILES || /* Vista or later */ + broken(ret == 0x402), /* XP */ + "Expected 0x402 or DE_INVALIDFILES, got %x\n", ret); + /* try the FOF_NORECURSION flag, continues deleting subdirs */ init_shfo_tests(); shfo.pFrom = "testdir2\0";

1 0

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

Nov. 20, 2013

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: Update the thread' s active_keyboard_layout on keyboard change.
by Alexandre Julliard Nov. 20, 2013

Nov. 20, 2013

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