August 2010 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Use float functions in drawprim.c.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 612801d3aa0ec8c6bb4e777e6c9f81969f4ba3fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=612801d3aa0ec8c6bb4e777e6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 29 17:08:59 2010 +0200 wined3d: Use float functions in drawprim.c. --- dlls/wined3d/drawprim.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index f848f51..4f70811 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -743,7 +743,7 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT static void normalize_normal(float *n) { float length = n[0] * n[0] + n[1] * n[1] + n[2] * n[2]; if (length == 0.0f) return; - length = sqrt(length); + length = sqrtf(length); n[0] = n[0] / length; n[1] = n[1] / length; n[2] = n[2] / length; @@ -828,9 +828,9 @@ HRESULT tesselate_rectpatch(IWineD3DDeviceImpl *This, for(j = 0; j < info->Height; j++) { for(i = 0; i < info->Width; i++) { const float *v = (const float *)(data + vtxStride * i + vtxStride * info->Stride * j); - if(fabs(v[0]) > max_x) max_x = fabs(v[0]); - if(fabs(v[1]) > max_y) max_y = fabs(v[1]); - if(fabs(v[2]) > max_z) max_z = fabs(v[2]); + if(fabs(v[0]) > max_x) max_x = fabsf(v[0]); + if(fabs(v[1]) > max_y) max_y = fabsf(v[1]); + if(fabs(v[2]) > max_z) max_z = fabsf(v[2]); if(v[2] < neg_z) neg_z = v[2]; } }

1 0

Nikolay Sivov : oleaut32/olepicture: Fix assumptions about S_OK value.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 32c2ef6c9761bf953ec97dc64d7196d9bb274521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c2ef6c9761bf953ec97dc64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 23 11:17:35 2010 +0400 oleaut32/olepicture: Fix assumptions about S_OK value. --- dlls/oleaut32/olepicture.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index df7826b..d6d55d9 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -494,7 +494,7 @@ static void OLEPicture_SendNotify(OLEPictureImpl* this, DISPID dispID) IEnumConnections *pEnum; CONNECTDATA CD; - if (IConnectionPoint_EnumConnections(this->pCP, &pEnum)) + if (IConnectionPoint_EnumConnections(this->pCP, &pEnum) != S_OK) return; while(IEnumConnections_Next(pEnum, 1, &CD, NULL) == S_OK) { IPropertyNotifySink *sink; @@ -1336,7 +1336,7 @@ static HRESULT OLEPictureImpl_LoadAPM(OLEPictureImpl *This, * Currently implemented: BITMAP, ICON, JPEG, GIF, WMF, EMF */ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { - HRESULT hr = E_FAIL; + HRESULT hr; BOOL headerisdata = FALSE; BOOL statfailed = FALSE; ULONG xread, toread; @@ -1365,8 +1365,8 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { * Also handle streams where we do not have a working "Stat" method by * reading all data until the end of the stream. */ - hr=IStream_Stat(pStm,&statstg,STATFLAG_NONAME); - if (hr) { + hr = IStream_Stat(pStm,&statstg,STATFLAG_NONAME); + if (hr != S_OK) { TRACE("stat failed with hres %x, proceeding to read all data.\n",hr); statfailed = TRUE; /* we will read at least 8 byte ... just right below */ @@ -1377,8 +1377,8 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { headerread = 0; headerisdata = FALSE; do { - hr=IStream_Read(pStm,header,8,&xread); - if (hr || xread!=8) { + hr = IStream_Read(pStm, header, 8, &xread); + if (hr != S_OK || xread!=8) { ERR("Failure while reading picture header (hr is %x, nread is %d).\n",hr,xread); return (hr?hr:E_FAIL); } @@ -1423,11 +1423,11 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { while (1) { while (xread < origsize) { hr = IStream_Read(pStm,xbuf+xread,origsize-xread,&nread); - xread+=nread; - if (hr || !nread) + xread += nread; + if (hr != S_OK || !nread) break; } - if (!nread || hr) /* done, or error */ + if (!nread || hr != S_OK) /* done, or error */ break; if (xread == origsize) { origsize += sizeinc; @@ -1435,7 +1435,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { xbuf = HeapReAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, xbuf, origsize); } } - if (hr) + if (hr != S_OK) TRACE("hr in no-stat loader case is %08x\n", hr); TRACE("loaded %d bytes.\n", xread); This->datalen = xread; @@ -1452,8 +1452,8 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { while (xread < This->datalen) { ULONG nread; hr = IStream_Read(pStm,xbuf+xread,This->datalen-xread,&nread); - xread+=nread; - if (hr || !nread) + xread += nread; + if (hr != S_OK || !nread) break; } if (xread != This->datalen) @@ -2159,8 +2159,8 @@ static const IConnectionPointContainerVtbl OLEPictureImpl_IConnectionPointContai HRESULT WINAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid, BOOL fOwn, LPVOID *ppvObj ) { - OLEPictureImpl* newPict = NULL; - HRESULT hr = S_OK; + OLEPictureImpl* newPict; + HRESULT hr; TRACE("(%p,%s,%d,%p)\n", lpPictDesc, debugstr_guid(riid), fOwn, ppvObj); @@ -2209,10 +2209,10 @@ HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, lpstream, lSize, fRunmode, debugstr_guid(riid), ppvObj); hr = OleCreatePictureIndirect(NULL,riid,!fRunmode,(LPVOID*)&newpic); - if (hr) + if (hr != S_OK) return hr; hr = IPicture_QueryInterface(newpic,&IID_IPersistStream, (LPVOID*)&ps); - if (hr) { + if (hr != S_OK) { ERR("Could not get IPersistStream iface from Ole Picture?\n"); IPicture_Release(newpic); *ppvObj = NULL; @@ -2228,7 +2228,7 @@ HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, return hr; } hr = IPicture_QueryInterface(newpic,riid,ppvObj); - if (hr) + if (hr != S_OK) ERR("Failed to get interface %s from IPicture.\n",debugstr_guid(riid)); IPicture_Release(newpic); return hr; @@ -2248,10 +2248,10 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, lpstream, lSize, fRunmode, debugstr_guid(riid), xsiz, ysiz, flags, ppvObj); hr = OleCreatePictureIndirect(NULL,riid,!fRunmode,(LPVOID*)&newpic); - if (hr) + if (hr != S_OK) return hr; hr = IPicture_QueryInterface(newpic,&IID_IPersistStream, (LPVOID*)&ps); - if (hr) { + if (hr != S_OK) { ERR("Could not get IPersistStream iface from Ole Picture?\n"); IPicture_Release(newpic); *ppvObj = NULL; @@ -2267,7 +2267,7 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, return hr; } hr = IPicture_QueryInterface(newpic,riid,ppvObj); - if (hr) + if (hr != S_OK) ERR("Failed to get interface %s from IPicture.\n",debugstr_guid(riid)); IPicture_Release(newpic); return hr;

1 0

Stefan Dösinger : wined3d: The clipplane mask and texcoords are unsigned.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 1d710bb4cab2ffcef26ffe2e52d028f7b5b37c9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d710bb4cab2ffcef26ffe2e5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 28 15:47:22 2010 +0200 wined3d: The clipplane mask and texcoords are unsigned. --- dlls/wined3d/arb_program_shader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 03443b4..db1f953 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -248,8 +248,8 @@ struct arb_vs_compile_args struct { WORD bools; - char clip_texcoord; - char clipplane_mask; + unsigned char clip_texcoord; + unsigned char clipplane_mask; } boolclip; DWORD boolclip_compare; } clip; @@ -4482,7 +4482,7 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW { if(stateblock->renderState[WINED3DRS_CLIPPING]) { - args->clip.boolclip.clipplane_mask = stateblock->renderState[WINED3DRS_CLIPPLANEENABLE]; + args->clip.boolclip.clipplane_mask = (unsigned char) stateblock->renderState[WINED3DRS_CLIPPLANEENABLE]; } /* clipplane_mask was set to 0 by setting boolclip_compare to 0 */ }

1 0

Nikolay Sivov : oleaut32/olepicture: Properly round while performing pixels->himetric units conversion.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 99863b02ba73f68c06cfa46425f06d12fc44bf9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=99863b02ba73f68c06cfa4642… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 23 10:59:06 2010 +0400 oleaut32/olepicture: Properly round while performing pixels->himetric units conversion. --- dlls/oleaut32/olepicture.c | 35 ++++++++++++---- dlls/oleaut32/tests/olepicture.c | 79 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index b8e949d..df7826b 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -181,28 +181,43 @@ static const IDispatchVtbl OLEPictureImpl_IDispatch_VTable; static const IPersistStreamVtbl OLEPictureImpl_IPersistStream_VTable; static const IConnectionPointContainerVtbl OLEPictureImpl_IConnectionPointContainer_VTable; +/* pixels to HIMETRIC units conversion */ +static inline OLE_XSIZE_HIMETRIC xpixels_to_himetric(INT pixels, HDC hdc) +{ + return MulDiv(pixels, 2540, GetDeviceCaps(hdc, LOGPIXELSX)); +} + +static inline OLE_YSIZE_HIMETRIC ypixels_to_himetric(INT pixels, HDC hdc) +{ + return MulDiv(pixels, 2540, GetDeviceCaps(hdc, LOGPIXELSY)); +} + /*********************************************************************** * Implementation of the OLEPictureImpl class. */ -static void OLEPictureImpl_SetBitmap(OLEPictureImpl*This) { +static void OLEPictureImpl_SetBitmap(OLEPictureImpl *This) +{ BITMAP bm; HDC hdcRef; TRACE("bitmap handle %p\n", This->desc.u.bmp.hbitmap); - if(GetObjectA(This->desc.u.bmp.hbitmap, sizeof(bm), &bm) != sizeof(bm)) { + if(GetObjectW(This->desc.u.bmp.hbitmap, sizeof(bm), &bm) != sizeof(bm)) { ERR("GetObject fails\n"); return; } This->origWidth = bm.bmWidth; This->origHeight = bm.bmHeight; + /* The width and height are stored in HIMETRIC units (0.01 mm), so we take our pixel width divide by pixels per inch and multiply by 25.4 * 100 */ /* Should we use GetBitmapDimension if available? */ hdcRef = CreateCompatibleDC(0); - This->himetricWidth =(bm.bmWidth *2540)/GetDeviceCaps(hdcRef, LOGPIXELSX); - This->himetricHeight=(bm.bmHeight*2540)/GetDeviceCaps(hdcRef, LOGPIXELSY); + + This->himetricWidth = xpixels_to_himetric(bm.bmWidth, hdcRef); + This->himetricHeight = xpixels_to_himetric(bm.bmHeight, hdcRef); + DeleteDC(hdcRef); } @@ -216,7 +231,7 @@ static void OLEPictureImpl_SetIcon(OLEPictureImpl * This) BITMAP bm; TRACE("bitmap handle for icon is %p\n", infoIcon.hbmColor); - if(GetObjectA(infoIcon.hbmColor ? infoIcon.hbmColor : infoIcon.hbmMask, sizeof(bm), &bm) != sizeof(bm)) { + if(GetObjectW(infoIcon.hbmColor ? infoIcon.hbmColor : infoIcon.hbmMask, sizeof(bm), &bm) != sizeof(bm)) { ERR("GetObject fails on icon bitmap\n"); return; } @@ -225,8 +240,10 @@ static void OLEPictureImpl_SetIcon(OLEPictureImpl * This) This->origHeight = infoIcon.hbmColor ? bm.bmHeight : bm.bmHeight / 2; /* see comment on HIMETRIC on OLEPictureImpl_SetBitmap() */ hdcRef = GetDC(0); - This->himetricWidth = (This->origWidth *2540)/GetDeviceCaps(hdcRef, LOGPIXELSX); - This->himetricHeight= (This->origHeight *2540)/GetDeviceCaps(hdcRef, LOGPIXELSY); + + This->himetricWidth = xpixels_to_himetric(This->origWidth, hdcRef); + This->himetricHeight = ypixels_to_himetric(This->origHeight, hdcRef); + ReleaseDC(0, hdcRef); DeleteObject(infoIcon.hbmMask); @@ -1241,8 +1258,8 @@ static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG x This->origWidth = cifd->idEntries[i].bWidth; This->origHeight = cifd->idEntries[i].bHeight; hdcRef = CreateCompatibleDC(0); - This->himetricWidth =(cifd->idEntries[i].bWidth *2540)/GetDeviceCaps(hdcRef, LOGPIXELSX); - This->himetricHeight=(cifd->idEntries[i].bHeight*2540)/GetDeviceCaps(hdcRef, LOGPIXELSY); + This->himetricWidth = xpixels_to_himetric(cifd->idEntries[i].bWidth, hdcRef); + This->himetricHeight= ypixels_to_himetric(cifd->idEntries[i].bHeight, hdcRef); DeleteDC(hdcRef); return S_OK; } diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index f00055e..9ab2515 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -880,6 +880,84 @@ static void test_OleLoadPicturePath(void) "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); } +static void test_himetric(void) +{ + static const BYTE bmp_bits[1024]; + OLE_XSIZE_HIMETRIC cx; + OLE_YSIZE_HIMETRIC cy; + IPicture *pic; + PICTDESC desc; + HBITMAP bmp; + HRESULT hr; + HICON icon; + HDC hdc; + INT d; + + if (!pOleCreatePictureIndirect) + { + win_skip("OleCreatePictureIndirect not available\n"); + return; + } + + desc.cbSizeofstruct = sizeof(desc); + desc.picType = PICTYPE_BITMAP; + desc.u.bmp.hpal = NULL; + + hdc = CreateCompatibleDC(0); + + bmp = CreateBitmap(1.9 * GetDeviceCaps(hdc, LOGPIXELSX), + 1.9 * GetDeviceCaps(hdc, LOGPIXELSY), 1, 1, NULL); + + desc.u.bmp.hbitmap = bmp; + + /* size in himetric units reported rounded up to next integer value */ + hr = pOleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); + ok(hr == S_OK, "got 0x%08x\n", hr); + + cx = 0; + d = MulDiv((INT)(1.9 * GetDeviceCaps(hdc, LOGPIXELSX)), 2540, GetDeviceCaps(hdc, LOGPIXELSX)); + hr = IPicture_get_Width(pic, &cx); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cx == d, "got %d, expected %d\n", cx, d); + + cy = 0; + d = MulDiv((INT)(1.9 * GetDeviceCaps(hdc, LOGPIXELSY)), 2540, GetDeviceCaps(hdc, LOGPIXELSY)); + hr = IPicture_get_Height(pic, &cy); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cy == d, "got %d, expected %d\n", cy, d); + + DeleteObject(bmp); + IPicture_Release(pic); + + /* same thing with icon */ + icon = CreateIcon(NULL, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), + 1, 1, bmp_bits, bmp_bits); + ok(icon != NULL, "failed to create icon\n"); + + desc.picType = PICTYPE_ICON; + desc.u.icon.hicon = icon; + + hr = pOleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); + ok(hr == S_OK, "got 0x%08x\n", hr); + + cx = 0; + d = MulDiv(GetSystemMetrics(SM_CXICON), 2540, GetDeviceCaps(hdc, LOGPIXELSX)); + hr = IPicture_get_Width(pic, &cx); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cx == d, "got %d, expected %d\n", cx, d); + + cy = 0; + d = MulDiv(GetSystemMetrics(SM_CYICON), 2540, GetDeviceCaps(hdc, LOGPIXELSY)); + hr = IPicture_get_Height(pic, &cy); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(cy == d, "got %d, expected %d\n", cy, d); + + IPicture_Release(pic); + DestroyIcon(icon); + + DeleteDC(hdc); +} + START_TEST(olepicture) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -911,6 +989,7 @@ START_TEST(olepicture) test_get_Handle(); test_get_Type(); test_OleLoadPicturePath(); + test_himetric(); }

1 0

Nikolay Sivov : comctl32/imagelist: Fix return value for IImageList_GetIconSize().
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: acbd632039a96a02feebc911a88de3114094512b URL: http://source.winehq.org/git/wine.git/?a=commit;h=acbd632039a96a02feebc911a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 21 19:31:29 2010 +0400 comctl32/imagelist: Fix return value for IImageList_GetIconSize(). --- dlls/comctl32/imagelist.c | 5 +--- dlls/comctl32/tests/imagelist.c | 48 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 89333bf..9396b95 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3431,7 +3431,7 @@ static HRESULT WINAPI ImageListImpl_GetIconSize(IImageList *iface, int *cx, { HIMAGELIST This = (HIMAGELIST) iface; - return ImageList_GetIconSize(This, cx, cy) ? S_OK : E_FAIL; + return ImageList_GetIconSize(This, cx, cy) ? S_OK : E_INVALIDARG; } static HRESULT WINAPI ImageListImpl_SetIconSize(IImageList *iface, int cx, @@ -3442,9 +3442,6 @@ static HRESULT WINAPI ImageListImpl_SetIconSize(IImageList *iface, int cx, static HRESULT WINAPI ImageListImpl_GetImageCount(IImageList *iface, int *pi) { - if (!pi) - return E_FAIL; - *pi = ImageList_GetImageCount((HIMAGELIST) iface); return S_OK; } diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index ff3ada4..c5ea95f 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1863,6 +1863,52 @@ if (0) IImageList_Release(imgl); } +static void test_IImageList_GetImageCount(void) +{ + IImageList *imgl; + HIMAGELIST himl; + int count; + HRESULT hr; + + himl = ImageList_Create(16, 16, ILC_COLOR16, 0, 3); + imgl = (IImageList*)himl; + +if (0) +{ + /* crashes on native */ + hr = IImageList_GetImageCount(imgl, NULL); +} + + count = -1; + hr = IImageList_GetImageCount(imgl, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 0, "got %d\n", count); + + IImageList_Release(imgl); +} + +static void test_IImageList_GetIconSize(void) +{ + IImageList *imgl; + HIMAGELIST himl; + int cx, cy; + HRESULT hr; + + himl = ImageList_Create(16, 16, ILC_COLOR16, 0, 3); + imgl = (IImageList*)himl; + + hr = IImageList_GetIconSize(imgl, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IImageList_GetIconSize(imgl, &cx, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IImageList_GetIconSize(imgl, NULL, &cy); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + IImageList_Release(imgl); +} + START_TEST(imagelist) { ULONG_PTR ctx_cookie; @@ -1918,6 +1964,8 @@ START_TEST(imagelist) test_IImageList_Clone(); test_IImageList_GetBkColor(); test_IImageList_SetBkColor(); + test_IImageList_GetImageCount(); + test_IImageList_GetIconSize(); CoUninitialize();

1 0

Gerald Pfeifer : comctl32: Remove the last, unused parameter from LISTVIEW_VScroll and all its invocations.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 84a6598290202d1a9ebf9372006fc62ac06e139e URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a6598290202d1a9ebf93720… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Aug 22 22:25:34 2010 +0200 comctl32: Remove the last, unused parameter from LISTVIEW_VScroll and all its invocations. --- dlls/comctl32/listview.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 11d8d98..ae8736a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -456,7 +456,7 @@ static INT LISTVIEW_GetStringWidthT(const LISTVIEW_INFO *, LPCWSTR, BOOL); static BOOL LISTVIEW_KeySelection(LISTVIEW_INFO *, INT, BOOL); static UINT LISTVIEW_GetItemState(const LISTVIEW_INFO *, INT, UINT); static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *, INT, const LVITEMW *); -static LRESULT LISTVIEW_VScroll(LISTVIEW_INFO *, INT, INT, HWND); +static LRESULT LISTVIEW_VScroll(LISTVIEW_INFO *, INT, INT); static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *, INT, INT, HWND); static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *, INT, BOOL); static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *, INT, HIMAGELIST); @@ -6033,7 +6033,7 @@ static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *infoPtr, INT nItem, BOOL bPart { INT diff = nVertDiff / nScrollPosHeight; if (nVertDiff % nScrollPosHeight) diff += nVertAdjust; - LISTVIEW_VScroll(infoPtr, SB_INTERNAL, diff, 0); + LISTVIEW_VScroll(infoPtr, SB_INTERNAL, diff); } return TRUE; @@ -7816,7 +7816,7 @@ static BOOL LISTVIEW_Scroll(LISTVIEW_INFO *infoPtr, INT dx, INT dy) } if (dx != 0) LISTVIEW_HScroll(infoPtr, SB_INTERNAL, dx, 0); - if (dy != 0) LISTVIEW_VScroll(infoPtr, SB_INTERNAL, dy, 0); + if (dy != 0) LISTVIEW_VScroll(infoPtr, SB_INTERNAL, dy); return TRUE; } @@ -9449,7 +9449,7 @@ static void scroll_list(LISTVIEW_INFO *infoPtr, INT dx, INT dy) * */ static LRESULT LISTVIEW_VScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode, - INT nScrollDiff, HWND hScrollWnd) + INT nScrollDiff) { INT nOldScrollPos, nNewScrollPos; SCROLLINFO scrollInfo; @@ -9654,7 +9654,7 @@ static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta) * should be fixed in the future. */ LISTVIEW_VScroll(infoPtr, SB_INTERNAL, (gcWheelDelta < 0) ? - -LISTVIEW_SCROLL_ICON_LINE_SIZE : LISTVIEW_SCROLL_ICON_LINE_SIZE, 0); + -LISTVIEW_SCROLL_ICON_LINE_SIZE : LISTVIEW_SCROLL_ICON_LINE_SIZE); break; case LV_VIEW_DETAILS: @@ -9662,7 +9662,7 @@ static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta) { int cLineScroll = min(LISTVIEW_GetCountPerColumn(infoPtr), pulScrollLines); cLineScroll *= (gcWheelDelta / WHEEL_DELTA); - LISTVIEW_VScroll(infoPtr, SB_INTERNAL, cLineScroll, 0); + LISTVIEW_VScroll(infoPtr, SB_INTERNAL, cLineScroll); } break; @@ -11493,7 +11493,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_ThemeChanged(infoPtr); case WM_VSCROLL: - return LISTVIEW_VScroll(infoPtr, (INT)LOWORD(wParam), 0, (HWND)lParam); + return LISTVIEW_VScroll(infoPtr, (INT)LOWORD(wParam), 0); case WM_MOUSEWHEEL: if (wParam & (MK_SHIFT | MK_CONTROL))

1 0

Nikolay Sivov : comctl32/imagelist: Make IImageList_Merge() crash like it does on native.
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: eb2aae669ca16affd019c02bcbc0dda1d19b34b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb2aae669ca16affd019c02bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 21 19:08:54 2010 +0400 comctl32/imagelist: Make IImageList_Merge() crash like it does on native. --- dlls/comctl32/imagelist.c | 5 ++--- dlls/comctl32/tests/imagelist.c | 7 +++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 2218d99..162d0d3 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3365,15 +3365,14 @@ static HRESULT WINAPI ImageListImpl_Copy(IImageList *iface, int iDst, } static HRESULT WINAPI ImageListImpl_Merge(IImageList *iface, int i1, - IUnknown *punk2, int i2, int dx, int dy, REFIID riid, PVOID *ppv) + IUnknown *punk2, int i2, int dx, int dy, REFIID riid, void **ppv) { HIMAGELIST This = (HIMAGELIST) iface; IImageList *iml2 = NULL; HIMAGELIST hNew; HRESULT ret = E_FAIL; - if (!punk2 || !ppv) - return E_FAIL; + TRACE("(%p)->(%d %p %d %d %d %s %p)\n", iface, i1, punk2, i2, dx, dy, debugstr_guid(riid), ppv); /* TODO: Add test for IID_ImageList2 too */ if (FAILED(IImageList_QueryInterface(punk2, &IID_IImageList, diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 26c7e12..3530932 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1674,6 +1674,13 @@ static void test_IImageList_Merge(void) ret = -1; ok( IImageList_ReplaceIcon(imgl2, -1, hicon1, &ret) == S_OK && (ret == 0),"add icon1 to himl2 failed\n"); +if (0) +{ + /* null cases that crash on native */ + hr = IImageList_Merge(imgl1, -1, NULL, 0, 0, 0, &IID_IImageList, (void**)&merge); + hr = IImageList_Merge(imgl1, -1, (IUnknown*) imgl2, 0, 0, 0, &IID_IImageList, NULL); +} + /* If himl1 has no images, merge still succeeds */ hr = IImageList_Merge(imgl1, -1, (IUnknown *) imgl2, 0, 0, 0, &IID_IImageList, (void **) &merge); ok(hr == S_OK, "merge himl1,-1 failed\n");

1 0

Nikolay Sivov : comctl32/imagelist: Remove parameter check from IImageList_Clone().
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 87847aa13cadc158a6cb2c49ec2c0b90e3cb16ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=87847aa13cadc158a6cb2c49e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 21 19:14:23 2010 +0400 comctl32/imagelist: Remove parameter check from IImageList_Clone(). --- dlls/comctl32/imagelist.c | 6 ++---- dlls/comctl32/tests/imagelist.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 162d0d3..34cf7d3 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3389,15 +3389,13 @@ static HRESULT WINAPI ImageListImpl_Merge(IImageList *iface, int i1, return ret; } -static HRESULT WINAPI ImageListImpl_Clone(IImageList *iface, REFIID riid, - PVOID *ppv) +static HRESULT WINAPI ImageListImpl_Clone(IImageList *iface, REFIID riid, void **ppv) { HIMAGELIST This = (HIMAGELIST) iface; HIMAGELIST hNew; HRESULT ret = E_FAIL; - if (!ppv) - return E_FAIL; + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); hNew = ImageList_Duplicate(This); diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 3530932..a4dae03 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1778,6 +1778,28 @@ static void test_create(void) ok(himl == NULL, "got %p\n", himl); } +static void test_IImageList_Clone(void) +{ + IImageList *imgl, *imgl2; + HIMAGELIST himl; + HRESULT hr; + + himl = ImageList_Create(16, 16, ILC_COLOR16, 0, 3); + imgl = (IImageList*)himl; + +if (0) +{ + /* crashes on native */ + hr = IImageList_Clone(imgl, &IID_IImageList, NULL); +} + + hr = IImageList_Clone(imgl, &IID_IImageList, (void**)&imgl2); + ok(hr == S_OK, "got 0x%08x\n", hr); + IImageList_Release(imgl2); + + IImageList_Release(imgl); +} + START_TEST(imagelist) { ULONG_PTR ctx_cookie; @@ -1830,6 +1852,7 @@ START_TEST(imagelist) test_IImageList_Get_SetImageCount(); test_IImageList_Draw(); test_IImageList_Merge(); + test_IImageList_Clone(); CoUninitialize();

1 0

Nikolay Sivov : comctl32/imagelist: Fix reference leak in IImageList_Clone( ).
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: 6db1d3c5b99b99ad10f3604ca2b87266b4aaa064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6db1d3c5b99b99ad10f3604ca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 21 19:17:34 2010 +0400 comctl32/imagelist: Fix reference leak in IImageList_Clone(). --- dlls/comctl32/imagelist.c | 13 +++++++++---- dlls/comctl32/tests/imagelist.c | 15 +++++++++++++-- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 34cf7d3..7133d2f 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3392,16 +3392,21 @@ static HRESULT WINAPI ImageListImpl_Merge(IImageList *iface, int i1, static HRESULT WINAPI ImageListImpl_Clone(IImageList *iface, REFIID riid, void **ppv) { HIMAGELIST This = (HIMAGELIST) iface; - HIMAGELIST hNew; + HIMAGELIST clone; HRESULT ret = E_FAIL; TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); - hNew = ImageList_Duplicate(This); + clone = ImageList_Duplicate(This); /* Get the interface for the new image list */ - if (hNew) - ret = HIMAGELIST_QueryInterface(hNew, riid, ppv); + if (clone) + { + IImageList *iclone = (IImageList*)clone; + + ret = HIMAGELIST_QueryInterface(clone, riid, ppv); + IImageList_Release(iclone); + } return ret; } diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index a4dae03..210f9ec 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1332,7 +1332,7 @@ cleanup: static void test_iimagelist(void) { - IImageList *imgl; + IImageList *imgl, *imgl2; HIMAGELIST himl; HRESULT hr; ULONG ret; @@ -1364,6 +1364,15 @@ static void test_iimagelist(void) ret = ImageList_Destroy((HIMAGELIST)imgl); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + /* ref counting, HIMAGELIST_QueryInterface adds a reference */ + imgl = (IImageList*)createImageList(32, 32); + hr = pHIMAGELIST_QueryInterface((HIMAGELIST)imgl, &IID_IImageList, (void**)&imgl2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(imgl2 == imgl, "got different pointer\n"); + ret = IImageList_Release(imgl); + ok(ret == 1, "got %u\n", ret); + IImageList_Release(imgl); + if (!pImageList_CoCreateInstance) { win_skip("Vista imagelist functions not available\n"); @@ -1783,6 +1792,7 @@ static void test_IImageList_Clone(void) IImageList *imgl, *imgl2; HIMAGELIST himl; HRESULT hr; + ULONG ref; himl = ImageList_Create(16, 16, ILC_COLOR16, 0, 3); imgl = (IImageList*)himl; @@ -1795,7 +1805,8 @@ if (0) hr = IImageList_Clone(imgl, &IID_IImageList, (void**)&imgl2); ok(hr == S_OK, "got 0x%08x\n", hr); - IImageList_Release(imgl2); + ref = IImageList_Release(imgl2); + ok(ref == 0, "got %u\n", ref); IImageList_Release(imgl); }

1 0

Henri Verbeet : wined3d: Pass a WINED3DCOLORVALUE structure to IWineD3DDeviceImpl_ClearRendertargetView ().
by Alexandre Julliard Aug. 23, 2010

Aug. 23, 2010

Module: wine Branch: master Commit: b93a9b37faecef25b50f7499fd7b99cbd7f80aef URL: http://source.winehq.org/git/wine.git/?a=commit;h=b93a9b37faecef25b50f7499f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 22 23:35:41 2010 +0200 wined3d: Pass a WINED3DCOLORVALUE structure to IWineD3DDeviceImpl_ClearRendertargetView(). The structure is nicer to work with than the array. --- dlls/d3d10core/device.c | 3 ++- dlls/wined3d/device.c | 26 ++++++++++++++------------ dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 2 +- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 191e681..9779511 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -373,11 +373,12 @@ static void STDMETHODCALLTYPE d3d10_device_ClearRenderTargetView(ID3D10Device *i { struct d3d10_device *This = (struct d3d10_device *)iface; IWineD3DRendertargetView *wined3d_view = ((struct d3d10_rendertarget_view *)render_target_view)->wined3d_view; + const WINED3DCOLORVALUE color = {color_rgba[0], color_rgba[1], color_rgba[2], color_rgba[3]}; TRACE("iface %p, render_target_view %p, color_rgba [%f %f %f %f]\n", iface, render_target_view, color_rgba[0], color_rgba[1], color_rgba[2], color_rgba[3]); - IWineD3DDevice_ClearRendertargetView(This->wined3d_device, wined3d_view, color_rgba); + IWineD3DDevice_ClearRendertargetView(This->wined3d_device, wined3d_view, &color); } static void STDMETHODCALLTYPE d3d10_device_ClearDepthStencilView(ID3D10Device *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8790046..defcceb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -655,7 +655,8 @@ static void prepare_ds_clear(IWineD3DSurfaceImpl *ds, struct wined3d_context *co } HRESULT device_clear_render_targets(IWineD3DDeviceImpl *device, UINT rt_count, IWineD3DSurfaceImpl **rts, - UINT rect_count, const WINED3DRECT *rects, DWORD flags, const float color[4], float depth, DWORD stencil) + UINT rect_count, const WINED3DRECT *rects, DWORD flags, const WINED3DCOLORVALUE *color, + float depth, DWORD stencil) { const RECT *clear_rect = (rect_count > 0 && rects) ? (const RECT *)rects : NULL; IWineD3DSurfaceImpl *depth_stencil = device->depth_stencil; @@ -741,7 +742,7 @@ HRESULT device_clear_render_targets(IWineD3DDeviceImpl *device, UINT rt_count, I IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1)); IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2)); IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3)); - glClearColor(color[0], color[1], color[2], color[3]); + glClearColor(color->r, color->g, color->b, color->a); checkGLcall("glClearColor"); clear_mask = clear_mask | GL_COLOR_BUFFER_BIT; } @@ -4578,7 +4579,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Present(IWineD3DDevice *iface, static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Count, const WINED3DRECT *pRects, DWORD Flags, WINED3DCOLOR color, float Z, DWORD Stencil) { - const float c[] = {D3DCOLOR_R(color), D3DCOLOR_G(color), D3DCOLOR_B(color), D3DCOLOR_A(color)}; + const WINED3DCOLORVALUE c = {D3DCOLOR_R(color), D3DCOLOR_G(color), D3DCOLOR_B(color), D3DCOLOR_A(color)}; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p) Count (%d), pRects (%p), Flags (%x), color (0x%08x), Z (%f), Stencil (%d)\n", This, @@ -4592,7 +4593,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun } return device_clear_render_targets(This, This->adapter->gl_info.limits.buffers, - This->render_targets, Count, pRects, Flags, c, Z, Stencil); + This->render_targets, Count, pRects, Flags, &c, Z, Stencil); } /***** @@ -5506,11 +5507,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, return WINED3DERR_INVALIDCALL; } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - const float c[4] = {D3DCOLOR_R(color), D3DCOLOR_G(color), D3DCOLOR_B(color), D3DCOLOR_A(color)}; + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + const WINED3DCOLORVALUE c = {D3DCOLOR_R(color), D3DCOLOR_G(color), D3DCOLOR_B(color), D3DCOLOR_A(color)}; return device_clear_render_targets((IWineD3DDeviceImpl *)iface, 1, &s, - !!pRect, pRect, WINED3DCLEAR_TARGET, c, 0.0f, 0); + !!pRect, pRect, WINED3DCLEAR_TARGET, &c, 0.0f, 0); } else { @@ -5524,7 +5526,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, } static void WINAPI IWineD3DDeviceImpl_ClearRendertargetView(IWineD3DDevice *iface, - IWineD3DRendertargetView *rendertarget_view, const float color[4]) + IWineD3DRendertargetView *rendertarget_view, const WINED3DCOLORVALUE *color) { IWineD3DResource *resource; IWineD3DSurfaceImpl *surface; @@ -5558,10 +5560,10 @@ static void WINAPI IWineD3DDeviceImpl_ClearRendertargetView(IWineD3DDevice *ifac WARN("Converting to WINED3DCOLOR, this might give incorrect results\n"); - c = ((DWORD)(color[2] * 255.0f)); - c |= ((DWORD)(color[1] * 255.0f)) << 8; - c |= ((DWORD)(color[0] * 255.0f)) << 16; - c |= ((DWORD)(color[3] * 255.0f)) << 24; + c = ((DWORD)(color->b * 255.0f)); + c |= ((DWORD)(color->g * 255.0f)) << 8; + c |= ((DWORD)(color->r * 255.0f)) << 16; + c |= ((DWORD)(color->a * 255.0f)) << 24; /* Just forward this to the DirectDraw blitting engine */ memset(&BltFx, 0, sizeof(BltFx)); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dfa124d..7aab4ff 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4872,10 +4872,10 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, enum blit_ static HRESULT ffp_blit_color_fill(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *dst_surface, const RECT *dst_rect, DWORD color) { - const float c[] = {D3DCOLOR_R(color), D3DCOLOR_G(color), D3DCOLOR_B(color), D3DCOLOR_A(color)}; + const WINED3DCOLORVALUE c = {D3DCOLOR_R(color), D3DCOLOR_G(color), D3DCOLOR_B(color), D3DCOLOR_A(color)}; return device_clear_render_targets(device, 1 /* rt_count */, &dst_surface, 1 /* rect_count */, - (const WINED3DRECT *)dst_rect, WINED3DCLEAR_TARGET, c, 0.0f /* depth */, 0 /* stencil */); + (const WINED3DRECT *)dst_rect, WINED3DCLEAR_TARGET, &c, 0.0f /* depth */, 0 /* stencil */); } const struct blit_shader ffp_blit = { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b99dc8c..34a8eb2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1690,7 +1690,7 @@ struct IWineD3DDeviceImpl HRESULT device_clear_render_targets(IWineD3DDeviceImpl *device, UINT rt_count, IWineD3DSurfaceImpl **rts, UINT rect_count, const WINED3DRECT *rects, - DWORD flags, const float color[4], float depth, DWORD stencil) DECLSPEC_HIDDEN; + DWORD flags, const WINED3DCOLORVALUE *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; BOOL device_context_add(IWineD3DDeviceImpl *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void device_context_remove(IWineD3DDeviceImpl *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void device_get_draw_rect(IWineD3DDeviceImpl *device, RECT *rect) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index da5531a..ea2f855 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -3321,7 +3321,7 @@ interface IWineD3DDevice : IWineD3DBase ); void ClearRendertargetView( [in] IWineD3DRendertargetView *rendertarget_view, - [in] const float color[4] + [in] const WINED3DCOLORVALUE *color ); void SetPrimitiveType( [in] WINED3DPRIMITIVETYPE primitive_topology

1 0