Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[ekohl] 45106: Implement PNP_HwProfFlags.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jan 16 17:18:00 2010 New Revision: 45106 URL: http://svn.reactos.org/svn/reactos?rev=45106&view=rev Log: Implement PNP_HwProfFlags. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Sat Jan 16 17:18:00 2010 @@ -1527,8 +1527,70 @@ DWORD ulNameLength, DWORD ulFlags) { - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + CONFIGRET ret = CR_SUCCESS; + WCHAR szKeyName[MAX_PATH]; + HKEY hKey; + HKEY hDeviceKey; + DWORD dwSize; + + UNREFERENCED_PARAMETER(hBinding); + + DPRINT("PNP_HwProfFlags() called\n"); + + if (ulConfig == 0) + { + wcscpy(szKeyName, + L"System\\CurrentControlSet\\HardwareProfiles\\Current\\System\\CurrentControlSet\\Enum"); + } + else + { + swprintf(szKeyName, + L"System\\CurrentControlSet\\HardwareProfiles\\%04u\\System\\CurrentControlSet\\Enum", + ulConfig); + } + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + szKeyName, + 0, + KEY_QUERY_VALUE, + &hKey) != ERROR_SUCCESS) + return CR_REGISTRY_ERROR; + + if (ulAction == PNP_GET_HWPROFFLAGS) + { + if (RegOpenKeyExW(hKey, + pDeviceID, + 0, + KEY_QUERY_VALUE, + &hDeviceKey) != ERROR_SUCCESS) + { + *pulValue = 0; + } + else + { + dwSize = sizeof(DWORD); + if (!RegQueryValueExW(hDeviceKey, + L"CSConfigFlags", + NULL, + NULL, + (LPBYTE)pulValue, + &dwSize) != ERROR_SUCCESS) + { + *pulValue = 0; + } + + RegCloseKey(hDeviceKey); + } + } + else if (ulAction == PNP_SET_HWPROFFLAGS) + { + /* FIXME: not implemented yet */ + ret = CR_CALL_NOT_IMPLEMENTED; + } + + RegCloseKey(hKey); + + return ret; }

14 years, 11 months

[fireball] 45105: - Update to Wine-1.1.31.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jan 16 17:05:35 2010 New Revision: 45105 URL: http://svn.reactos.org/svn/reactos?rev=45105&view=rev Log: - Update to Wine-1.1.31. Modified: branches/arwinss/reactos/dll/win32/comctl32/comboex.c branches/arwinss/reactos/dll/win32/comctl32/comctl32.h branches/arwinss/reactos/dll/win32/comctl32/datetime.c branches/arwinss/reactos/dll/win32/comctl32/ipaddress.c branches/arwinss/reactos/dll/win32/comctl32/listview.c branches/arwinss/reactos/dll/win32/comctl32/monthcal.c branches/arwinss/reactos/dll/win32/comctl32/toolbar.c branches/arwinss/reactos/dll/win32/comctl32/treeview.c branches/arwinss/reactos/dll/win32/comctl32/updown.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/reactos/dll/win32/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl32.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/ipaddress.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct…

14 years, 11 months

[fireball] 45104: - Remove all ROS-specific modifications from comctl32-1.1.30 except the TOOLTIPS_NotifyFormat one for now.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jan 16 16:43:36 2010 New Revision: 45104 URL: http://svn.reactos.org/svn/reactos?rev=45104&view=rev Log: - Remove all ROS-specific modifications from comctl32-1.1.30 except the TOOLTIPS_NotifyFormat one for now. Modified: branches/arwinss/reactos/dll/win32/comctl32/imagelist.c branches/arwinss/reactos/dll/win32/comctl32/propsheet.c branches/arwinss/reactos/dll/win32/comctl32/rsrc.rc branches/arwinss/reactos/dll/win32/comctl32/treeview.c Modified: branches/arwinss/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… ============================================================================== --- branches/arwinss/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] Sat Jan 16 16:43:36 2010 @@ -156,7 +156,7 @@ * This function CANNOT be used to reduce the number of images. */ static void -IMAGELIST_InternalExpandBitmaps (HIMAGELIST himl, INT nImageCount, INT cy) +IMAGELIST_InternalExpandBitmaps (HIMAGELIST himl, INT nImageCount, INT cx, INT cy) { HDC hdcBitmap; HBITMAP hbmNewBitmap, hbmNull; @@ -167,14 +167,15 @@ && (himl->cy >= cy)) return; + if (cx == 0) cx = himl->cx; nNewCount = himl->cCurImage + nImageCount + himl->cGrow; - imagelist_get_bitmap_size(himl, nNewCount, himl->cx, &sz); + imagelist_get_bitmap_size(himl, nNewCount, cx, &sz); TRACE("Create expanded bitmaps : himl=%p x=%d y=%d count=%d\n", himl, sz.cx, cy, nNewCount); hdcBitmap = CreateCompatibleDC (0); - hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount, himl->cx); + hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount, cx); if (hbmNewBitmap == 0) ERR("creating new image bitmap (x=%d y=%d)!\n", sz.cx, cy); @@ -248,7 +249,7 @@ nImageCount = bmp.bmWidth / himl->cx; - IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmHeight); + IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmWidth, bmp.bmHeight); hdcBitmap = CreateCompatibleDC(0); @@ -350,7 +351,7 @@ else nImageCount = 0; - IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmHeight); + IMAGELIST_InternalExpandBitmaps (himl, nImageCount, bmp.bmWidth, bmp.bmHeight); nIndex = himl->cCurImage; himl->cCurImage += nImageCount; @@ -2304,7 +2305,7 @@ if (nIndex == -1) { if (himl->cCurImage + 1 > himl->cMaxImage) - IMAGELIST_InternalExpandBitmaps (himl, 1, 0); + IMAGELIST_InternalExpandBitmaps (himl, 1, 0, 0); nIndex = himl->cCurImage; himl->cCurImage++; Modified: branches/arwinss/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… ============================================================================== --- branches/arwinss/reactos/dll/win32/comctl32/propsheet.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/comctl32/propsheet.c [iso-8859-1] Sat Jan 16 16:43:36 2010 @@ -2422,28 +2422,6 @@ return FALSE; } -BOOL CALLBACK -EnumChildProc(HWND hwnd, LPARAM lParam) -{ - WCHAR szType[20]; - RealGetWindowClassW(hwnd, szType, 20); - - if (strcmpW(szType, WC_EDITW) == 0) - { - if (IsWindowEnabled(hwnd) && IsWindowVisible(hwnd)) - { - SetFocus(hwnd); - return FALSE; - } - } - else - { - EnumChildWindows(hwnd, EnumChildProc, 0); - } - - return TRUE; -} - /****************************************************************************** * PROPSHEET_SetWizButtons * @@ -2464,6 +2442,17 @@ EnableWindow(hwndBack, FALSE); EnableWindow(hwndNext, FALSE); EnableWindow(hwndFinish, FALSE); + + /* set the default pushbutton to an enabled button */ + if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) + SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); + else if (dwFlags & PSWIZB_NEXT) + SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); + else if (dwFlags & PSWIZB_BACK) + SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0); + else + SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); + if (dwFlags & PSWIZB_BACK) EnableWindow(hwndBack, TRUE); @@ -2494,31 +2483,6 @@ } else if (!(dwFlags & PSWIZB_DISABLEDFINISH)) EnableWindow(hwndFinish, TRUE); - - /* set the default pushbutton to an enabled button and give it focus */ - if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) - { - SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); - SetFocus(hwndFinish); - } - else if (dwFlags & PSWIZB_NEXT) - { - SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); - SetFocus(hwndNext); - } - else if (dwFlags & PSWIZB_BACK) - { - SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0); - SetFocus(hwndBack); - } - else - { - SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); - SetFocus(GetDlgItem(hwndDlg, IDCANCEL)); - } - - /* Now try to find an edit control that deserves focus */ - EnumChildWindows(PropSheet_GetCurrentPageHwnd(hwndDlg), EnumChildProc, 0); } /****************************************************************************** Modified: branches/arwinss/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… ============================================================================== --- branches/arwinss/reactos/dll/win32/comctl32/rsrc.rc [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/comctl32/rsrc.rc [iso-8859-1] Sat Jan 16 16:43:36 2010 @@ -19,10 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" #include "comctl32.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL Modified: branches/arwinss/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… ============================================================================== --- branches/arwinss/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] Sat Jan 16 16:43:36 2010 @@ -2843,12 +2843,7 @@ } } - // - // This is correct, but is causes and infinite loop of WM_PAINT messages, resulting - // in continuous painting of the scroll bar in reactos. Comment out until the real - // bug is found - // - //TREEVIEW_UpdateScrollBars(infoPtr); + TREEVIEW_UpdateScrollBars(infoPtr); if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT) infoPtr->cdmode =

14 years, 11 months

[fireball] 45103: - Revert back to working comctl32 (Wine-1.1.30 as it looks like from logs). - Apply TOOLTIPS_NotifyFormat fix.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jan 16 16:27:59 2010 New Revision: 45103 URL: http://svn.reactos.org/svn/reactos?rev=45103&view=rev Log: - Revert back to working comctl32 (Wine-1.1.30 as it looks like from logs). - Apply TOOLTIPS_NotifyFormat fix. Modified: branches/arwinss/reactos/dll/win32/comctl32/comboex.c branches/arwinss/reactos/dll/win32/comctl32/comctl32.h branches/arwinss/reactos/dll/win32/comctl32/comctl32.rbuild branches/arwinss/reactos/dll/win32/comctl32/comctl_Bg.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Cs.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_De.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_El.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_En.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Eo.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Es.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Fr.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Hu.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_It.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Ja.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Ko.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Lt.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Nl.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_No.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Pl.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Pt.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Ro.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Ru.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Si.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Sk.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Sv.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Th.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Tr.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Uk.rc branches/arwinss/reactos/dll/win32/comctl32/comctl_Zh.rc branches/arwinss/reactos/dll/win32/comctl32/commctrl.c branches/arwinss/reactos/dll/win32/comctl32/datetime.c branches/arwinss/reactos/dll/win32/comctl32/draglist.c branches/arwinss/reactos/dll/win32/comctl32/header.c branches/arwinss/reactos/dll/win32/comctl32/imagelist.c branches/arwinss/reactos/dll/win32/comctl32/imagelist.h branches/arwinss/reactos/dll/win32/comctl32/ipaddress.c branches/arwinss/reactos/dll/win32/comctl32/listview.c branches/arwinss/reactos/dll/win32/comctl32/monthcal.c branches/arwinss/reactos/dll/win32/comctl32/propsheet.c branches/arwinss/reactos/dll/win32/comctl32/rebar.c branches/arwinss/reactos/dll/win32/comctl32/rsrc.rc branches/arwinss/reactos/dll/win32/comctl32/status.c branches/arwinss/reactos/dll/win32/comctl32/syslink.c branches/arwinss/reactos/dll/win32/comctl32/tab.c branches/arwinss/reactos/dll/win32/comctl32/theme_combo.c branches/arwinss/reactos/dll/win32/comctl32/toolbar.c branches/arwinss/reactos/dll/win32/comctl32/tooltips.c branches/arwinss/reactos/dll/win32/comctl32/trackbar.c branches/arwinss/reactos/dll/win32/comctl32/treeview.c branches/arwinss/reactos/dll/win32/comctl32/updown.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/reactos/dll/win32/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl32.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Bg.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Cs.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_De.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_El.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_En.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Eo.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Es.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_It.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_No.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Si.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Sk.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Th.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/draglist.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/imagelist.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/ipaddress.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/syslink.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/theme_combo.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct…

14 years, 11 months

[cgutman] 45102: - Fix a null-pointer dereference crash that happens when we complete a queued NDIS_REQUEST in MiniportWorker

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jan 16 15:59:54 2010 New Revision: 45102 URL: http://svn.reactos.org/svn/reactos?rev=45102&view=rev Log: - Fix a null-pointer dereference crash that happens when we complete a queued NDIS_REQUEST in MiniportWorker Modified: branches/aicom-network-branch/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-branch/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sat Jan 16 15:59:54 2010 @@ -961,13 +961,6 @@ Adapter->NdisMiniportBlock.MiniportAdapterContext, NULL, /* FIXME */ NdisRequest); - } - - if (Status != NDIS_STATUS_PENDING) - { - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - Adapter->NdisMiniportBlock.PendingRequest = NULL; - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } return Status;

14 years, 11 months

[fireball] 45101: - Sync comctl32 to Wine-1.1.36.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jan 16 15:14:02 2010 New Revision: 45101 URL: http://svn.reactos.org/svn/reactos?rev=45101&view=rev Log: - Sync comctl32 to Wine-1.1.36. Modified: branches/arwinss/reactos/dll/win32/comctl32/comboex.c branches/arwinss/reactos/dll/win32/comctl32/comctl32.rbuild branches/arwinss/reactos/dll/win32/comctl32/comctl_De.rc branches/arwinss/reactos/dll/win32/comctl32/commctrl.c branches/arwinss/reactos/dll/win32/comctl32/datetime.c branches/arwinss/reactos/dll/win32/comctl32/draglist.c branches/arwinss/reactos/dll/win32/comctl32/header.c branches/arwinss/reactos/dll/win32/comctl32/imagelist.c branches/arwinss/reactos/dll/win32/comctl32/imagelist.h branches/arwinss/reactos/dll/win32/comctl32/listview.c branches/arwinss/reactos/dll/win32/comctl32/propsheet.c branches/arwinss/reactos/dll/win32/comctl32/rebar.c branches/arwinss/reactos/dll/win32/comctl32/status.c branches/arwinss/reactos/dll/win32/comctl32/tab.c branches/arwinss/reactos/dll/win32/comctl32/theme_combo.c branches/arwinss/reactos/dll/win32/comctl32/toolbar.c branches/arwinss/reactos/dll/win32/comctl32/tooltips.c branches/arwinss/reactos/dll/win32/comctl32/trackbar.c branches/arwinss/reactos/dll/win32/comctl32/treeview.c branches/arwinss/reactos/dll/win32/comctl32/updown.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/reactos/dll/win32/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl_De.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/draglist.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/imagelist.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/theme_combo.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct…

14 years, 11 months

[fireball] 45100: Merge: - 45097: "Add commoncontrols.idl from Wine-1.1.36 (needed for newer comctl32)". - 45098: "Merge Wine-1.1.36 changes to commctrl.h." - 45099: "Add missing IIDs to UUID."

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jan 16 14:55:35 2010 New Revision: 45100 URL: http://svn.reactos.org/svn/reactos?rev=45100&view=rev Log: Merge: - 45097: "Add commoncontrols.idl from Wine-1.1.36 (needed for newer comctl32)". - 45098: "Merge Wine-1.1.36 changes to commctrl.h." - 45099: "Add missing IIDs to UUID." Added: branches/arwinss/reactos/include/psdk/commoncontrols.idl - copied unchanged from r45097, trunk/reactos/include/psdk/commoncontrols.idl Modified: branches/arwinss/ (props changed) branches/arwinss/reactos/ (props changed) branches/arwinss/reactos/dll/directx/d3d8/d3d8.spec (props changed) branches/arwinss/reactos/dll/shellext/devcpux/devcpux.spec (props changed) branches/arwinss/reactos/dll/shellext/slayer/slayer.spec (props changed) branches/arwinss/reactos/dll/win32/gdi32/ (props changed) branches/arwinss/reactos/dll/win32/kernel32/kernel32.pspec (props changed) branches/arwinss/reactos/dll/win32/user32/ (props changed) branches/arwinss/reactos/dll/win32/winex11.drv/ (props changed) branches/arwinss/reactos/include/ndk/amd64/ (props changed) branches/arwinss/reactos/include/ndk/amd64/asmmacro.S (props changed) branches/arwinss/reactos/include/psdk/ (props changed) branches/arwinss/reactos/include/psdk/commctrl.h (contents, props changed) branches/arwinss/reactos/include/psdk/psdk.rbuild branches/arwinss/reactos/lib/sdk/crt/time/ (props changed) branches/arwinss/reactos/lib/sdk/uuid/uuid.c branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c (props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/ (props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/request.h (props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/user.h (props changed) branches/arwinss/reactos/subsystems/win32/win32k/wine/ (props changed) branches/arwinss/reactos/tools/rsym/log2lines.c (props changed) branches/arwinss/reactos/tools/rsym/log2lines.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym.c (props changed) branches/arwinss/reactos/tools/rsym/rsym.h (props changed) branches/arwinss/reactos/tools/rsym/rsym.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym_common.c (props changed) branches/arwinss/rosapps/applications/cmdutils/ (props changed) branches/arwinss/rosapps/applications/devutils/ (props changed) branches/arwinss/rosapps/applications/fraginator/ (props changed) branches/arwinss/rosapps/applications/net/ (props changed) branches/arwinss/rosapps/applications/net/roshttpd/ (props changed) branches/arwinss/rosapps/applications/notevil/ (props changed) branches/arwinss/rosapps/applications/sysutils/ (props changed) branches/arwinss/rosapps/applications/sysutils/gettype/ (props changed) branches/arwinss/rosapps/applications/sysutils/logevent/ (props changed) branches/arwinss/rosapps/applications/sysutils/screenshot/ (props changed) branches/arwinss/rosapps/applications/winfile/ (props changed) branches/arwinss/rosapps/lib/win32err/ (props changed) branches/arwinss/rosapps/lib/win32err/win32err.rbuild (props changed) branches/arwinss/rosapps/templates/imagesoft/ (props changed) branches/arwinss/rosapps/templates/imagesoft/lang/no-NO.rc (props changed) branches/arwinss/rosapps/templates/old_wordpad/ (props changed) branches/arwinss/rosapps/templates/old_wordpad/lang/no-NO.rc (props changed) branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/README (props changed) branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/README.odt (props changed) branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh (props changed) branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/scripts/ (props changed) branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/sources/ (props changed) branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/tools/ (props changed) branches/arwinss/wallpaper/Angelus_02_ROSWP.bmp (props changed) branches/arwinss/wallpaper/Angelus_02_ROSWP_4-3_1440x1080.jpg (props changed) Propchange: branches/arwinss/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,1 +1,1 @@ -/trunk:42678-43126 +/trunk:42678-43126,45097-45099 Propchange: branches/arwinss/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos:42000-43670 +/trunk/reactos:42000-43670,45097-45099 Propchange: branches/arwinss/reactos/dll/directx/d3d8/d3d8.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec:36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/directx/d3d8/d3d8.spec:43127-43670 +/trunk/reactos/dll/directx/d3d8/d3d8.spec:43127-43670,45097-45099 Propchange: branches/arwinss/reactos/dll/shellext/devcpux/devcpux.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec:38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/shellext/devcpux/devcpux.spec:43127-43670 +/trunk/reactos/dll/shellext/devcpux/devcpux.spec:43127-43670,45097-45099 Propchange: branches/arwinss/reactos/dll/shellext/slayer/slayer.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec:38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/shellext/slayer/slayer.spec:43127-43670 +/trunk/reactos/dll/shellext/slayer/slayer.spec:43127-43670,45097-45099 Propchange: branches/arwinss/reactos/dll/win32/gdi32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/gdi32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/win32/gdi32:42000-43670 +/trunk/reactos/dll/win32/gdi32:42000-43670,45097-45099 /vendor/wine/dlls/gdi32/current:43136,43149,43398,43708,44151,44715,45044 Propchange: branches/arwinss/reactos/dll/win32/kernel32/kernel32.pspec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/dll/win32/kernel32/kernel32.pspec:42000-43670,44261 +/trunk/reactos/dll/win32/kernel32/kernel32.pspec:42000-43670,44261,45097-45099 Propchange: branches/arwinss/reactos/dll/win32/user32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/user32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/win32/user32:42000-43670 +/trunk/reactos/dll/win32/user32:42000-43670,45097-45099 /vendor/wine/dlls/user32/current:43136,43149,43398,43708,44151,44715,45044 Propchange: branches/arwinss/reactos/dll/win32/winex11.drv/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/winex11.drv:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/win32/winex11.drv:42000-43670 +/trunk/reactos/dll/win32/winex11.drv:42000-43670,45097-45099 /vendor/wine/dlls/winex11.drv/current:43149,43398,43708,44151,44715,45044 Propchange: branches/arwinss/reactos/include/ndk/amd64/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/ndk/amd64:34925,34967,34970,35323-35324,35347-35348,35361,35436,35509,35588,35739,35823,35952,35966,36360,37323,37434,37472,37475,37536,37820-37821,37869,37990,38013-38014,43426,43454 -/trunk/reactos/include/ndk/amd64:43125-43670 +/trunk/reactos/include/ndk/amd64:43125-43670,45097-45099 Propchange: branches/arwinss/reactos/include/ndk/amd64/asmmacro.S ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,1 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S:37475,37536,37820-37821,37869,37990,38013-38014,43426,43454 +/trunk/reactos/include/ndk/amd64/asmmacro.S:45097-45099 Propchange: branches/arwinss/reactos/include/psdk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/psdk:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/include/psdk:42000-43670,44153 +/trunk/reactos/include/psdk:42000-43670,44153,45097-45099 Modified: branches/arwinss/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/co… ============================================================================== --- branches/arwinss/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Jan 16 14:55:35 2010 @@ -2991,6 +2991,7 @@ #define LVSIL_NORMAL 0 #define LVSIL_SMALL 1 #define LVSIL_STATE 2 +#define LVSIL_GROUPHEADER 3 /* following 2 flags only for LVS_OWNERDATA listviews */ /* and only in report or list mode */ @@ -2998,11 +2999,12 @@ #define LVSICF_NOSCROLL 0x0002 -#define LVFI_PARAM 0X0001 -#define LVFI_STRING 0X0002 -#define LVFI_PARTIAL 0X0008 -#define LVFI_WRAP 0X0020 -#define LVFI_NEARESTXY 0X0040 +#define LVFI_PARAM 0x0001 +#define LVFI_STRING 0x0002 +#define LVFI_SUBSTRING 0x0004 +#define LVFI_PARTIAL 0x0008 +#define LVFI_WRAP 0x0020 +#define LVFI_NEARESTXY 0x0040 #define LVIF_TEXT 0x0001 #define LVIF_IMAGE 0x0002 @@ -5133,7 +5135,7 @@ #define WC_EDIT WINELIB_NAME_AW(WC_EDIT) /************************************************************************** - * List box control + * Listbox control */ #define WC_LISTBOXA "ListBox" @@ -5147,7 +5149,7 @@ #define WC_LISTBOX WINELIB_NAME_AW(WC_LISTBOX) /************************************************************************** - * Scroll bar control + * Scrollbar control */ #define WC_SCROLLBARA "ScrollBar" Propchange: branches/arwinss/reactos/include/psdk/commctrl.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/psdk/commctrl.h:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/include/psdk/commctrl.h:42000-43670,44013,44015,44019,44153 +/trunk/reactos/include/psdk/commctrl.h:42000-43670,44013,44015,44019,44153,45097-45099 Modified: branches/arwinss/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/ps… ============================================================================== --- branches/arwinss/reactos/include/psdk/psdk.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/psdk.rbuild [iso-8859-1] Sat Jan 16 14:55:35 2010 @@ -6,6 +6,7 @@ <file>activscp.idl</file> <file>bits1_5.idl</file> <file>bits.idl</file> + <file>commoncontrols.idl</file> <file>control.idl</file> <file>ctxtcall.idl</file> <file>dimm.idl</file> Propchange: branches/arwinss/reactos/lib/sdk/crt/time/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,4 +1,4 @@ /branches/ros-amd64-bringup/reactos/lib/sdk/crt/time:38268,41028 /branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new:42414 -/trunk/reactos/lib/sdk/crt/time:42678-43670 +/trunk/reactos/lib/sdk/crt/time:42678-43670,45097-45099 /trunk/reactos/lib/sdk/crt/time_new:39350-42241,42401-42678 Modified: branches/arwinss/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/uuid/uu… ============================================================================== --- branches/arwinss/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Sat Jan 16 14:55:35 2010 @@ -77,6 +77,12 @@ #include "isguids.h" #include "objsafe.h" #include "perhist.h" +#include "netcon.h" +#include "netfw.h" +#include "msctf.h" +#include "sensevts.h" +#include "ocmm.h" +#include "commoncontrols.h" /* FIXME: cguids declares GUIDs but does not define their values */ Propchange: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:42000-43670,43934-43935 +/trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:42000-43670,43934-43935,45097-45099 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/subsystems/win32/win32k/include:42000-43670 +/trunk/reactos/subsystems/win32/win32k/include:42000-43670,45097-45099 /vendor/wine/server/current:45044 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/request.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/request.h:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/subsystems/win32/win32k/include/request.h:42000-43670 +/trunk/reactos/subsystems/win32/win32k/include/request.h:42000-43670,45097-45099 /vendor/wine/server/current/request.h:43136,43398,43708,45044 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/user.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/user.h:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/subsystems/win32/win32k/include/user.h:42000-43126 +/trunk/reactos/subsystems/win32/win32k/include/user.h:42000-43126,45097-45099 /vendor/wine/server/current/user.h:43708,45044 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/wine/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/wine:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/subsystems/win32/win32k/wine:42000-43126 +/trunk/reactos/subsystems/win32/win32k/wine:42000-43126,45097-45099 /vendor/wine/server/current:43708,44715,45044 Propchange: branches/arwinss/reactos/tools/rsym/log2lines.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.c:38268,41028 -/trunk/reactos/tools/rsym/log2lines.c:43125-43670 +/trunk/reactos/tools/rsym/log2lines.c:43125-43670,45097-45099 Propchange: branches/arwinss/reactos/tools/rsym/log2lines.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.mak:38268,41028 -/trunk/reactos/tools/rsym/log2lines.mak:43125-43670 +/trunk/reactos/tools/rsym/log2lines.mak:43125-43670,45097-45099 Propchange: branches/arwinss/reactos/tools/rsym/rsym.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:37291,37302,37305,37320,37329,37462,37895,38129,38268,38330-38331,38341,38947,38973,39072,39114,39121,40605,41028 -/trunk/reactos/tools/rsym/rsym.c:42000-43670 +/trunk/reactos/tools/rsym/rsym.c:42000-43670,45097-45099 Propchange: branches/arwinss/reactos/tools/rsym/rsym.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:37291,37302,37305,37320,37329,37462,37895,38129,38268,38330-38331,38341,38947,38973,39072,39114,39121,40605,41028 -/trunk/reactos/tools/rsym/rsym.h:42000-43670 +/trunk/reactos/tools/rsym/rsym.h:42000-43670,45097-45099 Propchange: branches/arwinss/reactos/tools/rsym/rsym.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:37291,37302,37305,37320,37329,37462,37895,38129,38268,38330-38331,38341,38947,38973,39072,39114,39121,40605,41028 -/trunk/reactos/tools/rsym/rsym.mak:42000-43670 +/trunk/reactos/tools/rsym/rsym.mak:42000-43670,45097-45099 Propchange: branches/arwinss/reactos/tools/rsym/rsym_common.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:37291,37302,37305,37320,37329,37462,37895,38129,38268,38330-38331,38341,38947,38973,39072,39114,39121,40605,41028 -/trunk/reactos/tools/rsym/rsym_common.c:42000-43670 +/trunk/reactos/tools/rsym/rsym_common.c:42000-43670,45097-45099 Propchange: branches/arwinss/rosapps/applications/cmdutils/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/rosapps/applications/cmdutils:45097-45099 Propchange: branches/arwinss/rosapps/applications/devutils/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/rosapps/applications/devutils:45097-45099 Propchange: branches/arwinss/rosapps/applications/fraginator/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/rosapps/applications/fraginator:45097-45099 Propchange: branches/arwinss/rosapps/applications/net/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/rosapps/applications/net:45097-45099 Propchange: branches/arwinss/rosapps/applications/net/roshttpd/ ------------------------------------------------------------------------------ (empty) Propchange: branches/arwinss/rosapps/applications/notevil/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/rosapps/applications/notevil:45097-45099 Propchange: branches/arwinss/rosapps/applications/sysutils/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/rosapps/applications/sysutils:45097-45099 Propchange: branches/arwinss/rosapps/applications/sysutils/gettype/ ------------------------------------------------------------------------------ (empty) Propchange: branches/arwinss/rosapps/applications/sysutils/logevent/ ------------------------------------------------------------------------------ (empty) Propchange: branches/arwinss/rosapps/applications/sysutils/screenshot/ ------------------------------------------------------------------------------ (empty) Propchange: branches/arwinss/rosapps/applications/winfile/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/rosapps/applications/winfile:45097-45099 Propchange: branches/arwinss/rosapps/lib/win32err/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/rosapps/lib/win32err:45097-45099 Propchange: branches/arwinss/rosapps/lib/win32err/win32err.rbuild ------------------------------------------------------------------------------ (empty) Propchange: branches/arwinss/rosapps/templates/imagesoft/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/rosapps/templates/imagesoft:45097-45099 Propchange: branches/arwinss/rosapps/templates/imagesoft/lang/no-NO.rc ------------------------------------------------------------------------------ (empty) Propchange: branches/arwinss/rosapps/templates/old_wordpad/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/rosapps/templates/old_wordpad:45097-45099 Propchange: branches/arwinss/rosapps/templates/old_wordpad/lang/no-NO.rc ------------------------------------------------------------------------------ (empty) Propchange: branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/README ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/tools/RosBE/RosBE-Unix/Base-i386/README:45097-45099 Propchange: branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/README.odt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/tools/RosBE/RosBE-Unix/Base-i386/README.odt:45097-45099 Propchange: branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh:45097-45099 Propchange: branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/scripts/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts:45097-45099 Propchange: branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/sources/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/tools/RosBE/RosBE-Unix/Base-i386/sources:45097-45099 Propchange: branches/arwinss/tools/RosBE/RosBE-Unix/Base-i386/tools/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/tools/RosBE/RosBE-Unix/Base-i386/tools:45097-45099 Propchange: branches/arwinss/wallpaper/Angelus_02_ROSWP.bmp ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/wallpaper/Angelus_02_ROSWP.bmp:45097-45099 Propchange: branches/arwinss/wallpaper/Angelus_02_ROSWP_4-3_1440x1080.jpg ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jan 16 14:55:35 2010 @@ -1,0 +1,1 @@ +/trunk/wallpaper/Angelus_02_ROSWP_4-3_1440x1080.jpg:45097-45099

14 years, 11 months

[fireball] 45099: [SDK] - Add missing IIDs to UUID.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jan 16 14:52:51 2010 New Revision: 45099 URL: http://svn.reactos.org/svn/reactos?rev=45099&view=rev Log: [SDK] - Add missing IIDs to UUID. Modified: trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=45… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Sat Jan 16 14:52:51 2010 @@ -78,6 +78,12 @@ #include "isguids.h" #include "objsafe.h" #include "perhist.h" +#include "netcon.h" +#include "netfw.h" +#include "msctf.h" +#include "sensevts.h" +#include "ocmm.h" +#include "commoncontrols.h" /* FIXME: cguids declares GUIDs but does not define their values */

14 years, 11 months

[fireball] 45098: [PSDK] - Merge Wine-1.1.36 changes to commctrl.h.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jan 16 14:40:30 2010 New Revision: 45098 URL: http://svn.reactos.org/svn/reactos?rev=45098&view=rev Log: [PSDK] - Merge Wine-1.1.36 changes to commctrl.h. Modified: trunk/reactos/include/psdk/commctrl.h Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Jan 16 14:40:30 2010 @@ -2809,7 +2809,7 @@ (LPARAM)(HTREEITEM)(hitem)) #define TreeView_EnsureVisible(hwnd, hitem) \ - (BOOL)SNDMSG((hwnd), TVM_ENSUREVISIBLE, 0, (LPARAM)(hitem)) + (BOOL)SNDMSG((hwnd), TVM_ENSUREVISIBLE, 0, (LPARAM)(UINT)(hitem)) #define TreeView_SortChildrenCB(hwnd, psort, recurse) \ (BOOL)SNDMSG((hwnd), TVM_SORTCHILDRENCB, (WPARAM)recurse, \ @@ -2993,6 +2993,7 @@ #define LVSIL_NORMAL 0 #define LVSIL_SMALL 1 #define LVSIL_STATE 2 +#define LVSIL_GROUPHEADER 3 /* following 2 flags only for LVS_OWNERDATA listviews */ /* and only in report or list mode */ @@ -3000,11 +3001,12 @@ #define LVSICF_NOSCROLL 0x0002 -#define LVFI_PARAM 0X0001 -#define LVFI_STRING 0X0002 -#define LVFI_PARTIAL 0X0008 -#define LVFI_WRAP 0X0020 -#define LVFI_NEARESTXY 0X0040 +#define LVFI_PARAM 0x0001 +#define LVFI_STRING 0x0002 +#define LVFI_SUBSTRING 0x0004 +#define LVFI_PARTIAL 0x0008 +#define LVFI_WRAP 0x0020 +#define LVFI_NEARESTXY 0x0040 #define LVIF_TEXT 0x0001 #define LVIF_IMAGE 0x0002 @@ -5135,7 +5137,7 @@ #define WC_EDIT WINELIB_NAME_AW(WC_EDIT) /************************************************************************** - * List box control + * Listbox control */ #define WC_LISTBOXA "ListBox" @@ -5149,7 +5151,7 @@ #define WC_LISTBOX WINELIB_NAME_AW(WC_LISTBOX) /************************************************************************** - * Scroll bar control + * Scrollbar control */ #define WC_SCROLLBARA "ScrollBar"

14 years, 11 months

[fireball] 45097: [PSDK] - Add commoncontrols.idl from Wine-1.1.36 (needed for newer comctl32).

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jan 16 13:39:44 2010 New Revision: 45097 URL: http://svn.reactos.org/svn/reactos?rev=45097&view=rev Log: [PSDK] - Add commoncontrols.idl from Wine-1.1.36 (needed for newer comctl32). Added: trunk/reactos/include/psdk/commoncontrols.idl (with props) Modified: trunk/reactos/include/psdk/psdk.rbuild Added: trunk/reactos/include/psdk/commoncontrols.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commoncontrol… ============================================================================== --- trunk/reactos/include/psdk/commoncontrols.idl (added) +++ trunk/reactos/include/psdk/commoncontrols.idl [iso-8859-1] Sat Jan 16 13:39:44 2010 @@ -1,0 +1,214 @@ +/* + * Common controls v6 interface definitions + * + * Copyright 2009 Owen Rudge for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +/* Definitions required for widl, but already defined in commctrl.h for C */ +cpp_quote("#if 0") +typedef DWORD RGBQUAD; +typedef IUnknown* HIMAGELIST; + +typedef struct +{ + HBITMAP hbmImage; + HBITMAP hbmMask; + int Unused1; + int Unused2; + RECT rcImage; +} IMAGEINFO; + +typedef IMAGEINFO* LPIMAGEINFO; + +typedef struct +{ + DWORD cbSize; + HIMAGELIST himl; + int i; + HDC hdcDst; + int x; + int y; + int cx; + int cy; + int xBitmap; + int yBitmap; + COLORREF rgbBk; + COLORREF rgbFg; + UINT fStyle; + DWORD dwRop; + DWORD fState; + DWORD Frame; + COLORREF crEffect; +} IMAGELISTDRAWPARAMS; + +typedef IMAGELISTDRAWPARAMS* LPIMAGELISTDRAWPARAMS; +cpp_quote("#endif") + +cpp_quote("HRESULT WINAPI ImageList_CoCreateInstance(REFCLSID,const IUnknown *, REFIID,void **);") + +const UINT ILIF_ALPHA = 1; + +[ + object, + uuid(46EB5926-582E-4017-9FDF-E8998DAA0950), + helpstring("Image List"), + local +] +interface IImageList : IUnknown +{ + HRESULT Add( + [in] HBITMAP hbmImage, + [in] HBITMAP hbmMask, + [out] int* pi); + + HRESULT ReplaceIcon( + [in] int i, + [in] HICON hicon, + [out] int* pi); + + HRESULT SetOverlayImage( + [in] int iImage, + [in] int iOverlay); + + HRESULT Replace( + [in] int i, + [in] HBITMAP hbmImage, + [in] HBITMAP hbmMask); + + HRESULT AddMasked( + [in] HBITMAP hbmImage, + [in] COLORREF crMask, + [out] int* pi); + + HRESULT Draw( + [in] IMAGELISTDRAWPARAMS* pimldp); + + HRESULT Remove( + [in] int i); + + HRESULT GetIcon( + [in] int i, + [in] UINT flags, + [out] HICON* picon); + + HRESULT GetImageInfo( + [in] int i, + [out] IMAGEINFO* pImageInfo); + + HRESULT Copy( + [in] int iDst, + [in] IUnknown* punkSrc, + [in] int iSrc, + [in] UINT uFlags); + + HRESULT Merge( + [in] int i1, + [in] IUnknown* punk2, + [in] int i2, + [in] int dx, + [in] int dy, + [out] REFIID riid, + [out] PVOID* ppv); + + HRESULT Clone( + [in] REFIID riid, + [out] PVOID* ppv); + + HRESULT GetImageRect( + [in] int i, + [out] RECT* prc); + + HRESULT GetIconSize( + [out] int* cx, + [out] int* cy); + + HRESULT SetIconSize( + [in] int cx, + [in] int cy); + + HRESULT GetImageCount( + [out] int* pi); + + HRESULT SetImageCount( + [in] UINT uNewCount); + + HRESULT SetBkColor( + [in] COLORREF clrBk, + [out] COLORREF* pclr); + + HRESULT GetBkColor( + [out] COLORREF* pclr); + + HRESULT BeginDrag( + [in] int iTrack, + [in] int dxHotspot, + [in] int dyHotspot); + + HRESULT EndDrag(); + + HRESULT DragEnter( + [in] HWND hwndLock, + [in] int x, + [in] int y); + + HRESULT DragLeave( + [in] HWND hwndLock); + + HRESULT DragMove( + [in] int x, + [in] int y); + + HRESULT SetDragCursorImage( + [in] IUnknown* punk, + [in] int iDrag, + [in] int dxHotspot, + [in] int dyHotspot); + + HRESULT DragShowNolock( + [in] BOOL fShow); + + HRESULT GetDragImage( + [out] POINT * ppt, + [out] POINT * pptHotspot, + [out] REFIID riid, + [out] PVOID* ppv); + + HRESULT GetItemFlags( + [in] int i, + [out] DWORD *dwFlags); + + HRESULT GetOverlayImage( + [in] int iOverlay, + [out] int* piIndex); +} + +[ + uuid(BCADA15B-B428-420c-8D28-023590924C9F) +] +library CommonControlObjects +{ + [ + uuid(7C476BA2-02B1-48f4-8048-B24619DDC058) + ] + coclass ImageList + { + interface IImageList; + } +} Propchange: trunk/reactos/include/psdk/commoncontrols.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r… ============================================================================== --- trunk/reactos/include/psdk/psdk.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/psdk/psdk.rbuild [iso-8859-1] Sat Jan 16 13:39:44 2010 @@ -6,6 +6,7 @@ <file>activscp.idl</file> <file>bits1_5.idl</file> <file>bits.idl</file> + <file>commoncontrols.idl</file> <file>control.idl</file> <file>ctxtcall.idl</file> <file>dimm.idl</file>

14 years, 11 months

← Newer
1
...
24
25
26
27
28
29
30
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2010