November 2006 - Wine-commits

Mike McCormack : comctl32: Remove a redundant variable.
by Alexandre Julliard 14 Nov '06

14 Nov '06

Module: wine Branch: master Commit: f3c6114d75efb614a04814f53b5e98ee60670ee9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c6114d75efb614a04814f53… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 14 16:47:45 2006 +0900 comctl32: Remove a redundant variable. --- dlls/comctl32/imagelist.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 17b267d..6b7793e 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2243,10 +2243,9 @@ ImageList_Replace (HIMAGELIST himl, INT */ INT WINAPI -ImageList_ReplaceIcon (HIMAGELIST himl, INT i, HICON hIcon) +ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) { HDC hdcImage; - INT nIndex; HICON hBestFitIcon; HBITMAP hbmOldSrc; ICONINFO ii; @@ -2255,14 +2254,14 @@ ImageList_ReplaceIcon (HIMAGELIST himl, POINT pt; INT i; - TRACE("(%p %d %p)\n", himl, i, hIcon); + TRACE("(%p %d %p)\n", himl, nIndex, hIcon); if (!is_valid(himl)) { ERR("invalid image list\n"); return -1; } - if ((i >= himl->cMaxImage) || (i < -1)) { - ERR("invalid image index %d / %d\n", i, himl->cMaxImage); + if ((nIndex >= himl->cMaxImage) || (nIndex < -1)) { + ERR("invalid image index %d / %d\n", nIndex, himl->cMaxImage); return -1; } @@ -2299,15 +2298,13 @@ ImageList_ReplaceIcon (HIMAGELIST himl, return -1; } - if (i == -1) { + if (nIndex == -1) { if (himl->cCurImage + 1 > himl->cMaxImage) IMAGELIST_InternalExpandBitmaps (himl, 1, 0, 0); nIndex = himl->cCurImage; himl->cCurImage++; } - else - nIndex = i; hdcImage = CreateCompatibleDC (0); TRACE("hdcImage=%p\n", hdcImage);

1 0

Jesse Allen : msvcrt: Free correct buffer in pf_vsnprintf.
by Alexandre Julliard 14 Nov '06

14 Nov '06

Module: wine Branch: master Commit: fa8656f8417a19f42dc5f3b85535db37228f007a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa8656f8417a19f42dc5f3b85… Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Mon Nov 13 20:51:17 2006 -0700 msvcrt: Free correct buffer in pf_vsnprintf. --- dlls/msvcrt/wcs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index a7a014d..591f28f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -667,7 +667,7 @@ static int pf_vsnprintf( pf_output *out, r = pf_output_format_A( out, x, -1, &flags ); if( x != number ) - HeapFree( GetProcessHeap(), 0, number ); + HeapFree( GetProcessHeap(), 0, x ); } /* deal with integers and floats using libc's printf */ @@ -687,7 +687,7 @@ static int pf_vsnprintf( pf_output *out, r = pf_output_stringA( out, x, -1 ); if( x != number ) - HeapFree( GetProcessHeap(), 0, number ); + HeapFree( GetProcessHeap(), 0, x ); } else continue;

1 0

Mike McCormack : comctl32: Fix a potential regression in ImageList_ReplaceIcon().
by Alexandre Julliard 14 Nov '06

14 Nov '06

Module: wine Branch: master Commit: 9e772d1369f0292cfb79d8cabc017611fc6d0369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e772d1369f0292cfb79d8cab… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 14 16:48:29 2006 +0900 comctl32: Fix a potential regression in ImageList_ReplaceIcon(). --- dlls/comctl32/imagelist.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index b626584..17b267d 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2253,6 +2253,7 @@ ImageList_ReplaceIcon (HIMAGELIST himl, BITMAP bmp; BOOL ret; POINT pt; + INT i; TRACE("(%p %d %p)\n", himl, i, hIcon); @@ -2317,14 +2318,17 @@ ImageList_ReplaceIcon (HIMAGELIST himl, SetBkColor (himl->hdcImage, RGB(255,255,255)); hbmOldSrc = SelectObject (hdcImage, ii.hbmColor); - imagelist_point_from_index(himl, nIndex, &pt); - StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, - hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); + for (i=0; i<(bmp.bmWidth/himl->cx); i++) { - 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); + imagelist_point_from_index(himl, nIndex+i, &pt); + StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, + hdcImage, 0, 0, himl->cx*i, bmp.bmHeight, SRCCOPY); + + if (himl->hbmMask) { + SelectObject (hdcImage, ii.hbmMask); + StretchBlt (himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, + hdcImage, 0, 0, himl->cx*i, bmp.bmHeight, SRCCOPY); + } } SelectObject (hdcImage, hbmOldSrc);

1 0

Mike McCormack : comctl32: When removing an image, move the remaining images one forward, not one backwards.
by Alexandre Julliard 14 Nov '06

14 Nov '06

Module: wine Branch: master Commit: 2614e0ee9120cecf1d5dd2ce6dfa27172cddb7f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2614e0ee9120cecf1d5dd2ce6… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 14 16:34:46 2006 +0900 comctl32: When removing an image, move the remaining images one forward, not one backwards. --- dlls/comctl32/imagelist.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index e9970e0..b626584 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2123,12 +2123,12 @@ ImageList_Remove (HIMAGELIST himl, INT i SelectObject (hdcBmp, hbmNewImage); imagelist_copy_images( himl, himl->hdcImage, hdcBmp, i, - (himl->cCurImage - i - 1), i + 1 ); + (himl->cCurImage - i - 1), i - 1 ); if (himl->hbmMask) { SelectObject (hdcBmp, hbmNewMask); imagelist_copy_images( himl, himl->hdcMask, hdcBmp, i, - (himl->cCurImage - i - 1), i + 1 ); + (himl->cCurImage - i - 1), i - 1 ); } }

1 0

Mike McCormack : user32: Print a fixme only once.
by Alexandre Julliard 14 Nov '06

14 Nov '06

Module: wine Branch: master Commit: 8f375e70f8f3a3aed5b19b67912e83f0aaecf293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f375e70f8f3a3aed5b19b679… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 14 16:32:01 2006 +0900 user32: Print a fixme only once. --- dlls/user/win.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/user/win.c b/dlls/user/win.c index 5e938e4..9ee1c00 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -3114,8 +3114,13 @@ BOOL WINAPI UpdateLayeredWindow( HWND hw HDC hdcSrc, POINT *pptSrc, COLORREF crKey, BLENDFUNCTION *pblend, DWORD dwFlags) { - FIXME("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%d): stub!\n", - hwnd, hdcDst, pptDst, psize, hdcSrc, pptSrc, crKey, pblend, dwFlags); + static int once; + if (!once) + { + once = 1; + FIXME("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%d): stub!\n", + hwnd, hdcDst, pptDst, psize, hdcSrc, pptSrc, crKey, pblend, dwFlags); + } return 0; }

1 0

Andrew Talbot : setupapi: Cast-qual warning fix.
by Alexandre Julliard 14 Nov '06

14 Nov '06

Module: wine Branch: master Commit: 2f5824438e5a2c96eac67c8fd66b8b8664d5cb65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f5824438e5a2c96eac67c8fd… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Nov 13 21:09:21 2006 +0000 setupapi: Cast-qual warning fix. --- dlls/setupapi/virtcopy.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/virtcopy.c b/dlls/setupapi/virtcopy.c index 51a6356..f92b455 100644 --- a/dlls/setupapi/virtcopy.c +++ b/dlls/setupapi/virtcopy.c @@ -91,6 +91,7 @@ VHSTR WINAPI vsmStringAdd16(LPCSTR lpszN VHSTR n; VHSTR index = 0xffff; HANDLE heap; + LPSTR str; TRACE("add string '%s'\n", lpszName); /* search whether string already inserted */ @@ -137,8 +138,9 @@ VHSTR WINAPI vsmStringAdd16(LPCSTR lpszN if (!vhstrlist[index]) vhstrlist[index] = HeapAlloc(heap, HEAP_ZERO_MEMORY, sizeof(VHSTR_STRUCT)); vhstrlist[index]->refcount = 1; - vhstrlist[index]->pStr = HeapAlloc(heap, 0, strlen(lpszName)+1); - strcpy((LPSTR)vhstrlist[index]->pStr, lpszName); + str = HeapAlloc(heap, 0, strlen(lpszName)+1); + strcpy(str, lpszName); + vhstrlist[index]->pStr = str; return index; }

1 0

James Hawkins : msi: Notify the external UI handler when changing media.
by Alexandre Julliard 14 Nov '06

14 Nov '06

Module: wine Branch: master Commit: 31a9b087c15b7798d7c5b7766f151522add47028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31a9b087c15b7798d7c5b7766… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Nov 13 14:18:54 2006 -0800 msi: Notify the external UI handler when changing media. --- dlls/msi/dialog.c | 4 ++++ dlls/msi/files.c | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index d928edc..a134aea 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3505,6 +3505,7 @@ UINT msi_spawn_error_dialog( MSIPACKAGE DWORD size = MAX_PATH; int res; + static const WCHAR szUILevel[] = {'U','I','L','e','v','e','l',0}; static const WCHAR pn_prop[] = {'P','r','o','d','u','c','t','N','a','m','e',0}; static const WCHAR title_fmt[] = {'%','s',' ','W','a','r','n','i','n','g',0}; static const WCHAR error_abort[] = {'E','r','r','o','r','A','b','o','r','t',0}; @@ -3512,6 +3513,9 @@ UINT msi_spawn_error_dialog( MSIPACKAGE 'M','S','I','E','r','r','o','r','D','i','a','l','o','g','R','e','s','u','l','t',0 }; + if ( msi_get_property_int(package, szUILevel, 0) == INSTALLUILEVEL_NONE ) + return ERROR_SUCCESS; + if ( !error_dialog ) { LPWSTR product_name = msi_dup_property( package, pn_prop ); diff --git a/dlls/msi/files.c b/dlls/msi/files.c index dc81e6a..8d3992e 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -69,21 +69,31 @@ struct media_info { static UINT msi_change_media( MSIPACKAGE *package, struct media_info *mi ) { + LPSTR msg; LPWSTR error, error_dialog; UINT r = ERROR_SUCCESS; static const WCHAR szUILevel[] = {'U','I','L','e','v','e','l',0}; static const WCHAR error_prop[] = {'E','r','r','o','r','D','i','a','l','o','g',0}; - if ( msi_get_property_int(package, szUILevel, 0) == INSTALLUILEVEL_NONE ) + if ( msi_get_property_int(package, szUILevel, 0) == INSTALLUILEVEL_NONE && !gUIHandlerA ) return ERROR_SUCCESS; error = generate_error_string( package, 1302, 1, mi->disk_prompt ); error_dialog = msi_dup_property( package, error_prop ); while ( r == ERROR_SUCCESS && GetFileAttributesW( mi->source ) == INVALID_FILE_ATTRIBUTES ) + { r = msi_spawn_error_dialog( package, error_dialog, error ); + if (gUIHandlerA) + { + msg = strdupWtoA( error ); + gUIHandlerA( gUIContext, MB_RETRYCANCEL | INSTALLMESSAGE_ERROR, msg ); + msi_free(msg); + } + } + msi_free( error ); msi_free( error_dialog );

1 0

Mike McCormack : kernel32: Print a FIXME only once.
by Alexandre Julliard 14 Nov '06

14 Nov '06

Module: wine Branch: master Commit: 15446fb9c00e1f8383310defdc1318277bde690f URL: http://source.winehq.org/git/wine.git/?a=commit;h=15446fb9c00e1f8383310defd… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 14 16:31:51 2006 +0900 kernel32: Print a FIXME only once. --- dlls/kernel32/locale.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 748995c..27d0034 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1524,6 +1524,7 @@ INT WINAPI MultiByteToWideChar( UINT pag { const union cptable *table; int ret; + static int once; if (!src || (!dst && dstlen)) { @@ -1533,7 +1534,11 @@ INT WINAPI MultiByteToWideChar( UINT pag if (srclen < 0) srclen = strlen(src) + 1; - if (flags & MB_USEGLYPHCHARS) FIXME("MB_USEGLYPHCHARS not supported\n"); + if (!once && (flags & MB_USEGLYPHCHARS)) + { + once = 1; + FIXME("MB_USEGLYPHCHARS not supported\n"); + } switch(page) {

1 0

Kai Blin : secur32: Fix handling of ISC_REQ* flags in InitializeSecurityContext.
by Alexandre Julliard 14 Nov '06

14 Nov '06

Module: wine Branch: master Commit: 1037e20bc7625cf721a86b638c112fc4c0307075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1037e20bc7625cf721a86b638… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Nov 13 15:55:39 2006 +0100 secur32: Fix handling of ISC_REQ* flags in InitializeSecurityContext. --- dlls/secur32/ntlm.c | 42 ++++++--- dlls/secur32/tests/ntlm.c | 213 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 239 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1037e20bc7625cf721a86…

1 0

Hans Leidekker : setupapi: The inf section suffix that corresponds to __x86_64 is .ntamd64.
by Alexandre Julliard 14 Nov '06

14 Nov '06

Module: wine Branch: master Commit: 709735e294412a0cab15696faa9fcf6833e552bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=709735e294412a0cab15696fa… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Nov 13 16:26:53 2006 +0100 setupapi: The inf section suffix that corresponds to __x86_64 is .ntamd64. --- dlls/setupapi/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index f6a541b..4c60b86 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -995,7 +995,7 @@ void WINAPI InstallHinfSectionW( HWND hw #ifdef __i386__ static const WCHAR nt_platformW[] = {'.','n','t','x','8','6',0}; #elif defined(__x86_64) - static const WCHAR nt_platformW[] = {'.','n','t','i','a','6','4',0}; + static const WCHAR nt_platformW[] = {'.','n','t','a','m','d','6','4',0}; #else /* FIXME: other platforms */ static const WCHAR nt_platformW[] = {'.','n','t',0}; #endif

1 0