wine-commits November 2013

wine-commits@winehq.org

2 participants
566 discussions

Piotr Caban : qcap: Add AVI Mux filter stub.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: ed858386e5ff671c9f69925f9d4978caccbbe48f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed858386e5ff671c9f69925f9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 20 22:48:04 2013 +0100 qcap: Add AVI Mux filter stub. --- dlls/qcap/Makefile.in | 1 + dlls/qcap/avimux.c | 626 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/qcap/qcap_main.c | 6 +- dlls/qcap/qcap_main.h | 6 +- 4 files changed, 633 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed858386e5ff671c9f699…

1 0

Piotr Caban : include: Add IPersistMediaPropertyBag definition.
by Alexandre Julliard 21 Nov '13

21 Nov '13

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 21 Nov '13

21 Nov '13

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 21 Nov '13

21 Nov '13

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 21 Nov '13

21 Nov '13

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 21 Nov '13

21 Nov '13

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 21 Nov '13

21 Nov '13

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

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

20 Nov '13

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: 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

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

← Newer
1
...
15
16
17
18
19
20
21
...
57
Older →

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 November 2013