March 2007 - Wine-commits - list.winehq.org

Felix Nawothnig : gdi32: Add PS_ALTERNATE tests.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 7fc0becf6ef4b3a8a4fae02afb781bae3f30b38a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fc0becf6ef4b3a8a4fae02af… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Mon Mar 12 20:47:17 2007 +0100 gdi32: Add PS_ALTERNATE tests. --- dlls/gdi32/tests/pen.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index 77b1044..77073f1 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -28,6 +28,8 @@ #include "wine/test.h" +#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) + static void test_logpen(void) { static const struct @@ -427,7 +429,61 @@ else } } +static unsigned int atoi2(const char *s) +{ + unsigned int ret = 0; + while(*s) ret = (ret << 1) | (*s++ == '1'); + return ret; +} + +#define TEST_LINE(x1, x2, z) \ + { int buf = 0; \ + SetBitmapBits(bmp, sizeof(buf), &buf); \ + MoveToEx(hdc, x1, 0, NULL); \ + LineTo(hdc, x2, 0); \ + GetBitmapBits(bmp, sizeof(buf), &buf); \ + expect(atoi2(z), buf); } + +static void test_ps_alternate(void) +{ + HDC hdc; + HBITMAP bmp; + HPEN pen; + LOGBRUSH lb; + + lb.lbStyle = BS_SOLID; + lb.lbColor = RGB(0xff,0xff,0xff); + + SetLastError(0xdeadbeef); + pen = ExtCreatePen(PS_COSMETIC|PS_ALTERNATE, 1, &lb, 0, NULL); + if(pen == NULL && GetLastError() == 0xdeadbeef) { + skip("looks like 9x, skipping PS_ALTERNATE tests\n"); + return; + } + ok(pen != NULL, "gle=%d\n", GetLastError()); + hdc = CreateCompatibleDC(NULL); + ok(hdc != NULL, "gle=%d\n", GetLastError()); + bmp = CreateBitmap(8, 1, 1, 1, NULL); + ok(bmp != NULL, "gle=%d\n", GetLastError()); + ok(SelectObject(hdc, bmp) != NULL, "gle=%d\n", GetLastError()); + ok(SelectObject(hdc, pen) != NULL, "gle=%d\n", GetLastError()); + ok(SetBkMode(hdc, TRANSPARENT), "gle=%d\n", GetLastError()); + + TEST_LINE(0, 1, "10000000") + TEST_LINE(0, 2, "10000000") + TEST_LINE(0, 3, "10100000") + TEST_LINE(0, 4, "10100000") + TEST_LINE(1, 4, "01010000") + TEST_LINE(1, 5, "01010000") + TEST_LINE(4, 8, "00001010") + + DeleteObject(pen); + DeleteObject(bmp); + DeleteDC(hdc); +} + START_TEST(pen) { test_logpen(); + test_ps_alternate(); }

1 0

Chris Robinson : quartz: Avoid asserting from used samples on allocator release.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 2e726e6e1120342a67ac226bec28cf7a0386d227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e726e6e1120342a67ac226be… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Mar 13 10:26:48 2007 -0700 quartz: Avoid asserting from used samples on allocator release. --- dlls/quartz/memallocator.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index d36b83c..9167990 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -490,7 +490,10 @@ static ULONG WINAPI StdMediaSample2_Release(IMediaSample2 * iface) if (!ref) { - IMemAllocator_ReleaseBuffer(This->pParent, (IMediaSample *)iface); + if (This->pParent) + IMemAllocator_ReleaseBuffer(This->pParent, (IMediaSample *)iface); + else + StdMediaSample2_Delete(This); return 0; } return ref; @@ -813,7 +816,17 @@ static HRESULT StdMemAllocator_Free(IMemAllocator * iface) StdMemAllocator *This = (StdMemAllocator *)iface; struct list * cursor; - assert(list_empty(&This->base.used_list)); + if (!list_empty(&This->base.used_list)) + { + WARN("Freeing allocator with outstanding samples!\n"); + while ((cursor = list_head(&This->base.used_list)) != NULL) + { + StdMediaSample2 *pSample; + list_remove(cursor); + pSample = LIST_ENTRY(cursor, StdMediaSample2, listentry); + pSample->pParent = NULL; + } + } while ((cursor = list_head(&This->base.free_list)) != NULL) {

1 0

Mikołaj Zalewski : wordpad: Update Polish translation.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: f215727c0303daab45bc40451fdd3bd49890f182 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f215727c0303daab45bc40451… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Mar 12 11:07:02 2007 +0100 wordpad: Update Polish translation. --- programs/wordpad/Pl.rc | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index cd76e0f..2c277e4 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -67,3 +67,10 @@ BEGIN END END END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_RICHTEXT_FILES_RTF, "Tekst sformatowany - RTF (*.rtf)" + STRING_TEXT_FILES_TXT, "Dokument tekstowy (*.txt)" + STRING_ALL_FILES, "Wszystkie dokumenty (*.*)" +END

1 0

Mikołaj Zalewski : localspl: Add Polish translation.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 8afb94837dcc4c539ff8426370952bd3866dee80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8afb94837dcc4c539ff842637… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Mar 12 11:07:59 2007 +0100 localspl: Add Polish translation. --- dlls/localspl/localspl.rc | 1 + dlls/localspl/spl_Pl.rc | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/localspl.rc b/dlls/localspl/localspl.rc index 73d58d8..be6d933 100644 --- a/dlls/localspl/localspl.rc +++ b/dlls/localspl/localspl.rc @@ -41,3 +41,4 @@ #include "spl_Fr.rc" #include "spl_Ko.rc" #include "spl_No.rc" +#include "spl_Pl.rc" diff --git a/dlls/localspl/spl_Pl.rc b/dlls/localspl/spl_Pl.rc new file mode 100644 index 0000000..9f63b69 --- /dev/null +++ b/dlls/localspl/spl_Pl.rc @@ -0,0 +1,30 @@ +/* + * Polish resources for localspl + * + * Copyright 2005 Huw Davies + * Copyright 2006 Detlef Riekenberg + * Copyright 2007 Mikolaj Zalewski + * + * 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 + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Port lokalny" + IDS_LOCALMONITOR "Monitor lokalny" + IDS_NOTHINGTOCONFIG "Ten port nie ma opcji do skonfigurowania" +}

1 0

Chris Robinson : quartz: Cleanup properly around error conditions and avoid a potential infinite loop .
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 559d541cf8f42e5418710d1288eaaa15e2602f4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=559d541cf8f42e5418710d128… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Mar 13 10:21:17 2007 -0700 quartz: Cleanup properly around error conditions and avoid a potential infinite loop. --- dlls/quartz/acmwrapper.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 4b2d143..344779c 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -78,7 +78,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt); if (FAILED(hr)) { ERR("Unable to retrieve media type\n"); - goto error; + return hr; } while(!stop) @@ -99,7 +99,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte hr = OutputPin_GetDeliveryBuffer((OutputPin*)This->tf.ppPins[1], &pSample, NULL, NULL, 0); if (FAILED(hr)) { ERR("Unable to get delivery buffer (%x)\n", hr); - goto error; + return hr; } hr = IMediaSample_SetActualDataLength(pSample, 0); @@ -152,11 +152,13 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte } error: - if (unprepare_header && (res = acmStreamUnprepareHeader(This->has, &ash, 0))) - ERR("Cannot unprepare header %d\n", res); + if (unprepare_header && (res = acmStreamUnprepareHeader(This->has, &ash, 0))) + ERR("Cannot unprepare header %d\n", res); + unprepare_header = FALSE; - if (pSample) - IMediaSample_Release(pSample); + if (pSample) + IMediaSample_Release(pSample); + pSample = NULL; } return hr;

1 0

Chris Robinson : quartz: Force disconnect when a filter is fully released.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 809f68420f5332594cd3da60ada4351e34c6a855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=809f68420f5332594cd3da60a… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Mar 13 10:47:47 2007 -0700 quartz: Force disconnect when a filter is fully released. --- dlls/quartz/dsoundrender.c | 9 +++++++++ dlls/quartz/parser.c | 11 +++++++++++ dlls/quartz/transform.c | 11 +++++++++++ dlls/quartz/videorenderer.c | 9 +++++++++ 4 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index bdb6079..b5fa40b 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -398,6 +398,8 @@ static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) if (!refCount) { + IPin *pConnectedTo; + This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); if (This->pClock) @@ -410,6 +412,13 @@ static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) IDirectSound_Release(This->dsound); This->dsound = NULL; + if (SUCCEEDED(IPin_ConnectedTo(This->ppPins[0], &pConnectedTo))) + { + IPin_Disconnect(pConnectedTo); + IPin_Release(pConnectedTo); + } + IPin_Disconnect(This->ppPins[0]); + IPin_Release(This->ppPins[0]); CoTaskMemFree(This->ppPins); diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 1da0b6d..fb8c085 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -193,7 +193,18 @@ static ULONG WINAPI Parser_Release(IBaseFilter * iface) IReferenceClock_Release(This->pClock); for (i = 0; i < This->cStreams + 1; i++) + { + IPin *pConnectedTo; + + if (SUCCEEDED(IPin_ConnectedTo(This->ppPins[i], &pConnectedTo))) + { + IPin_Disconnect(pConnectedTo); + IPin_Release(pConnectedTo); + } + IPin_Disconnect(This->ppPins[i]); + IPin_Release(This->ppPins[i]); + } CoTaskMemFree(This->ppPins); This->lpVtbl = NULL; diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index 22cb2bf..04366ef 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -283,7 +283,18 @@ static ULONG WINAPI TransformFilter_Release(IBaseFilter * iface) IReferenceClock_Release(This->pClock); for (i = 0; i < 2; i++) + { + IPin *pConnectedTo; + + if (SUCCEEDED(IPin_ConnectedTo(This->ppPins[i], &pConnectedTo))) + { + IPin_Disconnect(pConnectedTo); + IPin_Release(pConnectedTo); + } + IPin_Disconnect(This->ppPins[i]); + IPin_Release(This->ppPins[i]); + } CoTaskMemFree(This->ppPins); This->lpVtbl = NULL; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 695258d..ccfa61a 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -522,6 +522,8 @@ static ULONG WINAPI VideoRenderer_Release(IBaseFilter * iface) if (!refCount) { + IPin *pConnectedTo; + This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); @@ -533,6 +535,13 @@ static ULONG WINAPI VideoRenderer_Release(IBaseFilter * iface) if (This->pClock) IReferenceClock_Release(This->pClock); + if (SUCCEEDED(IPin_ConnectedTo(This->ppPins[0], &pConnectedTo))) + { + IPin_Disconnect(pConnectedTo); + IPin_Release(pConnectedTo); + } + IPin_Disconnect(This->ppPins[0]); + IPin_Release(This->ppPins[0]); CoTaskMemFree(This->ppPins);

1 0

Alexandre Julliard : oleview: Use standard APIs in SaveIdl and avoid overflows.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: f0ddaedc29bc70dd4e8139482d8f9cba811bde91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0ddaedc29bc70dd4e8139482… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 13 21:17:03 2007 +0100 oleview: Use standard APIs in SaveIdl and avoid overflows. --- programs/oleview/typelib.c | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 9a9f04d..baba628 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -117,8 +117,9 @@ static void SaveIdl(WCHAR *wszFileName) HTREEITEM hIDL; TVITEM tvi; HANDLE hFile; - DWORD dwNumWrite; + DWORD len, dwNumWrite; char *wszIdl; + TYPELIB_DATA *data; hIDL = TreeView_GetChild(typelib.hTree, TVI_ROOT); @@ -126,31 +127,24 @@ static void SaveIdl(WCHAR *wszFileName) tvi.hItem = hIDL; SendMessage(typelib.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); + data = (TYPELIB_DATA *)tvi.lParam; hFile = CreateFile(wszFileName, GENERIC_WRITE, FILE_SHARE_WRITE, - NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if(hFile == INVALID_HANDLE_VALUE) { ShowLastError(); return; } - wszIdl = HeapAlloc(GetProcessHeap(), 0, - sizeof(WCHAR)*((TYPELIB_DATA *)(tvi.lParam))->idlLen); - wine_utf8_wcstombs(((TYPELIB_DATA *)(tvi.lParam))->idl, - ((TYPELIB_DATA *)(tvi.lParam))->idlLen, wszIdl, - ((TYPELIB_DATA *)(tvi.lParam))->idlLen); + len = WideCharToMultiByte( CP_UTF8, 0, data->idl, data->idlLen, NULL, 0, NULL, NULL ); + wszIdl = HeapAlloc(GetProcessHeap(), 0, len); + WideCharToMultiByte( CP_UTF8, 0, data->idl, data->idlLen, wszIdl, len, NULL, NULL ); - if(!WriteFile(hFile, wszIdl, ((TYPELIB_DATA *)(tvi.lParam))->idlLen, - &dwNumWrite, NULL)) - { - ShowLastError(); - HeapFree(GetProcessHeap(), 0, wszIdl); - return; - } + if(!WriteFile(hFile, wszIdl, len, &dwNumWrite, NULL)) + ShowLastError(); HeapFree(GetProcessHeap(), 0, wszIdl); - SetEndOfFile(hFile); CloseHandle(hFile); }

1 0

Mikołaj Zalewski : comctl32: listview: Compute the state icon rect in GetItemMetrics.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 88bdc3af953da14442b5bb01af71ff39a3d6da3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=88bdc3af953da14442b5bb01a… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Mar 12 22:39:59 2007 +0100 comctl32: listview: Compute the state icon rect in GetItemMetrics. --- dlls/comctl32/listview.c | 50 ++++++++++++++++++++++++++------------------- 1 files changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 113845d..c07cd2b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1886,10 +1886,11 @@ static void LISTVIEW_GetItemOrigin(LISTVIEW_INFO *infoPtr, INT nItem, LPPOINT lp * [I] lpLVItem : item to compute the measures for * [O] lprcBox : ptr to Box rectangle * Same as LVM_GETITEMRECT with LVIR_BOUNDS - * [0] lprcSelectBox : ptr to State icon rectangle + * [0] lprcSelectBox : ptr to select box rectangle * Same as LVM_GETITEMRECT with LVIR_SELECTEDBOUNDS * [O] lprcIcon : ptr to Icon rectangle * Same as LVM_GETITEMRECT with LVIR_ICON + * [O] lprcStateIcon: ptr to State Icon rectangle * [O] lprcLabel : ptr to Label rectangle * Same as LVM_GETITEMRECT with LVIR_LABEL * @@ -1898,7 +1899,7 @@ static void LISTVIEW_GetItemOrigin(LISTVIEW_INFO *infoPtr, INT nItem, LPPOINT lp */ static void LISTVIEW_GetItemMetrics(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, LPRECT lprcBox, LPRECT lprcSelectBox, - LPRECT lprcIcon, LPRECT lprcLabel) + LPRECT lprcIcon, LPRECT lprcStateIcon, LPRECT lprcLabel) { UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; BOOL doSelectBox = FALSE, doIcon = FALSE, doLabel = FALSE, oversizedBox = FALSE; @@ -1917,7 +1918,7 @@ static void LISTVIEW_GetItemMetrics(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVI } if (lprcSelectBox) doSelectBox = TRUE; if (lprcLabel) doLabel = TRUE; - if (doLabel || lprcIcon) doIcon = TRUE; + if (doLabel || lprcIcon || lprcStateIcon) doIcon = TRUE; if (doSelectBox) { doIcon = TRUE; @@ -1942,9 +1943,9 @@ static void LISTVIEW_GetItemMetrics(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVI Box.top = 0; Box.bottom = infoPtr->nItemHeight; - /************************************************************/ - /* compute ICON bounding box (ala LVM_GETITEMRECT) */ - /************************************************************/ + /******************************************************************/ + /* compute ICON bounding box (ala LVM_GETITEMRECT) and STATEICON */ + /******************************************************************/ if (doIcon) { LONG state_width = 0; @@ -1983,6 +1984,16 @@ static void LISTVIEW_GetItemMetrics(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVI } if(lprcIcon) *lprcIcon = Icon; TRACE(" - icon=%s\n", wine_dbgstr_rect(&Icon)); + + /* TODO: is this correct? */ + if (lprcStateIcon) + { + lprcStateIcon->left = Icon.left - state_width; + lprcStateIcon->right = Icon.left; + lprcStateIcon->top = Icon.top; + lprcStateIcon->bottom = lprcStateIcon->top + infoPtr->iconSize.cy; + TRACE(" - state icon=%s\n", wine_dbgstr_rect(lprcStateIcon)); + } } else Icon.right = 0; @@ -2144,7 +2155,7 @@ static void LISTVIEW_GetItemBox(LISTVIEW_INFO *infoPtr, INT nItem, LPRECT lprcBo lvItem.stateMask = LVIS_FOCUSED; lvItem.state = (lvItem.mask & LVIF_TEXT ? LVIS_FOCUSED : 0); } - LISTVIEW_GetItemMetrics(infoPtr, &lvItem, lprcBox, 0, 0, 0); + LISTVIEW_GetItemMetrics(infoPtr, &lvItem, lprcBox, 0, 0, 0, 0); OffsetRect(lprcBox, Position.x + Origin.x, Position.y + Origin.y); } @@ -3714,7 +3725,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS WCHAR szDispText[DISP_TEXT_SIZE] = { '\0' }; static const WCHAR szCallback[] = { '(', 'c', 'a', 'l', 'l', 'b', 'a', 'c', 'k', ')', 0 }; DWORD cdsubitemmode = CDRF_DODEFAULT; - RECT* lprcFocus, rcSelect, rcBox, rcIcon, rcLabel; + RECT *lprcFocus, rcSelect, rcBox, rcIcon, rcLabel, rcStateIcon; NMLVCUSTOMDRAW nmlvcd; HIMAGELIST himl; LVITEMW lvItem; @@ -3743,10 +3754,11 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS lprcFocus = infoPtr->bFocus && (lvItem.state & LVIS_FOCUSED) ? &infoPtr->rcFocus : 0; if (!lprcFocus) lvItem.state &= ~LVIS_FOCUSED; - LISTVIEW_GetItemMetrics(infoPtr, &lvItem, &rcBox, &rcSelect, &rcIcon, &rcLabel); + LISTVIEW_GetItemMetrics(infoPtr, &lvItem, &rcBox, &rcSelect, &rcIcon, &rcStateIcon, &rcLabel); OffsetRect(&rcBox, pos.x, pos.y); OffsetRect(&rcSelect, pos.x, pos.y); OffsetRect(&rcIcon, pos.x, pos.y); + OffsetRect(&rcStateIcon, pos.x, pos.y); OffsetRect(&rcLabel, pos.x, pos.y); TRACE(" rcBox=%s, rcSelect=%s, rcIcon=%s. rcLabel=%s\n", wine_dbgstr_rect(&rcBox), wine_dbgstr_rect(&rcSelect), @@ -3783,8 +3795,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS { TRACE("uStateImage=%d\n", uStateImage); ImageList_Draw(infoPtr->himlState, uStateImage - 1, hdc, - rcIcon.left - infoPtr->iconStateSize.cx, - rcIcon.top, ILD_NORMAL); + rcStateIcon.left, rcStateIcon.top, ILD_NORMAL); } } @@ -5645,19 +5656,19 @@ static BOOL LISTVIEW_GetItemRect(LISTVIEW_INFO *infoPtr, INT nItem, LPRECT lprc) switch(lprc->left) { case LVIR_ICON: - LISTVIEW_GetItemMetrics(infoPtr, &lvItem, NULL, NULL, lprc, NULL); + LISTVIEW_GetItemMetrics(infoPtr, &lvItem, NULL, NULL, lprc, NULL, NULL); break; case LVIR_LABEL: - LISTVIEW_GetItemMetrics(infoPtr, &lvItem, NULL, NULL, NULL, lprc); + LISTVIEW_GetItemMetrics(infoPtr, &lvItem, NULL, NULL, NULL, NULL, lprc); break; case LVIR_BOUNDS: - LISTVIEW_GetItemMetrics(infoPtr, &lvItem, lprc, NULL, NULL, NULL); + LISTVIEW_GetItemMetrics(infoPtr, &lvItem, lprc, NULL, NULL, NULL, NULL); break; case LVIR_SELECTBOUNDS: - LISTVIEW_GetItemMetrics(infoPtr, &lvItem, NULL, lprc, NULL, NULL); + LISTVIEW_GetItemMetrics(infoPtr, &lvItem, NULL, lprc, NULL, NULL, NULL); break; default: @@ -5719,12 +5730,12 @@ static BOOL LISTVIEW_GetSubItemRect(LISTVIEW_INFO *infoPtr, INT nItem, LPRECT lp switch(lprc->left) { case LVIR_ICON: - LISTVIEW_GetItemMetrics(infoPtr, &lvItem, NULL, NULL, lprc, NULL); + LISTVIEW_GetItemMetrics(infoPtr, &lvItem, NULL, NULL, lprc, NULL, NULL); break; case LVIR_LABEL: case LVIR_BOUNDS: - LISTVIEW_GetItemMetrics(infoPtr, &lvItem, lprc, NULL, NULL, NULL); + LISTVIEW_GetItemMetrics(infoPtr, &lvItem, lprc, NULL, NULL, NULL, NULL); break; default: @@ -6203,7 +6214,7 @@ static INT LISTVIEW_HitTest(LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, BOOL s if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) return -1; if (!infoPtr->bFocus) lvItem.state &= ~LVIS_FOCUSED; - LISTVIEW_GetItemMetrics(infoPtr, &lvItem, &rcBox, NULL, &rcIcon, &rcLabel); + LISTVIEW_GetItemMetrics(infoPtr, &lvItem, &rcBox, NULL, &rcIcon, &rcState, &rcLabel); LISTVIEW_GetItemOrigin(infoPtr, iItem, &Position); opt.x = lpht->pt.x - Position.x - Origin.x; opt.y = lpht->pt.y - Position.y - Origin.y; @@ -6215,9 +6226,6 @@ static INT LISTVIEW_HitTest(LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, BOOL s TRACE("rcBounds=%s\n", wine_dbgstr_rect(&rcBounds)); if (!PtInRect(&rcBounds, opt)) return -1; - rcState = rcIcon; - OffsetRect(&rcState, -infoPtr->iconStateSize.cx, 0); - if (PtInRect(&rcIcon, opt)) lpht->flags |= LVHT_ONITEMICON; else if (PtInRect(&rcLabel, opt))

1 0

Paul Vriens : advapi32/tests: Use GetModuleHandle and skip.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 33e310f63d1fb2ce7160cb815a5658b9f2455f77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e310f63d1fb2ce7160cb815… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Mar 13 19:41:01 2007 +0100 advapi32/tests: Use GetModuleHandle and skip. --- dlls/advapi32/tests/crypt_sha.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/crypt_sha.c b/dlls/advapi32/tests/crypt_sha.c index 33fd430..e8cd557 100644 --- a/dlls/advapi32/tests/crypt_sha.c +++ b/dlls/advapi32/tests/crypt_sha.c @@ -51,12 +51,16 @@ static void test_sha_ctx(void) ULONG result[5]; ULONG result_correct[5] = {0xe014f93, 0xe09791ec, 0x6dcf96c8, 0x8e9385fc, 0x1611c1bb}; - hmod = LoadLibrary("advapi32.dll"); + hmod = GetModuleHandleA("advapi32.dll"); pA_SHAInit = GetProcAddress(hmod, "A_SHAInit"); pA_SHAUpdate = GetProcAddress(hmod, "A_SHAUpdate"); pA_SHAFinal = GetProcAddress(hmod, "A_SHAFinal"); - if (!pA_SHAInit || !pA_SHAUpdate || !pA_SHAFinal) return; + if (!pA_SHAInit || !pA_SHAUpdate || !pA_SHAFinal) + { + skip("A_SHAInit and/or A_SHAUpdate and/or A_SHAFinal are not available\n"); + return; + } RtlZeroMemory(&ctx, sizeof(ctx)); pA_SHAInit(&ctx); @@ -71,8 +75,6 @@ static void test_sha_ctx(void) pA_SHAFinal(&ctx, result); ok(!ctxcmp(&ctx, &ctx_initialized), "context hasn't been reinitialized\n"); ok(!memcmp(result, result_correct, sizeof(result)), "incorrect result\n"); - - FreeLibrary(hmod); } START_TEST(crypt_sha)

1 0

Aric Stewart : wineps.drv: Check for correct value for end of list.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: ea8e8609039d1eb06a2fdbe1ad35e3449e33b110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea8e8609039d1eb06a2fdbe1a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 13 14:12:13 2007 -0500 wineps.drv: Check for correct value for end of list. --- dlls/wineps.drv/driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index f833486..30bc0b3 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -71,7 +71,7 @@ void PSDRV_MergeDevmodes(PSDRV_DEVMODEA *dm1, PSDRV_DEVMODEA *dm2, if(page->WinPage == dm2->dmPublic.u1.s1.dmPaperSize) break; } - if(page) { + if(&page->entry != &pi->ppd->PageSizes ) { dm1->dmPublic.u1.s1.dmPaperSize = dm2->dmPublic.u1.s1.dmPaperSize; dm1->dmPublic.u1.s1.dmPaperWidth = page->PaperDimension->x * 254.0 / 72.0;

1 0