January 2012 - Wine-commits

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

30 Jan '12

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

Christian Costa : d3dx9_36: Remove TGA from TODO since it is supported.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 0a23797f1be167b6f92713ecfa49584da0bd555c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a23797f1be167b6f92713ecf… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jan 30 01:17:23 2012 +0100 d3dx9_36: Remove TGA from TODO since it is supported. --- dlls/d3dx9_36/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index fea7f1e..c3796ee 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -64,7 +64,7 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D if (!warn_once++) FIXME("(%p, %d, %p): partially implemented\n", data, datasize, info); - /* TODO: Add support for (or at least detect) TGA, DDS, PPM and DIB */ + /* TODO: Add support for (or at least detect) DDS, PPM and DIB */ if (!data || !datasize) return D3DERR_INVALIDCALL;

1 0

Nikolay Sivov : comctl32: Never release state image list.
by Alexandre Julliard 30 Jan '12

30 Jan '12

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

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 17f09513ef2b9ae6b1bf768d1001be3ee8b8ab21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17f09513ef2b9ae6b1bf768d1… Author: Luca Bennati <lucak3(a)gmail.com> Date: Fri Jan 27 21:52:16 2012 +0100 po: Update Italian translation. --- po/it.po | 113 +++++++++++++++++++++++++++++++------------------------------ 1 files changed, 57 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17f09513ef2b9ae6b1bf7…

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 30 Jan '12

30 Jan '12

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

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

30 Jan '12

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

Alexandre Julliard : wrc: Fix parsing of virtkey accelerators.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 811da88cfcd86a7f6da9ba7d3e0f23e9fdeb2660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=811da88cfcd86a7f6da9ba7d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 30 12:12:19 2012 +0100 wrc: Fix parsing of virtkey accelerators. --- tools/wrc/genres.c | 2 ++ tools/wrc/parser.y | 43 ------------------------------------------- 2 files changed, 2 insertions(+), 43 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index edf4823..e49d8a5 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -282,6 +282,7 @@ static int parse_accel_string( const string_t *key, int flags ) if(key->type == str_char) { + if (key->str.cstr[0] == '#') return 0; /* ignore message contexts */ if((flags & WRC_AF_VIRTKEY) && !((key->str.cstr[0] >= 'A' && key->str.cstr[0] <= 'Z') || (key->str.cstr[0] >= '0' && key->str.cstr[0] <= '9'))) @@ -309,6 +310,7 @@ static int parse_accel_string( const string_t *key, int flags ) } else { + if (key->str.wstr[0] == '#') return 0; /* ignore message contexts */ if((flags & WRC_AF_VIRTKEY) && !((key->str.wstr[0] >= 'A' && key->str.wstr[0] <= 'Z') || (key->str.wstr[0] >= '0' && key->str.wstr[0] <= '9'))) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index efcc050..4cc37ac 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -2175,52 +2175,9 @@ static event_t *add_event(int key, int id, int flags, event_t *prev) static event_t *add_string_event(string_t *key, int id, int flags, event_t *prev) { - int keycode = 0; event_t *ev = new_event(); - if(key->type == str_char) - { - if((flags & WRC_AF_VIRTKEY) && - !((key->str.cstr[0] >= 'A' && key->str.cstr[0] <= 'Z') || - (key->str.cstr[0] >= '0' && key->str.cstr[0] <= '9'))) - yyerror("VIRTKEY code is not equal to ascii value"); - - if(key->str.cstr[0] == '^' && (flags & WRC_AF_CONTROL) != 0) - { - yyerror("Cannot use both '^' and CONTROL modifier"); - } - else if(key->str.cstr[0] == '^') - { - keycode = toupper((unsigned char)key->str.cstr[1]) - '@'; - if(keycode >= ' ') - yyerror("Control-code out of range"); - } - else - keycode = key->str.cstr[0]; - } - else - { - if((flags & WRC_AF_VIRTKEY) && - !((key->str.wstr[0] >= 'A' && key->str.wstr[0] <= 'Z') || - (key->str.wstr[0] >= '0' && key->str.wstr[0] <= '9'))) - yyerror("VIRTKEY code is not equal to ascii value"); - - if(key->str.wstr[0] == '^' && (flags & WRC_AF_CONTROL) != 0) - { - yyerror("Cannot use both '^' and CONTROL modifier"); - } - else if(key->str.wstr[0] == '^') - { - keycode = toupperW(key->str.wstr[1]) - '@'; - if(keycode >= ' ') - yyerror("Control-code out of range"); - } - else - keycode = key->str.wstr[0]; - } - ev->str = key; - ev->key = keycode; ev->id = id; ev->flags = flags & ~WRC_AF_ASCII; ev->prev = prev;

1 0

Alexandre Julliard : Wine release 1.4-rc1
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: website Branch: master Commit: bb585096cf9067cd812cb840270ff142de13225a URL: http://source.winehq.org/git/website.git/?a=commit;h=bb585096cf9067cd812cb8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 27 20:58:13 2012 +0100 Wine release 1.4-rc1 --- news/en/2012012701.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2012012701.xml b/news/en/2012012701.xml new file mode 100644 index 0000000..24e39b2 --- /dev/null +++ b/news/en/2012012701.xml @@ -0,0 +1,18 @@ +<news> +<date>January 27, 2012</date> +<title>Wine 1.4-rc1 Released</title> +<body> + The Wine development release 1.4-rc1 is now available. + This is the first release candidate for the upcoming Wine 1.4. It marks the beginning of the code freeze period. Please give this release a good testing to help us make 1.4 as good as possible. + <a href="{$root}/announce/1.4-rc1">What's new</a> in this release: +<ul> + <li>Improved crash dialog with support for saving the backtrace.</li> + <li>Support for the Back button in built-in Internet Explorer.</li> + <li>Keyboard accelerators can now be translated through po files.</li> + <li>A number of installer fixes.</li> + <li>Many translation updates and tweaks.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc1.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.4-rc1.
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: master Commit: f0cfa7cf46d7c832fb84555529d1a1b7c49c46c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0cfa7cf46d7c832fb8455552… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 27 20:47:46 2012 +0100 Release 1.4-rc1. --- ANNOUNCE | 1194 ++++++++++++++++++++++++++++++++++--------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 670 insertions(+), 544 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0cfa7cf46d7c832fb845…

1 0

Tag wine-1.4-rc1 : Alexandre Julliard : Release 1.4-rc1
by Alexandre Julliard 27 Jan '12

27 Jan '12

Module: wine Branch: refs/tags/wine-1.4-rc1 Tag: ccebc894c5f23fa5bef79a6f20204a9991fbc4be URL: http://source.winehq.org/git/wine.git/?a=tag;h=ccebc894c5f23fa5bef79a6f2020… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 27 20:47:47 2012 +0100 Release 1.4-rc1

1 0