wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Detlef Riekenberg : mlang: Return HRESULT from lcid_to_rfc1766 helper.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: e84ae0e720b65606c6c8d962d0c572c50b732d28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e84ae0e720b65606c6c8d962d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 29 22:58:54 2009 +0200 mlang: Return HRESULT from lcid_to_rfc1766 helper. --- dlls/mlang/mlang.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 9cd9a87..bac4e48 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1135,7 +1135,7 @@ HRESULT WINAPI IsConvertINetStringAvailable( return S_FALSE; } -static inline INT lcid_to_rfc1766A( LCID lcid, LPSTR rfc1766, INT len ) +static inline HRESULT lcid_to_rfc1766A( LCID lcid, LPSTR rfc1766, INT len ) { INT n = GetLocaleInfoA( lcid, LOCALE_SISO639LANGNAME, rfc1766, len ); if (n) @@ -1143,12 +1143,12 @@ static inline INT lcid_to_rfc1766A( LCID lcid, LPSTR rfc1766, INT len ) rfc1766[n - 1] = '-'; n += GetLocaleInfoA( lcid, LOCALE_SISO3166CTRYNAME, rfc1766 + n, len - n ); LCMapStringA( LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, rfc1766, n, rfc1766, len ); - return n; + return S_OK; } - return 0; + return E_FAIL; } -static inline INT lcid_to_rfc1766W( LCID lcid, LPWSTR rfc1766, INT len ) +static inline HRESULT lcid_to_rfc1766W( LCID lcid, LPWSTR rfc1766, INT len ) { INT n = GetLocaleInfoW( lcid, LOCALE_SISO639LANGNAME, rfc1766, len ); INT save = n; @@ -1159,9 +1159,9 @@ static inline INT lcid_to_rfc1766W( LCID lcid, LPWSTR rfc1766, INT len ) if (n == save) rfc1766[n - 1] = '\0'; LCMapStringW( LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, rfc1766, n, rfc1766, len ); - return n; + return S_OK; } - return 0; + return E_FAIL; } HRESULT WINAPI LcidToRfc1766A( @@ -1171,10 +1171,7 @@ HRESULT WINAPI LcidToRfc1766A( { TRACE("%04x %p %u\n", lcid, pszRfc1766, nChar); - if (lcid_to_rfc1766A( lcid, pszRfc1766, nChar )) - return S_OK; - - return S_FALSE; + return lcid_to_rfc1766A(lcid, pszRfc1766, nChar); } HRESULT WINAPI LcidToRfc1766W( @@ -1184,10 +1181,7 @@ HRESULT WINAPI LcidToRfc1766W( { TRACE("%04x %p %u\n", lcid, pszRfc1766, nChar); - if (lcid_to_rfc1766W( lcid, pszRfc1766, nChar )) - return S_OK; - - return S_FALSE; + return lcid_to_rfc1766W(lcid, pszRfc1766, nChar); } static HRESULT lcid_from_rfc1766(IEnumRfc1766 *iface, LCID *lcid, LPCWSTR rfc1766) @@ -2239,7 +2233,7 @@ static HRESULT WINAPI fnIMultiLanguage_GetRfc1766FromLcid( TRACE("%p %04x %p\n", iface, lcid, pbstrRfc1766); - if (lcid_to_rfc1766W( lcid, buf, MAX_RFC1766_NAME )) + if (!lcid_to_rfc1766W( lcid, buf, MAX_RFC1766_NAME )) { *pbstrRfc1766 = SysAllocString( buf ); return S_OK; @@ -2794,7 +2788,7 @@ static HRESULT WINAPI fnIMultiLanguage2_GetRfc1766FromLcid( TRACE("%p %04x %p\n", iface, lcid, pbstrRfc1766); - if (lcid_to_rfc1766W( lcid, buf, MAX_RFC1766_NAME )) + if (!lcid_to_rfc1766W( lcid, buf, MAX_RFC1766_NAME )) { *pbstrRfc1766 = SysAllocString( buf ); return S_OK;

1 0

Alexandre Julliard : d3d9/tests: Skip CheckDeviceMultiSampleType test if not available.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 2449eea0fdb4559a199743db2d747977bab6b687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2449eea0fdb4559a199743db2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 14:07:39 2009 +0200 d3d9/tests: Skip CheckDeviceMultiSampleType test if not available. --- dlls/d3d9/tests/device.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index f1d3595..5610a71 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -172,7 +172,12 @@ static void test_checkdevicemultisampletype(void) hr = IDirect3D9_CheckDeviceMultiSampleType(pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, TRUE, D3DMULTISAMPLE_NONE, &qualityLevels); - ok(SUCCEEDED(hr), "CheckDeviceMultiSampleType failed with (%08x)\n", hr); + ok(SUCCEEDED(hr) || hr == D3DERR_NOTAVAILABLE, "CheckDeviceMultiSampleType failed with (%08x)\n", hr); + if(hr == D3DERR_NOTAVAILABLE) + { + skip("IDirect3D9_CheckDeviceMultiSampleType not available\n"); + goto cleanup; + } ok(qualityLevels == 1,"qualitylevel is not 1 but %d\n",qualityLevels); hr = IDirect3D9_CheckDeviceMultiSampleType(pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, FALSE,

1 0

Gerald Pfeifer : msxml3: Tweak two assertions.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 875f0c2470c862bba1d54ff9bf0b337989ded830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=875f0c2470c862bba1d54ff9b… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 31 23:51:44 2009 +0200 msxml3: Tweak two assertions. --- dlls/msxml3/node.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index f33f6f8..19fa4c5 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -369,8 +369,8 @@ static HRESULT WINAPI xmlnode_get_nodeType( TRACE("%p %p\n", This, type); - assert( NODE_ELEMENT == XML_ELEMENT_NODE ); - assert( NODE_NOTATION == XML_NOTATION_NODE ); + assert( (int)NODE_ELEMENT == (int)XML_ELEMENT_NODE ); + assert( (int)NODE_NOTATION == (int)XML_NOTATION_NODE ); *type = This->node->type;

1 0

Eric Pouech : winhlp32: Fix typo in color init.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: a105f924f4c82c4c0eb292b01eb69e850647bc91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a105f924f4c82c4c0eb292b01… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun May 31 21:14:17 2009 +0200 winhlp32: Fix typo in color init. --- programs/winhlp32/winhelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index a0177ee..1639c14 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -286,7 +286,7 @@ HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name) mwi.origin.x = mwi.origin.y = mwi.size.cx = mwi.size.cy = CW_USEDEFAULT; mwi.style = SW_SHOW; mwi.win_style = WS_OVERLAPPEDWINDOW; - mwi.sr_color = mwi.sr_color = 0xFFFFFF; + mwi.sr_color = mwi.nsr_color = 0xFFFFFF; } return &mwi; }

1 0

Eric Pouech : winhlp32: Correctly set the window' s title when no window information is present.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: d67df82636ac5897ba908193b76e6a0f33c9b716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d67df82636ac5897ba908193b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun May 31 21:13:59 2009 +0200 winhlp32: Correctly set the window's title when no window information is present. --- programs/winhlp32/winhelp.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 027bf65..a0177ee 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -274,7 +274,15 @@ HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name) { strcpy(mwi.type, "primary"); strcpy(mwi.name, "main"); - LoadString(Globals.hInstance, STID_WINE_HELP, mwi.caption, sizeof(mwi.caption)); + if (hlpfile->lpszTitle[0]) + { + char tmp[128]; + LoadString(Globals.hInstance, STID_WINE_HELP, tmp, sizeof(tmp)); + snprintf(mwi.caption, sizeof(mwi.caption), "%s %s - %s", + hlpfile->lpszTitle, tmp, hlpfile->lpszPath); + } + else + LoadString(Globals.hInstance, STID_WINE_HELP, mwi.caption, sizeof(mwi.caption)); mwi.origin.x = mwi.origin.y = mwi.size.cx = mwi.size.cy = CW_USEDEFAULT; mwi.style = SW_SHOW; mwi.win_style = WS_OVERLAPPEDWINDOW;

1 0

Nikolay Sivov : comctl32/listview: Some tests for LVM_EDITLABEL.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 5e53ddfc6f40cc17ffe9520b103dc6ad9e3e697d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e53ddfc6f40cc17ffe9520b1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jun 1 02:17:35 2009 +0400 comctl32/listview: Some tests for LVM_EDITLABEL. --- dlls/comctl32/tests/listview.c | 57 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 42b9df6..dd5fd86 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -230,6 +230,10 @@ 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; + defwndproc_counter++; ret = DefWindowProcA(hwnd, message, wParam, lParam); defwndproc_counter--; @@ -2830,6 +2834,58 @@ static void test_getitemrect(void) DestroyWindow(hwnd); } +static void test_editbox(void) +{ + HWND hwnd, hwndedit; + LVITEMA item; + DWORD r; + static CHAR testitemA[] = "testitem"; + static CHAR testitem1A[] = "testitem1"; + static CHAR buffer[10]; + + hwnd = create_listview_control(LVS_EDITLABELS); + ok(hwnd != NULL, "failed to create a listview window\n"); + + insert_column(hwnd, 0); + + memset(&item, 0, sizeof(item)); + item.mask = LVIF_TEXT; + item.pszText = testitemA; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + expect(0, r); + + /* setting focus is necessary */ + SetFocus(hwnd); + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + ok(IsWindow(hwndedit), "Expected Edit window to be created\n"); + + /* modify initial string */ + r = SendMessage(hwndedit, WM_SETTEXT, 0, (LPARAM)testitem1A); + expect(TRUE, r); + /* return focus to listview */ + SetFocus(hwnd); + + memset(&item, 0, sizeof(item)); + item.mask = LVIF_TEXT; + item.pszText = buffer; + item.cchTextMax = 10; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, r); + + ok(strcmp(buffer, testitem1A) == 0, "Expected item text to change\n"); + + /* creating label disabled when control isn't focused */ + SetFocus(0); + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + todo_wine ok(hwndedit == NULL, "Expected Edit window not to be created\n"); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -2878,6 +2934,7 @@ START_TEST(listview) test_getviewrect(); test_getitemposition(); test_columnscreation(); + test_editbox(); DestroyWindow(hwndparent); }

1 0

Nikolay Sivov : comctl32/listview: Fix item bounds calculation for LVS_REPORT style.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 551bb4784a6aa01c049e513326ddaf759c750290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=551bb4784a6aa01c049e51332… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat May 30 20:11:00 2009 +0400 comctl32/listview: Fix item bounds calculation for LVS_REPORT style. --- dlls/comctl32/listview.c | 16 +++---- dlls/comctl32/tests/listview.c | 86 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 7c1aee2..a1aa250 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2045,7 +2045,11 @@ static void LISTVIEW_GetItemMetrics(const LISTVIEW_INFO *infoPtr, const LVITEMW Icon.left = Box.left + state_width; if (uView == LVS_REPORT && lpLVItem->iSubItem == 0) - Icon.left += REPORT_MARGINX; + { + /* we need the indent in report mode */ + assert(lpLVItem->mask & LVIF_INDENT); + Icon.left += infoPtr->iconSize.cx * lpLVItem->iIndent + REPORT_MARGINX; + } Icon.top = Box.top; Icon.right = Icon.left; @@ -2164,16 +2168,10 @@ calc_label: { if (uView == LVS_REPORT) { - SelectBox.left = Icon.right; /* FIXME: should be Icon.left */ + SelectBox.left = Icon.left; SelectBox.top = Box.top; SelectBox.bottom = Box.bottom; - if (lpLVItem->iSubItem == 0) - { - /* we need the indent in report mode */ - assert(lpLVItem->mask & LVIF_INDENT); - SelectBox.left += infoPtr->iconSize.cx * lpLVItem->iIndent; - } - SelectBox.right = min(SelectBox.left + labelSize.cx, Label.right); + SelectBox.right = min(Label.left + labelSize.cx, Label.right); } else { diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index b6a44c8..42b9df6 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2741,6 +2741,92 @@ static void test_getitemrect(void) expect(18, rect.left); expect(50, rect.right); + r = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)NULL); + ok(r != 0, "should return current list handle\n"); + + r = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)himl); + ok(r == 0, "should return zero\n"); + + item.mask = LVIF_STATE | LVIF_IMAGE; + item.iImage = 1; + item.state = 0; + item.stateMask = ~0; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_SETITEM, 0, (LPARAM)&item); + expect(TRUE, r); + + /* icon bounds */ + rect.left = LVIR_ICON; + rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* padding, icon width */ + expect(2, rect.left); + expect(18, rect.right); + /* label bounds */ + rect.left = LVIR_LABEL; + rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* padding + icon width -> column width */ + expect(18, rect.left); + expect(50, rect.right); + + /* select bounds */ + rect.left = LVIR_SELECTBOUNDS; + rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* padding, column width */ + expect(2, rect.left); + todo_wine expect(50, rect.right); + + /* try with indentation */ + item.mask = LVIF_INDENT; + item.iIndent = 1; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_SETITEM, 0, (LPARAM)&item); + expect(TRUE, r); + + /* bounds */ + rect.left = LVIR_BOUNDS; + rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* padding + 1 icon width, column width */ + expect(0, rect.left); + expect(150, rect.right); + + /* select bounds */ + rect.left = LVIR_SELECTBOUNDS; + rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* padding + 1 icon width, column width */ + expect(2 + 16, rect.left); + todo_wine expect(50, rect.right); + + /* label bounds */ + rect.left = LVIR_LABEL; + rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* padding + 2 icon widths, column width */ + expect(2 + 16*2, rect.left); + expect(50, rect.right); + + /* icon bounds */ + rect.left = LVIR_ICON; + rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* padding + 1 icon width indentation, icon width */ + expect(2 + 16, rect.left); + expect(34, rect.right); + + DestroyWindow(hwnd); }

1 0

Nikolay Sivov : comctl32/listview: Item horizontal position isn' t applied for any item bounds on LVS_REPORT.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 8cf54c5645bdbd9991de3f4b87f9bced0dfde69e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf54c5645bdbd9991de3f4b8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat May 30 01:43:18 2009 +0400 comctl32/listview: Item horizontal position isn't applied for any item bounds on LVS_REPORT. --- dlls/comctl32/listview.c | 6 +-- dlls/comctl32/tests/listview.c | 66 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 1c84f02..7c1aee2 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2158,7 +2158,7 @@ calc_label: } /************************************************************/ - /* compute STATEICON bounding box */ + /* compute SELECT bounding box */ /************************************************************/ if (doSelectBox) { @@ -5928,7 +5928,6 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT BOOL doLabel = TRUE, oversizedBox = FALSE; POINT Position, Origin; LVITEMW lvItem; - INT type; TRACE("(hwnd=%p, nItem=%d, lprc=%p)\n", infoPtr->hwndSelf, nItem, lprc); @@ -5963,7 +5962,6 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT lvItem.state = (oversizedBox ? LVIS_FOCUSED : 0); } - type = lprc->left; if (uView == LVS_REPORT && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) && lprc->left == LVIR_SELECTBOUNDS) lprc->left = LVIR_BOUNDS; switch(lprc->left) @@ -5989,7 +5987,7 @@ static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT return FALSE; } - if ((uView == LVS_REPORT) && (type == LVIR_BOUNDS)) + if (uView == LVS_REPORT) OffsetRect(lprc, Origin.x, Position.y + Origin.y); else OffsetRect(lprc, Position.x + Origin.x, Position.y + Origin.y); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 217c2ee..b6a44c8 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2597,6 +2597,8 @@ static void test_columnscreation(void) static void test_getitemrect(void) { HWND hwnd; + HIMAGELIST himl; + HBITMAP hbm; RECT rect; DWORD r; LVITEMA item; @@ -2650,7 +2652,24 @@ static void test_getitemrect(void) r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); expect(TRUE, r); /* padding */ - todo_wine expect(2, rect.left); + expect(2, rect.left); + + rect.left = LVIR_LABEL; + rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* padding, column width */ + expect(2, rect.left); + expect(50, rect.right); + + /* no icons attached */ + rect.left = LVIR_ICON; + rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* padding */ + expect(2, rect.left); + expect(2, rect.right); /* change order */ order[0] = 1; order[1] = 0; @@ -2677,6 +2696,51 @@ static void test_getitemrect(void) /* column width + padding */ todo_wine expect(102, rect.left); + /* back to initial order */ + order[0] = 0; order[1] = 1; + r = SendMessage(hwnd, LVM_SETCOLUMNORDERARRAY, 2, (LPARAM)&order); + expect(TRUE, r); + + /* state icons */ + himl = ImageList_Create(16, 16, 0, 2, 2); + ok(himl != NULL, "failed to create imagelist\n"); + hbm = CreateBitmap(16, 16, 1, 1, NULL); + ok(hbm != NULL, "failed to create bitmap\n"); + r = ImageList_Add(himl, hbm, 0); + ok(r == 0, "should be zero\n"); + hbm = CreateBitmap(16, 16, 1, 1, NULL); + ok(hbm != NULL, "failed to create bitmap\n"); + r = ImageList_Add(himl, hbm, 0); + ok(r == 1, "should be one\n"); + + r = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)himl); + ok(r == 0, "should return zero\n"); + + item.mask = LVIF_STATE; + item.state = INDEXTOSTATEIMAGEMASK(1); + item.stateMask = LVIS_STATEIMAGEMASK; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_SETITEM, 0, (LPARAM)&item); + expect(TRUE, r); + + /* icon bounds */ + rect.left = LVIR_ICON; + rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* padding + stateicon width */ + expect(18, rect.left); + expect(18, rect.right); + /* label bounds */ + rect.left = LVIR_LABEL; + rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* padding + stateicon width -> column width */ + expect(18, rect.left); + expect(50, rect.right); + DestroyWindow(hwnd); }

1 0

Stefan Leichter : kernel32: Fix spec of QueryFullProcessImageNameW.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: d56839f64ec7774bcc3f38c60efd0af205499b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56839f64ec7774bcc3f38c60… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun May 31 19:52:33 2009 +0200 kernel32: Fix spec of QueryFullProcessImageNameW. --- dlls/kernel32/kernel32.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a73ea1b..b555621 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -866,7 +866,7 @@ @ stdcall QueryDosDeviceA(str ptr long) @ stdcall QueryDosDeviceW(wstr ptr long) @ stub QueryFullProcessImageNameA -@ stdcall QueryFullProcessImageNameW(ptr long wstr ptr) +@ stdcall QueryFullProcessImageNameW(ptr long ptr ptr) @ stdcall QueryInformationJobObject(long long ptr long ptr) # @ stub QueryMemoryResourceNotification @ stub QueryNumberOfEventLogRecords

1 0

Eric Pouech : winhlp32: Now manage windows with refcounts.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 82ffc04ef3b98c0cdc70b0c4ad373dd569c4c082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82ffc04ef3b98c0cdc70b0c4a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat May 30 14:27:04 2009 +0200 winhlp32: Now manage windows with refcounts. --- programs/winhlp32/macro.c | 6 ++-- programs/winhlp32/macro.lex.l | 3 +- programs/winhlp32/winhelp.c | 67 +++++++++++++++++++++++++++++++---------- programs/winhlp32/winhelp.h | 3 ++ 4 files changed, 59 insertions(+), 20 deletions(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index 3383545..c2fc3cc 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -281,7 +281,7 @@ static void CALLBACK MACRO_CloseSecondarys(void) WINE_TRACE("()\n"); for (win = Globals.win_list; win; win = win->next) if (lstrcmpi(win->info->name, "main")) - DestroyWindow(win->hMainWnd); + WINHELP_ReleaseWindow(win); } static void CALLBACK MACRO_CloseWindow(LPCSTR lpszWindow) @@ -294,7 +294,7 @@ static void CALLBACK MACRO_CloseWindow(LPCSTR lpszWindow) for (win = Globals.win_list; win; win = win->next) if (!lstrcmpi(win->info->name, lpszWindow)) - DestroyWindow(win->hMainWnd); + WINHELP_ReleaseWindow(win); } static void CALLBACK MACRO_Compare(LPCSTR str) @@ -367,7 +367,7 @@ void CALLBACK MACRO_Exit(void) WINE_TRACE("()\n"); while (Globals.win_list) - DestroyWindow(Globals.win_list->hMainWnd); + WINHELP_ReleaseWindow(Globals.win_list); } static void CALLBACK MACRO_ExtAbleItem(LPCSTR str, LONG u) diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l index bf65fa0..67926cb 100644 --- a/programs/winhlp32/macro.lex.l +++ b/programs/winhlp32/macro.lex.l @@ -285,7 +285,7 @@ BOOL MACRO_ExecuteMacro(WINHELP_WINDOW* window, LPCSTR macro) memset(lex_data, 0, sizeof(*lex_data)); lex_data->macroptr = macro; - lex_data->window = window; + lex_data->window = WINHELP_GrabWindow(window); while ((t = yylex()) != EMPTY) { @@ -316,6 +316,7 @@ done: for (t = 0; t < lex_data->cache_used; t++) HeapFree(GetProcessHeap(), 0, lex_data->cache_string[t]); lex_data = prev_lex_data; + WINHELP_ReleaseWindow(window); return ret; } diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 8e6ba50..027bf65 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -500,11 +500,39 @@ static void WINHELP_DeletePageLinks(HLPFILE_PAGE* page) /*********************************************************************** * + * WINHELP_GrabWindow + */ +WINHELP_WINDOW* WINHELP_GrabWindow(WINHELP_WINDOW* win) +{ + WINE_TRACE("Grab %p#%d++\n", win, win->ref_count); + win->ref_count++; + return win; +} + +/*********************************************************************** + * + * WINHELP_RelaseWindow + */ +BOOL WINHELP_ReleaseWindow(WINHELP_WINDOW* win) +{ + WINE_TRACE("Release %p#%d--\n", win, win->ref_count); + + if (!--win->ref_count) + { + DestroyWindow(win->hMainWnd); + return FALSE; + } + return TRUE; +} + +/*********************************************************************** + * * WINHELP_DeleteWindow */ static void WINHELP_DeleteWindow(WINHELP_WINDOW* win) { WINHELP_WINDOW** w; + BOOL bExit; for (w = &Globals.win_list; *w; w = &(*w)->next) { @@ -514,6 +542,7 @@ static void WINHELP_DeleteWindow(WINHELP_WINDOW* win) break; } } + bExit = (Globals.wVersion >= 4 && !lstrcmpi(win->info->name, "main")); if (Globals.active_win == win) { @@ -537,6 +566,10 @@ static void WINHELP_DeleteWindow(WINHELP_WINDOW* win) if (win->page) HLPFILE_FreeHlpFile(win->page->file); HeapFree(GetProcessHeap(), 0, win); + + if (bExit) MACRO_Exit(); + if (!Globals.win_list) + PostQuitMessage(0); } static char* WINHELP_GetCaption(WINHELP_WNDPAGE* wpage) @@ -706,9 +739,11 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe win->hHandCur = LoadCursorW(0, (LPWSTR)IDC_HAND); win->back.index = 0; win->font_scale = 1; + WINHELP_GrabWindow(win); } win->page = wpage->page; win->info = wpage->wininfo; + WINHELP_GrabWindow(win); if (!bPopup && wpage->page && remember) { @@ -772,6 +807,14 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe for (macro = wpage->page->first_macro; macro; macro = macro->next) MACRO_ExecuteMacro(win, macro->lpszMacro); } + /* See #17681, in some cases, the newly created window is closed by the macros it contains + * (braindead), so deal with this case + */ + for (win = Globals.win_list; win; win = win->next) + { + if (!lstrcmpi(win->info->name, wpage->wininfo->name)) break; + } + if (!win || !WINHELP_ReleaseWindow(win)) return TRUE; if (bPopup) { @@ -883,7 +926,7 @@ static BOOL WINHELP_HandleTextMouse(WINHELP_WINDOW* win, UINT msg, LPARAM lParam */ static BOOL WINHELP_CheckPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT* lret) { - HWND hPopup; + WINHELP_WINDOW* popup; if (!Globals.active_popup) return FALSE; @@ -916,9 +959,9 @@ static BOOL WINHELP_CheckPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam case WM_NCLBUTTONDOWN: case WM_NCMBUTTONDOWN: case WM_NCRBUTTONDOWN: - hPopup = Globals.active_popup->hMainWnd; + popup = Globals.active_popup; Globals.active_popup = NULL; - DestroyWindow(hPopup); + WINHELP_ReleaseWindow(popup); return TRUE; } return FALSE; @@ -1422,7 +1465,8 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, switch (msgf->msg) { case WM_KEYUP: - if (msgf->wParam == VK_ESCAPE) DestroyWindow(hWnd); + if (msgf->wParam == VK_ESCAPE) + WINHELP_ReleaseWindow((WINHELP_WINDOW*)GetWindowLongPtr(hWnd, 0)); break; case WM_RBUTTONDOWN: { @@ -1486,18 +1530,9 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_LARGE, MF_BYCOMMAND | (win->font_scale == 2) ? MF_CHECKED : 0); break; - - case WM_NCDESTROY: - { - BOOL bExit; - win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); - bExit = (Globals.wVersion >= 4 && !lstrcmpi(win->info->name, "main")); - WINHELP_DeleteWindow(win); - - if (bExit) MACRO_Exit(); - if (!Globals.win_list) - PostQuitMessage(0); - } + case WM_DESTROY: + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); + WINHELP_DeleteWindow(win); break; } return DefWindowProc(hWnd, msg, wParam, lParam); diff --git a/programs/winhlp32/winhelp.h b/programs/winhlp32/winhelp.h index 70e2dc2..e770cb5 100644 --- a/programs/winhlp32/winhelp.h +++ b/programs/winhlp32/winhelp.h @@ -71,6 +71,7 @@ typedef struct tagPageSet typedef struct tagWinHelp { + unsigned ref_count; WINHELP_BUTTON* first_button; HLPFILE_PAGE* page; @@ -151,6 +152,8 @@ void WINHELP_DeleteBackSet(WINHELP_WINDOW*); HLPFILE* WINHELP_LookupHelpFile(LPCSTR lpszFile); HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name); void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win); +WINHELP_WINDOW* WINHELP_GrabWindow(WINHELP_WINDOW*); +BOOL WINHELP_ReleaseWindow(WINHELP_WINDOW*); extern const char MAIN_WIN_CLASS_NAME[]; extern const char BUTTON_BOX_WIN_CLASS_NAME[];

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2009