June 2013 - Wine-Commits - list.winehq.org

Matteo Bruni : d3d9/tests: Reset texture 0 to NULL at the end of texop_test ().
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: 5ffabcdfff8a14256b202cd8e26187afe603c5fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ffabcdfff8a14256b202cd8e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 19 21:59:25 2013 +0200 d3d9/tests: Reset texture 0 to NULL at the end of texop_test(). --- dlls/d3d9/tests/visual.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index dc84559..73f5066 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10179,8 +10179,9 @@ static void texop_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Present failed with 0x%08x\n", hr); } - if (texture) IDirect3DTexture9_Release(texture); - if (vertex_declaration) IDirect3DVertexDeclaration9_Release(vertex_declaration); + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + IDirect3DTexture9_Release(texture); + IDirect3DVertexDeclaration9_Release(vertex_declaration); } static void yuv_color_test(IDirect3DDevice9 *device) {

1 0

Hans Leidekker : msi: Restrict the match on files from cabinets to the disk ID.
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: 7974b12ab1d452a4ae6b7488be25ab93f0a6a6dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7974b12ab1d452a4ae6b7488b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 20 10:32:11 2013 +0200 msi: Restrict the match on files from cabinets to the disk ID. --- dlls/msi/files.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index d53da91..ec46ae3 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -246,13 +246,15 @@ static UINT msi_create_directory( MSIPACKAGE *package, const WCHAR *dir ) return ERROR_SUCCESS; } -static MSIFILE *find_file( MSIPACKAGE *package, const WCHAR *filename ) +static MSIFILE *find_file( MSIPACKAGE *package, UINT disk_id, const WCHAR *filename ) { MSIFILE *file; LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { - if (file->state != msifs_installed && !strcmpiW( filename, file->File )) return file; + if (file->disk_id == disk_id && + file->state != msifs_installed && + !strcmpiW( filename, file->File )) return file; } return NULL; } @@ -265,7 +267,7 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, if (action == MSICABEXTRACT_BEGINEXTRACT) { - if (!(f = find_file( package, file ))) + if (!(f = find_file( package, disk_id, file ))) { TRACE("unknown file in cabinet (%s)\n", debugstr_w(file)); return FALSE; @@ -394,7 +396,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) } else if (file->state != msifs_installed && !(file->Attributes & msidbFileAttributesPatchAdded)) { - ERR("compressed file wasn't installed (%s)\n", debugstr_w(file->TargetPath)); + ERR("compressed file wasn't installed (%s)\n", debugstr_w(file->File)); rc = ERROR_INSTALL_FAILURE; goto done; }

1 0

Jacek Caban : dwmapi.h: Added some missing declarations.
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: 92bdc3705860303c0c540aee7f6b73b598f71b19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92bdc3705860303c0c540aee7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 20 15:28:59 2013 +0200 dwmapi.h: Added some missing declarations. --- include/dwmapi.h | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/include/dwmapi.h b/include/dwmapi.h index b2546ae..f85999a 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -32,6 +32,59 @@ extern "C" { DECLARE_HANDLE(HTHUMBNAIL); typedef HTHUMBNAIL *PHTHUMBNAIL; +#include <pshpack1.h> + +typedef ULONGLONG DWM_FRAME_COUNT; +typedef ULONGLONG QPC_TIME; + +typedef struct _UNSIGNED_RATIO { + UINT32 uiNumerator; + UINT32 uiDenominator; +} UNSIGNED_RATIO; + +typedef struct _DWM_TIMING_INFO { + UINT32 cbSize; + UNSIGNED_RATIO rateRefresh; + QPC_TIME qpcRefreshPeriod; + UNSIGNED_RATIO rateCompose; + QPC_TIME qpcVBlank; + DWM_FRAME_COUNT cRefresh; + UINT cDXRefresh; + QPC_TIME qpcCompose; + DWM_FRAME_COUNT cFrame; + UINT cDXPresent; + DWM_FRAME_COUNT cRefreshFrame; + DWM_FRAME_COUNT cFrameSubmitted; + UINT cDXPresentSubmitted; + DWM_FRAME_COUNT cFrameConfirmed; + UINT cDXPresentConfirmed; + DWM_FRAME_COUNT cRefreshConfirmed; + UINT cDXRefreshConfirmed; + DWM_FRAME_COUNT cFramesLate; + UINT cFramesOutstanding; + DWM_FRAME_COUNT cFrameDisplayed; + QPC_TIME qpcFrameDisplayed; + DWM_FRAME_COUNT cRefreshFrameDisplayed; + DWM_FRAME_COUNT cFrameComplete; + QPC_TIME qpcFrameComplete; + DWM_FRAME_COUNT cFramePending; + QPC_TIME qpcFramePending; + DWM_FRAME_COUNT cFramesDisplayed; + DWM_FRAME_COUNT cFramesComplete; + DWM_FRAME_COUNT cFramesPending; + DWM_FRAME_COUNT cFramesAvailable; + DWM_FRAME_COUNT cFramesDropped; + DWM_FRAME_COUNT cFramesMissed; + DWM_FRAME_COUNT cRefreshNextDisplayed; + DWM_FRAME_COUNT cRefreshNextPresented; + DWM_FRAME_COUNT cRefreshesDisplayed; + DWM_FRAME_COUNT cRefreshesPresented; + DWM_FRAME_COUNT cRefreshStarted; + ULONGLONG cPixelsReceived; + ULONGLONG cPixelsDrawn; + DWM_FRAME_COUNT cBuffersEmpty; +} DWM_TIMING_INFO; + typedef struct _MilMatrix3x2D { DOUBLE S_11; @@ -42,6 +95,8 @@ typedef struct _MilMatrix3x2D DOUBLE DY; } MilMatrix3x2D; +#include <poppack.h> + #define DWM_BB_ENABLE 0x00000001 #define DWM_BB_BLURREGION 0x00000002 #define DWM_BB_TRANSITIONONMAXIMIZED 0x00000004 @@ -60,6 +115,7 @@ DWMAPI DwmEnableComposition(UINT); DWMAPI DwmEnableMMCSS(BOOL); DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*); DWMAPI DwmGetColorizationColor(DWORD*,BOOL); +DWMAPI DwmGetCompositionTimingInfo(HWND,DWM_TIMING_INFO*); DWMAPI DwmIsCompositionEnabled(BOOL*); DWMAPI DwmRegisterThumbnail(HWND, HWND, PHTHUMBNAIL); DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD);

1 0

Aric Stewart : gdi32/tests: Add a test case for vertical fonts enumeration order.
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: 37d216cc563477312b438dad9fbe4156e53a1e67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d216cc563477312b438dad9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 18 07:42:00 2013 -0500 gdi32/tests: Add a test case for vertical fonts enumeration order. --- dlls/gdi32/tests/font.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 9563da9..6ee8db4 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5098,6 +5098,42 @@ static void test_max_height(void) return; } +static void test_vertical_order(void) +{ + struct enum_font_data efd; + LOGFONTA lf; + HDC hdc; + int i, j; + + hdc = CreateCompatibleDC(0); + ok(hdc != NULL, "CreateCompatibleDC failed\n"); + + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfClipPrecision = CLIP_DEFAULT_PRECIS; + lf.lfHeight = 16; + lf.lfWidth = 16; + lf.lfQuality = DEFAULT_QUALITY; + lf.lfItalic = FALSE; + lf.lfWeight = FW_DONTCARE; + efd.total = 0; + EnumFontFamiliesExA(hdc, &lf, enum_font_data_proc, (LPARAM)&efd, 0); + for (i = 0; i < efd.total; i++) + { + if (efd.lf[i].lfFaceName[0] != '@') continue; + for (j = 0; j < efd.total; j++) + { + if (!strcmp(efd.lf[i].lfFaceName + 1, efd.lf[j].lfFaceName)) + { + ok(i > j,"Found vertical font %s before its horizontal version\n", efd.lf[i].lfFaceName); + break; + } + } + } + DeleteDC( hdc ); +} + + START_TEST(font) { init(); @@ -5155,6 +5191,7 @@ START_TEST(font) test_fullname2(); test_east_asian_font_selection(); test_max_height(); + test_vertical_order(); /* These tests should be last test until RemoveFontResource * is properly implemented.

1 0

Alexandre Julliard : gdi32: Add support for loading name strings in Macintosh format.
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: 3d0f044883e361ec6c9379cd3da85b9dc7f366fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d0f044883e361ec6c9379cd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 15:04:11 2013 +0200 gdi32: Add support for loading name strings in Macintosh format. --- dlls/gdi32/freetype.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 153 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d0f044883e361ec6c937…

1 0

Alexandre Julliard : gdi32: Improve font name localization by not requiring a strict language match.
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: b05b637c9179b7b01f21f5fd80e46cf405c04419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b05b637c9179b7b01f21f5fd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 13:36:34 2013 +0200 gdi32: Improve font name localization by not requiring a strict language match. --- dlls/gdi32/freetype.c | 114 +++++++++++++++++++++++-------------------------- 1 files changed, 53 insertions(+), 61 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 62e1608..dc08fc2 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1173,69 +1173,74 @@ static void LoadSubstList(void) } -/***************************************************************** - * get_name_table_entry - * - * Supply the platform, encoding, language and name ids in req - * and if the name exists the function will fill in the string - * and string_len members. The string is owned by FreeType so - * don't free it. Returns TRUE if the name is found else FALSE. - */ -static BOOL get_name_table_entry(FT_Face ft_face, FT_SfntName *req) +static int match_name_table_language( const FT_SfntName *name, LANGID lang ) { - FT_SfntName name; - FT_UInt num_names, name_index; + LANGID name_lang; - if(FT_IS_SFNT(ft_face)) + switch (name->platform_id) { - num_names = pFT_Get_Sfnt_Name_Count(ft_face); - - for(name_index = 0; name_index < num_names; name_index++) + case TT_PLATFORM_MICROSOFT: + switch (name->encoding_id) { - if(!pFT_Get_Sfnt_Name(ft_face, name_index, &name)) - { - if((name.platform_id == req->platform_id) && - ((name.encoding_id == TT_MS_ID_UNICODE_CS) || (name.encoding_id == TT_MS_ID_SYMBOL_CS)) && - (name.language_id == req->language_id) && - (name.name_id == req->name_id)) - { - req->string = name.string; - req->string_len = name.string_len; - return TRUE; - } - } + case TT_MS_ID_UNICODE_CS: + case TT_MS_ID_SYMBOL_CS: + name_lang = name->language_id; + break; + default: + return 0; } + break; + default: + return 0; } - req->string = NULL; - req->string_len = 0; - return FALSE; + if (name_lang == lang) return 3; + if (PRIMARYLANGID( name_lang ) == PRIMARYLANGID( lang )) return 2; + if (name_lang == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT )) return 1; + return 0; } -static WCHAR *get_face_name(FT_Face ft_face, FT_UShort name_id, FT_UShort language_id) +static WCHAR *copy_name_table_string( const FT_SfntName *name ) +{ + WCHAR *ret; + int i; + + ret = HeapAlloc( GetProcessHeap(), 0, name->string_len + sizeof(WCHAR) ); + for (i = 0; i < name->string_len / 2; i++) + ret[i] = (name->string[i * 2] << 8) | name->string[i * 2 + 1]; + ret[i] = 0; + return ret; +} + +static WCHAR *get_face_name(FT_Face ft_face, FT_UShort name_id, LANGID language_id) { - WCHAR *ret = NULL; FT_SfntName name; + FT_UInt num_names, name_index; + int res, best_lang = 0, best_index = -1; - name.platform_id = TT_PLATFORM_MICROSOFT; - name.language_id = language_id; - name.name_id = name_id; + if (!FT_IS_SFNT(ft_face)) return NULL; - if(get_name_table_entry(ft_face, &name)) - { - FT_UInt i; + num_names = pFT_Get_Sfnt_Name_Count( ft_face ); - /* String is not nul terminated and string_len is a byte length. */ - ret = HeapAlloc(GetProcessHeap(), 0, name.string_len + 2); - for(i = 0; i < name.string_len / 2; i++) + for (name_index = 0; name_index < num_names; name_index++) + { + if (pFT_Get_Sfnt_Name( ft_face, name_index, &name )) continue; + if (name.name_id != name_id) continue; + res = match_name_table_language( &name, language_id ); + if (res > best_lang) { - WORD *tmp = (WORD *)&name.string[i * 2]; - ret[i] = GET_BE_WORD(*tmp); + best_lang = res; + best_index = name_index; } - ret[i] = 0; - TRACE("Got localised name %s\n", debugstr_w(ret)); } - return ret; + if (best_index != -1 && !pFT_Get_Sfnt_Name( ft_face, best_index, &name )) + { + WCHAR *ret = copy_name_table_string( &name ); + TRACE( "name %u found platform %u lang %04x %s\n", + name_id, name.platform_id, name.language_id, debugstr_w( ret )); + return ret; + } + return NULL; } static inline BOOL faces_equal( const Face *f1, const Face *f2 ) @@ -1614,7 +1619,7 @@ static WCHAR *prepend_at(WCHAR *family) static void get_family_names( FT_Face ft_face, WCHAR **name, WCHAR **english, BOOL vertical ) { - *english = get_face_name( ft_face, TT_NAME_ID_FONT_FAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES ); + *english = get_face_name( ft_face, TT_NAME_ID_FONT_FAMILY, MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT) ); if (!*english) *english = towstr( CP_ACP, ft_face->family_name ); *name = get_face_name( ft_face, TT_NAME_ID_FONT_FAMILY, GetSystemDefaultLCID() ); @@ -1777,16 +1782,9 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, face->refcount = 1; face->StyleName = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, GetSystemDefaultLangID() ); - if (!face->StyleName) - face->StyleName = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES ); - if (!face->StyleName) - { - face->StyleName = towstr( CP_ACP, ft_face->style_name ); - } + if (!face->StyleName) face->StyleName = towstr( CP_ACP, ft_face->style_name ); face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, GetSystemDefaultLangID() ); - if (!face->FullName) - face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES ); if (flags & ADDFONT_VERTICAL_FONT) face->FullName = prepend_at( face->FullName ); @@ -6998,8 +6996,6 @@ static BOOL get_outline_text_metrics(GdiFont *font) style_nameW = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, GetSystemDefaultLangID() ); if (!style_nameW) - style_nameW = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES ); - if (!style_nameW) { FIXME("failed to read style_nameW for font %s!\n", wine_dbgstr_w(font->name)); style_nameW = towstr( CP_ACP, ft_face->style_name ); @@ -7008,8 +7004,6 @@ static BOOL get_outline_text_metrics(GdiFont *font) face_nameW = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, GetSystemDefaultLangID() ); if (!face_nameW) - face_nameW = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES ); - if (!face_nameW) { FIXME("failed to read face_nameW for font %s!\n", wine_dbgstr_w(font->name)); face_nameW = strdupW(font->name); @@ -7019,8 +7013,6 @@ static BOOL get_outline_text_metrics(GdiFont *font) full_nameW = get_face_name( ft_face, TT_NAME_ID_UNIQUE_ID, GetSystemDefaultLangID() ); if (!full_nameW) - full_nameW = get_face_name( ft_face, TT_NAME_ID_UNIQUE_ID, TT_MS_LANGID_ENGLISH_UNITED_STATES ); - if (!full_nameW) { WCHAR fake_nameW[] = {'f','a','k','e',' ','n','a','m','e', 0}; FIXME("failed to read full_nameW for font %s!\n", wine_dbgstr_w(font->name));

1 0

Marcus Meissner : wbemprox: Add missing FindClose() (Coverity).
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: c60bab330c928dea18823b39afc5106fb5b00da8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c60bab330c928dea18823b39a… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Jun 20 10:34:57 2013 +0200 wbemprox: Add missing FindClose() (Coverity). --- dlls/wbemprox/builtin.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d90165f..3cf47f8 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1302,6 +1302,7 @@ static enum fill_status fill_directory( struct table *table, const struct expr * { if (!resize_table( table, row + 1, sizeof(*rec) )) { + FindClose( handle ); status = FILL_STATUS_FAILED; goto done; } @@ -1313,6 +1314,7 @@ static enum fill_status fill_directory( struct table *table, const struct expr * if (!(push_dir( dirstack, new_path, len ))) { heap_free( new_path ); + FindClose( handle ); status = FILL_STATUS_FAILED; goto done; }

1 0

Ken Thomases : winemac: Also activate if a window is ordered front shortly after tray icon clicked .
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: 1d10457aee5833d460bb3f9d2747add51f5d97a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d10457aee5833d460bb3f9d2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 19 19:09:18 2013 -0500 winemac: Also activate if a window is ordered front shortly after tray icon clicked. ... in addition to if one is focused. --- dlls/winemac.drv/cocoa_window.m | 10 +++++++--- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/window.c | 8 +++++++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d926635..d0ee81f 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -761,7 +761,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) /* Returns whether or not the window was ordered in, which depends on if its frame intersects any screen. */ - - (BOOL) orderBelow:(WineWindow*)prev orAbove:(WineWindow*)next + - (BOOL) orderBelow:(WineWindow*)prev orAbove:(WineWindow*)next activate:(BOOL)activate { WineApplicationController* controller = [WineApplicationController sharedController]; BOOL on_screen = frame_intersects_screens([self frame], [NSScreen screens]); @@ -772,6 +772,9 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [controller transformProcessToForeground]; + if (activate) + [NSApp activateIgnoringOtherApps:YES]; + NSDisableScreenUpdates(); if (latentParentWindow) @@ -1627,14 +1630,15 @@ void macdrv_set_cocoa_window_title(macdrv_window w, const unsigned short* title, * (i.e. if its frame intersects with a screen). Otherwise, false. */ int macdrv_order_cocoa_window(macdrv_window w, macdrv_window prev, - macdrv_window next) + macdrv_window next, int activate) { WineWindow* window = (WineWindow*)w; __block BOOL on_screen; OnMainThread(^{ on_screen = [window orderBelow:(WineWindow*)prev - orAbove:(WineWindow*)next]; + orAbove:(WineWindow*)next + activate:activate]; }); return on_screen; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 085f786..0f39e5d 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -162,6 +162,7 @@ extern void macdrv_window_did_unminimize(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_mouse_button(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_mouse_moved(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_mouse_scroll(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; +extern void macdrv_release_capture(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) DECLSPEC_HIDDEN; extern void macdrv_keyboard_changed(const macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 92e9892..cdfe85b 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -350,7 +350,7 @@ extern void macdrv_set_cocoa_window_state(macdrv_window w, extern void macdrv_set_cocoa_window_title(macdrv_window w, const UniChar* title, size_t length) DECLSPEC_HIDDEN; extern int macdrv_order_cocoa_window(macdrv_window w, macdrv_window prev, - macdrv_window next) DECLSPEC_HIDDEN; + macdrv_window next, int activate) DECLSPEC_HIDDEN; extern void macdrv_hide_cocoa_window(macdrv_window w) DECLSPEC_HIDDEN; extern int macdrv_set_cocoa_window_frame(macdrv_window w, const CGRect* new_frame) DECLSPEC_HIDDEN; extern void macdrv_get_cocoa_window_frame(macdrv_window w, CGRect* out_frame) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 3c0041b..5e03936 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -587,6 +587,7 @@ static void show_window(struct macdrv_win_data *data) HWND next = NULL; macdrv_window prev_window = NULL; macdrv_window next_window = NULL; + BOOL activate = FALSE; /* find window that this one must be after */ prev = GetWindow(data->hwnd, GW_HWNDPREV); @@ -605,12 +606,16 @@ static void show_window(struct macdrv_win_data *data) TRACE("win %p/%p below %p/%p above %p/%p\n", data->hwnd, data->cocoa_window, prev, prev_window, next, next_window); - data->on_screen = macdrv_order_cocoa_window(data->cocoa_window, prev_window, next_window); + if (!prev_window) + activate = activate_on_focus_time && (GetTickCount() - activate_on_focus_time < 2000); + data->on_screen = macdrv_order_cocoa_window(data->cocoa_window, prev_window, next_window, activate); if (data->on_screen) { HWND hwndFocus = GetFocus(); if (hwndFocus && (data->hwnd == hwndFocus || IsChild(data->hwnd, hwndFocus))) macdrv_SetFocus(hwndFocus); + if (activate) + activate_on_focus_time = 0; } } @@ -861,6 +866,7 @@ void CDECL macdrv_SetFocus(HWND hwnd) BOOL activate = activate_on_focus_time && (GetTickCount() - activate_on_focus_time < 2000); /* Set Mac focus */ macdrv_give_cocoa_window_focus(data->cocoa_window, activate); + activate_on_focus_time = 0; } release_win_data(data);

1 0

Ken Thomases : winemac: Forcibly release mouse capture for clicks in Mac menu bar or app deactivation .
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: 153f3e27c4dce070def05bc03da46f6c9ba2fa5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=153f3e27c4dce070def05bc03… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 19 19:09:33 2013 -0500 winemac: Forcibly release mouse capture for clicks in Mac menu bar or app deactivation. --- dlls/winemac.drv/cocoa_app.m | 34 ++++++++++++++++++++++++++++++++++ dlls/winemac.drv/event.c | 5 +++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/mouse.c | 23 +++++++++++++++++++++++ 4 files changed, 63 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 20050bf..25081db 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1719,6 +1719,7 @@ int macdrv_err_on; { NSNotificationCenter* nc = [NSNotificationCenter defaultCenter]; NSNotificationCenter* wsnc = [[NSWorkspace sharedWorkspace] notificationCenter]; + NSDistributedNotificationCenter* dnc = [NSDistributedNotificationCenter defaultCenter]; [nc addObserverForName:NSWindowDidBecomeKeyNotification object:nil @@ -1760,6 +1761,17 @@ int macdrv_err_on; selector:@selector(activeSpaceDidChange) name:NSWorkspaceActiveSpaceDidChangeNotification object:nil]; + + [nc addObserver:self + selector:@selector(releaseMouseCapture) + name:NSMenuDidBeginTrackingNotification + object:nil]; + + [dnc addObserver:self + selector:@selector(releaseMouseCapture) + name:@"com.apple.HIToolbox.beginMenuTrackingNotification" + object:nil + suspensionBehavior:NSNotificationSuspensionBehaviorDrop]; } - (BOOL) inputSourceIsInputMethod @@ -1781,6 +1793,26 @@ int macdrv_err_on; return inputSourceIsInputMethod; } + - (void) releaseMouseCapture + { + // This might be invoked on a background thread by the distributed + // notification center. Shunt it to the main thread. + if (![NSThread isMainThread]) + { + dispatch_async(dispatch_get_main_queue(), ^{ [self releaseMouseCapture]; }); + return; + } + + if (mouseCaptureWindow) + { + macdrv_event* event; + + event = macdrv_create_event(RELEASE_CAPTURE, mouseCaptureWindow); + [mouseCaptureWindow.queue postEvent:event]; + macdrv_release_event(event); + } + } + /* * ---------- NSApplicationDelegate methods ---------- @@ -1850,6 +1882,8 @@ int macdrv_err_on; [eventQueuesLock unlock]; macdrv_release_event(event); + + [self releaseMouseCapture]; } - (NSApplicationTerminateReply) applicationShouldTerminate:(NSApplication *)sender diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index deac187..5eb823e 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -44,6 +44,7 @@ static const char *dbgstr_event(int type) "MOUSE_MOVED_ABSOLUTE", "MOUSE_SCROLL", "QUERY_EVENT", + "RELEASE_CAPTURE", "STATUS_ITEM_CLICKED", "WINDOW_CLOSE_REQUESTED", "WINDOW_DID_MINIMIZE", @@ -104,6 +105,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) if (mask & QS_SENDMESSAGE) { event_mask |= event_mask_for_type(QUERY_EVENT); + event_mask |= event_mask_for_type(RELEASE_CAPTURE); } return event_mask; @@ -202,6 +204,9 @@ void macdrv_handle_event(const macdrv_event *event) case QUERY_EVENT: macdrv_query_event(hwnd, event); break; + case RELEASE_CAPTURE: + macdrv_release_capture(hwnd, event); + break; case STATUS_ITEM_CLICKED: macdrv_status_item_clicked(event); break; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index cdfe85b..40173ba 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -175,6 +175,7 @@ enum { MOUSE_MOVED_ABSOLUTE, MOUSE_SCROLL, QUERY_EVENT, + RELEASE_CAPTURE, STATUS_ITEM_CLICKED, WINDOW_CLOSE_REQUESTED, WINDOW_DID_MINIMIZE, diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 2e49909..b729d55 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -918,3 +918,26 @@ void macdrv_mouse_scroll(HWND hwnd, const macdrv_event *event) event->mouse_scroll.x, event->mouse_scroll.y, event->mouse_scroll.x_scroll, FALSE, event->mouse_scroll.time_ms); } + + +/*********************************************************************** + * macdrv_release_capture + * + * Handler for RELEASE_CAPTURE events. + */ +void macdrv_release_capture(HWND hwnd, const macdrv_event *event) +{ + struct macdrv_thread_data *thread_data = macdrv_thread_data(); + HWND capture = GetCapture(); + HWND capture_top = GetAncestor(capture, GA_ROOT); + + TRACE("win %p/%p thread_data->capture_window %p GetCapture() %p in %p\n", hwnd, + event->window, thread_data->capture_window, capture, capture_top); + + if (event->window == thread_data->capture_window && hwnd == capture_top) + { + ReleaseCapture(); + if (!PostMessageW(capture, WM_CANCELMODE, 0, 0)) + WARN("failed to post WM_CANCELMODE; error 0x%08x\n", GetLastError()); + } +}

1 0

Bruno Jesus : po: Update Brazilian Portuguese translation.
by Alexandre Julliard June 20, 2013

June 20, 2013

Module: wine Branch: master Commit: 486e921ab9c8b89b2ae7c445bad360706e0939c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=486e921ab9c8b89b2ae7c445b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jun 19 23:25:11 2013 -0300 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 187 ++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 107 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=486e921ab9c8b89b2ae7c…

1 0