wine-commits November 2013

wine-commits@winehq.org

2 participants
566 discussions

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: Update the layout list if the enabled input sources change.
by Alexandre Julliard 20 Nov '13

20 Nov '13

Module: wine Branch: master Commit: f344d7a21331d42e44f8915f9d2d47509fc9cad9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f344d7a21331d42e44f8915f9… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 20 15:30:35 2013 +0000 winemac: Update the layout list if the enabled input sources change. --- dlls/winemac.drv/cocoa_app.m | 10 +++++++ dlls/winemac.drv/keyboard.c | 57 +++++++++++++++++++++++++++++++++----- dlls/winemac.drv/macdrv_cocoa.h | 1 + 3 files changed, 60 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index d576b81..284023b 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -411,6 +411,11 @@ int macdrv_err_on; } } + - (void) enabledKeyboardInputSourcesChanged + { + macdrv_layout_list_needs_update = TRUE; + } + - (CGFloat) primaryScreenHeight { if (!primaryScreenHeightValid) @@ -1930,6 +1935,11 @@ int macdrv_err_on; name:@"com.apple.HIToolbox.beginMenuTrackingNotification" object:nil suspensionBehavior:NSNotificationSuspensionBehaviorDrop]; + + [dnc addObserver:self + selector:@selector(enabledKeyboardInputSourcesChanged) + name:(NSString*)kTISNotifyEnabledKeyboardInputSourcesChanged + object:nil]; } - (BOOL) inputSourceIsInputMethod diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 09eff95..52f97da 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -435,6 +435,7 @@ struct layout struct list entry; HKL hkl; TISInputSourceRef input_source; + BOOL enabled; /* is the input source enabled - ie displayed in the input source selector UI */ }; static CRITICAL_SECTION layout_list_section; @@ -446,6 +447,8 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION layout_list_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +int macdrv_layout_list_needs_update = TRUE; + static DWORD get_lcid(CFStringRef lang) { CFRange range; @@ -481,10 +484,36 @@ static HKL get_hkl(CFStringRef lang, CFStringRef type) return (HKL)lcid; } +/****************************************************************** + * get_layout_from_source + * + * Must be called while holding the layout_list_section. + * Note, returned layout may not currently be enabled. + */ +static struct layout *get_layout_from_source(TISInputSourceRef input) +{ + struct layout *ret = NULL, *layout; + + LIST_FOR_EACH_ENTRY(layout, &layout_list, struct layout, entry) + { + if (CFEqual(input, layout->input_source)) + { + ret = layout; + break; + } + } + return ret; +} + /*********************************************************************** * update_layout_list * * Must be called while holding the layout_list_section + * + * If an input source has been disabled (ie. removed from the UI) its + * entry remains in the layout list but is marked as such and is not + * enumerated by GetKeyboardLayoutList. This is to ensure the + * HKL <-> input source mapping is unique. */ static void update_layout_list(void) { @@ -492,23 +521,34 @@ static void update_layout_list(void) struct layout *layout; int i; - if (!list_empty(&layout_list)) return; + if (!InterlockedExchange(&macdrv_layout_list_needs_update, FALSE)) return; sources = macdrv_create_input_source_list(); + LIST_FOR_EACH_ENTRY(layout, &layout_list, struct layout, entry) + layout->enabled = FALSE; + for (i = 0; i < CFArrayGetCount(sources); i++) { CFDictionaryRef dict = CFArrayGetValueAtIndex(sources, i); TISInputSourceRef input = (TISInputSourceRef)CFDictionaryGetValue(dict, macdrv_input_source_input_key); - CFStringRef type = CFDictionaryGetValue(dict, macdrv_input_source_type_key); - CFStringRef lang = CFDictionaryGetValue(dict, macdrv_input_source_lang_key); + layout = get_layout_from_source(input); + if (!layout) + { + CFStringRef type = CFDictionaryGetValue(dict, macdrv_input_source_type_key); + CFStringRef lang = CFDictionaryGetValue(dict, macdrv_input_source_lang_key); + + layout = HeapAlloc(GetProcessHeap(), 0, sizeof(*layout)); + layout->input_source = (TISInputSourceRef)CFRetain(input); + layout->hkl = get_hkl(lang, type); - layout = HeapAlloc(GetProcessHeap(), 0, sizeof(*layout)); - layout->input_source = (TISInputSourceRef)CFRetain(input); - layout->hkl = get_hkl(lang, type); + list_add_tail(&layout_list, &layout->entry); + TRACE("adding new layout %p\n", layout->hkl); + } + else + TRACE("enabling already existing layout %p\n", layout->hkl); - list_add_tail(&layout_list, &layout->entry); - TRACE("adding new layout %p\n", layout->hkl); + layout->enabled = TRUE; } CFRelease(sources); @@ -1322,6 +1362,7 @@ UINT CDECL macdrv_GetKeyboardLayoutList(INT size, HKL *list) LIST_FOR_EACH_ENTRY(layout, &layout_list, struct layout, entry) { + if (!layout->enabled) continue; if (list) { if (count >= size) break; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 3ce1c26..1c2277f 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -416,6 +416,7 @@ 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; extern const CFStringRef macdrv_input_source_lang_key DECLSPEC_HIDDEN; +extern int macdrv_layout_list_needs_update DECLSPEC_HIDDEN; /* clipboard */

1 0

Huw Davies : winemac: Implement GetKeyboardLayoutList.
by Alexandre Julliard 20 Nov '13

20 Nov '13

Module: wine Branch: master Commit: fecaab9cfdb88ca34e562d6d53061587d26a99c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fecaab9cfdb88ca34e562d6d5… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 20 15:30:34 2013 +0000 winemac: Implement GetKeyboardLayoutList. --- dlls/winemac.drv/cocoa_app.m | 49 ++++++++++++++++ dlls/winemac.drv/keyboard.c | 115 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 5 ++ dlls/winemac.drv/winemac.drv.spec | 1 + 4 files changed, 170 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index f351f33..d576b81 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -2446,3 +2446,52 @@ void macdrv_set_mouse_capture_window(macdrv_window window) [[WineApplicationController sharedController] setMouseCaptureWindow:w]; }); } + +const CFStringRef macdrv_input_source_input_key = CFSTR("input"); +const CFStringRef macdrv_input_source_type_key = CFSTR("type"); +const CFStringRef macdrv_input_source_lang_key = CFSTR("lang"); + +/*********************************************************************** + * macdrv_create_input_source_list + */ +CFArrayRef macdrv_create_input_source_list(void) +{ + CFMutableArrayRef ret = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks); + + OnMainThread(^{ + CFArrayRef input_list; + CFDictionaryRef filter_dict; + const void *filter_keys[2] = { kTISPropertyInputSourceCategory, kTISPropertyInputSourceIsSelectCapable }; + const void *filter_values[2] = { kTISCategoryKeyboardInputSource, kCFBooleanTrue }; + int i; + + filter_dict = CFDictionaryCreate(NULL, filter_keys, filter_values, sizeof(filter_keys)/sizeof(filter_keys[0]), + &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); + input_list = TISCreateInputSourceList(filter_dict, false); + + for (i = 0; i < CFArrayGetCount(input_list); i++) + { + TISInputSourceRef input = (TISInputSourceRef)CFArrayGetValueAtIndex(input_list, i); + CFArrayRef source_langs = TISGetInputSourceProperty(input, kTISPropertyInputSourceLanguages); + CFDictionaryRef entry; + const void *input_keys[3] = { macdrv_input_source_input_key, + macdrv_input_source_type_key, + macdrv_input_source_lang_key }; + const void *input_values[3]; + + input_values[0] = input; + input_values[1] = TISGetInputSourceProperty(input, kTISPropertyInputSourceType); + input_values[2] = CFArrayGetValueAtIndex(source_langs, 0); + + entry = CFDictionaryCreate(NULL, input_keys, input_values, sizeof(input_keys) / sizeof(input_keys[0]), + &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); + + CFArrayAppendValue(ret, entry); + CFRelease(entry); + } + CFRelease(input_list); + CFRelease(filter_dict); + }); + + return ret; +} diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 1fffa22..09eff95 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -176,6 +176,7 @@ enum { kVK_UpArrow = 0x7E, }; +extern const CFStringRef kTISTypeKeyboardLayout; /* Indexed by Mac virtual keycode values defined above. */ static const struct { @@ -428,6 +429,90 @@ static int strip_apple_private_chars(LPWSTR bufW, int len) return len; } +static struct list layout_list = LIST_INIT( layout_list ); +struct layout +{ + struct list entry; + HKL hkl; + TISInputSourceRef input_source; +}; + +static CRITICAL_SECTION layout_list_section; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &layout_list_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": layout_list_section") } +}; +static CRITICAL_SECTION layout_list_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + +static DWORD get_lcid(CFStringRef lang) +{ + CFRange range; + WCHAR str[10]; + + range.location = 0; + range.length = min(CFStringGetLength(lang), sizeof(str) / sizeof(str[0]) - 1); + CFStringGetCharacters(lang, range, str); + str[range.length] = 0; + return LocaleNameToLCID(str, 0); +} + +static HKL get_hkl(CFStringRef lang, CFStringRef type) +{ + ULONG_PTR lcid = get_lcid(lang); + struct layout *layout; + + /* Look for the last occurrence of this lcid in the list and if + present use that value + 0x10000 */ + LIST_FOR_EACH_ENTRY_REV(layout, &layout_list, struct layout, entry) + { + ULONG_PTR hkl = HandleToUlong(layout->hkl); + + if (LOWORD(hkl) == lcid) + { + lcid = (hkl & ~0xe0000000) + 0x10000; + break; + } + } + + if (!CFEqual(type, kTISTypeKeyboardLayout)) lcid |= 0xe0000000; + + return (HKL)lcid; +} + +/*********************************************************************** + * update_layout_list + * + * Must be called while holding the layout_list_section + */ +static void update_layout_list(void) +{ + CFArrayRef sources; + struct layout *layout; + int i; + + if (!list_empty(&layout_list)) return; + + sources = macdrv_create_input_source_list(); + + for (i = 0; i < CFArrayGetCount(sources); i++) + { + CFDictionaryRef dict = CFArrayGetValueAtIndex(sources, i); + TISInputSourceRef input = (TISInputSourceRef)CFDictionaryGetValue(dict, macdrv_input_source_input_key); + CFStringRef type = CFDictionaryGetValue(dict, macdrv_input_source_type_key); + CFStringRef lang = CFDictionaryGetValue(dict, macdrv_input_source_lang_key); + + layout = HeapAlloc(GetProcessHeap(), 0, sizeof(*layout)); + layout->input_source = (TISInputSourceRef)CFRetain(input); + layout->hkl = get_hkl(lang, type); + + list_add_tail(&layout_list, &layout->entry); + TRACE("adding new layout %p\n", layout->hkl); + } + + CFRelease(sources); +} /*********************************************************************** * macdrv_compute_keyboard_layout @@ -1222,6 +1307,36 @@ HKL CDECL macdrv_GetKeyboardLayout(DWORD thread_id) /*********************************************************************** + * GetKeyboardLayoutList (MACDRV.@) + */ +UINT CDECL macdrv_GetKeyboardLayoutList(INT size, HKL *list) +{ + int count = 0; + struct layout *layout; + + TRACE("%d, %p\n", size, list); + + EnterCriticalSection(&layout_list_section); + + update_layout_list(); + + LIST_FOR_EACH_ENTRY(layout, &layout_list, struct layout, entry) + { + if (list) + { + if (count >= size) break; + list[count] = layout->hkl; + TRACE("\t%d: %p\n", count, list[count]); + } + count++; + } + LeaveCriticalSection(&layout_list_section); + + TRACE("returning %d\n", count); + return count; +} + +/*********************************************************************** * GetKeyboardLayoutName (MACDRV.@) */ BOOL CDECL macdrv_GetKeyboardLayoutName(LPWSTR name) diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index b452461..3ce1c26 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -123,6 +123,7 @@ enum { MACDRV_HOTKEY_FAILURE, }; +typedef struct __TISInputSource *TISInputSourceRef; typedef struct macdrv_opaque_window* macdrv_window; typedef struct macdrv_opaque_event_queue* macdrv_event_queue; @@ -411,6 +412,10 @@ 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 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; +extern const CFStringRef macdrv_input_source_lang_key DECLSPEC_HIDDEN; /* clipboard */ diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index f3739a8..58a894b 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -22,6 +22,7 @@ @ cdecl GetClipboardData(long) macdrv_GetClipboardData @ cdecl GetCursorPos(ptr) macdrv_GetCursorPos @ cdecl GetKeyboardLayout(long) macdrv_GetKeyboardLayout +@ cdecl GetKeyboardLayoutList(long ptr) macdrv_GetKeyboardLayoutList @ cdecl GetKeyboardLayoutName(ptr) macdrv_GetKeyboardLayoutName @ cdecl GetKeyNameText(long ptr long) macdrv_GetKeyNameText @ cdecl GetMonitorInfo(long ptr) macdrv_GetMonitorInfo

1 0

Alistair Leslie-Hughes : mscoree: Attempt to load the assembly from the application directory.
by Alexandre Julliard 20 Nov '13

20 Nov '13

Module: wine Branch: master Commit: a3a19518f4acc9f48fa77e040ba6f2533c2b6022 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3a19518f4acc9f48fa77e040… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 14 15:59:53 2013 +1000 mscoree: Attempt to load the assembly from the application directory. --- dlls/mscoree/corruntimehost.c | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 554f4c5..9626662 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1280,6 +1280,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) static const WCHAR wszFileSlash[] = {'f','i','l','e',':','/','/','/',0}; static const WCHAR wszCLSIDSlash[] = {'C','L','S','I','D','\\',0}; static const WCHAR wszInprocServer32[] = {'\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; + static const WCHAR wszDLL[] = {'.','d','l','l',0}; WCHAR path[CHARS_IN_GUID + ARRAYSIZE(wszCLSIDSlash) + ARRAYSIZE(wszInprocServer32) - 1]; MonoDomain *domain; MonoAssembly *assembly; @@ -1328,6 +1329,8 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) } else { + WCHAR assemblyname[MAX_PATH + 8]; + hr = CLASS_E_CLASSNOTAVAILABLE; WARN("CodeBase value cannot be found, trying Assembly.\n"); /* get the last subkey of InprocServer32 */ @@ -1343,16 +1346,36 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) if (res != ERROR_SUCCESS) goto cleanup; dwBufLen = MAX_PATH + 8; - res = RegGetValueW(subkey, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, codebase, &dwBufLen); + res = RegGetValueW(subkey, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, assemblyname, &dwBufLen); RegCloseKey(subkey); if (res != ERROR_SUCCESS) goto cleanup; - hr = get_file_from_strongname(codebase, filename, MAX_PATH); + + hr = get_file_from_strongname(assemblyname, filename, MAX_PATH); if (!SUCCEEDED(hr)) - goto cleanup; + { + /* + * The registry doesn't have a CodeBase entry and it's not in the GAC. + * + * Use the Assembly Key to retrieve the filename. + * Assembly : REG_SZ : AssemblyName, Version=X.X.X.X, Culture=neutral, PublicKeyToken=null + */ + WCHAR *ns; + + WARN("Attempt to load from the application directory.\n"); + GetModuleFileNameW(NULL, filename, MAX_PATH); + ns = strrchrW(filename, '\\'); + *(ns+1) = '\0'; + + ns = strchrW(assemblyname, ','); + *(ns) = '\0'; + strcatW(filename, assemblyname); + *(ns) = '.'; + strcatW(filename, wszDLL); + } } - TRACE("codebase (%s)\n", debugstr_w(filename)); + TRACE("filename (%s)\n", debugstr_w(filename)); *ppObj = NULL;

1 0

Huw Davies : user32: Add a GetKeyboardLayoutList driver entry.
by Alexandre Julliard 20 Nov '13

20 Nov '13

Module: wine Branch: master Commit: 85e105bd379a18ac8e71438c395a66865475182f URL: http://source.winehq.org/git/wine.git/?a=commit;h=85e105bd379a18ac8e71438c3… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 20 15:30:33 2013 +0000 user32: Add a GetKeyboardLayoutList driver entry. --- dlls/user32/driver.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/input.c | 57 +------------------------------------ dlls/user32/user_private.h | 1 + 3 files changed, 69 insertions(+), 55 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 37de424..85e4116 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -99,6 +99,7 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(GetAsyncKeyState); GET_USER_FUNC(GetKeyNameText); GET_USER_FUNC(GetKeyboardLayout); + GET_USER_FUNC(GetKeyboardLayoutList); GET_USER_FUNC(GetKeyboardLayoutName); GET_USER_FUNC(LoadKeyboardLayout); GET_USER_FUNC(MapVirtualKeyEx); @@ -195,6 +196,64 @@ static SHORT CDECL nulldrv_GetAsyncKeyState( INT key ) return -1; } +static UINT CDECL nulldrv_GetKeyboardLayoutList( INT size, HKL *layouts ) +{ + HKEY hKeyKeyboard; + DWORD rc; + INT count = 0; + ULONG_PTR baselayout; + LANGID langid; + static const WCHAR szKeyboardReg[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s',0}; + + baselayout = GetUserDefaultLCID(); + langid = PRIMARYLANGID(LANGIDFROMLCID(baselayout)); + if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) + baselayout |= 0xe001 << 16; /* IME */ + else + baselayout |= baselayout << 16; + + /* Enumerate the Registry */ + rc = RegOpenKeyW(HKEY_LOCAL_MACHINE,szKeyboardReg,&hKeyKeyboard); + if (rc == ERROR_SUCCESS) + { + do { + WCHAR szKeyName[9]; + HKL layout; + rc = RegEnumKeyW(hKeyKeyboard, count, szKeyName, 9); + if (rc == ERROR_SUCCESS) + { + layout = (HKL)(ULONG_PTR)strtoulW(szKeyName,NULL,16); + if (baselayout != 0 && layout == (HKL)baselayout) + baselayout = 0; /* found in the registry do not add again */ + if (size && layouts) + { + if (count >= size ) break; + layouts[count] = layout; + } + count ++; + } + } while (rc == ERROR_SUCCESS); + RegCloseKey(hKeyKeyboard); + } + + /* make sure our base layout is on the list */ + if (baselayout != 0) + { + if (size && layouts) + { + if (count < size) + { + layouts[count] = (HKL)baselayout; + count++; + } + } + else + count++; + } + + return count; +} + static INT CDECL nulldrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) { return 0; @@ -455,6 +514,7 @@ static USER_DRIVER null_driver = nulldrv_GetAsyncKeyState, nulldrv_GetKeyNameText, nulldrv_GetKeyboardLayout, + nulldrv_GetKeyboardLayoutList, nulldrv_GetKeyboardLayoutName, nulldrv_LoadKeyboardLayout, nulldrv_MapVirtualKeyEx, @@ -542,6 +602,11 @@ static HKL CDECL loaderdrv_GetKeyboardLayout( DWORD thread_id ) return load_driver()->pGetKeyboardLayout( thread_id ); } +static UINT CDECL loaderdrv_GetKeyboardLayoutList( INT size, HKL *layouts ) +{ + return load_driver()->pGetKeyboardLayoutList( size, layouts ); +} + static BOOL CDECL loaderdrv_GetKeyboardLayoutName( LPWSTR name ) { return load_driver()->pGetKeyboardLayoutName( name ); @@ -704,6 +769,7 @@ static USER_DRIVER lazy_load_driver = loaderdrv_GetAsyncKeyState, loaderdrv_GetKeyNameText, loaderdrv_GetKeyboardLayout, + loaderdrv_GetKeyboardLayoutList, loaderdrv_GetKeyboardLayoutName, loaderdrv_LoadKeyboardLayout, loaderdrv_MapVirtualKeyEx, diff --git a/dlls/user32/input.c b/dlls/user32/input.c index b21c674..078fa49 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1074,62 +1074,9 @@ BOOL WINAPI BlockInput(BOOL fBlockIt) */ UINT WINAPI GetKeyboardLayoutList(INT nBuff, HKL *layouts) { - HKEY hKeyKeyboard; - DWORD rc; - INT count = 0; - ULONG_PTR baselayout; - LANGID langid; - static const WCHAR szKeyboardReg[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s',0}; - - TRACE_(keyboard)("(%d,%p)\n",nBuff,layouts); - - baselayout = GetUserDefaultLCID(); - langid = PRIMARYLANGID(LANGIDFROMLCID(baselayout)); - if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) - baselayout |= 0xe001 << 16; /* IME */ - else - baselayout |= baselayout << 16; - - /* Enumerate the Registry */ - rc = RegOpenKeyW(HKEY_LOCAL_MACHINE,szKeyboardReg,&hKeyKeyboard); - if (rc == ERROR_SUCCESS) - { - do { - WCHAR szKeyName[9]; - HKL layout; - rc = RegEnumKeyW(hKeyKeyboard, count, szKeyName, 9); - if (rc == ERROR_SUCCESS) - { - layout = (HKL)(ULONG_PTR)strtoulW(szKeyName,NULL,16); - if (baselayout != 0 && layout == (HKL)baselayout) - baselayout = 0; /* found in the registry do not add again */ - if (nBuff && layouts) - { - if (count >= nBuff ) break; - layouts[count] = layout; - } - count ++; - } - } while (rc == ERROR_SUCCESS); - RegCloseKey(hKeyKeyboard); - } - - /* make sure our base layout is on the list */ - if (baselayout != 0) - { - if (nBuff && layouts) - { - if (count < nBuff) - { - layouts[count] = (HKL)baselayout; - count++; - } - } - else - count++; - } + TRACE_(keyboard)( "(%d, %p)\n", nBuff, layouts ); - return count; + return USER_Driver->pGetKeyboardLayoutList( nBuff, layouts ); } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 9daa9f4..a20dd2a 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -64,6 +64,7 @@ typedef struct tagUSER_DRIVER { SHORT (CDECL *pGetAsyncKeyState)(INT); INT (CDECL *pGetKeyNameText)(LONG, LPWSTR, INT); HKL (CDECL *pGetKeyboardLayout)(DWORD); + UINT (CDECL *pGetKeyboardLayoutList)(INT, HKL *); BOOL (CDECL *pGetKeyboardLayoutName)(LPWSTR); HKL (CDECL *pLoadKeyboardLayout)(LPCWSTR, UINT); UINT (CDECL *pMapVirtualKeyEx)(UINT, UINT, HKL);

1 0

Stefan Dösinger : wined3d: Remove surface->dirtyRect.
by Alexandre Julliard 20 Nov '13

20 Nov '13

Module: wine Branch: master Commit: 0ff0a6e9bc5beabe5f5fb934e6817c4dc2181b81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ff0a6e9bc5beabe5f5fb934e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 20 12:33:32 2013 +0100 wined3d: Remove surface->dirtyRect. --- dlls/wined3d/surface.c | 47 +++------------------------------------ dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 3 +- 3 files changed, 6 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c69b67b..a4c22f7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -850,22 +850,7 @@ static void surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD } if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) - { - if (!rect) - surface_add_dirty_rect(surface, NULL); - else - { - struct wined3d_box b; - - b.left = rect->left; - b.top = rect->top; - b.right = rect->right; - b.bottom = rect->bottom; - b.front = 0; - b.back = 1; - surface_add_dirty_rect(surface, &b); - } - } + surface_set_dirty(surface); } static void surface_unmap(struct wined3d_surface *surface) @@ -904,18 +889,9 @@ static void surface_unmap(struct wined3d_surface *surface) } if (surface->swapchain && surface->swapchain->front_buffer == surface) - { surface_load_location(surface, surface->draw_binding); - - surface->dirtyRect.left = surface->resource.width; - surface->dirtyRect.top = surface->resource.height; - surface->dirtyRect.right = 0; - surface->dirtyRect.bottom = 0; - } else if (surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) - { FIXME("Depth / stencil buffer locking is not implemented.\n"); - } } static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RECT *r) @@ -2314,9 +2290,9 @@ GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) } /* Slightly inefficient way to handle multiple dirty rects but it works :) */ -void surface_add_dirty_rect(struct wined3d_surface *surface, const struct wined3d_box *dirty_rect) +void surface_set_dirty(struct wined3d_surface *surface) { - TRACE("surface %p, dirty_rect %p.\n", surface, dirty_rect); + TRACE("surface %p.\n", surface); if (!(surface->flags & SFLAG_INSYSMEM) && (surface->flags & SFLAG_INTEXTURE)) surface_load_location(surface, SFLAG_INSYSMEM); @@ -2324,21 +2300,6 @@ void surface_add_dirty_rect(struct wined3d_surface *surface, const struct wined3 surface_validate_location(surface, SFLAG_INSYSMEM); surface_invalidate_location(surface, ~SFLAG_INSYSMEM); - if (dirty_rect) - { - surface->dirtyRect.left = min(surface->dirtyRect.left, dirty_rect->left); - surface->dirtyRect.top = min(surface->dirtyRect.top, dirty_rect->top); - surface->dirtyRect.right = max(surface->dirtyRect.right, dirty_rect->right); - surface->dirtyRect.bottom = max(surface->dirtyRect.bottom, dirty_rect->bottom); - } - else - { - surface->dirtyRect.left = 0; - surface->dirtyRect.top = 0; - surface->dirtyRect.right = surface->resource.width; - surface->dirtyRect.bottom = surface->resource.height; - } - wined3d_texture_set_dirty(surface->container); } @@ -6635,7 +6596,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text surface->flags |= SFLAG_DYNLOCK; /* Mark the texture as dirty so that it gets loaded first time around. */ - surface_add_dirty_rect(surface, NULL); + surface_set_dirty(surface); list_init(&surface->renderbuffers); TRACE("surface %p, memory %p, size %u\n", diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8bae223..7bafa66 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -689,7 +689,7 @@ static void texture2d_preload(struct wined3d_texture *texture, static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub_resource, const struct wined3d_box *dirty_region) { - surface_add_dirty_rect(surface_from_resource(sub_resource), dirty_region); + surface_set_dirty(surface_from_resource(sub_resource)); } static void texture2d_sub_resource_cleanup(struct wined3d_resource *sub_resource) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9e67c9b..e56f501 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2202,7 +2202,6 @@ struct wined3d_surface GLenum texture_target; RECT lockedRect; - RECT dirtyRect; int lockCount; /* For GetDC */ @@ -2242,7 +2241,7 @@ static inline GLuint surface_get_texture_name(const struct wined3d_surface *surf ? surface->container->texture_srgb.name : surface->container->texture_rgb.name; } -void surface_add_dirty_rect(struct wined3d_surface *surface, const struct wined3d_box *dirty_rect) DECLSPEC_HIDDEN; +void surface_set_dirty(struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) DECLSPEC_HIDDEN; GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Remove partial surface update support.
by Alexandre Julliard 20 Nov '13

20 Nov '13

Module: wine Branch: master Commit: 047ce3af6e5331137900e9daae6342a3c65c41ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=047ce3af6e5331137900e9daa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 20 12:33:31 2013 +0100 wined3d: Remove partial surface update support. This has only ever worked for render targets, and only through the glDrawPixels codepath, which was removed long ago. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/surface.c | 174 ++++++++++++++-------------------------- dlls/wined3d/swapchain.c | 6 +- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 68 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=047ce3af6e5331137900e…

1 0

Stefan Dösinger : wined3d: Remove broken ddraw overlay support.
by Alexandre Julliard 20 Nov '13

20 Nov '13

Module: wine Branch: master Commit: 5d4233378d0104ec7d97c8e70c994ccc2ef44dcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d4233378d0104ec7d97c8e70… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 20 12:33:30 2013 +0100 wined3d: Remove broken ddraw overlay support. --- dlls/wined3d/surface.c | 48 +--------------------------------------- dlls/wined3d/wined3d_private.h | 25 ++++++++++---------- 2 files changed, 13 insertions(+), 60 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1536908..0ad52d1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -800,27 +800,6 @@ static void surface_realize_palette(struct wined3d_surface *surface) surface_load_location(surface, surface->draw_binding, NULL); } -static HRESULT surface_draw_overlay(struct wined3d_surface *surface) -{ - HRESULT hr; - - /* If there's no destination surface there is nothing to do. */ - if (!surface->overlay_dest) - return WINED3D_OK; - - /* Blt calls ModifyLocation on the dest surface, which in turn calls - * DrawOverlay to update the overlay. Prevent an endless recursion. */ - if (surface->overlay_dest->flags & SFLAG_INOVERLAYDRAW) - return WINED3D_OK; - - surface->overlay_dest->flags |= SFLAG_INOVERLAYDRAW; - hr = wined3d_surface_blt(surface->overlay_dest, &surface->overlay_destrect, surface, - &surface->overlay_srcrect, WINEDDBLT_WAIT, NULL, WINED3D_TEXF_LINEAR); - surface->overlay_dest->flags &= ~SFLAG_INOVERLAYDRAW; - - return hr; -} - static void surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags) { struct wined3d_device *device = surface->resource.device; @@ -929,7 +908,7 @@ static void surface_unmap(struct wined3d_surface *surface) if (surface->flags & (SFLAG_INDRAWABLE | SFLAG_INTEXTURE)) { TRACE("Not dirtified, nothing to do.\n"); - goto done; + return; } if (surface->swapchain && surface->swapchain->front_buffer == surface) @@ -972,11 +951,6 @@ static void surface_unmap(struct wined3d_surface *surface) { FIXME("Depth / stencil buffer locking is not implemented.\n"); } - -done: - /* Overlays have to be redrawn manually after changes with the GL implementation */ - if (surface->overlay_dest) - surface_draw_overlay(surface); } static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RECT *r) @@ -2861,8 +2835,6 @@ HRESULT CDECL wined3d_surface_set_overlay_position(struct wined3d_surface *surfa surface->overlay_destrect.right = x + w; surface->overlay_destrect.bottom = y + h; - surface_draw_overlay(surface); - return WINED3D_OK; } @@ -2971,8 +2943,6 @@ HRESULT CDECL wined3d_surface_update_overlay(struct wined3d_surface *surface, co surface->overlay_dest = NULL; } - surface_draw_overlay(surface); - return WINED3D_OK; } @@ -3603,11 +3573,6 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined } flip_surface(surface, override); - - /* Update overlays if they're visible. */ - if ((surface->resource.usage & WINED3DUSAGE_OVERLAY) && surface->overlay_dest) - return surface_draw_overlay(surface); - return WINED3D_OK; } @@ -5167,20 +5132,9 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co void surface_validate_location(struct wined3d_surface *surface, DWORD location) { - struct wined3d_surface *overlay; - TRACE("surface %p, location %s.\n", surface, debug_surflocation(location & SFLAG_LOCATIONS)); surface->flags |= (location & SFLAG_LOCATIONS); - - /* Redraw emulated overlays, if any. */ - if (location & SFLAG_INDRAWABLE && !list_empty(&surface->overlays)) - { - LIST_FOR_EACH_ENTRY(overlay, &surface->overlays, struct wined3d_surface, overlay_entry) - { - surface_draw_overlay(overlay); - } - } } void surface_invalidate_location(struct wined3d_surface *surface, DWORD location) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 16fae5a..58b8998 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2292,19 +2292,18 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_LOST 0x00000080 /* Surface lost flag for ddraw. */ #define SFLAG_GLCKEY 0x00000100 /* The GL texture was created with a color key. */ #define SFLAG_CLIENT 0x00000200 /* GL_APPLE_client_storage is used with this surface. */ -#define SFLAG_INOVERLAYDRAW 0x00000400 /* Overlay drawing is in progress. Recursion prevention. */ -#define SFLAG_DIBSECTION 0x00000800 /* Has a DIB section attached for GetDC. */ -#define SFLAG_USERPTR 0x00001000 /* The application allocated the memory for this surface. */ -#define SFLAG_ALLOCATED 0x00002000 /* A GL texture is allocated for this surface. */ -#define SFLAG_SRGBALLOCATED 0x00004000 /* A sRGB GL texture is allocated for this surface. */ -#define SFLAG_PBO 0x00008000 /* The surface has a PBO. */ -#define SFLAG_INSYSMEM 0x00010000 /* The system memory copy is current. */ -#define SFLAG_INTEXTURE 0x00020000 /* The GL texture is current. */ -#define SFLAG_INSRGBTEX 0x00040000 /* The GL sRGB texture is current. */ -#define SFLAG_INDRAWABLE 0x00080000 /* The GL drawable is current. */ -#define SFLAG_INRB_MULTISAMPLE 0x00100000 /* The multisample renderbuffer is current. */ -#define SFLAG_INRB_RESOLVED 0x00200000 /* The resolved renderbuffer is current. */ -#define SFLAG_DISCARDED 0x00400000 /* Surface was discarded, allocating new location is enough. */ +#define SFLAG_DIBSECTION 0x00000400 /* Has a DIB section attached for GetDC. */ +#define SFLAG_USERPTR 0x00000800 /* The application allocated the memory for this surface. */ +#define SFLAG_ALLOCATED 0x00001000 /* A GL texture is allocated for this surface. */ +#define SFLAG_SRGBALLOCATED 0x00002000 /* A sRGB GL texture is allocated for this surface. */ +#define SFLAG_PBO 0x00004000 /* The surface has a PBO. */ +#define SFLAG_INSYSMEM 0x00008000 /* The system memory copy is current. */ +#define SFLAG_INTEXTURE 0x00010000 /* The GL texture is current. */ +#define SFLAG_INSRGBTEX 0x00020000 /* The GL sRGB texture is current. */ +#define SFLAG_INDRAWABLE 0x00040000 /* The GL drawable is current. */ +#define SFLAG_INRB_MULTISAMPLE 0x00080000 /* The multisample renderbuffer is current. */ +#define SFLAG_INRB_RESOLVED 0x00100000 /* The resolved renderbuffer is current. */ +#define SFLAG_DISCARDED 0x00200000 /* Surface was discarded, allocating new location is enough. */ /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long

1 0

Piotr Caban : qcap: Add ICaptureGraphBuilder2:: RenderStream test with intermediate filter.
by Alexandre Julliard 20 Nov '13

20 Nov '13

Module: wine Branch: master Commit: cdbf03df83939bac664cb9103eddf5e51d3825e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdbf03df83939bac664cb9103… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 20 12:02:42 2013 +0100 qcap: Add ICaptureGraphBuilder2::RenderStream test with intermediate filter. --- dlls/qcap/tests/qcap.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 73 insertions(+), 1 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index d8788de..a710c03 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -199,6 +199,65 @@ static const struct { {GRAPHBUILDER_CONNECT, NOT_FILTER}, {BASEFILTER_GETSTATE, SOURCE_FILTER, TRUE}, {END, NOT_FILTER} +}, renderstream_intermediate[] = { + {BASEFILTER_QUERYINTERFACE, SOURCE_FILTER}, + {BASEFILTER_ENUMPINS, SOURCE_FILTER}, + {ENUMPINS_NEXT, SOURCE_FILTER}, + {PIN_QUERYDIRECTION, SOURCE_FILTER}, + {PIN_CONNECTEDTO, SOURCE_FILTER}, + {PIN_QUERYPININFO, SOURCE_FILTER, TRUE}, + {KSPROPERTYSET_GET, SOURCE_FILTER}, + {PIN_ENUMMEDIATYPES, SOURCE_FILTER}, + {ENUMMEDIATYPES_RESET, SOURCE_FILTER}, + {ENUMMEDIATYPES_NEXT, SOURCE_FILTER}, + {BASEFILTER_QUERYINTERFACE, SOURCE_FILTER}, + {BASEFILTER_ENUMPINS, SOURCE_FILTER}, + {ENUMPINS_NEXT, SOURCE_FILTER}, + {PIN_QUERYDIRECTION, SOURCE_FILTER}, + {PIN_CONNECTEDTO, SOURCE_FILTER}, + {PIN_QUERYPININFO, SOURCE_FILTER, TRUE}, + {KSPROPERTYSET_GET, SOURCE_FILTER}, + {ENUMPINS_NEXT, SOURCE_FILTER}, + {BASEFILTER_QUERYINTERFACE, SOURCE_FILTER, TRUE}, + {BASEFILTER_ENUMPINS, SOURCE_FILTER, TRUE}, + {ENUMPINS_NEXT, SOURCE_FILTER, TRUE}, + {PIN_QUERYDIRECTION, SOURCE_FILTER, TRUE}, + {PIN_CONNECTEDTO, SOURCE_FILTER, TRUE}, + {PIN_QUERYPININFO, SOURCE_FILTER, TRUE}, + {KSPROPERTYSET_GET, SOURCE_FILTER, TRUE}, + {ENUMPINS_NEXT, SOURCE_FILTER, TRUE}, + {BASEFILTER_QUERYINTERFACE, SOURCE_FILTER, TRUE}, + {BASEFILTER_ENUMPINS, SOURCE_FILTER, TRUE}, + {ENUMPINS_NEXT, SOURCE_FILTER, TRUE}, + {PIN_QUERYDIRECTION, SOURCE_FILTER, TRUE}, + {PIN_CONNECTEDTO, SOURCE_FILTER, TRUE}, + {PIN_QUERYPININFO, SOURCE_FILTER, TRUE}, + {KSPROPERTYSET_GET, SOURCE_FILTER, TRUE}, + {ENUMPINS_NEXT, SOURCE_FILTER, TRUE}, + {PIN_ENUMMEDIATYPES, SOURCE_FILTER, TRUE}, + {ENUMMEDIATYPES_NEXT, SOURCE_FILTER, TRUE}, + {BASEFILTER_QUERYINTERFACE, SINK_FILTER, FALSE, TRUE}, + {BASEFILTER_ENUMPINS, SINK_FILTER}, + {ENUMPINS_NEXT, SINK_FILTER}, + {PIN_QUERYDIRECTION, SINK_FILTER}, + {PIN_CONNECTEDTO, SINK_FILTER}, + {BASEFILTER_QUERYINTERFACE, INTERMEDIATE_FILTER, FALSE, TRUE}, + {BASEFILTER_ENUMPINS, INTERMEDIATE_FILTER}, + {ENUMPINS_NEXT, INTERMEDIATE_FILTER}, + {PIN_QUERYDIRECTION, INTERMEDIATE_FILTER}, + {PIN_CONNECTEDTO, INTERMEDIATE_FILTER}, + {ENUMPINS_NEXT, INTERMEDIATE_FILTER}, + {PIN_QUERYDIRECTION, INTERMEDIATE_FILTER}, + {PIN_CONNECTEDTO, INTERMEDIATE_FILTER}, + {GRAPHBUILDER_CONNECT, NOT_FILTER}, + {BASEFILTER_QUERYINTERFACE, INTERMEDIATE_FILTER, FALSE, TRUE}, + {BASEFILTER_ENUMPINS, INTERMEDIATE_FILTER}, + {ENUMPINS_NEXT, INTERMEDIATE_FILTER}, + {PIN_QUERYDIRECTION, INTERMEDIATE_FILTER}, + {PIN_CONNECTEDTO, INTERMEDIATE_FILTER}, + {GRAPHBUILDER_CONNECT, NOT_FILTER}, + {BASEFILTER_GETSTATE, SOURCE_FILTER, TRUE}, + {END, NOT_FILTER} }, *current_calls_list; int call_no; @@ -559,7 +618,7 @@ static HRESULT WINAPI EnumPins_Next(IEnumPins *iface, ok(ppPins != NULL, "ppPins == NULL\n"); ok(pcFetched != NULL, "pcFetched == NULL\n"); - if(!This->enum_pins_pos++) { + if(This->enum_pins_pos++ < (This->filter_type == INTERMEDIATE_FILTER ? 2 : 1)) { *ppPins = &This->IPin_iface; *pcFetched = 1; return S_OK; @@ -677,6 +736,8 @@ static HRESULT WINAPI Pin_QueryDirection(IPin *iface, PIN_DIRECTION *pPinDir) check_calls_list("Pin_QueryDirection", PIN_QUERYDIRECTION, This->filter_type); *pPinDir = This->dir; + if(This->filter_type==INTERMEDIATE_FILTER && This->enum_pins_pos==2) + *pPinDir = PINDIR_INPUT; return S_OK; } @@ -894,6 +955,8 @@ static void test_CaptureGraphBuilder_RenderStream(void) {&KsPropertySetVtbl}, {&EnumMediaTypesVtbl}, PINDIR_OUTPUT, SOURCE_FILTER}; test_filter sink_filter = {{&BaseFilterVtbl}, {&EnumPinsVtbl}, {&PinVtbl}, {&KsPropertySetVtbl}, {&EnumMediaTypesVtbl}, PINDIR_INPUT, SINK_FILTER}; + test_filter intermediate_filter = {{&BaseFilterVtbl}, {&EnumPinsVtbl}, {&PinVtbl}, + {&KsPropertySetVtbl}, {&EnumMediaTypesVtbl}, PINDIR_OUTPUT, INTERMEDIATE_FILTER}; ICaptureGraphBuilder2 *cgb; HRESULT hr; @@ -918,6 +981,15 @@ static void test_CaptureGraphBuilder_RenderStream(void) ok(hr == S_OK, "RenderStream failed: %08x\n", hr); check_calls_list("test_CaptureGraphBuilder_RenderStream", END, NOT_FILTER); + trace("RenderStream with intermediate filter\n"); + current_calls_list = renderstream_intermediate; + call_no = 0; + hr = ICaptureGraphBuilder2_RenderStream(cgb, &PIN_CATEGORY_EDS, + &MEDIATYPE_Video, (IUnknown*)&source_filter.IBaseFilter_iface, + &intermediate_filter.IBaseFilter_iface, &sink_filter.IBaseFilter_iface); + ok(hr == S_OK, "RenderStream failed: %08x\n", hr); + check_calls_list("test_CaptureGraphBuilder_RenderStream", END, NOT_FILTER); + ICaptureGraphBuilder2_Release(cgb); }

1 0

Piotr Caban : qcap: Add initial ICaptureGraphBuilder2::RenderStream tests.
by Alexandre Julliard 20 Nov '13

20 Nov '13

Module: wine Branch: master Commit: 2b1befb9a047d4795cb1ef4986805be650e1dea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1befb9a047d4795cb1ef498… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 20 12:02:29 2013 +0100 qcap: Add initial ICaptureGraphBuilder2::RenderStream tests. --- dlls/qcap/tests/qcap.c | 822 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 822 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b1befb9a047d4795cb1e…

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
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