December 2008 - Wine-commits

Huw Davies : ddraw/tests: Skip tests if we can't create a primary surface.
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: ebb31dbbb7fef3bf628c13edbf85a4ad0fc59cbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebb31dbbb7fef3bf628c13edb… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 5 12:22:17 2008 +0000 ddraw/tests: Skip tests if we can't create a primary surface. --- dlls/ddraw/tests/dsurface.c | 22 ++++++++++++++++++++++ dlls/ddraw/tests/visual.c | 3 +-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index d4626ad..80cf9b1 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2748,6 +2748,22 @@ static void SurfaceCapsTest(void) } } +static BOOL can_create_primary_surface(void) +{ + DDSURFACEDESC ddsd; + IDirectDrawSurface *surface; + HRESULT hr; + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS; + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); + if(FAILED(hr)) return FALSE; + IDirectDrawSurface_Release(surface); + return TRUE; +} + START_TEST(dsurface) { HRESULT ret; @@ -2765,6 +2781,12 @@ START_TEST(dsurface) } IDirectDraw_Release(dd4); + if(!can_create_primary_surface()) + { + skip("Unable to create primary surface\n"); + return; + } + MipMapCreationTest(); SrcColorKey32BlitTest(); QueryInterface(); diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 12f11c9..185cc33 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -89,8 +89,7 @@ static BOOL createObjects(void) ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE; ddsd.dwBackBufferCount = 1; hr = IDirectDraw7_CreateSurface(DirectDraw, &ddsd, &Surface, NULL); - ok(hr==DD_OK, "CreateSurface returned: %08x\n", hr); - if(!Surface) goto err; + if(FAILED(hr)) goto err; hr = IDirect3D7_CreateDevice(Direct3D, &IID_IDirect3DTnLHalDevice, Surface, &Direct3DDevice); if(FAILED(hr))

1 0

Paul Vriens : hlink/tests: Fix some failures on Win9x and WinMe.
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: d127bbd5db78cd513a30ae3d5c3735f7dbd5f73f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d127bbd5db78cd513a30ae3d5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Dec 5 10:10:29 2008 +0100 hlink/tests: Fix some failures on Win9x and WinMe. --- dlls/hlink/tests/hlink.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 89b7c7a..5e07359 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -351,6 +351,7 @@ static void test_persist_save_data(const char *testname, IHlink *lnk, const unsigned char *data; DWORD i; BOOL same; + unsigned int expected_data_win9x_size = 0; hr = IHlink_QueryInterface(lnk, &IID_IPersistStream, (void **)&ps); ok(hr == S_OK, "IHlink_QueryInterface failed with error 0x%08x\n", hr); @@ -368,8 +369,13 @@ static void test_persist_save_data(const char *testname, IHlink *lnk, data = GlobalLock(hglobal); + if (expected_data_size % 4) + expected_data_win9x_size = 4 * ((expected_data_size / 4) + 1); + /* first check we have the right amount of data */ - ok((data_size == expected_data_size) || (data_size == expected_data_alt_size), + ok((data_size == expected_data_size) || + (data_size == expected_data_alt_size) || + broken(data_size == expected_data_win9x_size), /* Win9x and WinMe */ "%s: Size of saved data differs (expected %d or %d, actual %d)\n", testname, expected_data_size, expected_data_alt_size, data_size);

1 0

Nikolay Sivov : gdiplus: Added GdipScaleTextureTransform.
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: 958e73aa69d7e2cb3d5aa8e57f563e9b06f282e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=958e73aa69d7e2cb3d5aa8e57… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Dec 5 10:37:21 2008 +0300 gdiplus: Added GdipScaleTextureTransform. --- dlls/gdiplus/brush.c | 14 ++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 7fefd9f..a24f54e 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -954,6 +954,20 @@ GpStatus WINGDIPAPI GdipResetTextureTransform(GpTexture* brush) return GdipSetMatrixElements(brush->transform, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); } +/****************************************************************************** + * GdipScaleTextureTransform [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipScaleTextureTransform(GpTexture* brush, + REAL sx, REAL sy, GpMatrixOrder order) +{ + TRACE("(%p, %.2f, %.2f, %d)\n", brush, sx, sy, order); + + if(!brush) + return InvalidParameter; + + return GdipScaleMatrix(brush->transform, sx, sy, order); +} + GpStatus WINGDIPAPI GdipSetLineBlend(GpLineGradient *brush, GDIPCONST REAL *blend, GDIPCONST REAL* positions, INT count) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 1b3f307..b3d2103 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -500,7 +500,7 @@ @ stdcall GdipScaleMatrix(ptr long long long) @ stub GdipScalePathGradientTransform @ stub GdipScalePenTransform -@ stub GdipScaleTextureTransform +@ stdcall GdipScaleTextureTransform(ptr long long long) @ stdcall GdipScaleWorldTransform(ptr long long long) @ stdcall GdipSetAdjustableArrowCapFillState(ptr long) @ stdcall GdipSetAdjustableArrowCapHeight(ptr long)

1 0

Paul Vriens : gdi32/tests: Fix a few test failures on Win9x and WinMe.
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: fee339f7ff9e3a46b6c9245c6df2943f0abd90e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fee339f7ff9e3a46b6c9245c6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Dec 5 10:51:46 2008 +0100 gdi32/tests: Fix a few test failures on Win9x and WinMe. --- dlls/gdi32/tests/bitmap.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 7ab8323..7094f85 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1956,11 +1956,17 @@ static void test_CreateBitmap(void) bmp.bmPlanes = 1; bmp.bmBitsPixel = i; bmp.bmBits = NULL; + SetLastError(0xdeadbeef); bm = CreateBitmapIndirect(&bmp); if(i > 32) { DWORD error = GetLastError(); - ok(bm == 0, "CreateBitmapIndirect for %d bpp succeeded\n", i); - ok(error == ERROR_INVALID_PARAMETER, "Got error %d, expected ERROR_INVALID_PARAMETER\n", error); + ok(bm == 0 || + broken(bm != 0), /* Win9x and WinMe */ + "CreateBitmapIndirect for %d bpp succeeded\n", i); + ok(error == ERROR_INVALID_PARAMETER || + broken(error == 0xdeadbeef), /* Win9x and WinME */ + "Got error %d, expected ERROR_INVALID_PARAMETER\n", error); + DeleteObject(bm); continue; } ok(bm != 0, "CreateBitmapIndirect error %u\n", GetLastError()); @@ -1978,7 +1984,9 @@ static void test_CreateBitmap(void) } else if(i <= 32) { expect = 32; } - ok(bmp.bmBitsPixel == expect, "CreateBitmapIndirect for a %d bpp bitmap created a %d bpp bitmap, expected %d\n", + ok(bmp.bmBitsPixel == expect || + broken(bmp.bmBitsPixel == i), /* Win9x and WinMe */ + "CreateBitmapIndirect for a %d bpp bitmap created a %d bpp bitmap, expected %d\n", i, bmp.bmBitsPixel, expect); DeleteObject(bm); }

1 0

Michael Stefaniuc : gdiplus: Reduce the number of casts by using the proper type for variables.
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: 4386caa13b00c4eab5708769fc6c1faab78a1f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4386caa13b00c4eab5708769f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 5 07:52:51 2008 +0100 gdiplus: Reduce the number of casts by using the proper type for variables. --- dlls/gdiplus/brush.c | 11 +++++------ dlls/gdiplus/image.c | 32 +++++++++++++++----------------- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index efcf31d..7fefd9f 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -478,8 +478,7 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, REAL height, GpTexture **texture) { HDC hdc; - OLE_HANDLE hbm; - HBITMAP old = NULL; + HBITMAP hbm, old = NULL; BITMAPINFO *pbmi; BITMAPINFOHEADER *bmih; INT n_x, n_y, n_width, n_height, abs_height, stride, image_stride, i, bytespp; @@ -507,7 +506,7 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, n_y + n_height > ((GpBitmap*)image)->height) return InvalidParameter; - IPicture_get_Handle(image->picture, &hbm); + IPicture_get_Handle(image->picture, (OLE_HANDLE*)&hbm); if(!hbm) return GenericError; IPicture_get_CurDC(image->picture, &hdc); bm_is_selected = (hdc != 0); @@ -520,11 +519,11 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, if(!bm_is_selected){ hdc = CreateCompatibleDC(0); - old = SelectObject(hdc, (HBITMAP)hbm); + old = SelectObject(hdc, hbm); } /* fill out bmi */ - GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); + GetDIBits(hdc, hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); bytespp = pbmi->bmiHeader.biBitCount / 8; abs_height = abs(pbmi->bmiHeader.biHeight); @@ -538,7 +537,7 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, dibits = GdipAlloc(pbmi->bmiHeader.biSizeImage); if(dibits) /* this is not a good place to error out */ - GetDIBits(hdc, (HBITMAP)hbm, 0, abs_height, dibits, pbmi, DIB_RGB_COLORS); + GetDIBits(hdc, hbm, 0, abs_height, dibits, pbmi, DIB_RGB_COLORS); if(!bm_is_selected){ SelectObject(hdc, old); diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 581eb27..683e9b7 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -96,9 +96,8 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, { BOOL bm_is_selected; INT stride, bitspp = PIXELFORMATBPP(format); - OLE_HANDLE hbm; HDC hdc; - HBITMAP old = NULL; + HBITMAP hbm, old = NULL; BITMAPINFO *pbmi; BYTE *buff = NULL; UINT abs_height; @@ -128,7 +127,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, if(bitmap->lockmode) return WrongState; - IPicture_get_Handle(bitmap->image.picture, &hbm); + IPicture_get_Handle(bitmap->image.picture, (OLE_HANDLE*)&hbm); IPicture_get_CurDC(bitmap->image.picture, &hdc); bm_is_selected = (hdc != 0); @@ -140,11 +139,11 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, if(!bm_is_selected){ hdc = CreateCompatibleDC(0); - old = SelectObject(hdc, (HBITMAP)hbm); + old = SelectObject(hdc, hbm); } /* fill out bmi */ - GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); + GetDIBits(hdc, hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); abs_height = abs(pbmi->bmiHeader.biHeight); stride = pbmi->bmiHeader.biWidth * bitspp / 8; @@ -155,7 +154,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, pbmi->bmiHeader.biBitCount = bitspp; if(buff) - GetDIBits(hdc, (HBITMAP)hbm, 0, abs_height, buff, pbmi, DIB_RGB_COLORS); + GetDIBits(hdc, hbm, 0, abs_height, buff, pbmi, DIB_RGB_COLORS); if(!bm_is_selected){ SelectObject(hdc, old); @@ -194,9 +193,8 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, BitmapData* lockeddata) { - OLE_HANDLE hbm; HDC hdc; - HBITMAP old = NULL; + HBITMAP hbm, old = NULL; BOOL bm_is_selected; BITMAPINFO *pbmi; @@ -218,7 +216,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, return Ok; } - IPicture_get_Handle(bitmap->image.picture, &hbm); + IPicture_get_Handle(bitmap->image.picture, (OLE_HANDLE*)&hbm); IPicture_get_CurDC(bitmap->image.picture, &hdc); bm_is_selected = (hdc != 0); @@ -228,12 +226,12 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, if(!bm_is_selected){ hdc = CreateCompatibleDC(0); - old = SelectObject(hdc, (HBITMAP)hbm); + old = SelectObject(hdc, hbm); } - GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); + GetDIBits(hdc, hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); pbmi->bmiHeader.biBitCount = PIXELFORMATBPP(lockeddata->PixelFormat); - SetDIBits(hdc, (HBITMAP)hbm, 0, abs(pbmi->bmiHeader.biHeight), + SetDIBits(hdc, hbm, 0, abs(pbmi->bmiHeader.biHeight), bitmap->bitmapbits, pbmi, DIB_RGB_COLORS); if(!bm_is_selected){ @@ -1035,7 +1033,7 @@ GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) if(type == PICTYPE_BITMAP){ BITMAPINFO *pbmi; BITMAPCOREHEADER* bmch; - OLE_HANDLE hbm; + HBITMAP hbm; HDC hdc; pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); @@ -1052,7 +1050,7 @@ GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) (*((GpBitmap**) image))->height = ipicture_pixel_height(pic); /* get the pixel format */ - IPicture_get_Handle(pic, &hbm); + IPicture_get_Handle(pic, (OLE_HANDLE*)&hbm); IPicture_get_CurDC(pic, &hdc); bmch = (BITMAPCOREHEADER*) (&pbmi->bmiHeader); @@ -1061,13 +1059,13 @@ GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) if(!hdc){ HBITMAP old; hdc = CreateCompatibleDC(0); - old = SelectObject(hdc, (HBITMAP)hbm); - GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); + old = SelectObject(hdc, hbm); + GetDIBits(hdc, hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); SelectObject(hdc, old); DeleteDC(hdc); } else - GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); + GetDIBits(hdc, hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); (*((GpBitmap**) image))->format = (bmch->bcBitCount << 8) | PixelFormatGDI; GdipFree(pbmi);

1 0

Michael Stefaniuc : gdiplus: Remove some superfluous casts.
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: 50ff5494202e707bd07a3173e40e441597ea2df7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50ff5494202e707bd07a3173e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 5 07:53:04 2008 +0100 gdiplus: Remove some superfluous casts. --- dlls/gdiplus/font.c | 2 +- dlls/gdiplus/image.c | 3 ++- dlls/gdiplus/tests/region.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 2366823..220409b 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -256,7 +256,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromDC(HDC hdc, GpFont **font) if(!font) return InvalidParameter; - hfont = (HFONT)GetCurrentObject(hdc, OBJ_FONT); + hfont = GetCurrentObject(hdc, OBJ_FONT); if(!hfont) return GenericError; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 683e9b7..0c61056 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -370,7 +370,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromResource(HINSTANCE hInstance, return InvalidParameter; /* load DIB */ - hbm = (HBITMAP)LoadImageW(hInstance,lpBitmapName,IMAGE_BITMAP,0,0,LR_CREATEDIBSECTION); + hbm = LoadImageW(hInstance, lpBitmapName, IMAGE_BITMAP, 0, 0, + LR_CREATEDIBSECTION); if(hbm){ stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, bitmap); diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 15363f2..1373634 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -765,7 +765,7 @@ todo_wine{ } GdipDeleteRegion(region); - DeleteObject((HGDIOBJ)hrgn); + DeleteObject(hrgn); /* ellipse */ hrgn = CreateEllipticRgn(0, 0, 100, 10); @@ -791,7 +791,7 @@ todo_wine{ expect_dword(buf + 8, 0x00006000); /* ?? */ } GdipDeleteRegion(region); - DeleteObject((HGDIOBJ)hrgn); + DeleteObject(hrgn); } static void test_gethrgn(void)

1 0

Paul Vriens : shlwapi/tests: Use a codepage that is supported on all platforms.
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: 8fc42993a1779d7984f7ea9552c080b1a36524dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc42993a1779d7984f7ea955… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Dec 5 08:49:08 2008 +0100 shlwapi/tests: Use a codepage that is supported on all platforms. --- dlls/shlwapi/tests/url.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 7ae79bc..80aee98 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -746,7 +746,7 @@ static void test_UrlCanonicalizeW(void) BOOL choped; int pos; - MultiByteToWideChar(CP_UTF8, 0, "http://www.winehq.org/X", -1, szUrl, 128); + MultiByteToWideChar(CP_ACP, 0, "http://www.winehq.org/X", -1, szUrl, 128); pos = lstrlenW(szUrl) - 1; szUrl[pos] = i; urllen = INTERNET_MAX_URL_LENGTH;

1 0

Michael Stefaniuc : wnaspi32: Replace malloc with HeapAlloc.
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: 81f919fd374b1bb2ba842b4b44f8aaa9b7190cbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=81f919fd374b1bb2ba842b4b4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 5 07:48:19 2008 +0100 wnaspi32: Replace malloc with HeapAlloc. --- dlls/wnaspi32/winaspi16.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wnaspi32/winaspi16.c b/dlls/wnaspi32/winaspi16.c index 4209082..17d6a6c 100644 --- a/dlls/wnaspi32/winaspi16.c +++ b/dlls/wnaspi32/winaspi16.c @@ -252,7 +252,7 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode) if (HOST_TO_TARGET(lpPRB)) { /* send header, command, and then data */ in_len = SCSI_OFF + lpPRB->SRB_CDBLen + lpPRB->SRB_BufLen; - sg_hd = (struct sg_header *) malloc(in_len); + sg_hd = HeapAlloc(GetProcessHeap(), 0, in_len); memset(sg_hd, 0, SCSI_OFF); memcpy(sg_hd + 1, &lpPRB->CDBByte[0], lpPRB->SRB_CDBLen); if (lpPRB->SRB_BufLen) { @@ -262,20 +262,20 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode) else { /* send header and command - no data */ in_len = SCSI_OFF + lpPRB->SRB_CDBLen; - sg_hd = (struct sg_header *) malloc(in_len); + sg_hd = HeapAlloc(GetProcessHeap(), 0, in_len); memset(sg_hd, 0, SCSI_OFF); memcpy(sg_hd + 1, &lpPRB->CDBByte[0], lpPRB->SRB_CDBLen); } if (TARGET_TO_HOST(lpPRB)) { out_len = SCSI_OFF + lpPRB->SRB_BufLen; - sg_reply_hdr = (struct sg_header *) malloc(out_len); + sg_reply_hdr = HeapAlloc(GetProcessHeap(), 0, out_len); memset(sg_reply_hdr, 0, SCSI_OFF); sg_hd->reply_len = out_len; } else { out_len = SCSI_OFF; - sg_reply_hdr = (struct sg_header *) malloc(out_len); + sg_reply_hdr = HeapAlloc(GetProcessHeap(), 0, out_len); memset(sg_reply_hdr, 0, SCSI_OFF); sg_hd->reply_len = out_len; } @@ -343,8 +343,8 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mode) } } - free(sg_reply_hdr); - free(sg_hd); + HeapFree(GetProcessHeap(), 0, sg_reply_hdr); + HeapFree(GetProcessHeap(), 0, sg_hd); ASPI_DebugPrintResult(lpPRB, mode); return SS_COMP; @@ -362,8 +362,8 @@ error_exit: * We probably should set lpPRB->SRB_TargStat, SRB_HaStat ? */ WARN("error_exit\n"); - free(sg_reply_hdr); - free(sg_hd); + HeapFree(GetProcessHeap(), 0, sg_reply_hdr); + HeapFree(GetProcessHeap(), 0, sg_hd); return lpPRB->SRB_Status; } #endif

1 0

Michael Stefaniuc : wnaspi32: Remove some superfluous casts.
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: f4c2f2b0c4155f22346869c0d29ec0e1866739f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4c2f2b0c4155f22346869c0d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 5 07:49:17 2008 +0100 wnaspi32: Remove some superfluous casts. --- dlls/wnaspi32/winaspi32.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c index 94ed418..45b352c 100644 --- a/dlls/wnaspi32/winaspi32.c +++ b/dlls/wnaspi32/winaspi32.c @@ -292,8 +292,8 @@ WNASPI32_DoPosting( SRB_ExecSCSICmd *lpPRB, DWORD status ) (*SRB_PostProc)(lpPRB); } else if (SRB_Flags & SRB_EVENT_NOTIFY) { - TRACE("Setting event %p\n", (HANDLE)SRB_PostProc); - SetEvent((HANDLE)SRB_PostProc); + TRACE("Setting event %p\n", SRB_PostProc); + SetEvent(SRB_PostProc); } } return SS_PENDING; @@ -598,7 +598,7 @@ DWORD __cdecl GetASPI32DLLVersion(void) return (DWORD)1; #else FIXME("Please add SCSI support for your operating system, returning 0\n"); - return (DWORD)0; + return 0; #endif }

1 0

Michael Stefaniuc : atl: Remove two superfluous casts.
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: fa1d0498470b120d2ad01648782c9eff17bcf2c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa1d0498470b120d2ad016487… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 5 07:50:43 2008 +0100 atl: Remove two superfluous casts. --- dlls/atl/atl_ax.c | 2 +- dlls/atl/registrar.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index a5ae342..c98cba7 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1244,7 +1244,7 @@ HWND WINAPI AtlAxCreateDialogW(HINSTANCE hInst, LPCWSTR name, HWND owner, DLGPRO hgl = LoadResource (hInst, hrsrc); if ( !hgl ) return NULL; - ptr = (LPCDLGTEMPLATEW)LockResource ( hgl ); + ptr = LockResource ( hgl ); if (!ptr) { FreeResource( hgl ); diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index dd8b7a2..d3ca9b0 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -439,7 +439,7 @@ static HRESULT resource_register(Registrar *This, LPCOLESTR resFileName, if(hins) { src = FindResourceW(hins, szID, szType); if(src) { - regstra = (LPSTR)LoadResource(hins, src); + regstra = LoadResource(hins, src); reslen = SizeofResource(hins, src); if(regstra) { len = MultiByteToWideChar(CP_ACP, 0, regstra, reslen, NULL, 0)+1;

1 0