September 2008 - Wine-Commits

Rob Shearman : d3d9: Fix incorrect ordering of brackets in IDirect3DVertexShader9Impl_GetDevice .
by Alexandre Julliard Sept. 30, 2008

Sept. 30, 2008

Module: wine Branch: master Commit: a4b2a2c3808854bfe7fc3cf6ba14bbe4cac356f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b2a2c3808854bfe7fc3cf6b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Sep 30 13:54:50 2008 +0100 d3d9: Fix incorrect ordering of brackets in IDirect3DVertexShader9Impl_GetDevice. The comparison should be (D3D_OK == hr && myDevice), not (D3D_OK == (hr && myDevice)). (Found with PreFast.) --- dlls/d3d9/vertexshader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index c41b2c4..d40d0a5 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -73,7 +73,8 @@ static HRESULT WINAPI IDirect3DVertexShader9Impl_GetDevice(LPDIRECT3DVERTEXSHADE TRACE("(%p) : Relay\n", This); EnterCriticalSection(&d3d9_cs); - if (D3D_OK == (hr = IWineD3DVertexShader_GetDevice(This->wineD3DVertexShader, &myDevice) && myDevice != NULL)) { + hr = IWineD3DVertexShader_GetDevice(This->wineD3DVertexShader, &myDevice); + if (D3D_OK == hr && myDevice != NULL) { hr = IWineD3DDevice_GetParent(myDevice, (IUnknown **)ppDevice); IWineD3DDevice_Release(myDevice); } else {

1 0

Rob Shearman : shlwapi: Use an error code instead of -1 for signalling prefix not being found in URL_GuessScheme .
by Alexandre Julliard Sept. 30, 2008

Sept. 30, 2008

Module: wine Branch: master Commit: 80b5b74f1583aaa3caed3a34dc93e6f5a1a1e489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80b5b74f1583aaa3caed3a34d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Sep 30 13:55:13 2008 +0100 shlwapi: Use an error code instead of -1 for signalling prefix not being found in URL_GuessScheme. --- dlls/shlwapi/url.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index febf6a7..e6289a5 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1589,7 +1589,7 @@ static HRESULT URL_GuessScheme(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut) index++; } RegCloseKey(newkey); - return -1; + return E_FAIL; } static HRESULT URL_ApplyDefault(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut) @@ -1652,7 +1652,7 @@ HRESULT WINAPI UrlApplySchemeW(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut, DW if (res1) { /* no scheme in input, need to see if we need to guess */ if (dwFlags & URL_APPLY_GUESSSCHEME) { - if ((ret = URL_GuessScheme(pszIn, pszOut, pcchOut)) != -1) + if ((ret = URL_GuessScheme(pszIn, pszOut, pcchOut)) != E_FAIL) return ret; } }

1 0

Rob Shearman : uxtheme: SetPropW returns a BOOL not an HRESULT.
by Alexandre Julliard Sept. 30, 2008

Sept. 30, 2008

Module: wine Branch: master Commit: 739bdaeb86bf7f29ea5a13e3a79ea98008d80a3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=739bdaeb86bf7f29ea5a13e3a… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Sep 30 13:55:03 2008 +0100 uxtheme: SetPropW returns a BOOL not an HRESULT. Therefore fix the code to handle SetPropW failing with this in mind. (Found by PreFast.) --- dlls/uxtheme/draw.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 8b3b959..ff0ac9e 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -52,19 +52,18 @@ extern ATOM atDialogThemeEnabled; HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD dwFlags) { static const WCHAR szTab[] = { 'T','a','b',0 }; - HRESULT hr; + BOOL res; TRACE("(%p,0x%08x\n", hwnd, dwFlags); - hr = SetPropW (hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled), + res = SetPropW (hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled), (HANDLE)(dwFlags|0x80000000)); /* 0x80000000 serves as a "flags set" flag */ - if (FAILED(hr)) - return hr; + if (!res) + return HRESULT_FROM_WIN32(GetLastError()); if (dwFlags & ETDT_USETABTEXTURE) return SetWindowTheme (hwnd, NULL, szTab); else return SetWindowTheme (hwnd, NULL, NULL); - return S_OK; } /***********************************************************************

1 0

Rob Shearman : winebuild: Declare fatal_error and fatal_perror as non-returning functions.
by Alexandre Julliard Sept. 30, 2008

Sept. 30, 2008

Module: wine Branch: master Commit: 8a6f1655d83b63b13a652b5b5075d74408a092b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a6f1655d83b63b13a652b5b5… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Sep 30 13:54:32 2008 +0100 winebuild: Declare fatal_error and fatal_perror as non-returning functions. --- tools/winebuild/build.h | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index b13b994..326a838 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -143,14 +143,22 @@ extern enum target_platform target_platform; #define __attribute__(X) #endif +#ifndef DECLSPEC_NORETURN +# if defined(_MSC_VER) && (_MSC_VER >= 1200) && !defined(MIDL_PASS) +# define DECLSPEC_NORETURN __declspec(noreturn) +# else +# define DECLSPEC_NORETURN __attribute__((noreturn)) +# endif +#endif + extern void *xmalloc (size_t size); extern void *xrealloc (void *ptr, size_t size); extern char *xstrdup( const char *str ); extern char *strupper(char *s); extern int strendswith(const char* str, const char* end); -extern void fatal_error( const char *msg, ... ) +extern DECLSPEC_NORETURN void fatal_error( const char *msg, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); -extern void fatal_perror( const char *msg, ... ) +extern DECLSPEC_NORETURN void fatal_perror( const char *msg, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); extern void error( const char *msg, ... ) __attribute__ ((__format__ (__printf__, 1, 2)));

1 0

Dylan Smith : richedit: Fixed test failing on windows version with larger font sizes.
by Alexandre Julliard Sept. 30, 2008

Sept. 30, 2008

Module: wine Branch: master Commit: 0699332b370df68e657eb84b2cbf7f0b45e4cca3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0699332b370df68e657eb84b2… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Sep 29 20:16:31 2008 -0400 richedit: Fixed test failing on windows version with larger font sizes. --- dlls/riched20/tests/editor.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 15f0248..649d7e7 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -392,7 +392,6 @@ static void line_scroll(HWND hwnd, int amount) static void test_EM_SCROLLCARET(void) { int prevY, curY; - HWND hwndRichEdit = new_richedit(NULL); const char text[] = "aa\n" "this is a long line of text that should be longer than the " "control's width\n" @@ -402,6 +401,14 @@ static void test_EM_SCROLLCARET(void) "ff\n" "gg\n" "hh\n"; + /* The richedit window height needs to be large enough vertically to fit in + * more than two lines of text, so the new_richedit function can't be used + * since a height of 60 was not large enough on some systems. + */ + HWND hwndRichEdit = CreateWindow(RICHEDIT_CLASS, NULL, + ES_MULTILINE|WS_POPUP|WS_HSCROLL|WS_VSCROLL|WS_VISIBLE, + 0, 0, 200, 80, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwndRichEdit != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); /* Can't verify this */ SendMessage(hwndRichEdit, EM_SCROLLCARET, 0, 0);

1 0

Dylan Smith : richedit: Fixed test failure that happend on older builds of riched20.dll.
by Alexandre Julliard Sept. 30, 2008

Sept. 30, 2008

Module: wine Branch: master Commit: c13fd6a44b71c263e76cf2a4bbf6026ed06a4ca0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c13fd6a44b71c263e76cf2a4b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Sep 29 13:33:52 2008 -0400 richedit: Fixed test failure that happend on older builds of riched20.dll. --- dlls/riched20/tests/editor.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 41dce86..15f0248 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1101,6 +1101,7 @@ static void test_SETPARAFORMAT(void) HWND hwndRichEdit = new_richedit(NULL); PARAFORMAT2 fmt; HRESULT ret; + LONG expectedMask = PFM_ALL2 & ~PFM_TABLEROWDELIMITER; fmt.cbSize = sizeof(PARAFORMAT2); fmt.dwMask = PFM_ALIGNMENT; fmt.wAlignment = PFA_LEFT; @@ -1111,8 +1112,14 @@ static void test_SETPARAFORMAT(void) fmt.cbSize = sizeof(PARAFORMAT2); fmt.dwMask = -1; ret = SendMessage(hwndRichEdit, EM_GETPARAFORMAT, 0, (LPARAM) &fmt); - ok(ret == PFM_ALL2, "expected %x got %x\n", PFM_ALL2, ret); - ok(fmt.dwMask == PFM_ALL2, "expected %x got %x\n", PFM_ALL2, fmt.dwMask); + /* Ignore the PFM_TABLEROWDELIMITER bit because it changes + * between richedit different native builds of riched20.dll + * used on different Windows versions. */ + ret &= ~PFM_TABLEROWDELIMITER; + fmt.dwMask &= ~PFM_TABLEROWDELIMITER; + + ok(ret == expectedMask, "expected %x got %x\n", expectedMask, ret); + ok(fmt.dwMask == expectedMask, "expected %x got %x\n", expectedMask, fmt.dwMask); DestroyWindow(hwndRichEdit); }

1 0

Lei Zhang : gdiplus: Allocate enough space for BITMAPINFO in GdipLoadImageFromStream.
by Alexandre Julliard Sept. 30, 2008

Sept. 30, 2008

Module: wine Branch: master Commit: 83d92f4195602bdc12a86e0c1e814a881df54ed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83d92f4195602bdc12a86e0c1… Author: Lei Zhang <thestig(a)google.com> Date: Sun Sep 28 12:36:30 2008 -0700 gdiplus: Allocate enough space for BITMAPINFO in GdipLoadImageFromStream. --- dlls/gdiplus/image.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 926c2a5..9e3fd62 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -974,13 +974,19 @@ GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) IPicture_get_Type(pic, &type); if(type == PICTYPE_BITMAP){ - BITMAPINFO bmi; + BITMAPINFO *pbmi; BITMAPCOREHEADER* bmch; OLE_HANDLE hbm; HDC hdc; + pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + if (!pbmi) + return OutOfMemory; *image = GdipAlloc(sizeof(GpBitmap)); - if(!*image) return OutOfMemory; + if(!*image){ + GdipFree(pbmi); + return OutOfMemory; + } (*image)->type = ImageTypeBitmap; (*((GpBitmap**) image))->width = ipicture_pixel_width(pic); @@ -990,22 +996,22 @@ GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) IPicture_get_Handle(pic, &hbm); IPicture_get_CurDC(pic, &hdc); - ZeroMemory(&bmi, sizeof(bmi)); - bmch = (BITMAPCOREHEADER*) (&bmi.bmiHeader); + bmch = (BITMAPCOREHEADER*) (&pbmi->bmiHeader); bmch->bcSize = sizeof(BITMAPCOREHEADER); if(!hdc){ HBITMAP old; hdc = CreateCompatibleDC(0); old = SelectObject(hdc, (HBITMAP)hbm); - GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, &bmi, DIB_RGB_COLORS); + GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); SelectObject(hdc, old); DeleteDC(hdc); } else - GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, &bmi, DIB_RGB_COLORS); + GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); (*((GpBitmap**) image))->format = (bmch->bcBitCount << 8) | PixelFormatGDI; + GdipFree(pbmi); } else if(type == PICTYPE_METAFILE || type == PICTYPE_ENHMETAFILE){ /* FIXME: missing initialization code */

1 0

Lei Zhang : gdiplus: Allocate enough space for BITMAPINFO in GdipBitmapUnlockBits.
by Alexandre Julliard Sept. 30, 2008

Sept. 30, 2008

Module: wine Branch: master Commit: 778ea2360e5ca9793b88b36b3da38aa91bddc2af URL: http://source.winehq.org/git/wine.git/?a=commit;h=778ea2360e5ca9793b88b36b3… Author: Lei Zhang <thestig(a)google.com> Date: Sun Sep 28 12:25:44 2008 -0700 gdiplus: Allocate enough space for BITMAPINFO in GdipBitmapUnlockBits. --- dlls/gdiplus/image.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index dc9607c..926c2a5 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -197,7 +197,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, HDC hdc; HBITMAP old = NULL; BOOL bm_is_selected; - BITMAPINFO bmi; + BITMAPINFO *pbmi; if(!bitmap || !lockeddata) return InvalidParameter; @@ -221,24 +221,26 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, IPicture_get_CurDC(bitmap->image.picture, &hdc); bm_is_selected = (hdc != 0); - bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bmi.bmiHeader.biBitCount = 0; + pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biBitCount = 0; if(!bm_is_selected){ hdc = CreateCompatibleDC(0); old = SelectObject(hdc, (HBITMAP)hbm); } - GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, &bmi, DIB_RGB_COLORS); - bmi.bmiHeader.biBitCount = PIXELFORMATBPP(lockeddata->PixelFormat); - SetDIBits(hdc, (HBITMAP)hbm, 0, abs(bmi.bmiHeader.biHeight), - bitmap->bitmapbits, &bmi, DIB_RGB_COLORS); + GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); + pbmi->bmiHeader.biBitCount = PIXELFORMATBPP(lockeddata->PixelFormat); + SetDIBits(hdc, (HBITMAP)hbm, 0, abs(pbmi->bmiHeader.biHeight), + bitmap->bitmapbits, pbmi, DIB_RGB_COLORS); if(!bm_is_selected){ SelectObject(hdc, old); DeleteDC(hdc); } + GdipFree(pbmi); GdipFree(bitmap->bitmapbits); bitmap->bitmapbits = NULL; bitmap->lockmode = 0;

1 0

Lei Zhang : gdiplus: Allocate enough space for BITMAPINFO in GdipBitmapLockBits.
by Alexandre Julliard Sept. 30, 2008

Sept. 30, 2008

Module: wine Branch: master Commit: 2309a9e4ab253d5ecc358a7724a7459182261f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2309a9e4ab253d5ecc358a772… Author: Lei Zhang <thestig(a)google.com> Date: Sun Sep 28 12:21:47 2008 -0700 gdiplus: Allocate enough space for BITMAPINFO in GdipBitmapLockBits. --- dlls/gdiplus/image.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 2172b51..dc9607c 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -98,7 +98,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, OLE_HANDLE hbm; HDC hdc; HBITMAP old = NULL; - BITMAPINFO bmi; + BITMAPINFO *pbmi; BYTE *buff = NULL; UINT abs_height; GpRect act_rect; /* actual rect to be used */ @@ -131,8 +131,11 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, IPicture_get_CurDC(bitmap->image.picture, &hdc); bm_is_selected = (hdc != 0); - bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bmi.bmiHeader.biBitCount = 0; + pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + if (!pbmi) + return OutOfMemory; + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biBitCount = 0; if(!bm_is_selected){ hdc = CreateCompatibleDC(0); @@ -140,33 +143,35 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, } /* fill out bmi */ - GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, &bmi, DIB_RGB_COLORS); + GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); - abs_height = abs(bmi.bmiHeader.biHeight); - stride = bmi.bmiHeader.biWidth * bitspp / 8; + abs_height = abs(pbmi->bmiHeader.biHeight); + stride = pbmi->bmiHeader.biWidth * bitspp / 8; stride = (stride + 3) & ~3; buff = GdipAlloc(stride * abs_height); - bmi.bmiHeader.biBitCount = bitspp; + pbmi->bmiHeader.biBitCount = bitspp; if(buff) - GetDIBits(hdc, (HBITMAP)hbm, 0, abs_height, buff, &bmi, DIB_RGB_COLORS); + GetDIBits(hdc, (HBITMAP)hbm, 0, abs_height, buff, pbmi, DIB_RGB_COLORS); if(!bm_is_selected){ SelectObject(hdc, old); DeleteDC(hdc); } - if(!buff) + if(!buff){ + GdipFree(pbmi); return OutOfMemory; + } lockeddata->Width = act_rect.Width; lockeddata->Height = act_rect.Height; lockeddata->PixelFormat = format; lockeddata->Reserved = flags; - if(bmi.bmiHeader.biHeight > 0){ + if(pbmi->bmiHeader.biHeight > 0){ lockeddata->Stride = -stride; lockeddata->Scan0 = buff + (bitspp / 8) * act_rect.X + stride * (abs_height - 1 - act_rect.Y); @@ -181,6 +186,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, bitmap->bitmapbits = buff; + GdipFree(pbmi); return Ok; }

1 0

Lei Zhang : gdiplus: Free memory on a failure.
by Alexandre Julliard Sept. 30, 2008

Sept. 30, 2008

Module: wine Branch: master Commit: fc753bbb5886443ab0126bc883fd231926d49b2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc753bbb5886443ab0126bc88… Author: Lei Zhang <thestig(a)google.com> Date: Sun Sep 28 12:17:26 2008 -0700 gdiplus: Free memory on a failure. --- dlls/gdiplus/brush.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index efa370f..8bf09ef 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -586,7 +586,11 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, abs(stride)); *texture = GdipAlloc(sizeof(GpTexture)); - if (!*texture) return OutOfMemory; + if (!*texture){ + GdipFree(dibits); + GdipFree(buff); + return OutOfMemory; + } if((status = GdipCreateMatrix(&(*texture)->transform)) != Ok){ GdipFree(*texture);

1 0