January 2012 - Wine-Commits

Aric Stewart : usp10: pwLogClust is ordered so its max will be on one end.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: 2ab625bf2f0a17134d30ea42e4b66314713b95fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ab625bf2f0a17134d30ea42e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 30 07:30:05 2012 -0600 usp10: pwLogClust is ordered so its max will be on one end. --- dlls/usp10/usp10.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 3c1887a..ef8a7ac 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -2309,16 +2309,14 @@ static inline int get_cluster_size(const WORD *pwLogClust, int cChars, int item, static inline int get_glyph_cluster_advance(const int* piAdvance, const SCRIPT_VISATTR *pva, const WORD *pwLogClust, int cGlyphs, int cChars, int glyph, int direction) { int advance; - int log_clust_max = 0; - int i; + int log_clust_max; advance = piAdvance[glyph]; - for (i = 0; i < cChars; i++) - { - if (pwLogClust[i] > log_clust_max) - log_clust_max = pwLogClust[i]; - } + if (pwLogClust[0] > pwLogClust[cChars-1]) + log_clust_max = pwLogClust[0]; + else + log_clust_max = pwLogClust[cChars-1]; if (glyph > log_clust_max) return advance;

1 0

Aric Stewart : user32: Check return code from ScriptStringAnalyse.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: 4bc418b3568ebc8000976674ac069124147396e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bc418b3568ebc8000976674a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 30 07:30:00 2012 -0600 user32: Check return code from ScriptStringAnalyse. --- dlls/user32/edit.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 81cb6cc..ab58145 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -403,6 +403,7 @@ static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData_linedef(EDITSTATE *es, HD HFONT old_font = NULL; HDC udc = dc; SCRIPT_TABDEF tabdef; + HRESULT hr; if (!udc) udc = GetDC(es->hwndSelf); @@ -414,7 +415,15 @@ static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData_linedef(EDITSTATE *es, HD tabdef.pTabStops = es->tabs; tabdef.iTabOrigin = 0; - ScriptStringAnalyse(udc, &es->text[index], line_def->net_length, (1.5*line_def->net_length+16), -1, SSA_LINK|SSA_FALLBACK|SSA_GLYPHS|SSA_TAB, -1, NULL, NULL, NULL, &tabdef, NULL, &line_def->ssa); + hr = ScriptStringAnalyse(udc, &es->text[index], line_def->net_length, + (1.5*line_def->net_length+16), -1, + SSA_LINK|SSA_FALLBACK|SSA_GLYPHS|SSA_TAB, -1, + NULL, NULL, NULL, &tabdef, NULL, &line_def->ssa); + if (FAILED(hr)) + { + WARN("ScriptStringAnalyse failed (%x)\n",hr); + line_def->ssa = NULL; + } if (es->font) SelectObject(udc, old_font);

1 0

Alexandre Julliard : notepad: Use virtkeys for all accelerators.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: 7115ef108b70fe43e7c578b00c8d6ce8226b30cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7115ef108b70fe43e7c578b00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 30 12:13:34 2012 +0100 notepad: Use virtkeys for all accelerators. --- po/ar.po | 114 +++++++++++++++++++++++++++++++------------ po/bg.po | 114 +++++++++++++++++++++++++++++++------------ po/ca.po | 102 ++++++++++++++++++++++++++++---------- po/cs.po | 96 ++++++++++++++++++++++++++++-------- po/da.po | 102 ++++++++++++++++++++++++++++---------- po/de.po | 104 +++++++++++++++++++++++++++++---------- po/el.po | 96 +++++++++++++++++++++++++++--------- po/en.po | 114 +++++++++++++++++++++++++++++++------------ po/en_US.po | 114 +++++++++++++++++++++++++++++++------------ po/eo.po | 96 +++++++++++++++++++++++++++--------- po/es.po | 96 +++++++++++++++++++++++++++--------- po/fa.po | 94 +++++++++++++++++++++++++++-------- po/fi.po | 94 +++++++++++++++++++++++++++-------- po/fr.po | 114 +++++++++++++++++++++++++++++++------------ po/he.po | 102 ++++++++++++++++++++++++++++---------- po/hi.po | 94 +++++++++++++++++++++++++++-------- po/hu.po | 102 ++++++++++++++++++++++++++++---------- po/it.po | 102 ++++++++++++++++++++++++++++---------- po/ja.po | 102 ++++++++++++++++++++++++++++---------- po/ko.po | 114 +++++++++++++++++++++++++++++++------------ po/lt.po | 114 +++++++++++++++++++++++++++++++------------ po/ml.po | 92 +++++++++++++++++++++++++++-------- po/nb_NO.po | 102 ++++++++++++++++++++++++++++---------- po/nl.po | 104 +++++++++++++++++++++++++++++---------- po/or.po | 92 +++++++++++++++++++++++++++-------- po/pa.po | 92 +++++++++++++++++++++++++++-------- po/pl.po | 114 +++++++++++++++++++++++++++++++------------ po/pt_BR.po | 106 +++++++++++++++++++++++++++++----------- po/pt_PT.po | 104 +++++++++++++++++++++++++++++---------- po/rm.po | 92 +++++++++++++++++++++++++++-------- po/ro.po | 104 +++++++++++++++++++++++++++++---------- po/ru.po | 102 ++++++++++++++++++++++++++++---------- po/sk.po | 94 +++++++++++++++++++++++++++-------- po/sl.po | 105 +++++++++++++++++++++++++++++----------- po/sr_RS(a)cyrillic.po | 100 ++++++++++++++++++++++++++++--------- po/sr_RS(a)latin.po | 100 ++++++++++++++++++++++++++++--------- po/sv.po | 102 ++++++++++++++++++++++++++++---------- po/te.po | 92 +++++++++++++++++++++++++++-------- po/th.po | 96 +++++++++++++++++++++++++++--------- po/tr.po | 96 +++++++++++++++++++++++++++--------- po/uk.po | 104 +++++++++++++++++++++++++++++---------- po/wa.po | 94 +++++++++++++++++++++++++++-------- po/wine.pot | 92 +++++++++++++++++++++++++++-------- po/zh_CN.po | 96 +++++++++++++++++++++++++++--------- po/zh_TW.po | 96 +++++++++++++++++++++++++++--------- programs/notepad/notepad.rc | 22 ++++---- 46 files changed, 3412 insertions(+), 1161 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7115ef108b70fe43e7c57…

1 0

Alexandre Julliard : view: Get rid of the quit accelerator.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

1 0

Alexandre Julliard : winefile: Get rid of the exit accelerator.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: 90acb6842590b852d6b6e2142682d842afe2c0db URL: http://source.winehq.org/git/wine.git/?a=commit;h=90acb6842590b852d6b6e2142… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 30 12:12:59 2012 +0100 winefile: Get rid of the exit accelerator. All window managers already have a key shortcut for that. --- po/ar.po | 170 +++++++++++++++++++--------------------- po/bg.po | 170 +++++++++++++++++++--------------------- po/ca.po | 169 +++++++++++++++++++--------------------- po/cs.po | 174 +++++++++++++++++++---------------------- po/da.po | 174 +++++++++++++++++++---------------------- po/de.po | 169 +++++++++++++++++++--------------------- po/el.po | 169 +++++++++++++++++++--------------------- po/en.po | 171 +++++++++++++++++++--------------------- po/en_US.po | 171 +++++++++++++++++++--------------------- po/eo.po | 174 +++++++++++++++++++---------------------- po/es.po | 169 +++++++++++++++++++--------------------- po/fa.po | 170 +++++++++++++++++++--------------------- po/fi.po | 169 +++++++++++++++++++--------------------- po/fr.po | 171 +++++++++++++++++++--------------------- po/he.po | 169 +++++++++++++++++++--------------------- po/hi.po | 169 +++++++++++++++++++--------------------- po/hu.po | 169 +++++++++++++++++++--------------------- po/it.po | 169 +++++++++++++++++++--------------------- po/ja.po | 169 +++++++++++++++++++--------------------- po/ko.po | 171 +++++++++++++++++++--------------------- po/lt.po | 171 +++++++++++++++++++--------------------- po/ml.po | 169 +++++++++++++++++++--------------------- po/nb_NO.po | 174 +++++++++++++++++++---------------------- po/nl.po | 169 +++++++++++++++++++--------------------- po/or.po | 169 +++++++++++++++++++--------------------- po/pa.po | 169 +++++++++++++++++++--------------------- po/pl.po | 171 +++++++++++++++++++--------------------- po/pt_BR.po | 169 +++++++++++++++++++--------------------- po/pt_PT.po | 169 +++++++++++++++++++--------------------- po/rm.po | 170 +++++++++++++++++++--------------------- po/ro.po | 174 +++++++++++++++++++---------------------- po/ru.po | 169 +++++++++++++++++++--------------------- po/sk.po | 169 +++++++++++++++++++--------------------- po/sl.po | 169 +++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 170 +++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 170 +++++++++++++++++++--------------------- po/sv.po | 169 +++++++++++++++++++--------------------- po/te.po | 169 +++++++++++++++++++--------------------- po/th.po | 170 +++++++++++++++++++--------------------- po/tr.po | 169 +++++++++++++++++++--------------------- po/uk.po | 169 +++++++++++++++++++--------------------- po/wa.po | 170 +++++++++++++++++++--------------------- po/wine.pot | 169 +++++++++++++++++++--------------------- po/zh_CN.po | 169 +++++++++++++++++++--------------------- po/zh_TW.po | 169 +++++++++++++++++++--------------------- programs/winefile/winefile.rc | 7 +-- 46 files changed, 3607 insertions(+), 4050 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90acb6842590b852d6b6e…

1 0

Alexandre Julliard : winemine: Get rid of the exit accelerator.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

1 0

Nikolay Sivov : comctl32: Never release state image list.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: 91fbef88bf1801f1a3a62d8648ce689a4c402600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91fbef88bf1801f1a3a62d864… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 29 19:27:17 2012 +0300 comctl32: Never release state image list. --- dlls/comctl32/tests/treeview.c | 27 +++++++++++++++++++++++++-- dlls/comctl32/treeview.c | 14 -------------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index c99d480..8c0ec93 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1607,9 +1607,9 @@ static void test_htreeitem_layout(void) static void test_TVS_CHECKBOXES(void) { - HIMAGELIST himl; + HIMAGELIST himl, himl2; + HWND hTree, hTree2; TVITEMA item; - HWND hTree; DWORD ret; hTree = create_treeview_control(0); @@ -1639,6 +1639,10 @@ static void test_TVS_CHECKBOXES(void) himl = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); ok(himl != NULL, "got %p\n", himl); + himl2 = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); + ok(himl2 != NULL, "got %p\n", himl2); + ok(himl2 == himl, "got %p, expected %p\n", himl2, himl); + item.hItem = hRoot; item.mask = TVIF_STATE; item.state = 0; @@ -1655,6 +1659,25 @@ static void test_TVS_CHECKBOXES(void) expect(TRUE, ret); ok(item.state == INDEXTOSTATEIMAGEMASK(1), "got 0x%x\n", item.state); + /* create another control and check its checkbox list */ + hTree2 = create_treeview_control(0); + fill_tree(hTree2); + + /* set some index for a child */ + item.hItem = hChild; + item.mask = TVIF_STATE; + item.state = INDEXTOSTATEIMAGEMASK(4); + item.stateMask = TVIS_STATEIMAGEMASK; + ret = SendMessageA(hTree2, TVM_SETITEMA, 0, (LPARAM)&item); + expect(TRUE, ret); + + /* enabling check boxes set all items to 1 state image index */ + SetWindowLongA(hTree2, GWL_STYLE, GetWindowLongA(hTree, GWL_STYLE) | TVS_CHECKBOXES); + himl2 = (HIMAGELIST)SendMessageA(hTree2, TVM_GETIMAGELIST, TVSIL_STATE, 0); + ok(himl2 != NULL, "got %p\n", himl2); + ok(himl != himl2, "got %p, expected %p\n", himl2, himl); + + DestroyWindow(hTree2); DestroyWindow(hTree); /* the same, but initially created with TVS_CHECKBOXES */ diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index c5f3bb3..3f4fdc6 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -66,14 +66,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(treeview); -enum StateListType -{ - OriginInternal, - OriginUser -}; - /* internal structures */ - typedef struct _TREEITEM /* HTREEITEM is a _TREEINFO *. */ { HTREEITEM parent; /* handle to parent or 0 if at root */ @@ -162,7 +155,6 @@ typedef struct tagTREEVIEW_INFO HIMAGELIST himlState; int stateImageHeight; int stateImageWidth; - enum StateListType statehimlType; HDPA items; DWORD lastKeyPressTimestamp; @@ -1793,11 +1785,8 @@ TREEVIEW_SetImageList(TREEVIEW_INFO *infoPtr, UINT type, HIMAGELIST himlNew) infoPtr->himlState = himlNew; if (himlNew) - { ImageList_GetIconSize(himlNew, &infoPtr->stateImageWidth, &infoPtr->stateImageHeight); - infoPtr->statehimlType = OriginUser; - } else { infoPtr->stateImageWidth = 0; @@ -4970,7 +4959,6 @@ TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) int nIndex; infoPtr->himlState = ImageList_Create(16, 16, ILC_COLOR | ILC_MASK, 3, 0); - infoPtr->statehimlType = OriginInternal; hdcScreen = GetDC(0); @@ -5134,8 +5122,6 @@ TREEVIEW_Destroy(TREEVIEW_INFO *infoPtr) CloseThemeData (GetWindowTheme (infoPtr->hwnd)); - if (infoPtr->statehimlType == OriginInternal) - ImageList_Destroy(infoPtr->himlState); /* Deassociate treeview from the window before doing anything drastic. */ SetWindowLongPtrW(infoPtr->hwnd, 0, 0);

1 0

Frédéric Delanoy : msi: Avoid dead code in parse_prop (Coverity).
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: ca4fdc57ed6db9c3c56531c81b00f438dc782c38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca4fdc57ed6db9c3c56531c81… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jan 29 23:25:40 2012 +0100 msi: Avoid dead code in parse_prop (Coverity). --- dlls/msi/action.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 665ca63..663a917 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -233,8 +233,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) break; default: state = state_token; - if (!count) in_quotes = 0; - else in_quotes = 1; + in_quotes = 1; len++; break; }

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: c4fb5b898c460dae39f45542bd673c45ce7bf09a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4fb5b898c460dae39f45542b… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Jan 28 19:58:45 2012 +0100 po: Update Polish translation. --- po/pl.po | 301 +++++++++++++++++++++++--------------------------------------- 1 files changed, 111 insertions(+), 190 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4fb5b898c460dae39f45…

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard Jan. 30, 2012

Jan. 30, 2012

Module: wine Branch: master Commit: b55042a7a5552c4bb005dab8ea0ec770722ed941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b55042a7a5552c4bb005dab8e… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Jan 28 23:19:18 2012 +0900 po: Updated Korean translation. --- po/ko.po | 56 ++++++++++++++++++++++++++------------------------------ 1 files changed, 26 insertions(+), 30 deletions(-) diff --git a/po/ko.po b/po/ko.po index 7c6fc96..2484270 100644 --- a/po/ko.po +++ b/po/ko.po @@ -9860,10 +9860,11 @@ msgstr "매개변수 오류\n" msgid "" "Volume Serial Number is %1!04x!-%2!04x!\n" "\n" -msgstr "볼륨 시리얼 번호는 %1!04x!-%2!04x!임\n" +msgstr "" +"볼륨 시리얼 번호는 %1!04x!-%2!04x!임\n" +"\n" #: cmd.rc:318 -#, fuzzy msgid "Volume label (11 characters, <Enter> for none)?" msgstr "볼륨 라벨 (11 글자, ENTER는 없음과 같음)?" @@ -10238,62 +10239,59 @@ msgid "Encoding:" msgstr "인코딩:" #: notepad.rc:129 wordpad.rc:278 -#, fuzzy msgctxt "accelerator Select All" msgid "^A" -msgstr "A" +msgstr "^A" #: notepad.rc:130 wordpad.rc:280 msgctxt "accelerator Copy" msgid "^C" -msgstr "" +msgstr "^C" #: notepad.rc:131 regedit.rc:320 wordpad.rc:276 -#, fuzzy msgctxt "accelerator Find" msgid "^F" -msgstr "F" +msgstr "^F" #: notepad.rc:132 wordpad.rc:277 msgctxt "accelerator Replace" msgid "^H" -msgstr "" +msgstr "^H" #: notepad.rc:133 wordpad.rc:286 -#, fuzzy msgctxt "accelerator New" msgid "^N" -msgstr "아니오" +msgstr "^N" #: notepad.rc:134 wordpad.rc:287 msgctxt "accelerator Open" msgid "^O" -msgstr "" +msgstr "^O" #: notepad.rc:135 regedit.rc:321 wordpad.rc:289 msgctxt "accelerator Print" msgid "^P" -msgstr "" +msgstr "^P" #: notepad.rc:136 wordpad.rc:288 msgctxt "accelerator Save" msgid "^S" -msgstr "" +msgstr "^S" #: notepad.rc:137 msgctxt "accelerator Paste" msgid "^V" -msgstr "" +msgstr "^V" #: notepad.rc:138 wordpad.rc:279 msgctxt "accelerator Cut" msgid "^X" -msgstr "" +msgstr "^X" #: notepad.rc:139 wordpad.rc:281 msgctxt "accelerator Undo" msgid "^Z" -msgstr "" +msgstr "^Z" #: notepad.rc:66 msgid "Page &p" @@ -12303,7 +12301,7 @@ msgstr "오른쪽(&R)" #: view.rc:51 msgctxt "accelerator Quit" msgid "^Q" -msgstr "" +msgstr "^Q" #: view.rc:46 msgid "Regular Metafile Viewer" @@ -13342,17 +13340,17 @@ msgstr "압축(&C)" #: winefile.rc:184 msgid "Version information" -msgstr "버젼 정보(&V)" +msgstr "버젼 정보" #: winefile.rc:201 winemine.rc:99 msgctxt "accelerator Exit" msgid "X" -msgstr "" +msgstr "X" #: winefile.rc:202 msgctxt "accelerator Fullscreen" msgid "^S" -msgstr "" +msgstr "^S" #: winefile.rc:93 msgid "Applying font settings" @@ -13775,43 +13773,42 @@ msgstr "가장자리에서 줄 넘기기(&M)" #: wordpad.rc:260 msgid "Toolbars" -msgstr " 도구바" +msgstr "도구바" #: wordpad.rc:273 msgctxt "accelerator Align Left" msgid "^L" -msgstr "" +msgstr "^L" #: wordpad.rc:274 msgctxt "accelerator Align Center" msgid "^E" -msgstr "" +msgstr "^E" #: wordpad.rc:275 msgctxt "accelerator Align Right" msgid "^R" -msgstr "" +msgstr "^R" #: wordpad.rc:282 -#, fuzzy msgctxt "accelerator Redo" msgid "^Y" -msgstr "예" +msgstr "^Y" #: wordpad.rc:283 msgctxt "accelerator Bold" msgid "^B" -msgstr "" +msgstr "^B" #: wordpad.rc:284 msgctxt "accelerator Italic" msgid "^I" -msgstr "" +msgstr "^I" #: wordpad.rc:285 msgctxt "accelerator Underline" msgid "^U" -msgstr "" +msgstr "^U" #: wordpad.rc:136 msgid "All documents (*.*)" @@ -13977,7 +13974,6 @@ msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "올바르지 않은 매개변수 '%1' - xcopy /?로 도움말을 보시오\n" #: xcopy.rc:29 -#, fuzzy msgid "Press <Enter> to begin copying\n" msgstr "<enter> 를 누르면 복사가 시작될 것입니다\n"

1 0