Author: winesync Date: Mon Jan 14 15:40:24 2008 New Revision: 31773
URL: http://svn.reactos.org/svn/reactos?rev=31773&view=rev Log: Autosyncing with Wine HEAD
Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/datetime.c trunk/reactos/dll/win32/comctl32/header.c trunk/reactos/dll/win32/comctl32/ipaddress.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/monthcal.c trunk/reactos/dll/win32/comctl32/pager.c trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/comctl32/status.c trunk/reactos/dll/win32/comctl32/syslink.c trunk/reactos/dll/win32/comctl32/tab.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/dll/win32/comctl32/trackbar.c trunk/reactos/dll/win32/comctl32/treeview.c trunk/reactos/dll/win32/comctl32/updown.c
Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32... ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.rbuild (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.rbuild Mon Jan 14 15:40:24 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllInstall" /> <importlibrary definition="comctl32.spec.def" /> @@ -54,3 +55,4 @@ <file>rsrc.rc</file> <file>comctl32.spec</file> </module> +</group>
Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32... ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Mon Jan 14 15:40:24 2008 @@ -86,7 +86,7 @@ =================================================================== --- tooltips.c (revision 25790) +++ tooltips.c (working copy) -@@ -2440,7 +2440,34 @@ +@@ -2433,7 +2433,34 @@ TOOLTIPS_NotifyFormat (HWND hwnd, WPARAM wParam, LPARAM lParam) { FIXME ("hwnd=%p wParam=%lx lParam=%lx\n", hwnd, wParam, lParam); @@ -125,7 +125,7 @@ =================================================================== --- treeview.c (revision 27134) +++ treeview.c (working copy) -@@ -2844,8 +2844,6 @@ +@@ -2834,8 +2834,6 @@ } }
Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctrl... ============================================================================== --- trunk/reactos/dll/win32/comctl32/commctrl.c (original) +++ trunk/reactos/dll/win32/comctl32/commctrl.c Mon Jan 14 15:40:24 2008 @@ -207,7 +207,7 @@ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL);
- COMCTL32_hModule = (HMODULE)hinstDLL; + COMCTL32_hModule = hinstDLL;
/* add global subclassing atom (used by 'tooltip' and 'updown') */ COMCTL32_wSubclass = (LPWSTR)(DWORD_PTR)GlobalAddAtomW (strCC32SubclassInfo); @@ -715,7 +715,7 @@ * * NOTES * Probaly all versions of comctl32 initializes the Win95 controls in DllMain - * during DLL initializaiton. Starting from comctl32 v5.82 all the controls + * during DLL initialization. Starting from comctl32 v5.82 all the controls * are initialized there. We follow this behaviour and this function is just * a dummy. * @@ -885,7 +885,7 @@ return 0; RtlMoveMemory (lpBitmapInfo, lpBitmap, nSize);
- pColorTable = (RGBQUAD*)(((LPBYTE)lpBitmapInfo)+(UINT)lpBitmapInfo->biSize); + pColorTable = (RGBQUAD*)(((LPBYTE)lpBitmapInfo) + lpBitmapInfo->biSize);
for (iColor = 0; iColor < nColorTableSize; iColor++) { for (i = 0; i < iMaps; i++) { @@ -907,8 +907,8 @@ } } } - nWidth = (INT)lpBitmapInfo->biWidth; - nHeight = (INT)lpBitmapInfo->biHeight; + nWidth = lpBitmapInfo->biWidth; + nHeight = lpBitmapInfo->biHeight; hdcScreen = GetDC (NULL); hbm = CreateCompatibleBitmap (hdcScreen, nWidth, nHeight); if (hbm) {
Modified: trunk/reactos/dll/win32/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/datetime... ============================================================================== --- trunk/reactos/dll/win32/comctl32/datetime.c (original) +++ trunk/reactos/dll/win32/comctl32/datetime.c Mon Jan 14 15:40:24 2008 @@ -1072,7 +1072,7 @@ TRACE("got focus from %p\n", lostFocus);
/* if monthcal is open and it loses focus, close monthcal */ - if (infoPtr->hMonthCal && (lostFocus == infoPtr->hMonthCal) && \ + if (infoPtr->hMonthCal && (lostFocus == infoPtr->hMonthCal) && IsWindowVisible(infoPtr->hMonthCal)) { ShowWindow(infoPtr->hMonthCal, SW_HIDE); @@ -1108,7 +1108,7 @@
MONTHCAL_CopyTime (&infoPtr->date, &dtdtc.st); return (BOOL) SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)dtdtc.nmhdr.idFrom, (LPARAM)&dtdtc); + dtdtc.nmhdr.idFrom, (LPARAM)&dtdtc); }
@@ -1123,7 +1123,7 @@ nmhdr.code = code;
return (BOOL) SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr); + nmhdr.idFrom, (LPARAM)&nmhdr); }
static LRESULT
Modified: trunk/reactos/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/header.c... ============================================================================== --- trunk/reactos/dll/win32/comctl32/header.c (original) +++ trunk/reactos/dll/win32/comctl32/header.c Mon Jan 14 15:40:24 2008 @@ -783,7 +783,7 @@ nmhdr->code = code;
return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmhdr->idFrom, (LPARAM)nmhdr); + nmhdr->idFrom, (LPARAM)nmhdr); }
static BOOL @@ -909,9 +909,7 @@ dispInfo.lParam = lpItem->lParam;
TRACE("Sending HDN_GETDISPINFO%c\n", infoPtr->nNotifyFormat == NFR_UNICODE?'W':'A'); - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM) dispInfo.hdr.idFrom, - (LPARAM) &dispInfo); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, dispInfo.hdr.idFrom, (LPARAM)&dispInfo);
TRACE("SendMessage returns(mask:0x%x,str:%s,lParam:%p)\n", dispInfo.mask,
Modified: trunk/reactos/dll/win32/comctl32/ipaddress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/ipaddres... ============================================================================== --- trunk/reactos/dll/win32/comctl32/ipaddress.c (original) +++ trunk/reactos/dll/win32/comctl32/ipaddress.c Mon Jan 14 15:40:24 2008 @@ -100,8 +100,7 @@ nmip.iField = field; nmip.iValue = value;
- SendMessageW (infoPtr->Notify, WM_NOTIFY, - (WPARAM)nmip.hdr.idFrom, (LPARAM)&nmip); + SendMessageW (infoPtr->Notify, WM_NOTIFY, nmip.hdr.idFrom, (LPARAM)&nmip);
TRACE("<-- %d\n", nmip.iValue);
Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listview... ============================================================================== --- trunk/reactos/dll/win32/comctl32/listview.c (original) +++ trunk/reactos/dll/win32/comctl32/listview.c Mon Jan 14 15:40:24 2008 @@ -735,8 +735,7 @@ pnmh->hwndFrom = infoPtr->hwndSelf; pnmh->idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); pnmh->code = code; - result = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)pnmh->idFrom, (LPARAM)pnmh); + result = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, pnmh->idFrom, (LPARAM)pnmh);
TRACE(" <= %ld\n", result);
Modified: trunk/reactos/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/monthcal... ============================================================================== --- trunk/reactos/dll/win32/comctl32/monthcal.c (original) +++ trunk/reactos/dll/win32/comctl32/monthcal.c Mon Jan 14 15:40:24 2008 @@ -1305,8 +1305,7 @@ nmds.cDayState = infoPtr->monthRange; nmds.prgDayState = Alloc(infoPtr->monthRange * sizeof(MONTHDAYSTATE));
- SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmds.nmhdr.idFrom, (LPARAM)&nmds); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmds.nmhdr.idFrom, (LPARAM)&nmds); for(i=0; i<infoPtr->monthRange; i++) infoPtr->monthdayState[i] = nmds.prgDayState[i]; } @@ -1336,8 +1335,7 @@ nmds.prgDayState = Alloc (infoPtr->monthRange * sizeof(MONTHDAYSTATE));
- SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmds.nmhdr.idFrom, (LPARAM)&nmds); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmds.nmhdr.idFrom, (LPARAM)&nmds); for(i=0; i<infoPtr->monthRange; i++) infoPtr->monthdayState[i] = nmds.prgDayState[i]; } @@ -1490,10 +1488,10 @@ nmsc.nmhdr.code = MCN_SELCHANGE; MONTHCAL_CopyTime(&infoPtr->minSel, &nmsc.stSelStart); MONTHCAL_CopyTime(&infoPtr->maxSel, &nmsc.stSelEnd); - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, (WPARAM)nmsc.nmhdr.idFrom, (LPARAM)&nmsc); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc);
nmsc.nmhdr.code = MCN_SELECT; - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, (WPARAM)nmsc.nmhdr.idFrom,(LPARAM)&nmsc); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); return 0; } if(hit == MCHT_CALENDARDATE) { @@ -1511,8 +1509,7 @@ MONTHCAL_CopyTime(&infoPtr->minSel,&nmsc.stSelStart); MONTHCAL_CopyTime(&infoPtr->maxSel,&nmsc.stSelEnd);
- SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmsc.nmhdr.idFrom,(LPARAM)&nmsc); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc);
/* redraw both old and new days if the selected day changed */ @@ -1577,7 +1574,7 @@ nmhdr.code = NM_RELEASEDCAPTURE; TRACE("Sent notification from %p to %p\n", infoPtr->hwndSelf, infoPtr->hwndNotify);
- SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmhdr.idFrom, (LPARAM)&nmhdr); /* redraw if necessary */ if(redraw) InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); @@ -1589,7 +1586,7 @@ MONTHCAL_CopyTime(&infoPtr->minSel, &nmsc.stSelStart); MONTHCAL_CopyTime(&infoPtr->maxSel, &nmsc.stSelEnd);
- SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, (WPARAM)nmsc.nmhdr.idFrom, (LPARAM)&nmsc); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc);
} return 0;
Modified: trunk/reactos/dll/win32/comctl32/pager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/pager.c?... ============================================================================== --- trunk/reactos/dll/win32/comctl32/pager.c (original) +++ trunk/reactos/dll/win32/comctl32/pager.c Mon Jan 14 15:40:24 2008 @@ -352,8 +352,7 @@ nmpgcs.dwFlag = getWidth ? PGF_CALCWIDTH : PGF_CALCHEIGHT; nmpgcs.iWidth = getWidth ? *size : 0; nmpgcs.iHeight = getWidth ? 0 : *size; - SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmpgcs.hdr.idFrom, (LPARAM)&nmpgcs); + SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, nmpgcs.hdr.idFrom, (LPARAM)&nmpgcs);
*size = getWidth ? nmpgcs.iWidth : nmpgcs.iHeight;
@@ -763,8 +762,7 @@ } nmpgScroll.iScroll -= 2*infoPtr->nButtonSize;
- SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmpgScroll.hdr.idFrom, (LPARAM)&nmpgScroll); + SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, nmpgScroll.hdr.idFrom, (LPARAM)&nmpgScroll);
TRACE("[%p] PGN_SCROLL returns iScroll=%d\n", infoPtr->hwndSelf, nmpgScroll.iScroll);
@@ -1076,8 +1074,7 @@ nmhdr.hwndFrom = infoPtr->hwndSelf; nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); nmhdr.code = NM_RELEASEDCAPTURE; - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr); + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmhdr.idFrom, (LPARAM)&nmhdr); } if (IsWindow(infoPtr->hwndSelf)) KillTimer(infoPtr->hwndSelf, TIMERID1);
Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshee... ============================================================================== --- trunk/reactos/dll/win32/comctl32/propsheet.c (original) +++ trunk/reactos/dll/win32/comctl32/propsheet.c Mon Jan 14 15:40:24 2008 @@ -522,7 +522,7 @@ p += 2; break; default: - p += lstrlenW( (LPCWSTR)p ) + 1; + p += lstrlenW( p ) + 1; break; }
@@ -536,14 +536,14 @@ p += 2; break; default: - p += lstrlenW( (LPCWSTR)p ) + 1; + p += lstrlenW( p ) + 1; break; }
/* Extract the caption */ - psInfo->proppage[index].pszText = (LPCWSTR)p; - TRACE("Tab %d %s\n",index,debugstr_w((LPCWSTR)p)); - p += lstrlenW((LPCWSTR)p) + 1; + psInfo->proppage[index].pszText = p; + TRACE("Tab %d %s\n",index,debugstr_w( p )); + p += lstrlenW( p ) + 1;
if (dwFlags & PSP_USETITLE) { @@ -632,7 +632,7 @@ return -1; }
- if(!(template = (LPVOID)LoadResource(COMCTL32_hModule, hRes))) + if(!(template = LoadResource(COMCTL32_hModule, hRes))) return -1;
/* @@ -1288,8 +1288,8 @@ p += 2; break; default: - TRACE("menu %s\n",debugstr_w((LPCWSTR)p)); - p += lstrlenW( (LPCWSTR)p ) + 1; + TRACE("menu %s\n",debugstr_w( p )); + p += lstrlenW( p ) + 1; break; }
@@ -1303,22 +1303,22 @@ p += 2; /* 0xffff plus predefined window class ordinal value */ break; default: - TRACE("class %s\n",debugstr_w((LPCWSTR)p)); - p += lstrlenW( (LPCWSTR)p ) + 1; + TRACE("class %s\n",debugstr_w( p )); + p += lstrlenW( p ) + 1; break; }
/* title */ - TRACE("title %s\n",debugstr_w((LPCWSTR)p)); - p += lstrlenW((LPCWSTR)p) + 1; + TRACE("title %s\n",debugstr_w( p )); + p += lstrlenW( p ) + 1;
/* font, if DS_SETFONT set */ if ((DS_SETFONT & ((istemplateex)? ((const MyDLGTEMPLATEEX*)pTemplate)->style : pTemplate->style))) { p+=(istemplateex)?3:1; - TRACE("font %s\n",debugstr_w((LPCWSTR)p)); - p += lstrlenW( (LPCWSTR)p ) + 1; /* the font name */ + TRACE("font %s\n",debugstr_w( p )); + p += lstrlenW( p ) + 1; /* the font name */ }
/* now process the DLGITEMTEMPLATE(EX) structs (plus custom data) @@ -1342,8 +1342,8 @@ p += 2; break; default: - TRACE("class %s\n",debugstr_w((LPCWSTR)p)); - p += lstrlenW( (LPCWSTR)p ) + 1; + TRACE("class %s\n",debugstr_w( p )); + p += lstrlenW( p ) + 1; break; }
@@ -1358,8 +1358,8 @@ p += 2; break; default: - TRACE("text %s\n",debugstr_w((LPCWSTR)p)); - p += lstrlenW( (LPCWSTR)p ) + 1; + TRACE("text %s\n",debugstr_w( p )); + p += lstrlenW( p ) + 1; break; } p += *p / sizeof(WORD) + 1; /* Skip extra data */
Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c?... ============================================================================== --- trunk/reactos/dll/win32/comctl32/rebar.c (original) +++ trunk/reactos/dll/win32/comctl32/rebar.c Mon Jan 14 15:40:24 2008 @@ -511,7 +511,7 @@
TRACE("window %p, code=%08x, via %s\n", parent, code, (infoPtr->bUnicode)?"Unicode":"ANSI");
- return SendMessageW(parent, WM_NOTIFY, (WPARAM)nmhdr->idFrom, (LPARAM)nmhdr); + return SendMessageW(parent, WM_NOTIFY, nmhdr->idFrom, (LPARAM)nmhdr); }
static INT
Modified: trunk/reactos/dll/win32/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/status.c... ============================================================================== --- trunk/reactos/dll/win32/comctl32/status.c (original) +++ trunk/reactos/dll/win32/comctl32/status.c Mon Jan 14 15:40:24 2008 @@ -1019,8 +1019,7 @@ nmttc.hdr.code = NM_TOOLTIPSCREATED; nmttc.hwndToolTips = infoPtr->hwndToolTip;
- SendMessageW (lpCreate->hwndParent, WM_NOTIFY, - (WPARAM)nmttc.hdr.idFrom, (LPARAM)&nmttc); + SendMessageW (lpCreate->hwndParent, WM_NOTIFY, nmttc.hdr.idFrom, (LPARAM)&nmttc); } }
Modified: trunk/reactos/dll/win32/comctl32/syslink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/syslink.... ============================================================================== --- trunk/reactos/dll/win32/comctl32/syslink.c (original) +++ trunk/reactos/dll/win32/comctl32/syslink.c Mon Jan 14 15:40:24 2008 @@ -1314,7 +1314,7 @@ nml.item.szUrl[0] = 0; }
- return SendMessageW(infoPtr->Notify, WM_NOTIFY, (WPARAM)nml.hdr.idFrom, (LPARAM)&nml); + return SendMessageW(infoPtr->Notify, WM_NOTIFY, nml.hdr.idFrom, (LPARAM)&nml); }
/***********************************************************************
Modified: trunk/reactos/dll/win32/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tab.c?re... ============================================================================== --- trunk/reactos/dll/win32/comctl32/tab.c (original) +++ trunk/reactos/dll/win32/comctl32/tab.c Mon Jan 14 15:40:24 2008 @@ -178,7 +178,7 @@ nmhdr.code = code;
return (BOOL) SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM) nmhdr.idFrom, (LPARAM) &nmhdr); + nmhdr.idFrom, (LPARAM) &nmhdr); }
static void
Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar.... ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c Mon Jan 14 15:40:24 2008 @@ -341,8 +341,7 @@ TRACE("to window %p, code=%08x, %s\n", infoPtr->hwndNotify, code, (infoPtr->bUnicode) ? "via Unicode" : "via ANSI");
- return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)nmhdr->idFrom, (LPARAM)nmhdr); + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmhdr->idFrom, (LPARAM)nmhdr); }
/*********************************************************************** @@ -3918,7 +3917,7 @@ { TBADDBITMAP tbab; tbab.hInst = (HINSTANCE)lParam; - tbab.nID = (UINT_PTR)wParam; + tbab.nID = wParam;
TRACE("hwnd = %p, hInst = %p, nID = %lu\n", hwnd, tbab.hInst, tbab.nID);
@@ -4231,7 +4230,7 @@ if (!res) { nmtbr.pData = Alloc(dwSize); - nmtbr.cbData = (UINT)dwSize; + nmtbr.cbData = dwSize; if (!nmtbr.pData) res = ERROR_OUTOFMEMORY; } if (!res) @@ -6374,7 +6373,7 @@
/* last resort: send notification on to app */ /* FIXME: find out what is really used here */ - return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, (WPARAM)lpnmtdi->hdr.idFrom, (LPARAM)lpnmtdi); + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, lpnmtdi->hdr.idFrom, (LPARAM)lpnmtdi); }
Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltips... ============================================================================== --- trunk/reactos/dll/win32/comctl32/tooltips.c (original) +++ trunk/reactos/dll/win32/comctl32/tooltips.c Mon Jan 14 15:40:24 2008 @@ -320,8 +320,7 @@ ttnmdi.lParam = toolPtr->lParam;
TRACE("hdr.idFrom = %lx\n", ttnmdi.hdr.idFrom); - SendMessageW(toolPtr->hwnd, WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&ttnmdi); + SendMessageW(toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&ttnmdi);
if (IS_INTRESOURCE(ttnmdi.lpszText)) { LoadStringW(ttnmdi.hinst, LOWORD(ttnmdi.lpszText), @@ -351,8 +350,7 @@ /* FIXME: Unsure if SETITEM should save the value or not */ if (infoPtr->szTipText[0] == 0x00) {
- SendMessageW(GetParent(toolPtr->hwnd), WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&ttnmdi); + SendMessageW(GetParent(toolPtr->hwnd), WM_NOTIFY, toolPtr->uId, (LPARAM)&ttnmdi);
if (IS_INTRESOURCE(ttnmdi.lpszText)) { LoadStringW(ttnmdi.hinst, LOWORD(ttnmdi.lpszText), @@ -378,8 +376,7 @@ ttnmdi.lParam = toolPtr->lParam;
TRACE("hdr.idFrom = %lx\n", ttnmdi.hdr.idFrom); - SendMessageW(toolPtr->hwnd, WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&ttnmdi); + SendMessageW(toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&ttnmdi);
if (IS_INTRESOURCE(ttnmdi.lpszText)) { LoadStringW(ttnmdi.hinst, LOWORD(ttnmdi.lpszText), @@ -409,8 +406,7 @@ /* FIXME: Unsure if SETITEM should save the value or not */ if (infoPtr->szTipText[0] == 0x00) {
- SendMessageW(GetParent(toolPtr->hwnd), WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&ttnmdi); + SendMessageW(GetParent(toolPtr->hwnd), WM_NOTIFY, toolPtr->uId, (LPARAM)&ttnmdi);
if (IS_INTRESOURCE(ttnmdi.lpszText)) { LoadStringW(ttnmdi.hinst, LOWORD(ttnmdi.lpszText), @@ -563,8 +559,7 @@ hdr.hwndFrom = hwnd; hdr.idFrom = toolPtr->uId; hdr.code = TTN_SHOW; - SendMessageW (toolPtr->hwnd, WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&hdr); + SendMessageW (toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&hdr);
TRACE("%s\n", debugstr_w(infoPtr->szTipText));
@@ -792,8 +787,7 @@ hdr.hwndFrom = hwnd; hdr.idFrom = toolPtr->uId; hdr.code = TTN_POP; - SendMessageW (toolPtr->hwnd, WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&hdr); + SendMessageW (toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&hdr);
infoPtr->nCurrentTool = -1;
@@ -825,8 +819,7 @@ hdr.hwndFrom = hwnd; hdr.idFrom = toolPtr->uId; hdr.code = TTN_POP; - SendMessageW (toolPtr->hwnd, WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&hdr); + SendMessageW (toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&hdr);
SetWindowPos (hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOZORDER | SWP_HIDEWINDOW | SWP_NOACTIVATE); @@ -1922,7 +1915,7 @@ { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); LPCSTR pszTitle = (LPCSTR)lParam; - UINT_PTR uTitleIcon = (UINT_PTR)wParam; + UINT_PTR uTitleIcon = wParam; UINT size;
TRACE("hwnd = %p, title = %s, icon = %p\n", hwnd, debugstr_a(pszTitle), @@ -1955,7 +1948,7 @@ { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); LPCWSTR pszTitle = (LPCWSTR)lParam; - UINT_PTR uTitleIcon = (UINT_PTR)wParam; + UINT_PTR uTitleIcon = wParam; UINT size;
TRACE("hwnd = %p, title = %s, icon = %p\n", hwnd, debugstr_w(pszTitle),
Modified: trunk/reactos/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/trackbar... ============================================================================== --- trunk/reactos/dll/win32/comctl32/trackbar.c (original) +++ trunk/reactos/dll/win32/comctl32/trackbar.c Mon Jan 14 15:40:24 2008 @@ -119,8 +119,7 @@ pnmh->hwndFrom = infoPtr->hwndSelf; pnmh->idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); pnmh->code = code; - result = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, - (WPARAM)pnmh->idFrom, (LPARAM)pnmh); + result = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, pnmh->idFrom, (LPARAM)pnmh);
TRACE(" <= %ld\n", result);
Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treeview... ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c Mon Jan 14 15:40:24 2008 @@ -518,8 +518,7 @@ nmhdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); nmhdr.code = get_notifycode(infoPtr, code);
- return (BOOL)TREEVIEW_SendRealNotify(infoPtr, - (WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr); + return (BOOL)TREEVIEW_SendRealNotify(infoPtr, nmhdr.idFrom, (LPARAM)&nmhdr); }
static VOID @@ -582,9 +581,7 @@ nmhdr.ptDrag.x = 0; nmhdr.ptDrag.y = 0;
- ret = (BOOL)TREEVIEW_SendRealNotify(infoPtr, - (WPARAM)nmhdr.hdr.idFrom, - (LPARAM)&nmhdr); + ret = (BOOL)TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, (LPARAM)&nmhdr); if (!infoPtr->bNtfUnicode) { Free(nmhdr.itemOld.pszText); @@ -614,9 +611,7 @@ nmhdr.ptDrag.x = pt.x; nmhdr.ptDrag.y = pt.y;
- return (BOOL)TREEVIEW_SendRealNotify(infoPtr, - (WPARAM)nmhdr.hdr.idFrom, - (LPARAM)&nmhdr); + return (BOOL)TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, (LPARAM)&nmhdr); }
@@ -644,9 +639,7 @@ nmcdhdr.clrTextBk = infoPtr->clrBk; nmcdhdr.iLevel = 0;
- return (BOOL)TREEVIEW_SendRealNotify(infoPtr, - (WPARAM)nmcd->hdr.idFrom, - (LPARAM)&nmcdhdr); + return (BOOL)TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, (LPARAM)&nmcdhdr); }
@@ -691,11 +684,9 @@ nmcd->dwDrawStage, nmcd->hdc, nmcd->dwItemSpec, nmcd->uItemState, nmcd->lItemlParam);
- retval = TREEVIEW_SendRealNotify(infoPtr, - (WPARAM)nmcd->hdr.idFrom, - (LPARAM)nmcdhdr); - - return (BOOL)retval; + retval = TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, (LPARAM)nmcdhdr); + + return retval; }
static BOOL @@ -750,8 +741,7 @@ if (mask & TVIF_TEXT) wineItem->textWidth = 0;
- TREEVIEW_SendRealNotify(infoPtr, - (WPARAM)callback.hdr.idFrom, (LPARAM)&callback); + TREEVIEW_SendRealNotify(infoPtr, callback.hdr.idFrom, (LPARAM)&callback);
/* It may have changed due to a call to SetItem. */ mask &= wineItem->callbackMask; @@ -3782,8 +3772,7 @@ tvdi.item.cchTextMax = 0; }
- bCommit = (BOOL)TREEVIEW_SendRealNotify(infoPtr, - (WPARAM)tvdi.hdr.idFrom, (LPARAM)&tvdi); + bCommit = (BOOL)TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, (LPARAM)&tvdi);
if (!bCancel && bCommit) /* Apply the changes */ {
Modified: trunk/reactos/dll/win32/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/updown.c... ============================================================================== --- trunk/reactos/dll/win32/comctl32/updown.c (original) +++ trunk/reactos/dll/win32/comctl32/updown.c Mon Jan 14 15:40:24 2008 @@ -627,7 +627,7 @@ ni.hdr.hwndFrom = infoPtr->Self; ni.hdr.idFrom = GetWindowLongPtrW (infoPtr->Self, GWLP_ID); ni.hdr.code = UDN_DELTAPOS; - if (!SendMessageW(infoPtr->Notify, WM_NOTIFY, (WPARAM)ni.hdr.idFrom, (LPARAM)&ni)) { + if (!SendMessageW(infoPtr->Notify, WM_NOTIFY, ni.hdr.idFrom, (LPARAM)&ni)) { /* Parent said: OK to adjust */
/* Now adjust value with (maybe new) delta */
-
winesync＠svn.reactos.org