December 2011 - Wine-commits

Francois Gouget : gdi32: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 2ae10acb615b2778dbc645126bd22bc298293e82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ae10acb615b2778dbc645126… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:08:31 2011 +0100 gdi32: Avoid hardcoding the Unicode string literal lengths. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9762230..9b07b97 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -410,7 +410,7 @@ static const WCHAR FixedSys_Value[] = {'F','I','X','E','D','F','O','N','.','F',' static const WCHAR System_Value[] = {'F','O','N','T','S','.','F','O','N','\0'}; static const WCHAR OEMFont_Value[] = {'O','E','M','F','O','N','T','.','F','O','N','\0'}; -static const WCHAR * const SystemFontValues[4] = { +static const WCHAR * const SystemFontValues[] = { System_Value, OEMFont_Value, FixedSys_Value,

1 0

Francois Gouget : ole32: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: d21c37a8607145b8f6bf0828ff3757a9adcf1e4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d21c37a8607145b8f6bf0828f… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:07:09 2011 +0100 ole32: Avoid hardcoding the Unicode string literal lengths. --- dlls/ole32/comcat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/comcat.c b/dlls/ole32/comcat.c index 93e1f26..b3cd889 100644 --- a/dlls/ole32/comcat.c +++ b/dlls/ole32/comcat.c @@ -1333,7 +1333,7 @@ static LPENUMGUID COMCAT_CATID_IEnumGUID_Construct( This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CATID_IEnumGUIDImpl)); if (This) { - WCHAR prefix[6] = { 'C', 'L', 'S', 'I', 'D', '\\' }; + WCHAR prefix[] = { 'C', 'L', 'S', 'I', 'D', '\\' }; This->lpVtbl = &COMCAT_CATID_IEnumGUID_Vtbl; memcpy(This->keyname, prefix, sizeof(prefix));

1 0

Francois Gouget : mlang/tests: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 68bd1ae6287bcd7a5d940dcd25b23e53077e443e URL: http://source.winehq.org/git/wine.git/?a=commit;h=68bd1ae6287bcd7a5d940dcd2… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:07:26 2011 +0100 mlang/tests: Avoid hardcoding the Unicode string literal lengths. --- dlls/mlang/tests/mlang.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 65244bb..7ff4ec3 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -809,7 +809,7 @@ static void IMLangFontLink_Test(IMLangFontLink* iMLFL) DWORD dwCodePages, dwManyCodePages; DWORD dwCmpCodePages; UINT CodePage; - static const WCHAR str[3] = { 'd', 0x0436, 0xff90 }; + static const WCHAR str[] = { 'd', 0x0436, 0xff90 }; LONG processed; HRESULT ret;

1 0

Francois Gouget : attrib: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: cf598bdd6232f8b2558edb14f7fa8089b7438991 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf598bdd6232f8b2558edb14f… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:06:27 2011 +0100 attrib: Avoid hardcoding the Unicode string literal lengths. --- programs/attrib/attrib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 1af9e73..eb497ee 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -126,7 +126,7 @@ int wmain(int argc, WCHAR *argv[]) DWORD count; HANDLE hff; WIN32_FIND_DATAW fd; - WCHAR flags[9] = {' ',' ',' ',' ',' ',' ',' ',' ','\0'}; + WCHAR flags[] = {' ',' ',' ',' ',' ',' ',' ',' ','\0'}; WCHAR name[128]; WCHAR *param = argc >= 2 ? argv[1] : NULL; DWORD attrib_set = 0;

1 0

Francois Gouget : fusion: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 598c095329eeb9c57aa055a33900df5f9ed0612d URL: http://source.winehq.org/git/wine.git/?a=commit;h=598c095329eeb9c57aa055a33… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:08:38 2011 +0100 fusion: Avoid hardcoding the Unicode string literal lengths. --- dlls/fusion/fusionpriv.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h index aecb026..8d51f5d 100644 --- a/dlls/fusion/fusionpriv.h +++ b/dlls/fusion/fusionpriv.h @@ -461,7 +461,7 @@ static inline void token_to_str(BYTE *bytes, LPWSTR str) { DWORD i; - static const WCHAR hexval[16] = { + static const WCHAR hexval[] = { '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' };

1 0

Francois Gouget : strmbase: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 7b8d9e84ac2c3cb7426de19b62845e541e1fcc83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b8d9e84ac2c3cb7426de19b6… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:06:11 2011 +0100 strmbase: Avoid hardcoding the Unicode string literal lengths. --- dlls/strmbase/dllfunc.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index adb5655..41d8b6b 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -53,14 +53,10 @@ static LONG server_locks = 0; */ #define MAX_KEY_LEN 260 -static WCHAR const clsid_keyname[6] = -{'C','L','S','I','D',0 }; -static WCHAR const ips32_keyname[15] = -{'I','n','P','r','o','c','S','e','r','v','e','r','3','2',0}; -static WCHAR const tmodel_keyname[15] = -{'T','h','r','e','a','d','i','n','g','M','o','d','e','l',0}; -static WCHAR const tmodel_both[] = -{'B','o','t','h',0}; +static WCHAR const clsid_keyname[] = {'C','L','S','I','D',0 }; +static WCHAR const ips32_keyname[] = {'I','n','P','r','o','c','S','e','r','v','e','r','3','2',0}; +static WCHAR const tmodel_keyname[] = {'T','h','r','e','a','d','i','n','g','M','o','d','e','l',0}; +static WCHAR const tmodel_both[] = {'B','o','t','h',0}; /* * SetupRegisterClass()

1 0

Francois Gouget : setupapi: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 9097fa132e56cc542fa3ea77706fea79353d2f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9097fa132e56cc542fa3ea777… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:06:38 2011 +0100 setupapi: Avoid hardcoding the Unicode string literal lengths. --- dlls/setupapi/queue.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index d302924..cd733a0 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -978,7 +978,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, VS_FIXEDFILEINFO *TargetInfo; VS_FIXEDFILEINFO *SourceInfo; UINT length; - WCHAR SubBlock[2]={'\\',0}; + static const WCHAR SubBlock[]={'\\',0}; DWORD ret; VersionSource = HeapAlloc(GetProcessHeap(),0,VersionSizeSource);

1 0

Francois Gouget : cmd: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: eb109f46e33011f5b23eb4c684346a24e89d4643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb109f46e33011f5b23eb4c68… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:06:23 2011 +0100 cmd: Avoid hardcoding the Unicode string literal lengths. --- programs/cmd/directory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index d58351e..8b556f7 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -562,7 +562,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le static void WCMD_dir_trailer(WCHAR drive) { ULARGE_INTEGER avail, total, freebytes; DWORD status; - WCHAR driveName[4] = {'c',':','\\','\0'}; + WCHAR driveName[] = {'c',':','\\','\0'}; driveName[0] = drive; status = GetDiskFreeSpaceExW(driveName, &avail, &total, &freebytes);

1 0

Alexandre Julliard : comctl32: Use DrawIconEx to copy icon bits and use the correct background color.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 40cf298c7524f4475b4636301798263aed1d437c URL: http://source.winehq.org/git/wine.git/?a=commit;h=40cf298c7524f4475b4636301… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 14:19:38 2011 +0100 comctl32: Use DrawIconEx to copy icon bits and use the correct background color. --- dlls/comctl32/imagelist.c | 76 +++++++++++++------------------------------- 1 files changed, 23 insertions(+), 53 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 81ee655..4e71795 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2531,7 +2531,6 @@ done: INT WINAPI ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) { - HDC hdcImage; HICON hBestFitIcon; ICONINFO ii; BITMAP bmp; @@ -2563,23 +2562,6 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) if (!hBestFitIcon) return -1; - ret = GetIconInfo (hBestFitIcon, &ii); - if (!ret) { - DestroyIcon(hBestFitIcon); - return -1; - } - - ret = GetObjectW (ii.hbmMask, sizeof(BITMAP), &bmp); - if (!ret) { - ERR("couldn't get mask bitmap info\n"); - if (ii.hbmColor) - DeleteObject (ii.hbmColor); - if (ii.hbmMask) - DeleteObject (ii.hbmMask); - DestroyIcon(hBestFitIcon); - return -1; - } - if (nIndex == -1) { if (himl->cCurImage + 1 > himl->cMaxImage) IMAGELIST_InternalExpandBitmaps(himl, 1); @@ -2588,13 +2570,11 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) himl->cCurImage++; } - hdcImage = CreateCompatibleDC (0); - TRACE("hdcImage=%p\n", hdcImage); - if (hdcImage == 0) - ERR("invalid hdcImage!\n"); - - if (himl->has_alpha) + if (himl->has_alpha && GetIconInfo (hBestFitIcon, &ii)) { + HDC hdcImage = CreateCompatibleDC( 0 ); + GetObjectW (ii.hbmMask, sizeof(BITMAP), &bmp); + if (!ii.hbmColor) { UINT height = bmp.bmHeight / 2; @@ -2606,48 +2586,38 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) ret = add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, height, color, ii.hbmMask ); DeleteDC( hdcMask ); DeleteObject( color ); - if (ret) goto done; } - else if (add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, bmp.bmHeight, - ii.hbmColor, ii.hbmMask )) goto done; + else ret = add_with_alpha( himl, hdcImage, nIndex, 1, bmp.bmWidth, bmp.bmHeight, + ii.hbmColor, ii.hbmMask ); + + DeleteDC( hdcImage ); + DeleteObject (ii.hbmMask); + if (ii.hbmColor) DeleteObject (ii.hbmColor); + if (ret) goto done; } imagelist_point_from_index(himl, nIndex, &pt); - SetTextColor(himl->hdcImage, RGB(0,0,0)); - SetBkColor (himl->hdcImage, RGB(255,255,255)); - - if (ii.hbmColor) + if (himl->hbmMask) { - SelectObject (hdcImage, ii.hbmColor); - StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, - hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); - if (himl->hbmMask) - { - SelectObject (hdcImage, ii.hbmMask); - StretchBlt (himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, - hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); - } + DrawIconEx( himl->hdcImage, pt.x, pt.y, hBestFitIcon, himl->cx, himl->cy, 0, 0, DI_IMAGE ); + PatBlt( himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, WHITENESS ); + DrawIconEx( himl->hdcMask, pt.x, pt.y, hBestFitIcon, himl->cx, himl->cy, 0, 0, DI_MASK ); } else { - UINT height = bmp.bmHeight / 2; - SelectObject (hdcImage, ii.hbmMask); - StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, - hdcImage, 0, height, bmp.bmWidth, height, SRCCOPY); - if (himl->hbmMask) - StretchBlt (himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, - hdcImage, 0, 0, bmp.bmWidth, height, SRCCOPY); + COLORREF color = himl->clrBk != CLR_NONE ? himl->clrBk : comctl32_color.clrWindow; + HBRUSH brush = CreateSolidBrush( GetNearestColor( himl->hdcImage, color )); + + SelectObject( himl->hdcImage, brush ); + PatBlt( himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, PATCOPY ); + SelectObject( himl->hdcImage, GetStockObject(BLACK_BRUSH) ); + DeleteObject( brush ); + DrawIconEx( himl->hdcImage, pt.x, pt.y, hBestFitIcon, himl->cx, himl->cy, 0, 0, DI_NORMAL ); } done: DestroyIcon(hBestFitIcon); - if (hdcImage) - DeleteDC (hdcImage); - if (ii.hbmColor) - DeleteObject (ii.hbmColor); - if (ii.hbmMask) - DeleteObject (ii.hbmMask); TRACE("Insert index = %d, himl->cCurImage = %d\n", nIndex, himl->cCurImage); return nIndex;

1 0

Alexandre Julliard : comctl32: Use GetDIBits to retrieve the default color map for an imagelist DIB section .
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: e0fc985f32b7f97f51cd662edb0ef4e695eeac91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0fc985f32b7f97f51cd662ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 14:20:05 2011 +0100 comctl32: Use GetDIBits to retrieve the default color map for an imagelist DIB section. --- dlls/comctl32/imagelist.c | 48 ++++++++++---------------------------------- 1 files changed, 11 insertions(+), 37 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 4e71795..c1edbdf 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3093,54 +3093,28 @@ static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count) if ((ilc >= ILC_COLOR4 && ilc <= ILC_COLOR32) || ilc == ILC_COLOR) { - VOID* bits; - BITMAPINFO *bmi; + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *bmi = (BITMAPINFO *)buffer; TRACE("Creating DIBSection %d x %d, %d Bits per Pixel\n", sz.cx, sz.cy, himl->uBitsPixel); - if (himl->uBitsPixel <= ILC_COLOR8) - { - LPPALETTEENTRY pal; - ULONG i, colors; - BYTE temp; - - colors = 1 << himl->uBitsPixel; - bmi = Alloc(sizeof(BITMAPINFOHEADER) + - sizeof(PALETTEENTRY) * colors); - - pal = (LPPALETTEENTRY)bmi->bmiColors; - GetPaletteEntries(GetStockObject(DEFAULT_PALETTE), 0, colors, pal); - - /* Swap colors returned by GetPaletteEntries so we can use them for - * CreateDIBSection call. */ - for (i = 0; i < colors; i++) - { - temp = pal[i].peBlue; - bmi->bmiColors[i].rgbRed = pal[i].peRed; - bmi->bmiColors[i].rgbBlue = temp; - } - } - else - { - bmi = Alloc(sizeof(BITMAPINFOHEADER)); - } - + memset( buffer, 0, sizeof(buffer) ); bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); bmi->bmiHeader.biWidth = sz.cx; bmi->bmiHeader.biHeight = sz.cy; bmi->bmiHeader.biPlanes = 1; bmi->bmiHeader.biBitCount = himl->uBitsPixel; bmi->bmiHeader.biCompression = BI_RGB; - bmi->bmiHeader.biSizeImage = 0; - bmi->bmiHeader.biXPelsPerMeter = 0; - bmi->bmiHeader.biYPelsPerMeter = 0; - bmi->bmiHeader.biClrUsed = 0; - bmi->bmiHeader.biClrImportant = 0; - - hbmNewBitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, &bits, 0, 0); - Free (bmi); + if (himl->uBitsPixel <= ILC_COLOR8) + { + /* retrieve the default color map */ + HBITMAP tmp = CreateBitmap( 1, 1, 1, 1, NULL ); + GetDIBits( hdc, tmp, 0, 0, NULL, bmi, DIB_RGB_COLORS ); + DeleteObject( tmp ); + } + hbmNewBitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, 0, 0); } else /*if (ilc == ILC_COLORDDB)*/ {

1 0