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

Nikolay Sivov : comctl32/listview: Defaulting to NFR_ANSI on query failure.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: ed250886ccf83c4b3cdd93744f964848f014f4a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed250886ccf83c4b3cdd93744… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 7 15:01:55 2009 +0400 comctl32/listview: Defaulting to NFR_ANSI on query failure. --- dlls/comctl32/listview.c | 10 +- dlls/comctl32/tests/listview.c | 261 ++++++++++++++++++++++++++++++++++------ 2 files changed, 228 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed250886ccf83c4b3cdd9…

1 0

Nikolay Sivov : comctl32/listview: Revert column scrolling recent change, it should be handled differently.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: 839b31fccef3961364e5d8458a60dd182ac53151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=839b31fccef3961364e5d8458… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 7 16:25:06 2009 +0400 comctl32/listview: Revert column scrolling recent change, it should be handled differently. --- dlls/comctl32/listview.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8fc89b6..38f7152 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4675,14 +4675,11 @@ static void LISTVIEW_ScrollColumns(LISTVIEW_INFO *infoPtr, INT nColumn, INT dx) rcCol.left = rcCol.right; /* adjust the other columns */ - for (nCol = 0; nCol < DPA_GetPtrCount(infoPtr->hdpaColumns); nCol++) + for (nCol = nColumn; nCol < DPA_GetPtrCount(infoPtr->hdpaColumns); nCol++) { lpColumnInfo = LISTVIEW_GetColumnInfo(infoPtr, nCol); - if (lpColumnInfo->rcHeader.left >= rcCol.left) - { - lpColumnInfo->rcHeader.left += dx; - lpColumnInfo->rcHeader.right += dx; - } + lpColumnInfo->rcHeader.left += dx; + lpColumnInfo->rcHeader.right += dx; } /* do not update screen if not in report mode */

1 0

Detlef Riekenberg : mlang/tests: Fix failures with IE 5.5 and below.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: fc813b9ec3b13f1dccd2d4621919dd8f0ecefc3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc813b9ec3b13f1dccd2d4621… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jun 6 16:03:22 2009 +0200 mlang/tests: Fix failures with IE 5.5 and below. --- dlls/mlang/tests/mlang.c | 33 +++++++++++++++++++++++---------- 1 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index d646d39..47fcde4 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -53,6 +53,8 @@ typedef struct lcid_tag_table { LPCSTR rfc1766; LCID lcid; HRESULT hr; + LCID broken_lcid; + LPCSTR broken_rfc; } lcid_table_entry; /* en, ar and zh use SUBLANG_NEUTRAL for the rfc1766 name without the country @@ -86,7 +88,7 @@ static const lcid_table_entry lcid_table[] = { {"fr-ca", 0x0c0c, S_OK}, {"fr-ch", 0x100c, S_OK}, {"fr-lu", 0x140c, S_OK}, - {"fr-mc", 0x180c, S_OK}, + {"fr-mc", 0x180c, S_OK, 0x040c}, {"it", 0x0410, S_OK}, {"it-ch", 0x0810, S_OK}, @@ -96,7 +98,7 @@ static const lcid_table_entry lcid_table[] = { {"pl", 0x0415, S_OK}, {"ru", 0x0419, S_OK}, - {"kok", 0x0457, S_OK} + {"kok", 0x0457, S_OK, 0x0412, "x-kok"} }; @@ -901,10 +903,13 @@ static void test_GetLcidFromRfc1766(IMultiLanguage2 *iML2) MultiByteToWideChar(CP_ACP, 0, lcid_table[i].rfc1766, -1, rfc1766W, MAX_RFC1766_NAME); ret = IMultiLanguage2_GetLcidFromRfc1766(iML2, &lcid, rfc1766W); - ok(ret == lcid_table[i].hr, + /* IE <6.0 guess 0x412 (ko) from "kok" */ + ok((ret == lcid_table[i].hr) || + broken(lcid_table[i].broken_lcid && (ret == S_FALSE)), "#%02d: HRESULT 0x%x (expected 0x%x)\n", i, ret, lcid_table[i].hr); - ok(lcid == lcid_table[i].lcid, + ok((lcid == lcid_table[i].lcid) || + broken(lcid == lcid_table[i].broken_lcid), /* IE <6.0 */ "#%02d: got LCID 0x%x (expected 0x%x)\n", i, lcid, lcid_table[i].lcid); } @@ -951,11 +956,13 @@ static void test_Rfc1766ToLcid(void) lcid = -1; ret = Rfc1766ToLcidA(&lcid, lcid_table[i].rfc1766); - ok(ret == lcid_table[i].hr, + /* IE <6.0 guess 0x412 (ko) from "kok" */ + ok( (ret == lcid_table[i].hr) || + broken(lcid_table[i].broken_lcid && (ret == S_FALSE)), "#%02d: HRESULT 0x%x (expected 0x%x)\n", i, ret, lcid_table[i].hr); - - ok(lcid == lcid_table[i].lcid, + ok( (lcid == lcid_table[i].lcid) || + broken(lcid == lcid_table[i].broken_lcid), /* IE <6.0 */ "#%02d: got LCID 0x%x (expected 0x%x)\n", i, lcid, lcid_table[i].lcid); } @@ -992,7 +999,9 @@ static void test_GetRfc1766FromLcid(IMultiLanguage2 *iML2) LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, lcid_table[i].rfc1766, lstrlenA(lcid_table[i].rfc1766) + 1, expected, MAX_RFC1766_NAME); - ok(!lstrcmpA(buffer, expected), + /* IE <6.0 return "x-kok" for LCID 0x457 ("kok") */ + ok( (!lstrcmpA(buffer, expected)) || + broken(!lstrcmpA(buffer, lcid_table[i].broken_rfc)), "#%02d: got '%s' (expected '%s')\n", i, buffer, expected); SysFreeString(rfcstr); @@ -1016,7 +1025,9 @@ static void test_LcidToRfc1766(void) hr = LcidToRfc1766A(lcid_table[i].lcid, buffer, MAX_RFC1766_NAME); - ok(hr == lcid_table[i].hr, + /* IE <5.0 does not recognize 0x180c (fr-mc) and 0x457 (kok) */ + ok( (hr == lcid_table[i].hr) || + broken(lcid_table[i].broken_lcid && (hr == E_FAIL)), "#%02d: HRESULT 0x%x (expected 0x%x)\n", i, hr, lcid_table[i].hr); if (hr != S_OK) @@ -1025,7 +1036,9 @@ static void test_LcidToRfc1766(void) LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, lcid_table[i].rfc1766, lstrlenA(lcid_table[i].rfc1766) + 1, expected, MAX_RFC1766_NAME); - ok(!lstrcmpA(buffer, expected), + /* IE <6.0 return "x-kok" for LCID 0x457 ("kok") */ + ok( (!lstrcmpA(buffer, expected)) || + broken(!lstrcmpA(buffer, lcid_table[i].broken_rfc)), "#%02d: got '%s' (expected '%s')\n", i, buffer, expected); }

1 0

Paul Vriens : winecfg: Fix Dutch translations.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: ee1aa86d2a5956354d63c1f455a451163b401caf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee1aa86d2a5956354d63c1f45… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jun 8 13:23:09 2009 +0200 winecfg: Fix Dutch translations. --- programs/winecfg/Nl.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index fb91290..ad315f7 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -83,11 +83,11 @@ BEGIN COMBOBOX IDC_D3D_VSHADER_MODE,120,108,125,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Pixel Shader toestaan (indien ondersteund door de hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,126,230,10 - GROUPBOX " Screen &Resolution ",IDC_STATIC,8,151,244,93 + GROUPBOX " Scherm &Resolutie ",IDC_STATIC,8,151,244,93 CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,161,187,15 EDITTEXT IDC_RES_DPIEDIT,204,161,23,13,ES_NUMBER|WS_TABSTOP LTEXT "dpi",IDC_STATIC,235,163,10,8 - LTEXT "This is a sample text using 10 point Tahoma",IDC_RES_FONT_PREVIEW,15,181,230,55 + LTEXT "Dit is een tekst voorbeeld in Tahoma met puntgrootte 10",IDC_RES_FONT_PREVIEW,15,181,230,55 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250 @@ -190,11 +190,11 @@ BEGIN COMBOBOX IDC_THEME_COLORCOMBO,15,48,112,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Tekstgrootte:",IDC_THEME_SIZETEXT,135,40,110,8 COMBOBOX IDC_THEME_SIZECOMBO,135,48,110,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Item:",IDC_STATIC,15,64,112,8 + LTEXT "Onderdeel:",IDC_STATIC,15,64,112,8 COMBOBOX IDC_SYSPARAM_COMBO,15,74,112,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Color:",IDC_SYSPARAM_COLOR_TEXT,135,64,25,8,WS_DISABLED + LTEXT "Kleur:",IDC_SYSPARAM_COLOR_TEXT,135,64,25,8,WS_DISABLED PUSHBUTTON "",IDC_SYSPARAM_COLOR,135,74,25,13,WS_DISABLED | BS_OWNERDRAW - LTEXT "Size:",IDC_SYSPARAM_SIZE_TEXT,166,64,30,8,WS_DISABLED + LTEXT "Grootte:",IDC_SYSPARAM_SIZE_TEXT,166,64,30,8,WS_DISABLED EDITTEXT IDC_SYSPARAM_SIZE,166,74,23,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASS,UDS_SETBUDDYINT | WS_DISABLED,187,74,15,13 PUSHBUTTON "Font",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED

1 0

Nikolay Sivov : comctl32/listview: Test showing that Edit box should be positioned after LVN_BEGINLABELEDIT.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: c98dc0da7107fd7cd63faf3cf7c01d38537eed51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c98dc0da7107fd7cd63faf3cf… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jun 6 07:04:43 2009 +0400 comctl32/listview: Test showing that Edit box should be positioned after LVN_BEGINLABELEDIT. --- dlls/comctl32/tests/listview.c | 95 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 91 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 933aa29..e36697b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -29,7 +29,8 @@ #define PARENT_SEQ_INDEX 0 #define PARENT_FULL_SEQ_INDEX 1 #define LISTVIEW_SEQ_INDEX 2 -#define NUM_MSG_SEQUENCES 3 +#define EDITBOX_SEQ_INDEX 3 +#define NUM_MSG_SEQUENCES 4 #define LISTVIEW_ID 0 #define HEADER_ID 1 @@ -39,6 +40,9 @@ "expected (%d,%d), got (%d,%d)\n", expected1, expected2, got1, got2) HWND hwndparent; +/* prevents edit box creation, LVN_BEGINLABELEDIT return value */ +BOOL blockEdit; +static HWND subclass_editbox(HWND hwndListview); static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; @@ -196,6 +200,18 @@ static const struct message getitemposition_seq2[] = { { 0 } }; +static const struct message editbox_create_pos[] = { + /* sequence sent after LVN_BEGINLABELEDIT */ + { WM_WINDOWPOSCHANGING, sent }, + { WM_NCCALCSIZE, sent }, + { WM_WINDOWPOSCHANGED, sent }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_WINDOWPOSCHANGING, sent }, + { WM_WINDOWPOSCHANGED, sent }, + { 0 } +}; + struct subclass_info { WNDPROC oldproc; @@ -230,9 +246,22 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP } add_message(sequences, PARENT_FULL_SEQ_INDEX, &msg); - /* always accept new item text */ - if (message == WM_NOTIFY && lParam && ((NMHDR*)lParam)->code == LVN_ENDLABELEDIT) - return TRUE; + if (message == WM_NOTIFY && lParam) + { + switch (((NMHDR*)lParam)->code) + { + case LVN_BEGINLABELEDIT: + /* subclass edit box */ + if (!blockEdit) + subclass_editbox(((NMHDR*)lParam)->hwndFrom); + + return blockEdit; + + case LVN_ENDLABELEDIT: + /* always accept new item text */ + return TRUE; + } + } defwndproc_counter++; ret = DefWindowProcA(hwnd, message, wParam, lParam); @@ -263,6 +292,8 @@ static HWND create_parent_window(void) if (!register_parent_wnd_class()) return NULL; + blockEdit = FALSE; + return CreateWindowEx(0, "Listview test parent class", "Listview test parent window", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | @@ -402,6 +433,52 @@ static HWND subclass_header(HWND hwndListview) return hwnd; } +static LRESULT WINAPI editbox_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + struct subclass_info *info = (struct subclass_info *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + static LONG defwndproc_counter = 0; + LRESULT ret; + struct message msg; + + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + + /* all we need is sizing */ + if (message == WM_WINDOWPOSCHANGING || + message == WM_NCCALCSIZE || + message == WM_WINDOWPOSCHANGED || + message == WM_MOVE || + message == WM_SIZE) + { + add_message(sequences, EDITBOX_SEQ_INDEX, &msg); + } + + defwndproc_counter++; + ret = CallWindowProcA(info->oldproc, hwnd, message, wParam, lParam); + defwndproc_counter--; + return ret; +} + +static HWND subclass_editbox(HWND hwndListview) +{ + struct subclass_info *info; + HWND hwnd; + + info = HeapAlloc(GetProcessHeap(), 0, sizeof(struct subclass_info)); + if (!info) + return NULL; + + hwnd = (HWND)SendMessage(hwndListview, LVM_GETEDITCONTROL, 0, 0); + info->oldproc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, + (LONG_PTR)editbox_subclass_proc); + SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)info); + + return hwnd; +} + /* Performs a single LVM_HITTEST test */ static void test_lvm_hittest(HWND hwnd, INT x, INT y, INT item, UINT flags, BOOL todo_item, BOOL todo_flags, int line) @@ -2989,6 +3066,16 @@ static void test_editbox(void) ok(!IsWindow(hwndedit), "Expected Edit window to be destroyed\n"); ok(GetFocus() == hwnd, "Expected List to be focused\n"); + /* messaging tests */ + SetFocus(hwnd); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + blockEdit = FALSE; + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + ok(IsWindow(hwndedit), "Expected Edit window to be created\n"); + /* testing only sizing messages */ + ok_sequence(sequences, EDITBOX_SEQ_INDEX, editbox_create_pos, + "edit box create - sizing", TRUE); + DestroyWindow(hwnd); }

1 0

Gerald Pfeifer : wined3d: Use & instead of && for bit test in IWineD3DDeviceImpl_CreateSurface().
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: 7856ac3c19d8f17be871aa86ec6f543cd1bc031b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7856ac3c19d8f17be871aa86e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jun 7 11:33:48 2009 +0200 wined3d: Use & instead of && for bit test in IWineD3DDeviceImpl_CreateSurface(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 16e4062..fe084ca 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1022,7 +1022,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, break; case WINED3DPOOL_DEFAULT: /*TODO: Create offscreen plain can cause this check to fail..., find out if it should */ if(!(Usage & WINED3DUSAGE_DYNAMIC) && !(Usage & WINED3DUSAGE_RENDERTARGET) - && !(Usage && WINED3DUSAGE_DEPTHSTENCIL ) && Lockable) + && !(Usage & WINED3DUSAGE_DEPTHSTENCIL ) && Lockable) WARN("Creating a surface with a POOL of DEFAULT with Lockable true, that doesn't specify DYNAMIC usage.\n"); break; default:

1 0

Nikolay Sivov : comctl32/listview: Edit box should be destroyed on invalid index too (LVM_EDITLABEL).
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: c1115004582371e015a6cbe6ea2cf8bea50a223c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1115004582371e015a6cbe6e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jun 6 01:32:02 2009 +0400 comctl32/listview: Edit box should be destroyed on invalid index too (LVM_EDITLABEL). --- dlls/comctl32/listview.c | 7 ++++--- dlls/comctl32/tests/listview.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8d4f6f3..d302e38 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5060,9 +5060,6 @@ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW) TRACE("(nItem=%d, isW=%d)\n", nItem, isW); if (~infoPtr->dwStyle & LVS_EDITLABELS) return 0; - if (nItem < 0 || nItem >= infoPtr->nItemCount) return 0; - - infoPtr->nEditLabelItem = nItem; /* Is the EditBox still there, if so remove it */ if(infoPtr->hwndEdit != 0) @@ -5071,6 +5068,10 @@ static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *infoPtr, INT nItem, BOOL isW) infoPtr->hwndEdit = 0; } + if (nItem < 0 || nItem >= infoPtr->nItemCount) return 0; + + infoPtr->nEditLabelItem = nItem; + LISTVIEW_SetSelection(infoPtr, nItem); LISTVIEW_SetItemFocus(infoPtr, nItem); LISTVIEW_InvalidateItem(infoPtr, nItem); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 9ecbeed..933aa29 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2957,6 +2957,38 @@ static void test_editbox(void) expect(lstrlen(item.pszText), r); ok(strcmp(buffer, testitem1A) == 0, "Expected item text to change\n"); + /* LVM_EDITLABEL with -1 destroys current edit */ + hwndedit = (HWND)SendMessage(hwnd, LVM_GETEDITCONTROL, 0, 0); + ok(hwndedit == NULL, "Expected Edit window not to be created\n"); + /* no edit present */ + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, -1, 0); + ok(hwndedit == NULL, "Expected Edit window not to be created\n"); + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + ok(IsWindow(hwndedit), "Expected Edit window to be created\n"); + /* edit present */ + ok(GetFocus() == hwndedit, "Expected Edit to be focused\n"); + hwndedit2 = (HWND)SendMessage(hwnd, LVM_EDITLABEL, -1, 0); + ok(hwndedit2 == NULL, "Expected Edit window not to be created\n"); + ok(!IsWindow(hwndedit), "Expected Edit window to be destroyed\n"); + ok(GetFocus() == hwnd, "Expected List to be focused\n"); + /* check another negative value */ + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + ok(IsWindow(hwndedit), "Expected Edit window to be created\n"); + ok(GetFocus() == hwndedit, "Expected Edit to be focused\n"); + hwndedit2 = (HWND)SendMessage(hwnd, LVM_EDITLABEL, -2, 0); + ok(hwndedit2 == NULL, "Expected Edit window not to be created\n"); + ok(!IsWindow(hwndedit), "Expected Edit window to be destroyed\n"); + ok(GetFocus() == hwnd, "Expected List to be focused\n"); + /* and value greater then max item index */ + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + ok(IsWindow(hwndedit), "Expected Edit window to be created\n"); + ok(GetFocus() == hwndedit, "Expected Edit to be focused\n"); + r = SendMessage(hwnd, LVM_GETITEMCOUNT, 0, 0); + hwndedit2 = (HWND)SendMessage(hwnd, LVM_EDITLABEL, r, 0); + ok(hwndedit2 == NULL, "Expected Edit window not to be created\n"); + ok(!IsWindow(hwndedit), "Expected Edit window to be destroyed\n"); + ok(GetFocus() == hwnd, "Expected List to be focused\n"); + DestroyWindow(hwnd); }

1 0

Aurimas Fišeras : winemine: Add Lithuanian translation .
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: e90102d5ff5750183d2bea154a3b29502f4e1662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e90102d5ff5750183d2bea154… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 7 19:07:57 2009 +0300 winemine: Add Lithuanian translation. --- programs/winemine/Lt.rc | 96 +++++++++++++++++++++++++++++++++++++++++++++ programs/winemine/rsrc.rc | 1 + 2 files changed, 97 insertions(+), 0 deletions(-) diff --git a/programs/winemine/Lt.rc b/programs/winemine/Lt.rc new file mode 100644 index 0000000..692717d --- /dev/null +++ b/programs/winemine/Lt.rc @@ -0,0 +1,96 @@ +/* + * WineMine + * Lithuanian Language Support + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE { + IDS_APPNAME, "WineMine" + IDS_NOBODY, "Niekas" + IDS_ABOUT, "Autoriaus teisės 2000 Joshua Thielen" +} + +MENU_WINEMINE MENU DISCARDABLE +{ + POPUP "&Parinktys" { + MENUITEM "&Naujas\tF2", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Žymėti klaustuku", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "P&radedantis", IDM_BEGINNER + MENUITEM "&Pažengęs", IDM_ADVANCED + MENUITEM "Ek&spertas", IDM_EXPERT + MENUITEM "Pasirin&ktas", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "Iš&eiti\tAlt+X", IDM_EXIT + } + POPUP "&Informacija" { + MENUITEM "&Geriausi laikai", IDM_TIMES + MENUITEM "&Apie", IDM_ABOUT + } +} + +DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Geriausi laikai" +{ + GROUPBOX "Geriausi laikai", -1, 10, 10, 140, 45 + LTEXT "Pradedantis", -1, 20, 20, 40, 8 + LTEXT "Pažengęs", -1, 20, 30, 40, 8 + LTEXT "Ekspertas", -1, 20, 40, 40, 8 + LTEXT "999", IDC_TIME1, 70, 20, 15, 8 + LTEXT "999", IDC_TIME2, 70, 30, 15, 8 + LTEXT "999", IDC_TIME3, 70, 40, 15, 8 + LTEXT "", IDC_NAME1, 90, 20, 55, 8 + LTEXT "", IDC_NAME2, 90, 30, 55, 8 + LTEXT "", IDC_NAME3, 90, 40, 55, 8 + DEFPUSHBUTTON "Gerai", IDOK, 55, 60, 50, 15 +} + +DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Sveikiname!" +{ + LTEXT "Įveskite savo vardą", -1, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "Gerai", IDOK, 60, 40, 40, 15 +} + +DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Pasirinktas žaidimas" +{ + LTEXT "Eilutės", -1, 5, 5, 30, 10 + LTEXT "Stulpeliai", -1, 5, 35, 30, 10 + LTEXT "Minos", -1, 5, 65, 30, 10 + EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER + DEFPUSHBUTTON "Gerai", IDOK, 40, 30, 50, 15 + PUSHBUTTON "Atsisakyti", IDCANCEL, 40, 50, 50, 15 +} + +#pragma code_page(default) diff --git a/programs/winemine/rsrc.rc b/programs/winemine/rsrc.rc index 8387ad8..09f5cd3 100644 --- a/programs/winemine/rsrc.rc +++ b/programs/winemine/rsrc.rc @@ -34,6 +34,7 @@ #include "It.rc" #include "Ja.rc" #include "Ko.rc" +#include "Lt.rc" #include "Nl.rc" #include "No.rc" #include "Pl.rc"

1 0

Gerald Pfeifer : user32: Fix logic condition in SPY_DumpStructure().
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: ae0ddb37c231e981875762392d28ed28d7bf8006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae0ddb37c231e981875762392… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jun 7 11:20:54 2009 +0200 user32: Fix logic condition in SPY_DumpStructure(). --- dlls/user32/spy.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 8cd926b..c2bd60b 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -2489,7 +2489,8 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter) SetLastError(save_error); if (strcmpW(TOOLBARCLASSNAMEW, from_class) == 0) dumplen = sizeof(NMTBCUSTOMDRAW)-sizeof(NMHDR); - } else if ((pnmh->code >= HDN_ITEMCHANGINGA) && (pnmh->code <= HDN_ENDDRAG)) { + } else if ( pnmh->code >= HDN_ENDDRAG + && pnmh->code <= HDN_ITEMCHANGINGA ) { dumplen = sizeof(NMHEADERA)-sizeof(NMHDR); } if (dumplen > 0) {

1 0

Gerald Pfeifer : wined3d: Fix (and simplify) the ATI case in IWineD3DImpl_FillGLCaps.
by Alexandre Julliard June 8, 2009

June 8, 2009

Module: wine Branch: master Commit: 6d1a76fb106b71c18ab0368adb0f877af30c0a5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1a76fb106b71c18ab0368ad… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jun 7 14:13:06 2009 +0200 wined3d: Fix (and simplify) the ATI case in IWineD3DImpl_FillGLCaps. --- dlls/wined3d/directx.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6013cfe..05443fc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -615,21 +615,15 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { major = minor = 0; gl_string_cursor = strchr(gl_string, '-'); if (gl_string_cursor) { - int error = 0; gl_string_cursor++; /* Check if version number is of the form x.y.z */ - if (*gl_string_cursor > '9' && *gl_string_cursor < '0') - error = 1; - if (!error && *(gl_string_cursor+2) > '9' && *(gl_string_cursor+2) < '0') - error = 1; - if (!error && *(gl_string_cursor+4) > '9' && *(gl_string_cursor+4) < '0') - error = 1; - if (!error && *(gl_string_cursor+1) != '.' && *(gl_string_cursor+3) != '.') - error = 1; - - /* Mark version number as malformed */ - if (error) + if ( *gl_string_cursor < '0' || *gl_string_cursor > '9' + || *(gl_string_cursor+1) != '.' + || *(gl_string_cursor+2) < '0' || *(gl_string_cursor+2) > '9' + || *(gl_string_cursor+3) != '.' + || *(gl_string_cursor+4) < '0' || *(gl_string_cursor+4) > '9' ) + /* Mark version number as malformed */ gl_string_cursor = 0; }

1 0