July 2009 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Don' t dirtify too many shader constants.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: c82da7d97506b638ded678abb93160e4bd6de2dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c82da7d97506b638ded678abb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jun 28 18:33:22 2009 +0200 wined3d: Don't dirtify too many shader constants. If we have start = 4, count = 3, the highest dirty constant is the one with index 6. start + count gives 7, so it already includes the zero-based array correction. Don't add an additional 1. Additionally to the inefficiency of looking at one extra constant, this causes problems if the driver rejects loading 257 constants on the initial load. In this case no constant is loaded if GL_EXT_gpu_program_parameters is used. --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 28118c7..66a7634 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -515,7 +515,7 @@ static void shader_arb_update_float_vertex_constants(IWineD3DDevice *iface, UINT * context. On a context switch the old context will be fully dirtified */ memset(This->activeContext->vshader_const_dirty + start, 1, sizeof(*This->activeContext->vshader_const_dirty) * count); - This->highest_dirty_vs_const = max(This->highest_dirty_vs_const, start + count + 1); + This->highest_dirty_vs_const = max(This->highest_dirty_vs_const, start + count); } static void shader_arb_update_float_pixel_constants(IWineD3DDevice *iface, UINT start, UINT count) @@ -526,7 +526,7 @@ static void shader_arb_update_float_pixel_constants(IWineD3DDevice *iface, UINT * context. On a context switch the old context will be fully dirtified */ memset(This->activeContext->pshader_const_dirty + start, 1, sizeof(*This->activeContext->pshader_const_dirty) * count); - This->highest_dirty_ps_const = max(This->highest_dirty_ps_const, start + count + 1); + This->highest_dirty_ps_const = max(This->highest_dirty_ps_const, start + count); } static DWORD *local_const_mapping(IWineD3DBaseShaderImpl *This)

1 0

Nikolay Sivov : comctl32/listview: Improve hittesting a bit.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: 84f14a37164f5dd7e8ed7cb65321ac5aa7f9206d URL: http://source.winehq.org/git/wine.git/?a=commit;h=84f14a37164f5dd7e8ed7cb65… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jul 1 00:40:03 2009 +0400 comctl32/listview: Improve hittesting a bit. --- dlls/comctl32/listview.c | 72 +++++++++++++++++++++------------------ dlls/comctl32/tests/listview.c | 18 +++++++++- 2 files changed, 55 insertions(+), 35 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 7099227..d7a5f97 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6798,55 +6798,42 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, lpht->iItem = -1; if (subitem) lpht->iSubItem = 0; - if (infoPtr->rcList.left > lpht->pt.x) - lpht->flags |= LVHT_TOLEFT; - else if (infoPtr->rcList.right < lpht->pt.x) - lpht->flags |= LVHT_TORIGHT; + LISTVIEW_GetOrigin(infoPtr, &Origin); + + /* set whole list relation flags */ + if (subitem && infoPtr->uView == LV_VIEW_DETAILS) + { + /* LVM_SUBITEMHITTEST checks left bound of possible client area */ + if (infoPtr->rcList.left > lpht->pt.x && Origin.x < lpht->pt.x) + lpht->flags |= LVHT_TOLEFT; + } + else + { + if (infoPtr->rcList.left > lpht->pt.x) + lpht->flags |= LVHT_TOLEFT; + else if (infoPtr->rcList.right < lpht->pt.x) + lpht->flags |= LVHT_TORIGHT; + } if (infoPtr->rcList.top > lpht->pt.y) lpht->flags |= LVHT_ABOVE; else if (infoPtr->rcList.bottom < lpht->pt.y) lpht->flags |= LVHT_BELOW; - TRACE("lpht->flags=0x%x\n", lpht->flags); - if (lpht->flags) return -1; - - lpht->flags |= LVHT_NOWHERE; - - LISTVIEW_GetOrigin(infoPtr, &Origin); - - /* first deal with the large items */ - rcSearch.left = lpht->pt.x; - rcSearch.top = lpht->pt.y; - rcSearch.right = rcSearch.left + 1; - rcSearch.bottom = rcSearch.top + 1; - - iterator_frameditems(&i, infoPtr, &rcSearch); - iterator_next(&i); /* go to first item in the sequence */ - iItem = i.nItem; - iterator_destroy(&i); - - TRACE("lpht->iItem=%d\n", iItem); - if (iItem == -1) return -1; - + /* even if item is invalid try to find subitem */ if (infoPtr->uView == LV_VIEW_DETAILS && subitem) { - RECT bounds, *pRect; + RECT *pRect; INT j; - /* for top/bottom only */ - bounds.left = LVIR_BOUNDS; - LISTVIEW_GetItemRect(infoPtr, iItem, &bounds); opt.x = lpht->pt.x - Origin.x; - opt.y = lpht->pt.y; + lpht->iSubItem = -1; for (j = 0; j < DPA_GetPtrCount(infoPtr->hdpaColumns); j++) { pRect = &LISTVIEW_GetColumnInfo(infoPtr, j)->rcHeader; - bounds.left = pRect->left; - bounds.right = pRect->right; - if (PtInRect(&bounds, opt)) + if ((opt.x >= pRect->left) && (opt.x < pRect->right)) { lpht->iSubItem = j; break; @@ -6855,6 +6842,25 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, TRACE("lpht->iSubItem=%d\n", lpht->iSubItem); } + TRACE("lpht->flags=0x%x\n", lpht->flags); + if (lpht->flags) return -1; + + lpht->flags |= LVHT_NOWHERE; + + /* first deal with the large items */ + rcSearch.left = lpht->pt.x; + rcSearch.top = lpht->pt.y; + rcSearch.right = rcSearch.left + 1; + rcSearch.bottom = rcSearch.top + 1; + + iterator_frameditems(&i, infoPtr, &rcSearch); + iterator_next(&i); /* go to first item in the sequence */ + iItem = i.nItem; + iterator_destroy(&i); + + TRACE("lpht->iItem=%d\n", iItem); + if (iItem == -1) return -1; + lvItem.mask = LVIF_STATE | LVIF_TEXT; if (infoPtr->uView == LV_VIEW_DETAILS) lvItem.mask |= LVIF_INDENT; lvItem.stateMask = LVIS_STATEIMAGEMASK; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 38155b1..d11d9de 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2684,7 +2684,16 @@ static void test_hittest(void) x = pos.x + 150; /* outside column */ y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); - test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, TRUE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); + /* outside possible client rectangle (to right) */ + x = pos.x + 500; + y = pos.y + (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE, __LINE__); + /* subitem returned with -1 item too */ + x = pos.x + 150; + y = -10; + test_lvm_subitemhittest(hwnd, x, y, -1, 1, LVHT_NOWHERE, FALSE, FALSE, TRUE, __LINE__); /* parent client area is 100x100 by default */ MoveWindow(hwnd, 0, 0, 300, 100, FALSE); x = pos.x + 150; /* outside column */ @@ -2701,7 +2710,12 @@ static void test_hittest(void) x = pos.x + 150; /* outside column */ y = pos.y + (bounds.bottom - bounds.top) / 2; test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); - test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, TRUE, TRUE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, 0, 1, LVHT_ONITEMLABEL, FALSE, FALSE, FALSE, __LINE__); + /* outside possible client rectangle (to right) */ + x = pos.x + 500; + y = pos.y + (bounds.bottom - bounds.top) / 2; + test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, FALSE, FALSE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE, __LINE__); /* try with icons, state icons index is 1 based so at least 2 bitmaps needed */ himl = ImageList_Create(16, 16, 0, 4, 4); ok(himl != NULL, "failed to create imagelist\n");

1 0

Nikolay Sivov : comctl32/header: Always release item down state on WM_LBUTTONUP.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: 1daf40a8375fb134e8db6fb22bd5e92fe9ce84a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1daf40a8375fb134e8db6fb22… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jul 1 01:33:29 2009 +0400 comctl32/header: Always release item down state on WM_LBUTTONUP. --- dlls/comctl32/header.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 1486a8a..ddc9cb0 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1590,6 +1590,9 @@ HEADER_LButtonUp (HEADER_INFO *infoPtr, INT x, INT y) HEADER_InternalHitTest (infoPtr, &pt, &flags, &nItem); if (infoPtr->bPressed) { + + infoPtr->items[infoPtr->iMoveItem].bDown = FALSE; + if (infoPtr->bDragging) { HEADER_ITEM *lpItem = &infoPtr->items[infoPtr->iMoveItem]; @@ -1597,8 +1600,7 @@ HEADER_LButtonUp (HEADER_INFO *infoPtr, INT x, INT y) ImageList_DragShowNolock(FALSE); ImageList_EndDrag(); - lpItem->bDown=FALSE; - + if (infoPtr->iHotDivider == -1) iNewOrder = -1; else if (infoPtr->iHotDivider == infoPtr->uNumItem) @@ -1623,14 +1625,14 @@ HEADER_LButtonUp (HEADER_INFO *infoPtr, INT x, INT y) infoPtr->bDragging = FALSE; HEADER_SetHotDivider(infoPtr, FALSE, -1); } - else if (!(infoPtr->dwStyle & HDS_DRAGDROP) || !HEADER_IsDragDistance(infoPtr, &pt)) + else { - infoPtr->items[infoPtr->iMoveItem].bDown = FALSE; hdc = GetDC (infoPtr->hwndSelf); HEADER_RefreshItem (infoPtr, infoPtr->iMoveItem); ReleaseDC (infoPtr->hwndSelf, hdc); - HEADER_SendNotifyWithHDItemT(infoPtr, HDN_ITEMCLICKW, infoPtr->iMoveItem, NULL); + if (!(infoPtr->dwStyle & HDS_DRAGDROP) || !HEADER_IsDragDistance(infoPtr, &pt)) + HEADER_SendNotifyWithHDItemT(infoPtr, HDN_ITEMCLICKW, infoPtr->iMoveItem, NULL); } TRACE("Released item %d!\n", infoPtr->iMoveItem);

1 0

Detlef Riekenberg : shlwapi: Last parameter in SHUnicodeToAnsiCP is an int.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: 2e19130976e1b1e169be8cc9c8bc44ed9f43cead URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e19130976e1b1e169be8cc9c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jun 30 22:32:52 2009 +0200 shlwapi: Last parameter in SHUnicodeToAnsiCP is an int. --- dlls/shlwapi/shlwapi.spec | 2 +- dlls/shlwapi/string.c | 76 +++++++++++++++++++++++---------------------- 2 files changed, 40 insertions(+), 38 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index b7ea3aa..fad7d56 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -215,7 +215,7 @@ 215 stdcall -noname SHAnsiToUnicode(str ptr long) 216 stdcall -noname SHAnsiToUnicodeCP(long str ptr long) 217 stdcall -noname SHUnicodeToAnsi(wstr ptr ptr) -218 stdcall -noname SHUnicodeToAnsiCP(long wstr ptr ptr) +218 stdcall -noname SHUnicodeToAnsiCP(long wstr ptr long) 219 stdcall -noname QISearch(long long long long) 220 stdcall -noname SHSetDefaultDialogFont(ptr long) 221 stdcall -noname SHRemoveDefaultDialogFont(ptr) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index da0dee3..755360d 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -2477,20 +2477,24 @@ DWORD WINAPI SHAnsiToUnicode(LPCSTR lpSrcStr, LPWSTR lpDstStr, int iLen) * CodePage [I] Code page to use for the conversion * lpSrcStr [I] Source Unicode string to convert * lpDstStr [O] Destination for converted Ascii string - * lpiLen [I/O] Input length of lpDstStr/destination for length of lpDstStr + * dstlen [I] Length of buffer at lpDstStr * * RETURNS - * Success: The number of characters that result from the conversion. - * Failure: 0. + * Success: The length in bytes of the result at lpDstStr (including the terminator) + * Failure: When using CP_UTF8, CP_UTF7 or 0xc350 as codePage, 0 is returned and + * the result is not nul-terminated. + * When using a different codepage, the length in bytes of the truncated + * result at lpDstStr (including the terminator) is returned and + * lpDstStr is always nul-terminated. + * */ -INT WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, - LPINT lpiLen) +DWORD WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, int dstlen) { static const WCHAR emptyW[] = { '\0' }; int len , reqLen; LPSTR mem; - if (!lpDstStr || !lpiLen) + if (!lpDstStr || !dstlen) return 0; if (!lpSrcStr) @@ -2509,41 +2513,41 @@ INT WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, case CP_UTF8: { DWORD dwMode = 0; - INT nWideCharCount = len - 1; - - if (ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, - &nWideCharCount, lpDstStr, - lpiLen) == S_OK) - return 0; + INT lenW = len - 1; + INT needed = dstlen - 1; + HRESULT hr; - if (nWideCharCount < len - 1) + /* try the user supplied buffer first */ + hr = ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &lenW, lpDstStr, &needed); + if (hr == S_OK) { - mem = HeapAlloc(GetProcessHeap(), 0, *lpiLen); - if (!mem) - return 0; + lpDstStr[needed] = '\0'; + return needed + 1; + } - *lpiLen = 0; + /* user buffer too small. exclude termination and copy as much as possible */ + lenW = len; + hr = ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &lenW, NULL, &needed); + needed++; + mem = HeapAlloc(GetProcessHeap(), 0, needed); + if (!mem) + return 0; - if (ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &len, - mem, lpiLen) != S_OK) - { - SHTruncateString(mem, *lpiLen); - lstrcpynA(lpDstStr, mem, *lpiLen + 1); - HeapFree(GetProcessHeap(), 0, mem); - return *lpiLen + 1; - } - HeapFree(GetProcessHeap(), 0, mem); - return *lpiLen; + hr = ConvertINetUnicodeToMultiByte(&dwMode, CodePage, lpSrcStr, &len, mem, &needed); + if (hr == S_OK) + { + reqLen = SHTruncateString(mem, dstlen); + if (reqLen > 0) memcpy(lpDstStr, mem, reqLen-1); } - lpDstStr[*lpiLen] = '\0'; - return *lpiLen; + HeapFree(GetProcessHeap(), 0, mem); + return 0; } default: break; } - reqLen = WideCharToMultiByte(CodePage, 0, lpSrcStr, len, lpDstStr, - *lpiLen, NULL, NULL); + /* try the user supplied buffer first */ + reqLen = WideCharToMultiByte(CodePage, 0, lpSrcStr, len, lpDstStr, dstlen, NULL, NULL); if (!reqLen && GetLastError() == ERROR_INSUFFICIENT_BUFFER) { @@ -2556,12 +2560,12 @@ INT WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, reqLen = WideCharToMultiByte(CodePage, 0, lpSrcStr, len, mem, reqLen, NULL, NULL); - reqLen = SHTruncateString(mem, *lpiLen); + reqLen = SHTruncateString(mem, dstlen -1); reqLen++; - lstrcpynA(lpDstStr, mem, *lpiLen); - + lstrcpynA(lpDstStr, mem, reqLen); HeapFree(GetProcessHeap(), 0, mem); + lpDstStr[reqLen-1] = '\0'; } } } @@ -2586,9 +2590,7 @@ INT WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, */ INT WINAPI SHUnicodeToAnsi(LPCWSTR lpSrcStr, LPSTR lpDstStr, INT iLen) { - INT myint = iLen; - - return SHUnicodeToAnsiCP(CP_ACP, lpSrcStr, lpDstStr, &myint); + return SHUnicodeToAnsiCP(CP_ACP, lpSrcStr, lpDstStr, iLen); } /*************************************************************************

1 0

Damjan Jovanovic : winemenubuilder: Distinguish menu icons from association icons.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: fe8d913358633b4c1b44b335f517b4a5995392df URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe8d913358633b4c1b44b335f… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jun 30 21:04:32 2009 +0200 winemenubuilder: Distinguish menu icons from association icons. --- programs/winemenubuilder/winemenubuilder.c | 55 ++++++++++++++++------------ 1 files changed, 31 insertions(+), 24 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 200cd0f..d9d7852 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -739,7 +739,7 @@ static BOOL create_directories(char *directory) } /* extract an icon from an exe or icon file; helper for IPersistFile_fnSave */ -static char *extract_icon( LPCWSTR path, int index, BOOL bWait ) +static char *extract_icon( LPCWSTR path, int index, const char *destFilename, BOOL bWait ) { unsigned short crc; char *iconsdir = NULL, *ico_path = NULL, *ico_name, *xpm_path = NULL; @@ -785,18 +785,35 @@ static char *extract_icon( LPCWSTR path, int index, BOOL bWait ) crc=crc16(ico_path); /* Try to treat the source file as an exe */ - xpm_path=HeapAlloc(GetProcessHeap(), 0, strlen(iconsdir)+1+4+1+strlen(ico_name)+1+12+1+3); - sprintf(xpm_path,"%s/%04x_%s.%d.png",iconsdir,crc,ico_name,index); + if (destFilename) + xpm_path=HeapAlloc(GetProcessHeap(),0,strlen(iconsdir)+1+strlen(destFilename)+1+3); + else + xpm_path=HeapAlloc(GetProcessHeap(), 0, strlen(iconsdir)+1+4+1+strlen(ico_name)+1+12+1+3); + if (xpm_path == NULL) + { + WINE_ERR("could not extract icon %s, out of memory\n", wine_dbgstr_a(ico_name)); + return NULL; + } + if (destFilename) + sprintf(xpm_path,"%s/%s.png",iconsdir,destFilename); + else + sprintf(xpm_path,"%s/%04x_%s.%d.png",iconsdir,crc,ico_name,index); if (ExtractFromEXEDLL( path, index, xpm_path )) goto end; /* Must be something else, ignore the index in that case */ - sprintf(xpm_path,"%s/%04x_%s.png",iconsdir,crc,ico_name); + if (destFilename) + sprintf(xpm_path,"%s/%s.png",iconsdir,destFilename); + else + sprintf(xpm_path,"%s/%04x_%s.png",iconsdir,crc,ico_name); if (ExtractFromICO( path, xpm_path)) goto end; if (!bWait) { - sprintf(xpm_path,"%s/%04x_%s.xpm",iconsdir,crc,ico_name); + if (destFilename) + sprintf(xpm_path,"%s/%s.xpm",iconsdir,destFilename); + else + sprintf(xpm_path,"%s/%04x_%s.xpm",iconsdir,crc,ico_name); if (create_default_icon( xpm_path, ico_path )) goto end; } @@ -1907,17 +1924,6 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package } iconW = assoc_query(ASSOCSTR_DEFAULTICON, extensionW, NULL); - if (iconW) - { - WCHAR *comma = strrchrW(iconW, ','); - int index = 0; - if (comma) - { - *comma = 0; - index = atoiW(comma + 1); - } - iconA = extract_icon(iconW, index, FALSE); - } contentTypeW = assoc_query(ASSOCSTR_CONTENTTYPE, extensionW, NULL); @@ -1936,18 +1942,19 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package /* Gnome seems to ignore the <icon> tag in MIME packages, * and the default name is more intuitive anyway. */ - if (iconA) + if (iconW) { char *flattened_mime = slashes_to_minuses(mimeTypeA); if (flattened_mime) { - char *dstIconPath = heap_printf("%s/icons/%s%s", xdg_data_dir, - flattened_mime, strrchr(iconA, '.')); - if (dstIconPath) + int index = 0; + WCHAR *comma = strrchrW(iconW, ','); + if (comma) { - rename(iconA, dstIconPath); - HeapFree(GetProcessHeap(), 0, dstIconPath); + *comma = 0; + index = atoiW(comma + 1); } + iconA = extract_icon(iconW, index, flattened_mime, FALSE); HeapFree(GetProcessHeap(), 0, flattened_mime); } } @@ -2098,9 +2105,9 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) /* extract the icon */ if( szIconPath[0] ) - icon_name = extract_icon( szIconPath , iIconId, bWait ); + icon_name = extract_icon( szIconPath , iIconId, NULL, bWait ); else - icon_name = extract_icon( szPath, iIconId, bWait ); + icon_name = extract_icon( szPath, iIconId, NULL, bWait ); /* fail - try once again after parent process exit */ if( !icon_name )

1 0

Huw Davies : gdi32/tests: Add a test for the MFCOMMENT record's size.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: 470e8fe2f438b2d91035ffa92d692efb91a8d701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=470e8fe2f438b2d91035ffa92… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 1 12:14:40 2009 +0100 gdi32/tests: Add a test for the MFCOMMENT record's size. --- dlls/gdi32/tests/metafile.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 237f2f4..4cc7ca4 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2348,7 +2348,9 @@ static void test_GetWinMetaFileBits(void) if(rec_num == mfcomment_chunks - 1) this_chunk_size = emf_size - rec_num * chunk_size; - ok(rec->rdFunction == META_ESCAPE, "got %04x\n", rec->rdFunction); + ok(rec->rdSize == (this_chunk_size + 44) / 2, "%04x: got %04x expected %04x\n", rec_num, rec->rdSize, (this_chunk_size + 44) / 2); + ok(rec->rdFunction == META_ESCAPE, "%04x: got %04x\n", rec_num, rec->rdFunction); + if(rec->rdSize < (this_chunk_size + 44) / 2) break; ok(rec->rdParm[0] == MFCOMMENT, "got %04x\n", rec->rdParm[0]); ok(rec->rdParm[1] == this_chunk_size + 34, "got %04x %x\n", rec->rdParm[1], emf_size + 34); ok(rec->rdParm[2] == 0x4d57, "got %04x\n", rec->rdParm[2]); /* WMFC */

1 0

Huw Davies : gdi32/tests: Dump the correct metafile if the test fails.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: d79943446f23b22fd6e3c3f9139e7c1567fc80bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d79943446f23b22fd6e3c3f91… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 1 12:03:04 2009 +0100 gdi32/tests: Dump the correct metafile if the test fails. --- dlls/gdi32/tests/metafile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 4cc7ca4..2b695d8 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1457,8 +1457,8 @@ static void test_CopyMetaFile(void) if (compare_mf_disk_bits(mf_name, MF_BLANK_BITS, sizeof(MF_BLANK_BITS), "mf_blank") != 0) { - dump_mf_bits(hMetafile, "mf_Blank"); - EnumMetaFile(0, hMetafile, mf_enum_proc, 0); + dump_mf_bits(hmf_copy, "mf_Blank"); + EnumMetaFile(0, hmf_copy, mf_enum_proc, 0); } ret = DeleteMetaFile(hmf_copy);

1 0

Paul Chitescu : services.exe: When asked to search by display name skip NULL names.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: 8fd619618f37a5e0b08e1063f6f0f5c3945b2664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fd619618f37a5e0b08e1063f… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Jul 1 15:21:47 2009 +0300 services.exe: When asked to search by display name skip NULL names. --- programs/services/services.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 9bed784..091c693 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -349,7 +349,7 @@ struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase LIST_FOR_EACH_ENTRY(service, &db->services, struct service_entry, entry) { - if (strcmpiW(name, service->config.lpDisplayName) == 0) + if (service->config.lpDisplayName && strcmpiW(name, service->config.lpDisplayName) == 0) return service; }

1 0

Alexandre Julliard : kernel32: Avoid the close-on-exec race with pipe() on kernels that support pipe2().
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: 887af612190f3c14d6f8513bf405759b98073e01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=887af612190f3c14d6f8513bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 12:13:46 2009 +0200 kernel32: Avoid the close-on-exec race with pipe() on kernels that support pipe2(). --- dlls/kernel32/process.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 83d1aa5..6fde35b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1304,12 +1304,18 @@ static int fork_and_exec( const char *filename, const WCHAR *cmdline, const WCHA if (!env) env = GetEnvironmentStringsW(); - if (pipe(fd) == -1) +#ifdef HAVE_PIPE2 + if (pipe2( fd, O_CLOEXEC ) == -1) +#endif { - SetLastError( ERROR_TOO_MANY_OPEN_FILES ); - return -1; + if (pipe(fd) == -1) + { + SetLastError( ERROR_TOO_MANY_OPEN_FILES ); + return -1; + } + fcntl( fd[0], F_SETFD, FD_CLOEXEC ); + fcntl( fd[1], F_SETFD, FD_CLOEXEC ); } - fcntl( fd[1], F_SETFD, 1 ); /* set close on exec */ if (!(flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS))) {

1 0

Alexandre Julliard : secur32: Avoid the close-on-exec race with pipe() on kernels that support pipe2().
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: a6b05ea96c2ed3ea18eb82e2c871933f578b9c16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6b05ea96c2ed3ea18eb82e2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 12:14:08 2009 +0200 secur32: Avoid the close-on-exec race with pipe() on kernels that support pipe2(). --- dlls/secur32/dispatcher.c | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/dispatcher.c b/dlls/secur32/dispatcher.c index 91f425c..666baea 100644 --- a/dlls/secur32/dispatcher.c +++ b/dlls/secur32/dispatcher.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "wine/port.h" #include <stdarg.h> #include <stdio.h> #ifdef HAVE_UNISTD_H @@ -57,16 +58,28 @@ SECURITY_STATUS fork_helper(PNegoHelper *new_helper, const char *prog, } TRACE("\n"); - if( pipe(pipe_in) < 0 ) +#ifdef HAVE_PIPE2 + if (pipe2( pipe_in, O_CLOEXEC ) < 0 ) +#endif { - return SEC_E_INTERNAL_ERROR; + if( pipe(pipe_in) < 0 ) return SEC_E_INTERNAL_ERROR; + fcntl( pipe_in[0], F_SETFD, FD_CLOEXEC ); + fcntl( pipe_in[1], F_SETFD, FD_CLOEXEC ); } - if( pipe(pipe_out) < 0 ) +#ifdef HAVE_PIPE2 + if (pipe2( pipe_out, O_CLOEXEC ) < 0 ) +#endif { - close(pipe_in[0]); - close(pipe_in[1]); - return SEC_E_INTERNAL_ERROR; + if( pipe(pipe_out) < 0 ) + { + close(pipe_in[0]); + close(pipe_in[1]); + return SEC_E_INTERNAL_ERROR; + } + fcntl( pipe_out[0], F_SETFD, FD_CLOEXEC ); + fcntl( pipe_out[1], F_SETFD, FD_CLOEXEC ); } + if (!(helper = HeapAlloc(GetProcessHeap(),0, sizeof(NegoHelper)))) { close(pipe_in[0]); @@ -91,9 +104,6 @@ SECURITY_STATUS fork_helper(PNegoHelper *new_helper, const char *prog, if(helper->helper_pid == 0) { /* We're in the child now */ - close(0); - close(1); - dup2(pipe_out[0], 0); close(pipe_out[0]); close(pipe_out[1]); @@ -125,10 +135,8 @@ SECURITY_STATUS fork_helper(PNegoHelper *new_helper, const char *prog, helper->crypt.ntlm2.recv_sign_key = NULL; helper->crypt.ntlm2.recv_seal_key = NULL; helper->pipe_in = pipe_in[0]; - fcntl( pipe_in[0], F_SETFD, 1 ); close(pipe_in[1]); helper->pipe_out = pipe_out[1]; - fcntl( pipe_out[1], F_SETFD, 1 ); close(pipe_out[0]); }

1 0