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

Ken Thomases : winemac: Also activate if a window is ordered front shortly after tray icon clicked .
by Alexandre Julliard 20 Jun '13

20 Jun '13

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 20 Jun '13

20 Jun '13

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 20 Jun '13

20 Jun '13

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

Kamil Pošvic : po: Update Czech translation.
by Alexandre Julliard 20 Jun '13

20 Jun '13

Module: wine Branch: master Commit: a356d47969181f6b071a13586ea4a87274c5843b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a356d47969181f6b071a13586… Author: Kamil Pošvic <kamil(a)posvic.com> Date: Wed Jun 19 23:49:28 2013 +0200 po: Update Czech translation. --- po/cs.po | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/po/cs.po b/po/cs.po index be67930..723b702 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1198,7 +1198,7 @@ msgstr "Připojuji se k %s" #: credui.rc:29 msgid "Logon unsuccessful" -msgstr "Přihlášení proběhlo úspěšně" +msgstr "Přihlášení proběhlo neúspěšně" #: credui.rc:30 msgid "" @@ -1415,19 +1415,19 @@ msgstr "" #: crypt32.rc:74 msgid "Title" -msgstr "" +msgstr "Titul" #: crypt32.rc:75 msgid "Given Name" -msgstr "" +msgstr "Křesní jméno" #: crypt32.rc:76 msgid "Initials" -msgstr "" +msgstr "Iniciály" #: crypt32.rc:77 msgid "Surname" -msgstr "" +msgstr "Příjmení" #: crypt32.rc:78 msgid "Domain Component" @@ -1752,7 +1752,7 @@ msgstr "" #: crypt32.rc:158 cryptui.rc:129 msgid "File Recovery" -msgstr "" +msgstr "Obnovení souboru" #: crypt32.rc:159 cryptui.rc:134 msgid "Root List Signer" @@ -1784,7 +1784,7 @@ msgstr "" #: crypt32.rc:170 msgid "Personal" -msgstr "" +msgstr "Osobní" #: crypt32.rc:171 msgid "Intermediate Certification Authorities" @@ -1792,7 +1792,7 @@ msgstr "" #: crypt32.rc:172 msgid "Other People" -msgstr "" +msgstr "Ostatní" #: crypt32.rc:173 msgid "Trusted Publishers" @@ -1812,7 +1812,7 @@ msgstr "" #: crypt32.rc:181 msgid "Certificate Serial Number=" -msgstr "" +msgstr "Sériové číslo certifikátu" #: crypt32.rc:182 msgid "Other Name=" @@ -1820,11 +1820,11 @@ msgstr "" #: crypt32.rc:183 msgid "Email Address=" -msgstr "" +msgstr "Emailová adresa" #: crypt32.rc:184 msgid "DNS Name=" -msgstr "" +msgstr "Jméno DNS=" #: crypt32.rc:185 msgid "Directory Address" @@ -1836,11 +1836,11 @@ msgstr "" #: crypt32.rc:187 msgid "IP Address=" -msgstr "" +msgstr "IP Adresa=" #: crypt32.rc:188 msgid "Mask=" -msgstr "" +msgstr "Maska=" #: crypt32.rc:189 msgid "Registered ID=" @@ -1879,7 +1879,7 @@ msgstr "" #: crypt32.rc:196 msgid "Information Not Available" -msgstr "" +msgstr "Informace nejsou dostupné" #: crypt32.rc:197 msgid "Authority Info Access" @@ -1916,7 +1916,7 @@ msgstr "" #: crypt32.rc:205 msgid "Full Name" -msgstr "" +msgstr "Celé jméno" #: crypt32.rc:206 msgid "RDN Name" @@ -1960,15 +1960,15 @@ msgstr "" #: crypt32.rc:216 taskmgr.rc:397 msgid "Available" -msgstr "" +msgstr "Dostupné" #: crypt32.rc:217 msgid "Not Available" -msgstr "" +msgstr "Nedostupné" #: crypt32.rc:218 msgid "Meets Criteria=" -msgstr "" +msgstr "Splňuje kritéria=" #: crypt32.rc:219 cryptui.rc:163 oleaut32.rc:29 wininet.rc:80 ipconfig.rc:44 msgid "Yes" @@ -2032,7 +2032,7 @@ msgstr "" #: crypt32.rc:234 msgid "Signature" -msgstr "" +msgstr "Podpis" #: crypt32.rc:235 msgid "SSL CA" @@ -2184,7 +2184,7 @@ msgstr "" #: cryptui.rc:265 cryptui.rc:66 msgid "Select Certificate Store" -msgstr "" +msgstr "Vybrat uložení certifikátu" #: cryptui.rc:268 msgid "Select the certificate store you want to use:" @@ -2192,7 +2192,7 @@ msgstr "" #: cryptui.rc:271 msgid "&Show physical stores" -msgstr "" +msgstr "&Zobrazit úložiště" #: cryptui.rc:277 cryptui.rc:288 cryptui.rc:305 cryptui.rc:319 cryptui.rc:68 msgid "Certificate Import Wizard"

1 0

Wei-Lun Chao : po: Update Chinese (Taiwan) translation.
by Alexandre Julliard 20 Jun '13

20 Jun '13

Module: wine Branch: master Commit: b9aa0c6fbf6c10184e550b9ae0116397b8951741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9aa0c6fbf6c10184e550b9ae… Author: Wei-Lun Chao <bluebat(a)member.fsf.org> Date: Thu Jun 20 22:42:41 2013 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 84 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 42 insertions(+), 42 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 0681c4e..84be9fa 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1190,7 +1190,8 @@ msgid "" msgstr "" "開啟大寫鎖定可能導致您輸入錯誤的密碼。\n" "\n" -"請在輸入密碼前按下 Caps Lock 鍵，解除大寫鎖定。" +"請在輸入密碼前按下 Caps Lock 鍵，解除\n" +"大寫鎖定。" #: credui.rc:31 msgid "Caps Lock is On" @@ -3095,11 +3096,11 @@ msgstr "我的最愛(&I)" #: hhctrl.rc:33 msgid "Hide &Tabs" -msgstr "隱藏分頁標籤(&T)" +msgstr "隱藏分頁(&T)" #: hhctrl.rc:34 msgid "Show &Tabs" -msgstr "顯示分頁標籤(&T)" +msgstr "顯示分頁(&T)" #: hhctrl.rc:39 msgid "Show" @@ -3263,7 +3264,7 @@ msgstr "空白頁面(&B)" #: inetcpl.rc:53 msgid "Browsing history" -msgstr "瀏覽記錄" +msgstr "瀏覽歷程" #: inetcpl.rc:54 msgid "You can delete cached pages, cookies and other data." @@ -3279,7 +3280,7 @@ msgstr "設定(&S)…" #: inetcpl.rc:65 msgid "Delete browsing history" -msgstr "刪除瀏覽記錄" +msgstr "刪除瀏覽歷程" #: inetcpl.rc:68 msgid "" @@ -3303,7 +3304,7 @@ msgid "" "History\n" "List of websites you have accessed." msgstr "" -"歷史記錄\n" +"歷程\n" "您曾存取過的網站清單。" #: inetcpl.rc:74 @@ -3504,11 +3505,11 @@ msgstr "在迴圈之外不可有 continue" #: jscript.rc:42 msgid "Label redefined" -msgstr "標籤重複定義" +msgstr "標貼重複定義" #: jscript.rc:43 msgid "Label not found" -msgstr "找不到標籤" +msgstr "找不到標貼" #: jscript.rc:44 msgid "Conditional compilation is turned off" @@ -3952,7 +3953,7 @@ msgstr "無效的層級。\n" #: winerror.mc:491 msgid "No volume label.\n" -msgstr "沒有卷冊標籤。\n" +msgstr "沒有卷冊標貼。\n" #: winerror.mc:496 msgid "Module not found.\n" @@ -3968,7 +3969,7 @@ msgstr "沒有要等待的子行程。\n" #: winerror.mc:511 msgid "Child process has not completed.\n" -msgstr "子行程未已完成。\n" +msgstr "子行程還未完成。\n" #: winerror.mc:516 msgid "Invalid use of direct access handle.\n" @@ -4064,7 +4065,7 @@ msgstr "DosSemMuxWait 清單無效。\n" #: winerror.mc:636 msgid "Volume label too long.\n" -msgstr "卷冊標籤太長。\n" +msgstr "卷冊標貼太長。\n" #: winerror.mc:641 msgid "Too many TCBs.\n" @@ -6012,7 +6013,7 @@ msgstr "不受支援的轉送語法。\n" #: winerror.mc:3086 msgid "Invalid tag.\n" -msgstr "無效的標定。\n" +msgstr "無效的標籤。\n" #: winerror.mc:3091 msgid "Invalid array bounds.\n" @@ -7500,7 +7501,7 @@ msgstr "倒回" #: shdoclc.rc:196 msgid "Trace Tags" -msgstr "追蹤標記" +msgstr "追蹤標籤" #: shdoclc.rc:197 msgid "Resource Failures" @@ -7898,7 +7899,7 @@ msgstr "印表套頁" #: shell32.rc:211 winhlp32.rc:45 msgid "History" -msgstr "記錄" +msgstr "歷程" #: shell32.rc:212 msgid "Program Files" @@ -9311,10 +9312,10 @@ msgstr "" "GOTO 命令在批次檔內將執行順序轉移到另一個\n" "敘述。\n" "\n" -"做為 GOTO 目標之用的標籤長度最多可以是 255 字元，\n" +"做為 GOTO 目標之用的標貼長度最多可以是 255 字元，\n" "但是不可以包含空格 (這是與其他作業系統不同的\n" -"地方)。如果兩個以上相同的標籤存在於批次檔中，\n" -"將會一律執行第一個。試圖前往不存在的標籤會\n" +"地方)。如果兩個以上相同的標貼存在於批次檔中，\n" +"將會一律執行第一個。試圖前往不存在的標貼會\n" "終止批次檔的執行。\n" "\n" "GOTO 用於互動模式中將沒有任何效果。\n" @@ -9355,11 +9356,11 @@ msgid "" "The command will prompt you for the new volume label for the given drive.\n" "You can display the disk volume label with the VOL command.\n" msgstr "" -"LABEL 用於設定磁碟卷冊標籤。\n" +"LABEL 用於設定磁碟卷冊標貼。\n" "\n" "語法：LABEL [裝置代號:]\n" -"命令將向您提示詢問新的卷冊標籤用於給定的儲存裝置。\n" -"您可以利用 VOL 命令來顯示磁碟卷冊標籤。\n" +"命令將向您提示詢問新的卷冊標貼用於給定的儲存裝置。\n" +"您可以利用 VOL 命令來顯示磁碟卷冊標貼。\n" #: cmd.rc:103 msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" @@ -9624,7 +9625,7 @@ msgstr "VER 顯示您正在執行的 cmd 版本。\n" #: cmd.rc:231 msgid "VOL shows the volume label of a disk device.\n" -msgstr "VOL 顯示磁碟裝置的卷冊標籤。\n" +msgstr "VOL 顯示磁碟裝置的卷冊標貼。\n" #: cmd.rc:235 msgid "" @@ -9798,7 +9799,7 @@ msgstr "" "TITLE\t\t設定用於 CMD 作業階段的視窗標題\n" "TYPE\t\t印出文字檔的內容\n" "VER\t\t顯示目前的 CMD 版本\n" -"VOL\t\t顯示磁碟裝置的卷冊標籤\n" +"VOL\t\t顯示磁碟裝置的卷冊標貼\n" "XCOPY\t\t複製來源檔案或樹狀目錄到目的地\n" "EXIT\t\t關閉 CMD\n" "\n" @@ -9880,7 +9881,7 @@ msgstr "開啟 %1 失敗\n" #: cmd.rc:337 msgid "Cannot call batch label outside of a batch script\n" -msgstr "無法呼叫批次命令稿外部的批次標籤\n" +msgstr "無法呼叫批次命令稿外部的批次標貼\n" #: cmd.rc:338 xcopy.rc:42 msgctxt "All key" @@ -9917,7 +9918,7 @@ msgstr "" #: cmd.rc:345 msgid "Volume label (11 characters, <Enter> for none)?" -msgstr "卷冊標籤 (11 個字元，<Enter> 表示沒有)？" +msgstr "卷冊標貼 (11 個字元，<Enter> 表示沒有)？" #: cmd.rc:346 msgid "PATH not found\n" @@ -9949,7 +9950,7 @@ msgstr "位於儲存裝置 %1!c! 的卷冊為 %2\n" #: cmd.rc:353 msgid "Volume in drive %1!c! has no label.\n" -msgstr "位於儲存裝置 %1!c! 的卷冊沒有任何標籤。\n" +msgstr "位於儲存裝置 %1!c! 的卷冊沒有任何標貼。\n" #: cmd.rc:354 msgid " (Yes|No)" @@ -10622,7 +10623,7 @@ msgstr "複製 C&LSID 到剪貼簿" #: oleview.rc:54 msgid "Copy &HTML object Tag to clipboard" -msgstr "複製 &HTML 物件標記到剪貼簿" +msgstr "複製 &HTML 物件標籤到剪貼簿" #: oleview.rc:60 msgid "&Expert mode" @@ -11626,7 +11627,7 @@ msgstr "選擇行(&S)…" #: taskmgr.rc:69 taskmgr.rc:258 msgid "&CPU History" -msgstr "&CPU 記錄" +msgstr "&CPU 歷程" #: taskmgr.rc:71 taskmgr.rc:259 msgid "&One Graph, All CPUs" @@ -11786,11 +11787,11 @@ msgstr "非置換頁" #: taskmgr.rc:414 msgid "CPU usage history" -msgstr "CPU 使用記錄" +msgstr "CPU 使用歷程" #: taskmgr.rc:415 msgid "Memory usage history" -msgstr "記憶體使用記錄" +msgstr "記憶體使用歷程" #: taskmgr.rc:428 taskmgr.rc:327 msgid "Debug Channels" @@ -12145,11 +12146,11 @@ msgstr "在效能圖表上顯示核心使用時間" #: taskmgr.rc:219 msgid "A single history graph shows total CPU usage" -msgstr "在一張記錄圖表顯示所有 CPU 用量" +msgstr "在一張歷程圖表顯示所有 CPU 用量" #: taskmgr.rc:220 msgid "Each CPU has its own history graph" -msgstr "每一個 CPU 有自己的記錄圖表" +msgstr "每一個 CPU 有自己的歷程圖表" #: taskmgr.rc:222 msgid "Brings a task to the foreground, switch focus to that task" @@ -12317,11 +12318,10 @@ msgid "" "data before it is terminated. Are you sure you want to\n" "terminate the process?" msgstr "" -"警告：終止行程可以造成 undesired\n" -"結果包含失真的資料和系統 instability。\n" -"行程將無法被給定的 chance 到儲存它的狀態或\n" -"資料之前它被終止。確定要\n" -"終止行程？" +"警告：終止行程可能造成預料之外的\n" +"結果像是資料的漏失與系統的不穩定。\n" +"行程將無法有機會於終止之前能夠儲存\n" +"它的狀態或資料。您確定要終止行程嗎？" #: taskmgr.rc:311 msgid "Unable to Terminate Process" @@ -12599,7 +12599,7 @@ msgstr "瀏覽(&W)…" #: winecfg.rc:244 msgid "&Label:" -msgstr "標籤(&L)：" +msgstr "標貼(&L)：" #: winecfg.rc:246 msgid "S&erial:" @@ -13021,7 +13021,7 @@ msgstr "啟用(&E)" #: wineconsole.rc:72 msgid "Command history" -msgstr "指令記錄" +msgstr "指令歷程" #: wineconsole.rc:73 msgid "&Number of recalled commands:" @@ -13753,7 +13753,7 @@ msgstr "格式(&O)" #: wordpad.rc:82 wordpad.rc:105 msgid "&Bullet points" -msgstr "要點(&B)" +msgstr "項目符號(&B)" #: wordpad.rc:83 wordpad.rc:106 msgid "&Paragraph..." @@ -13761,7 +13761,7 @@ msgstr "段落(&P)…" #: wordpad.rc:84 msgid "&Tabs..." -msgstr "標籤(&T)…" +msgstr "分頁(&T)…" #: wordpad.rc:85 msgid "Backgroun&d" @@ -13821,11 +13821,11 @@ msgstr "對齊" #: wordpad.rc:239 msgid "Tabs" -msgstr "標籤" +msgstr "分頁" #: wordpad.rc:242 msgid "Tab stops" -msgstr "標籤停點" +msgstr "定位停點" #: wordpad.rc:248 msgid "Remove al&l"

1 0

Hans Leidekker : msi: Restrict the match on files from cabinets to the disk ID.
by Alexandre Julliard 20 Jun '13

20 Jun '13

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

Marcus Meissner : wbemprox: Add missing FindClose() (Coverity).
by Alexandre Julliard 20 Jun '13

20 Jun '13

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

Alexandre Julliard : gdi32: Improve font name localization by not requiring a strict language match.
by Alexandre Julliard 20 Jun '13

20 Jun '13

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

Alexandre Julliard : gdi32: Add support for loading name strings in Macintosh format.
by Alexandre Julliard 20 Jun '13

20 Jun '13

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: Add support for loading name strings in Apple Unicode format.
by Alexandre Julliard 20 Jun '13

20 Jun '13

Module: wine Branch: master Commit: 102b2785f4e9d892fa4ae7a84ccc57792000e5e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=102b2785f4e9d892fa4ae7a84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 21:07:33 2013 +0200 gdi32: Add support for loading name strings in Apple Unicode format. --- dlls/gdi32/freetype.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 468ea4b..2ec7335 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1325,6 +1325,19 @@ static int match_name_table_language( const FT_SfntName *name, LANGID lang ) if (name->language_id >= sizeof(mac_langid_table)/sizeof(mac_langid_table[0])) return 0; name_lang = mac_langid_table[name->language_id]; break; + case TT_PLATFORM_APPLE_UNICODE: + switch (name->encoding_id) + { + case TT_APPLE_ID_DEFAULT: + case TT_APPLE_ID_ISO_10646: + case TT_APPLE_ID_UNICODE_2_0: + if (name->language_id >= sizeof(mac_langid_table)/sizeof(mac_langid_table[0])) return 0; + name_lang = mac_langid_table[name->language_id]; + break; + default: + return 0; + } + break; default: return 0; } @@ -1342,6 +1355,7 @@ static WCHAR *copy_name_table_string( const FT_SfntName *name ) switch (name->platform_id) { + case TT_PLATFORM_APPLE_UNICODE: case TT_PLATFORM_MICROSOFT: ret = HeapAlloc( GetProcessHeap(), 0, name->string_len + sizeof(WCHAR) ); for (i = 0; i < name->string_len / 2; i++)

1 0