Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 44015: - Remove accidentally committed Wineisms. Build is fixed.
by fireball＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: fireball Date: Sat Nov 7 20:53:41 2009 New Revision: 44015 URL: http://svn.reactos.org/svn/reactos?rev=44015&view=rev Log: - Remove accidentally committed Wineisms. Build is fixed. 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 Nov 7 20:53:41 2009 @@ -394,15 +394,7 @@ /* UpDown */ #define UPDOWN_CLASSA "msctls_updown32" -#if defined(__GNUC__) -# define UPDOWN_CLASSW (const WCHAR []){ 'm','s','c','t','l','s','_', \ - 'u','p','d','o','w','n','3','2',0 } -#elif defined(_MSC_VER) # define UPDOWN_CLASSW L"msctls_updown32" -#else -static const WCHAR UPDOWN_CLASSW[] = { 'm','s','c','t','l','s','_', - 'u','p','d','o','w','n','3','2',0 }; -#endif #define UPDOWN_CLASS WINELIB_NAME_AW(UPDOWN_CLASS) typedef struct _UDACCEL @@ -463,15 +455,7 @@ /* Progress Bar */ #define PROGRESS_CLASSA "msctls_progress32" -#if defined(__GNUC__) -# define PROGRESS_CLASSW (const WCHAR []){ 'm','s','c','t','l','s','_', \ - 'p','r','o','g','r','e','s','s','3','2',0 } -#elif defined(_MSC_VER) # define PROGRESS_CLASSW L"msctls_progress32" -#else -static const WCHAR PROGRESS_CLASSW[] = { 'm','s','c','t','l','s','_', - 'p','r','o','g','r','e','s','s','3','2',0 }; -#endif #define PROGRESS_CLASS WINELIB_NAME_AW(PROGRESS_CLASS) #define PBM_SETRANGE (WM_USER+1) @@ -721,13 +705,7 @@ /* Header control */ #define WC_HEADERA "SysHeader32" -#if defined(__GNUC__) -# define WC_HEADERW (const WCHAR []){ 'S','y','s','H','e','a','d','e','r','3','2',0 } -#elif defined(_MSC_VER) # define WC_HEADERW L"SysHeader32" -#else -static const WCHAR WC_HEADERW[] = { 'S','y','s','H','e','a','d','e','r','3','2',0 }; -#endif #define WC_HEADER WINELIB_NAME_AW(WC_HEADER) #define HDS_HORZ 0x0000 @@ -1036,13 +1014,7 @@ /* Win32 5.1 Button Theme */ #define WC_BUTTONA "Button" -#if defined(__GNUC__) -# define WC_BUTTONW (const WCHAR []){ 'B','u','t','t','o','n',0 } -#elif defined(_MSC_VER) # define WC_BUTTONW L"Button" -#else -static const WCHAR WC_BUTTONW[] = { 'B','u','t','t','o','n',0 }; -#endif #define WC_BUTTON WINELIB_NAME_AW(WC_BUTTON) #define BCN_FIRST (0U-1250U) @@ -1061,15 +1033,8 @@ /* Toolbar */ #define TOOLBARCLASSNAMEA "ToolbarWindow32" -#if defined(__GNUC__) -# define TOOLBARCLASSNAMEW (const WCHAR []){ 'T','o','o','l','b','a','r', \ - 'W','i','n','d','o','w','3','2',0 } -#elif defined(_MSC_VER) # define TOOLBARCLASSNAMEW L"ToolbarWindow32" -#else -static const WCHAR TOOLBARCLASSNAMEW[] = { 'T','o','o','l','b','a','r', - 'W','i','n','d','o','w','3','2',0 }; -#endif + #define TOOLBARCLASSNAME WINELIB_NAME_AW(TOOLBARCLASSNAME) #define CMB_MASKED 0x02 @@ -1628,15 +1593,7 @@ /* Tool tips */ #define TOOLTIPS_CLASSA "tooltips_class32" -#if defined(__GNUC__) -# define TOOLTIPS_CLASSW (const WCHAR []){ 't','o','o','l','t','i','p','s','_', \ - 'c','l','a','s','s','3','2',0 } -#elif defined(_MSC_VER) # define TOOLTIPS_CLASSW L"tooltips_class32" -#else -static const WCHAR TOOLTIPS_CLASSW[] = { 't','o','o','l','t','i','p','s','_', - 'c','l','a','s','s','3','2',0 }; -#endif #define TOOLTIPS_CLASS WINELIB_NAME_AW(TOOLTIPS_CLASS) #define INFOTIPSIZE 1024

1 0

[fireball] 44014: [comctl32] - Fix a critical bug in TOOLTIPS_NotifyFormat. Its first parameter changed from HWND to infoPtr pointer, however the function was not updated accordingly.
by fireball＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: fireball Date: Sat Nov 7 20:42:57 2009 New Revision: 44014 URL: http://svn.reactos.org/svn/reactos?rev=44014&view=rev Log: [comctl32] - Fix a critical bug in TOOLTIPS_NotifyFormat. Its first parameter changed from HWND to infoPtr pointer, however the function was not updated accordingly. Modified: trunk/reactos/dll/win32/comctl32/tooltips.c Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltip… ============================================================================== --- trunk/reactos/dll/win32/comctl32/tooltips.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/tooltips.c [iso-8859-1] Sat Nov 7 20:42:57 2009 @@ -2402,13 +2402,12 @@ static LRESULT -TOOLTIPS_NotifyFormat (HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); +TOOLTIPS_NotifyFormat (TOOLTIPS_INFO *infoPtr, WPARAM wParam, LPARAM lParam) +{ TTTOOL_INFO *toolPtr = infoPtr->tools; INT nResult; - TRACE("hwnd=%p wParam=%lx lParam=%lx\n", hwnd, wParam, lParam); + TRACE("hwnd=%p wParam=%lx lParam=%lx\n", infoPtr->hwndSelf, wParam, lParam); if (lParam == NF_QUERY) { if (toolPtr->bNotifyUnicode) { @@ -2419,7 +2418,7 @@ } else if (lParam == NF_REQUERY) { nResult = (INT) SendMessageW (toolPtr->hwnd, WM_NOTIFYFORMAT, - (WPARAM)hwnd, (LPARAM)NF_QUERY); + (WPARAM)infoPtr->hwndSelf, (LPARAM)NF_QUERY); if (nResult == NFR_ANSI) { toolPtr->bNotifyUnicode = FALSE; TRACE(" -- WM_NOTIFYFORMAT returns: NFR_ANSI\n");

1 0

[fireball] 44013: - Update commctrl.h to Wine-1.1.31.
by fireball＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: fireball Date: Sat Nov 7 20:34:59 2009 New Revision: 44013 URL: http://svn.reactos.org/svn/reactos?rev=44013&view=rev Log: - Update commctrl.h to Wine-1.1.31. 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 Nov 7 20:34:59 2009 @@ -394,7 +394,15 @@ /* UpDown */ #define UPDOWN_CLASSA "msctls_updown32" +#if defined(__GNUC__) +# define UPDOWN_CLASSW (const WCHAR []){ 'm','s','c','t','l','s','_', \ + 'u','p','d','o','w','n','3','2',0 } +#elif defined(_MSC_VER) # define UPDOWN_CLASSW L"msctls_updown32" +#else +static const WCHAR UPDOWN_CLASSW[] = { 'm','s','c','t','l','s','_', + 'u','p','d','o','w','n','3','2',0 }; +#endif #define UPDOWN_CLASS WINELIB_NAME_AW(UPDOWN_CLASS) typedef struct _UDACCEL @@ -455,7 +463,15 @@ /* Progress Bar */ #define PROGRESS_CLASSA "msctls_progress32" +#if defined(__GNUC__) +# define PROGRESS_CLASSW (const WCHAR []){ 'm','s','c','t','l','s','_', \ + 'p','r','o','g','r','e','s','s','3','2',0 } +#elif defined(_MSC_VER) # define PROGRESS_CLASSW L"msctls_progress32" +#else +static const WCHAR PROGRESS_CLASSW[] = { 'm','s','c','t','l','s','_', + 'p','r','o','g','r','e','s','s','3','2',0 }; +#endif #define PROGRESS_CLASS WINELIB_NAME_AW(PROGRESS_CLASS) #define PBM_SETRANGE (WM_USER+1) @@ -568,6 +584,7 @@ } IMAGELISTDRAWPARAMS, *LPIMAGELISTDRAWPARAMS; +HRESULT WINAPI HIMAGELIST_QueryInterface(HIMAGELIST,REFIID,void **); INT WINAPI ImageList_Add(HIMAGELIST,HBITMAP,HBITMAP); INT WINAPI ImageList_AddMasked(HIMAGELIST,HBITMAP,COLORREF); BOOL WINAPI ImageList_BeginDrag(HIMAGELIST,INT,INT,INT); @@ -704,7 +721,13 @@ /* Header control */ #define WC_HEADERA "SysHeader32" +#if defined(__GNUC__) +# define WC_HEADERW (const WCHAR []){ 'S','y','s','H','e','a','d','e','r','3','2',0 } +#elif defined(_MSC_VER) # define WC_HEADERW L"SysHeader32" +#else +static const WCHAR WC_HEADERW[] = { 'S','y','s','H','e','a','d','e','r','3','2',0 }; +#endif #define WC_HEADER WINELIB_NAME_AW(WC_HEADER) #define HDS_HORZ 0x0000 @@ -1013,7 +1036,13 @@ /* Win32 5.1 Button Theme */ #define WC_BUTTONA "Button" +#if defined(__GNUC__) +# define WC_BUTTONW (const WCHAR []){ 'B','u','t','t','o','n',0 } +#elif defined(_MSC_VER) # define WC_BUTTONW L"Button" +#else +static const WCHAR WC_BUTTONW[] = { 'B','u','t','t','o','n',0 }; +#endif #define WC_BUTTON WINELIB_NAME_AW(WC_BUTTON) #define BCN_FIRST (0U-1250U) @@ -1032,8 +1061,15 @@ /* Toolbar */ #define TOOLBARCLASSNAMEA "ToolbarWindow32" +#if defined(__GNUC__) +# define TOOLBARCLASSNAMEW (const WCHAR []){ 'T','o','o','l','b','a','r', \ + 'W','i','n','d','o','w','3','2',0 } +#elif defined(_MSC_VER) # define TOOLBARCLASSNAMEW L"ToolbarWindow32" - +#else +static const WCHAR TOOLBARCLASSNAMEW[] = { 'T','o','o','l','b','a','r', + 'W','i','n','d','o','w','3','2',0 }; +#endif #define TOOLBARCLASSNAME WINELIB_NAME_AW(TOOLBARCLASSNAME) #define CMB_MASKED 0x02 @@ -1592,27 +1628,16 @@ /* Tool tips */ #define TOOLTIPS_CLASSA "tooltips_class32" +#if defined(__GNUC__) +# define TOOLTIPS_CLASSW (const WCHAR []){ 't','o','o','l','t','i','p','s','_', \ + 'c','l','a','s','s','3','2',0 } +#elif defined(_MSC_VER) # define TOOLTIPS_CLASSW L"tooltips_class32" +#else +static const WCHAR TOOLTIPS_CLASSW[] = { 't','o','o','l','t','i','p','s','_', + 'c','l','a','s','s','3','2',0 }; +#endif #define TOOLTIPS_CLASS WINELIB_NAME_AW(TOOLTIPS_CLASS) - -#if (_WIN32_WINNT >= 0x501) -#define BUTTON_IMAGELIST_ALIGN_LEFT 0 -#define BUTTON_IMAGELIST_ALIGN_RIGHT 1 -#define BUTTON_IMAGELIST_ALIGN_TOP 2 -#define BUTTON_IMAGELIST_ALIGN_BOTTOM 3 -#define BUTTON_IMAGELIST_ALIGN_CENTER 4 - -typedef struct -{ - HIMAGELIST himl; - RECT margin; - UINT uAlign; -} BUTTON_IMAGELIST, *PBUTTON_IMAGELIST; - -#define BCM_FIRST 0x1600 -#define BCM_GETIDEALSIZE (BCM_FIRST + 1) -#define BCM_SETIMAGELIST (BCM_FIRST + 2) -#endif /* _WIN32_WINNT */ #define INFOTIPSIZE 1024 @@ -1749,6 +1774,10 @@ #define TTTOOLINFOA_V1_SIZE CCSIZEOF_STRUCT(TTTOOLINFOA, lpszText) #define TTTOOLINFOW_V1_SIZE CCSIZEOF_STRUCT(TTTOOLINFOW, lpszText) #define TTTOOLINFO_V1_SIZE CCSIZEOF_STRUCT(WINELIB_NAME_AW(TTTOOLINFO), lpszText) +#define TTTOOLINFOA_V2_SIZE CCSIZEOF_STRUCT(TTTOOLINFOA, lParam) +#define TTTOOLINFOW_V2_SIZE CCSIZEOF_STRUCT(TTTOOLINFOW, lParam) +#define TTTOOLINFOA_V3_SIZE CCSIZEOF_STRUCT(TTTOOLINFOA, lpReserved) +#define TTTOOLINFOW_V3_SIZE CCSIZEOF_STRUCT(TTTOOLINFOW, lpReserved) typedef struct _TT_HITTESTINFOA { @@ -4239,9 +4268,10 @@ #define TCN_FIRST (0U-550U) #define TCN_LAST (0U-580U) #define TCN_KEYDOWN (TCN_FIRST - 0) -#define TCN_SELCHANGE (TCN_FIRST - 1) +#define TCN_SELCHANGE (TCN_FIRST - 1) #define TCN_SELCHANGING (TCN_FIRST - 2) #define TCN_GETOBJECT (TCN_FIRST - 3) +#define TCN_FOCUSCHANGE (TCN_FIRST - 4) #include <pshpack1.h> typedef struct tagTCKEYDOWN @@ -4644,6 +4674,7 @@ #define MCS_WEEKNUMBERS 0x0004 #define MCS_NOTODAY 0x0010 #define MCS_NOTODAYCIRCLE 0x0008 +#define MCS_NOTRAILINGDATES 0x0040 #define MCHT_TITLE 0x00010000 #define MCHT_CALENDAR 0x00020000 @@ -4679,7 +4710,14 @@ POINT pt; UINT uHit; SYSTEMTIME st; + /* Vista */ + RECT rc; + INT iOffset; + INT iRow; + INT iCol; } MCHITTESTINFO, *PMCHITTESTINFO; + +#define MCHITTESTINFO_V1_SIZE CCSIZEOF_STRUCT(MCHITTESTINFO, st) typedef struct tagNMSELCHANGE { @@ -4703,51 +4741,51 @@ /* macros */ #define MonthCal_GetCurSel(hmc, pst) \ - (BOOL)SNDMSGA(hmc, MCM_GETCURSEL, 0, (LPARAM)(pst)) + (BOOL)SNDMSG(hmc, MCM_GETCURSEL, 0, (LPARAM)(pst)) #define MonthCal_SetCurSel(hmc, pst) \ - (BOOL)SNDMSGA(hmc, MCM_SETCURSEL, 0, (LPARAM)(pst)) + (BOOL)SNDMSG(hmc, MCM_SETCURSEL, 0, (LPARAM)(pst)) #define MonthCal_GetMaxSelCount(hmc) \ - (DWORD)SNDMSGA(hmc, MCM_GETMAXSELCOUNT, 0, 0L) + (DWORD)SNDMSG(hmc, MCM_GETMAXSELCOUNT, 0, 0L) #define MonthCal_SetMaxSelCount(hmc, n) \ - (BOOL)SNDMSGA(hmc, MCM_SETMAXSELCOUNT, (WPARAM)(n), 0L) + (BOOL)SNDMSG(hmc, MCM_SETMAXSELCOUNT, (WPARAM)(n), 0L) #define MonthCal_GetSelRange(hmc, rgst) \ - SNDMSGA(hmc, MCM_GETSELRANGE, 0, (LPARAM) (rgst)) + SNDMSG(hmc, MCM_GETSELRANGE, 0, (LPARAM) (rgst)) #define MonthCal_SetSelRange(hmc, rgst) \ - SNDMSGA(hmc, MCM_SETSELRANGE, 0, (LPARAM) (rgst)) + SNDMSG(hmc, MCM_SETSELRANGE, 0, (LPARAM) (rgst)) #define MonthCal_GetMonthRange(hmc, gmr, rgst) \ - (DWORD)SNDMSGA(hmc, MCM_GETMONTHRANGE, (WPARAM)(gmr), (LPARAM)(rgst)) + (DWORD)SNDMSG(hmc, MCM_GETMONTHRANGE, (WPARAM)(gmr), (LPARAM)(rgst)) #define MonthCal_SetDayState(hmc, cbds, rgds) \ - SNDMSGA(hmc, MCM_SETDAYSTATE, (WPARAM)(cbds), (LPARAM)(rgds)) + SNDMSG(hmc, MCM_SETDAYSTATE, (WPARAM)(cbds), (LPARAM)(rgds)) #define MonthCal_GetMinReqRect(hmc, prc) \ - SNDMSGA(hmc, MCM_GETMINREQRECT, 0, (LPARAM)(prc)) + SNDMSG(hmc, MCM_GETMINREQRECT, 0, (LPARAM)(prc)) #define MonthCal_SetColor(hmc, iColor, clr)\ - SNDMSGA(hmc, MCM_SETCOLOR, iColor, clr) + SNDMSG(hmc, MCM_SETCOLOR, iColor, clr) #define MonthCal_GetColor(hmc, iColor) \ - SNDMSGA(hmc, MCM_SETCOLOR, iColor, 0) + SNDMSG(hmc, MCM_SETCOLOR, iColor, 0) #define MonthCal_GetToday(hmc, pst)\ - (BOOL)SNDMSGA(hmc, MCM_GETTODAY, 0, (LPARAM)pst) + (BOOL)SNDMSG(hmc, MCM_GETTODAY, 0, (LPARAM)pst) #define MonthCal_SetToday(hmc, pst)\ - SNDMSGA(hmc, MCM_SETTODAY, 0, (LPARAM)pst) + SNDMSG(hmc, MCM_SETTODAY, 0, (LPARAM)pst) #define MonthCal_HitTest(hmc, pinfo) \ - SNDMSGA(hmc, MCM_HITTEST, 0, (LPARAM)(PMCHITTESTINFO)pinfo) + SNDMSG(hmc, MCM_HITTEST, 0, (LPARAM)(PMCHITTESTINFO)pinfo) #define MonthCal_SetFirstDayOfWeek(hmc, iDay) \ - SNDMSGA(hmc, MCM_SETFIRSTDAYOFWEEK, 0, iDay) + SNDMSG(hmc, MCM_SETFIRSTDAYOFWEEK, 0, iDay) #define MonthCal_GetFirstDayOfWeek(hmc) \ - (DWORD)SNDMSGA(hmc, MCM_GETFIRSTDAYOFWEEK, 0, 0) + (DWORD)SNDMSG(hmc, MCM_GETFIRSTDAYOFWEEK, 0, 0) #define MonthCal_GetRange(hmc, rgst) \ - (DWORD)SNDMSGA(hmc, MCM_GETRANGE, 0, (LPARAM)(rgst)) + (DWORD)SNDMSG(hmc, MCM_GETRANGE, 0, (LPARAM)(rgst)) #define MonthCal_SetRange(hmc, gd, rgst) \ - (BOOL)SNDMSGA(hmc, MCM_SETRANGE, (WPARAM)(gd), (LPARAM)(rgst)) + (BOOL)SNDMSG(hmc, MCM_SETRANGE, (WPARAM)(gd), (LPARAM)(rgst)) #define MonthCal_GetMonthDelta(hmc) \ - (int)SNDMSGA(hmc, MCM_GETMONTHDELTA, 0, 0) + (int)SNDMSG(hmc, MCM_GETMONTHDELTA, 0, 0) #define MonthCal_SetMonthDelta(hmc, n) \ - (int)SNDMSGA(hmc, MCM_SETMONTHDELTA, n, 0) + (int)SNDMSG(hmc, MCM_SETMONTHDELTA, n, 0) #define MonthCal_GetMaxTodayWidth(hmc) \ - (DWORD)SNDMSGA(hmc, MCM_GETMAXTODAYWIDTH, 0, 0) + (DWORD)SNDMSG(hmc, MCM_GETMAXTODAYWIDTH, 0, 0) #define MonthCal_SetUnicodeFormat(hwnd, fUnicode) \ - (BOOL)SNDMSGA((hwnd), MCM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0) + (BOOL)SNDMSG((hwnd), MCM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0) #define MonthCal_GetUnicodeFormat(hwnd) \ - (BOOL)SNDMSGA((hwnd), MCM_GETUNICODEFORMAT, 0, 0) + (BOOL)SNDMSG((hwnd), MCM_GETUNICODEFORMAT, 0, 0) /************************************************************************** @@ -4907,28 +4945,28 @@ #define DateTime_GetSystemtime(hdp, pst) \ - (DWORD)SNDMSGA (hdp, DTM_GETSYSTEMTIME , 0, (LPARAM)(pst)) + (DWORD)SNDMSG (hdp, DTM_GETSYSTEMTIME , 0, (LPARAM)(pst)) #define DateTime_SetSystemtime(hdp, gd, pst) \ - (BOOL)SNDMSGA (hdp, DTM_SETSYSTEMTIME, (LPARAM)(gd), (LPARAM)(pst)) + (BOOL)SNDMSG (hdp, DTM_SETSYSTEMTIME, (LPARAM)(gd), (LPARAM)(pst)) #define DateTime_GetRange(hdp, rgst) \ - (DWORD)SNDMSGA (hdp, DTM_GETRANGE, 0, (LPARAM)(rgst)) + (DWORD)SNDMSG (hdp, DTM_GETRANGE, 0, (LPARAM)(rgst)) #define DateTime_SetRange(hdp, gd, rgst) \ - (BOOL)SNDMSGA (hdp, DTM_SETRANGE, (WPARAM)(gd), (LPARAM)(rgst)) + (BOOL)SNDMSG (hdp, DTM_SETRANGE, (WPARAM)(gd), (LPARAM)(rgst)) #define DateTime_SetFormatA(hdp, sz) \ (BOOL)SNDMSGA (hdp, DTM_SETFORMATA, 0, (LPARAM)(sz)) #define DateTime_SetFormatW(hdp, sz) \ (BOOL)SNDMSGW (hdp, DTM_SETFORMATW, 0, (LPARAM)(sz)) #define DateTime_SetFormat WINELIB_NAME_AW(DateTime_SetFormat) #define DateTime_GetMonthCalColor(hdp, iColor) \ - SNDMSGA (hdp, DTM_GETMCCOLOR, iColor, 0) + SNDMSG (hdp, DTM_GETMCCOLOR, iColor, 0) #define DateTime_SetMonthCalColor(hdp, iColor, clr) \ - SNDMSGA (hdp, DTM_SETMCCOLOR, iColor, clr) + SNDMSG (hdp, DTM_SETMCCOLOR, iColor, clr) #define DateTime_GetMonthCal(hdp) \ - (HWND) SNDMSGA (hdp, DTM_GETMONTHCAL, 0, 0) + (HWND) SNDMSG (hdp, DTM_GETMONTHCAL, 0, 0) #define DateTime_SetMonthCalFont(hdp, hfont, fRedraw) \ - SNDMSGA (hdp, DTM_SETMCFONT, (WPARAM)hfont, (LPARAM)fRedraw) + SNDMSG (hdp, DTM_SETMCFONT, (WPARAM)hfont, (LPARAM)fRedraw) #define DateTime_GetMonthCalFont(hdp) \ - SNDMSGA (hdp, DTM_GETMCFONT, 0, 0) + SNDMSG (hdp, DTM_GETMCFONT, 0, 0) #define DA_LAST (0x7fffffff) #define DPA_APPEND (0x7fffffff) @@ -4999,6 +5037,9 @@ struct IStream; typedef HRESULT (CALLBACK *PFNDPASTREAM)(DPASTREAMINFO*, struct IStream*, LPVOID); +HRESULT WINAPI DPA_LoadStream(HDPA*, PFNDPASTREAM, struct IStream*, LPVOID); +HRESULT WINAPI DPA_SaveStream(HDPA, PFNDPASTREAM, struct IStream*, LPVOID); + BOOL WINAPI Str_SetPtrW (LPWSTR *, LPCWSTR); /************************************************************************** @@ -5012,6 +5053,10 @@ #else static const WCHAR WC_LINK[] = { 'S','y','s','L','i','n','k',0 }; #endif + +/* SysLink styles */ +#define LWS_TRANSPARENT 0x0001 +#define LWS_IGNORERETURN 0x0002 /* SysLink messages */ #define LM_HITTEST (WM_USER + 768)

1 0

[hyperion] 44012: Fix keyboard navigation of menus (up/down keys) Patch by IJM <mailnew2ster AT mail.ru>
by hyperion＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: hyperion Date: Sat Nov 7 20:21:13 2009 New Revision: 44012 URL: http://svn.reactos.org/svn/reactos?rev=44012&view=rev Log: Fix keyboard navigation of menus (up/down keys) Patch by IJM <mailnew2ster AT mail.ru> Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sat Nov 7 20:21:13 2009 @@ -3553,7 +3553,8 @@ } else /* otherwise try to move selection */ { - MenuMoveSelection(Mt.OwnerWnd, &MenuInfo, ITEM_NEXT); + MenuMoveSelection(Mt.OwnerWnd, &MenuInfo, + VK_DOWN == Msg.wParam ? ITEM_NEXT : ITEM_PREV); } } break;

1 0

[khornicek] 44011: - fill the whole pattern
by khornicek＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: khornicek Date: Sat Nov 7 19:56:04 2009 New Revision: 44011 URL: http://svn.reactos.org/svn/reactos?rev=44011&view=rev Log: - fill the whole pattern Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c [iso-8859-1] Sat Nov 7 19:56:04 2009 @@ -256,7 +256,7 @@ pBrush->hbmPattern = GreCreateBitmap(szPatSize, 0, BMF_1BPP, BMF_NOZEROINIT, NULL); GDIOBJ_SetOwnership(pBrush->hbmPattern, NULL); pPattern = SURFACE_Lock(pBrush->hbmPattern); - GreSetBitmapBits(pPattern, 8, (PVOID)HatchBrushes[iHatchStyle]); + GreSetBitmapBits(pPattern, 8 * sizeof(USHORT), (PVOID)HatchBrushes[iHatchStyle]); SURFACE_Unlock(pPattern); /* Set color to the reserved value */

1 0

[cgutman] 44010: - Remove TCPSleep and TCPWakeup (we make all oskittcp sockets non-blocking) - Crash ROS better in oskittcp_die
by cgutman＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: cgutman Date: Sat Nov 7 19:12:58 2009 New Revision: 44010 URL: http://svn.reactos.org/svn/reactos?rev=44010&view=rev Log: - Remove TCPSleep and TCPWakeup (we make all oskittcp sockets non-blocking) - Crash ROS better in oskittcp_die Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Sat Nov 7 19:12:58 2009 @@ -121,74 +121,6 @@ } return 0; -} - -int TCPSleep( void *ClientData, void *token, int priority, char *msg, - int tmio ) { - PSLEEPING_THREAD SleepingThread; - LARGE_INTEGER Timeout; - - ASSERT_LOCKED(&TCPLock); - - TI_DbgPrint(DEBUG_TCP, - ("Called TSLEEP: tok = %x, pri = %d, wmesg = %s, tmio = %x\n", - token, priority, msg, tmio)); - - SleepingThread = exAllocatePool( NonPagedPool, sizeof( *SleepingThread ) ); - if( SleepingThread ) { - KeInitializeEvent( &SleepingThread->Event, NotificationEvent, FALSE ); - SleepingThread->SleepToken = token; - - /* We're going to sleep and need to release the lock, otherwise - it's impossible to re-enter oskittcp to deliver the event that's - going to wake us */ - TcpipRecursiveMutexLeave( &TCPLock ); - - TcpipAcquireFastMutex( &SleepingThreadsLock ); - InsertTailList( &SleepingThreadsList, &SleepingThread->Entry ); - TcpipReleaseFastMutex( &SleepingThreadsLock ); - - Timeout.QuadPart = Int32x32To64(tmio, -10000); - - TI_DbgPrint(DEBUG_TCP,("Waiting on %x\n", token)); - KeWaitForSingleObject( &SleepingThread->Event, - Executive, - KernelMode, - TRUE, - (tmio != 0) ? &Timeout : NULL ); - - TcpipAcquireFastMutex( &SleepingThreadsLock ); - RemoveEntryList( &SleepingThread->Entry ); - TcpipReleaseFastMutex( &SleepingThreadsLock ); - - TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - - exFreePool( SleepingThread ); - } else - return OSK_ENOBUFS; - - TI_DbgPrint(DEBUG_TCP,("Waiting finished: %x\n", token)); - return 0; -} - -void TCPWakeup( void *ClientData, void *token ) { - PLIST_ENTRY Entry; - PSLEEPING_THREAD SleepingThread; - - ASSERT_LOCKED(&TCPLock); - - TcpipAcquireFastMutex( &SleepingThreadsLock ); - Entry = SleepingThreadsList.Flink; - while( Entry != &SleepingThreadsList ) { - SleepingThread = CONTAINING_RECORD(Entry, SLEEPING_THREAD, Entry); - TI_DbgPrint(DEBUG_TCP,("Sleeper @ %x\n", SleepingThread)); - if( SleepingThread->SleepToken == token ) { - TI_DbgPrint(DEBUG_TCP,("Setting event to wake %x\n", token)); - KeSetEvent( &SleepingThread->Event, IO_NETWORK_INCREMENT, FALSE ); - } - Entry = Entry->Flink; - } - TcpipReleaseFastMutex( &SleepingThreadsLock ); } /* Memory management routines Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sat Nov 7 19:12:58 2009 @@ -17,8 +17,6 @@ static NPAGED_LOOKASIDE_LIST TCPSegmentList; LIST_ENTRY SignalledConnectionsList; KSPIN_LOCK SignalledConnectionsLock; -LIST_ENTRY SleepingThreadsList; -FAST_MUTEX SleepingThreadsLock; RECURSIVE_MUTEX TCPLock; PORT_SET TCPPorts; @@ -403,11 +401,6 @@ void *data, OSK_PCHAR file, OSK_UINT line ); void TCPMemShutdown( void ); -int TCPSleep( void *ClientData, void *token, int priority, char *msg, - int tmio ); - -void TCPWakeup( void *ClientData, void *token ); - OSKITTCP_EVENT_HANDLERS EventHandlers = { NULL, /* Client Data */ TCPSocketState, /* SocketState */ @@ -415,8 +408,8 @@ TCPFindInterface, /* FindInterface */ TCPMalloc, /* Malloc */ TCPFree, /* Free */ - TCPSleep, /* Sleep */ - TCPWakeup /* Wakeup */ + NULL, /* Sleep */ + NULL, /* Wakeup */ }; static KEVENT TimerLoopEvent; @@ -490,9 +483,7 @@ NTSTATUS Status; TcpipRecursiveMutexInit( &TCPLock ); - ExInitializeFastMutex( &SleepingThreadsLock ); KeInitializeSpinLock( &SignalledConnectionsLock ); - InitializeListHead( &SleepingThreadsList ); InitializeListHead( &SignalledConnectionsList ); Status = TCPMemStartup(); if ( ! NT_SUCCESS(Status) ) { Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Sat Nov 7 19:12:58 2009 @@ -566,7 +566,7 @@ void oskittcp_die( const char *file, int line ) { DbgPrint("\n\n*** OSKITTCP: Panic Called at %s:%d ***\n", file, line); - *((int *)0) = 0; + ASSERT(FALSE); } /* Stuff supporting the BSD network-interface interface */

1 0

[tkreuzer] 44009: Fix KiDoubleFaultAbort
by tkreuzer＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: tkreuzer Date: Sat Nov 7 19:11:35 2009 New Revision: 44009 URL: http://svn.reactos.org/svn/reactos?rev=44009&view=rev Log: Fix KiDoubleFaultAbort Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Sat Nov 7 19:11:35 2009 @@ -354,13 +354,18 @@ push 0 .allocstack 0x8 + /* Reserve stack space for parameters */ + sub rsp, 0x28 + .allocstack 0x28 + /* Bugcheck code UNEXPECTED_KERNEL_MODE_TRAP */ mov rcx, 0x0000007F - /* Specify double fault */ + /* Set double fault parameters */ mov rdx, 0x00000008 mov r8, 0 mov r9, 0 + mov qword ptr [rsp + 0x20], 0 call _KeBugCheckEx

1 0

[tkreuzer] 44008: - Remove useless check in KeInvalidateAllCaches - implement KiDoubleFaultAbort
by tkreuzer＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: tkreuzer Date: Sat Nov 7 18:43:55 2009 New Revision: 44008 URL: http://svn.reactos.org/svn/reactos?rev=44008&view=rev Log: - Remove useless check in KeInvalidateAllCaches - implement KiDoubleFaultAbort Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Sat Nov 7 18:43:55 2009 @@ -601,9 +601,6 @@ NTAPI KeInvalidateAllCaches(VOID) { - /* Only supported on Pentium Pro and higher */ - if (KeI386CpuType < 6) return FALSE; - /* Invalidate all caches */ __wbinvd(); return TRUE; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Sat Nov 7 18:43:55 2009 @@ -354,7 +354,15 @@ push 0 .allocstack 0x8 - UNIMPLEMENTED KiDoubleFaultAbort + /* Bugcheck code UNEXPECTED_KERNEL_MODE_TRAP */ + mov rcx, 0x0000007F + + /* Specify double fault */ + mov rdx, 0x00000008 + mov r8, 0 + mov r9, 0 + + call _KeBugCheckEx jmp $ .endproc

1 0

[tkreuzer] 44007: revert r43841
by tkreuzer＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: tkreuzer Date: Sat Nov 7 18:36:39 2009 New Revision: 44007 URL: http://svn.reactos.org/svn/reactos?rev=44007&view=rev Log: revert r43841 Modified: branches/ros-amd64-bringup/reactos/include/psdk/ntgdi.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/ntgdi.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/ntgdi.h [iso-8859-1] Sat Nov 7 18:36:39 2009 @@ -2794,7 +2794,7 @@ IN HDC hdc, IN ULONG_PTR idEnum, IN ULONG cjEfdw, - OUT ULONG_PTR *pcjEfdw, + OUT ULONG *pcjEfdw, OUT PENUMFONTDATAW pefdw ); #endif @@ -2809,7 +2809,7 @@ IN ULONG cwchMax, IN OPTIONAL LPWSTR pwszFaceName, IN ULONG lfCharSet, - OUT ULONG_PTR *pulCount + OUT ULONG *pulCount ); W32KAPI

1 0

[hyperion] 44006: Unbreak build
by hyperion＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: hyperion Date: Sat Nov 7 18:24:06 2009 New Revision: 44006 URL: http://svn.reactos.org/svn/reactos?rev=44006&view=rev Log: Unbreak build Modified: trunk/reactos/tools/rbuild/backend/mingw/rules.mak Modified: trunk/reactos/tools/rbuild/backend/mingw/rules.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Sat Nov 7 18:24:06 2009 @@ -65,7 +65,7 @@ #(module, flags, includes, compiler, prefix) RBUILD_compiler_flags_with_includes=\ -$$($(5)$(4)INCLUDES) +$$($(5)$(4)INCLUDES) \ $(3) \ $$($(1)_$(4)INCLUDES) $$($(1)_CPPINCLUDES) \ $$(MODULETYPE$($(1)_TYPE)_$(4)INCLUDES) \ @@ -80,7 +80,7 @@ #(module, flags, includes, compiler, prefix) RBUILD_compiler_flags_cpp=\ -$$($(5)$(4)INCLUDES) $$(CPPINCLUDES) +$$($(5)$(4)INCLUDES) $$(CPPINCLUDES) \ $(3) \ $$($(1)_$(4)INCLUDES) $$($(1)_CPPINCLUDES) \ $$(MODULETYPE$($(1)_TYPE)_$(4)INCLUDES) $$(MODULETYPE$($(1)_TYPE)_CPPINCLUDES) \ @@ -106,6 +106,7 @@ RBUILD_midlflags=${call RBUILD_compiler_flags_builtin_cpp,$(1),$(2),$(3),MIDL} RBUILD_host_cflags=${call RBUILD_compiler_flags_with_cpp,$(1),$(2),$(3),C,HOST_} RBUILD_host_cxxflags=${call RBUILD_compiler_flags_with_cpp,$(1),$(2),$(3),CXX,HOST_} +RBUILD_ldflags=${call RBUILD_compiler_flags,$(1),$(2),,LD} RCFLAG_UNICODE:=-DUNICODE -D_UNICODE

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs