Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[hyperion] 41812: modified include/reactos/libs/pseh/pseh2.h Only leave the frame in the outermost _SEH2_END (like in PSEH1)

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Jul 8 23:52:48 2009 New Revision: 41812 URL: http://svn.reactos.org/svn/reactos?rev=41812&view=rev Log: modified include/reactos/libs/pseh/pseh2.h Only leave the frame in the outermost _SEH2_END (like in PSEH1) Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Wed Jul 8 23:52:48 2009 @@ -194,16 +194,18 @@ #define __SEH_ENTER_SCOPE(TRYLEVEL_) (_SEHTopTryLevel ? __SEH_ENTER_FRAME_AND_TRYLEVEL(TRYLEVEL_) : __SEH_ENTER_TRYLEVEL(TRYLEVEL_)) #define __SEH_ENTER_HANDLE_SCOPE(TRYLEVEL_, HANDLE_) (({ __SEH_BARRIER; __asm__ __volatile__("mov %%esp, %0" : "=m" ((TRYLEVEL_)->SHT_Esp)); __SEH_BARRIER; }), (_SEHTopTryLevel ? __SEH_ENTER_FRAME_AND_HANDLE_TRYLEVEL((TRYLEVEL_), (HANDLE_)) : __SEH_ENTER_HANDLE_TRYLEVEL((TRYLEVEL_), (HANDLE_)))) -#define __SEH_LEAVE_SCOPE() \ +#define __SEH_LEAVE_TRYLEVEL() \ + if(!_SEHTopTryLevel) \ + { \ + __SEH_SET_TRYLEVEL(_SEHPrevTryLevelP); \ + } \ + +#define __SEH_LEAVE_FRAME() \ if(_SEHTopTryLevel) \ { \ _SEH2LeaveFrame(); \ __asm__ __volatile__("mov %0, %%esp" : : "g" (_SEHStackPointer)); \ - } \ - else \ - { \ - __SEH_SET_TRYLEVEL(_SEHPrevTryLevelP); \ - } \ + } #define __SEH_END_SCOPE_CHAIN \ static __attribute__((unused)) const int _SEH2ScopeKind = 1; \ @@ -289,7 +291,7 @@ \ _SEHAbnormalTermination = 0; \ \ - __SEH_LEAVE_SCOPE(); \ + __SEH_LEAVE_TRYLEVEL(); \ \ _SEHFinally(); \ goto _SEHEndExcept; \ @@ -362,7 +364,7 @@ __attribute__((unused)) __SEH_DEFINE_FINALLY(_SEHFinally) { __SEH_RETURN_FINALLY(); } \ \ _SEHAfterTry:; \ - __SEH_LEAVE_SCOPE(); \ + __SEH_LEAVE_TRYLEVEL(); \ \ goto _SEHEndExcept; \ \ @@ -377,6 +379,8 @@ } \ \ _SEHEndExcept:; \ + \ + __SEH_LEAVE_FRAME(); \ } \ __SEH_END_SCOPE;

15 years, 11 months

[hyperion] 41811: modified tests/pseh2/psehtest.c Don't use ok() when we mean trace() Fix the stack after corruption of the registration list Revised figures: "only" FOURTY of ninety-three tests fail with a corrupted registration list

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Jul 8 23:40:54 2009 New Revision: 41811 URL: http://svn.reactos.org/svn/reactos?rev=41811&view=rev Log: modified tests/pseh2/psehtest.c Don't use ok() when we mean trace() Fix the stack after corruption of the registration list Revised figures: "only" FOURTY of ninety-three tests fail with a corrupted registration list Modified: trunk/rostests/tests/pseh2/psehtest.c Modified: trunk/rostests/tests/pseh2/psehtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/psehtest.c?re… ============================================================================== --- trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] (original) +++ trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] Wed Jul 8 23:40:54 2009 @@ -2348,7 +2348,7 @@ static LONG WINAPI unhandled_exception(PEXCEPTION_POINTERS ExceptionInfo) { - ok(0, "unhandled exception %08lX thrown from %p\n", ExceptionInfo->ExceptionRecord->ExceptionCode, ExceptionInfo->ExceptionRecord->ExceptionAddress); + trace("unhandled exception %08lX thrown from %p\n", ExceptionInfo->ExceptionRecord->ExceptionCode, ExceptionInfo->ExceptionRecord->ExceptionAddress); return EXCEPTION_CONTINUE_SEARCH; } @@ -2374,8 +2374,8 @@ { if(ret && memcmp(before, after, sizeof(before))) { - ok(0, "volatile context corrupted\n"); - ret = 0; + trace("volatile context corrupted\n"); + return 0; } return ret; @@ -2438,11 +2438,11 @@ #if defined(_X86_) if((_SEH2Registration_t *)__readfsdword(0) != &passthrough_frame || passthrough_frame.SER_Prev != prev_frame) { - ok(0, "exception registration list corrupted\n"); + trace("exception registration list corrupted\n"); ret = 0; } - else - __writefsdword(0, (unsigned long)prev_frame); + + __writefsdword(0, (unsigned long)prev_frame); #endif SetUnhandledExceptionFilter(prev_unhandled_exception);

15 years, 11 months

[hyperion] 41810: modified tests/pseh2/psehtest.c Test case for bug #4663 (still unsolved) New sanity check for correct unlinking of the frame. !!!EIGHTY TESTS OUT OF NINETY-THREE CURRENTLY FAIL THIS!!!

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Jul 8 23:30:02 2009 New Revision: 41810 URL: http://svn.reactos.org/svn/reactos?rev=41810&view=rev Log: modified tests/pseh2/psehtest.c Test case for bug #4663 (still unsolved) New sanity check for correct unlinking of the frame. !!!EIGHTY TESTS OUT OF NINETY-THREE CURRENTLY FAIL THIS!!! Modified: trunk/rostests/tests/pseh2/psehtest.c Modified: trunk/rostests/tests/pseh2/psehtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/psehtest.c?re… ============================================================================== --- trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] (original) +++ trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] Wed Jul 8 23:30:02 2009 @@ -2304,6 +2304,45 @@ return return_arg(i1) + return_arg(i2) + return_arg(i3) == return_positive() * 3; } //}}} + +/* #4663: *///{{{ +DEFINE_TEST(test_bug_4663) +{ + int i1, i2; + + i1 = return_zero(); + i2 = return_zero(); + + _SEH2_TRY + { + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, NULL); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + if (i1 == return_zero()) + { + i1 = return_one(); + } + } + _SEH2_END; + + if (i1 == return_one()) + { + i1 = return_minusone(); + RaiseException(0xE00DEAD0, 0, 0, NULL); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + i2 = return_one(); + } + _SEH2_END; + + return ((i1 == return_minusone()) && (i2 == return_one())); +} +//}}} //}}} static @@ -2334,9 +2373,18 @@ int sanity_check(int ret, struct volatile_context * before, struct volatile_context * after) { if(ret && memcmp(before, after, sizeof(before))) + { ok(0, "volatile context corrupted\n"); + ret = 0; + } return ret; +} + +static +int passthrough_handler(struct _EXCEPTION_RECORD * e, void * f, struct _CONTEXT * c, void * d) +{ + return ExceptionContinueSearch; } static @@ -2346,8 +2394,17 @@ static int ret; static struct volatile_context before, after; static LPTOP_LEVEL_EXCEPTION_FILTER prev_unhandled_exception; + static _SEH2Registration_t * prev_frame; + _SEH2Registration_t passthrough_frame; prev_unhandled_exception = SetUnhandledExceptionFilter(&unhandled_exception); + +#if defined(_X86_) + prev_frame = (_SEH2Registration_t *)__readfsdword(0); + passthrough_frame.SER_Prev = prev_frame; + passthrough_frame.SER_Handler = passthrough_handler; + __writefsdword(0, (unsigned long)&passthrough_frame); +#endif #if defined(__GNUC__) && defined(__i386__) __asm__ __volatile__ @@ -2378,6 +2435,16 @@ ret = func(); #endif +#if defined(_X86_) + if((_SEH2Registration_t *)__readfsdword(0) != &passthrough_frame || passthrough_frame.SER_Prev != prev_frame) + { + ok(0, "exception registration list corrupted\n"); + ret = 0; + } + else + __writefsdword(0, (unsigned long)prev_frame); +#endif + SetUnhandledExceptionFilter(prev_unhandled_exception); return ret; } @@ -2501,12 +2568,16 @@ USE_TEST(test_abnorm_8), USE_TEST(test_bug_4004), + USE_TEST(test_bug_4663), }; size_t i; for(i = 0; i < sizeof(testsuite) / sizeof(testsuite[0]); ++ i) + { + //printf("%s\n", testsuite[i].name); ok(call_test(testsuite[i].func), "%s failed\n", testsuite[i].name); + } } const struct test winetest_testlist[] = {

15 years, 11 months

[sserapion] 41809: Remove unneeded character in ROS_PREFIX case of invocation so that TryToDetectThisCompiler() doesn't fail

by sserapion＠svn.reactos.org

Author: sserapion Date: Wed Jul 8 21:28:52 2009 New Revision: 41809 URL: http://svn.reactos.org/svn/reactos?rev=41809&view=rev Log: Remove unneeded character in ROS_PREFIX case of invocation so that TryToDetectThisCompiler() doesn't fail Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Wed Jul 8 21:28:52 2009 @@ -749,7 +749,7 @@ if ( ROS_PREFIXValue.length () > 0 ) { compilerPrefix = ROS_PREFIXValue; - compilerCommand = compilerPrefix + "-gcc"; + compilerCommand = compilerPrefix + "gcc"; detectedCompiler = TryToDetectThisCompiler ( compilerCommand ); } #if defined(WIN32)

15 years, 11 months

[jmorlan] 41808: In cmd: free all memory before exiting to prevent "memory leak" messages (bug 4510). Also, CMD /? should exit with a code of 1 instead of 0.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Wed Jul 8 21:28:21 2009 New Revision: 41808 URL: http://svn.reactos.org/svn/reactos?rev=41808&view=rev Log: In cmd: free all memory before exiting to prevent "memory leak" messages (bug 4510). Also, CMD /? should exit with a code of 1 instead of 0. Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Wed Jul 8 21:28:21 2009 @@ -739,42 +739,22 @@ return Ret; } -BOOL -GrowIfNecessary_dbg ( UINT needed, LPTSTR* ret, UINT* retlen, const char *file, int line ) -{ - if ( *ret && needed < *retlen ) - return TRUE; - *retlen = needed; - if ( *ret ) - cmd_free ( *ret ); -#ifdef _DEBUG_MEM - *ret = (LPTSTR)cmd_alloc_dbg ( *retlen * sizeof(TCHAR), file, line ); -#else - *ret = (LPTSTR)cmd_alloc ( *retlen * sizeof(TCHAR) ); -#endif - if ( !*ret ) - SetLastError ( ERROR_OUTOFMEMORY ); - return *ret != NULL; -} -#define GrowIfNecessary(x, y, z) GrowIfNecessary_dbg(x, y, z, __FILE__, __LINE__) - LPTSTR GetEnvVar(LPCTSTR varName) { static LPTSTR ret = NULL; - static UINT retlen = 0; UINT size; - size = GetEnvironmentVariable ( varName, ret, retlen ); - if ( size > retlen ) - { - if ( !GrowIfNecessary ( size, &ret, &retlen ) ) - return NULL; - size = GetEnvironmentVariable ( varName, ret, retlen ); - } - if ( size ) - return ret; - return NULL; + cmd_free(ret); + ret = NULL; + size = GetEnvironmentVariable(varName, NULL, 0); + if (size > 0) + { + ret = cmd_alloc(size * sizeof(TCHAR)); + if (ret != NULL) + GetEnvironmentVariable(varName, ret, size + 1); + } + return ret; } LPCTSTR @@ -1636,9 +1616,6 @@ NtReadVirtualMemoryPtr = (NtReadVirtualMemoryProc)GetProcAddress(NtDllModule, "NtReadVirtualMemory"); } - cmdLine = GetCommandLine(); - TRACE ("[command args: %s]\n", debugstr_aw(cmdLine)); - InitLocale (); /* get default input and output console handles */ @@ -1652,8 +1629,31 @@ if (GetEnvironmentVariable(_T("PROMPT"),lpBuffer, sizeof(lpBuffer) / sizeof(lpBuffer[0])) == 0) SetEnvironmentVariable (_T("PROMPT"), _T("$P$G")); +#ifdef FEATURE_DIR_STACK + /* initialize directory stack */ + InitDirectoryStack (); +#endif + +#ifdef FEATURE_HISTORY + /*initialize history*/ + InitHistory(); +#endif + + /* Set COMSPEC environment variable */ + if (0 != GetModuleFileName (NULL, ModuleName, _MAX_PATH + 1)) + { + ModuleName[_MAX_PATH] = _T('\0'); + SetEnvironmentVariable (_T("COMSPEC"), ModuleName); + } + + /* add ctrl break handler */ + AddBreakHandler (); + SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT); + + cmdLine = GetCommandLine(); + TRACE ("[command args: %s]\n", debugstr_aw(cmdLine)); for (ptr = cmdLine; *ptr; ptr++) { @@ -1663,7 +1663,9 @@ if (option == _T('?')) { ConOutResPaging(TRUE,STRING_CMD_HELP8); - cmd_exit(0); + nErrorLevel = 1; + bExit = TRUE; + return; } else if (option == _T('P')) { @@ -1731,27 +1733,6 @@ ConOutPuts(_T("(C) Copyright 1998-") _T(COPYRIGHT_YEAR) _T(" ReactOS Team.")); } -#ifdef FEATURE_DIR_STACK - /* initialize directory stack */ - InitDirectoryStack (); -#endif - - -#ifdef FEATURE_HISTORY - /*initialize history*/ - InitHistory(); -#endif - - /* Set COMSPEC environment variable */ - if (0 != GetModuleFileName (NULL, ModuleName, _MAX_PATH + 1)) - { - ModuleName[_MAX_PATH] = _T('\0'); - SetEnvironmentVariable (_T("COMSPEC"), ModuleName); - } - - /* add ctrl break handler */ - AddBreakHandler (); - if (AutoRun) { ExecuteAutoRunFile(HKEY_LOCAL_MACHINE); @@ -1796,6 +1777,8 @@ CleanHistory(); #endif + /* free GetEnvVar's buffer */ + GetEnvVar(NULL); /* remove ctrl break handler */ RemoveBreakHandler ();

15 years, 11 months

[weiden] 41807: Simplify code, thx Ged

by weiden＠svn.reactos.org

Author: weiden Date: Wed Jul 8 20:57:12 2009 New Revision: 41807 URL: http://svn.reactos.org/svn/reactos?rev=41807&view=rev Log: Simplify code, thx Ged Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta… ============================================================================== --- trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] Wed Jul 8 20:57:12 2009 @@ -1030,7 +1030,7 @@ static BOOL TaskSwitchWnd_ActivateTaskItem(IN OUT PTASK_SWITCH_WND This, - IN OUT PTASK_ITEM TaskItem) + IN OUT PTASK_ITEM TaskItem OPTIONAL) { if (TaskItem != NULL) { @@ -1647,29 +1647,32 @@ TaskSwitchWnd_HandleTaskItemClick(IN OUT PTASK_SWITCH_WND This, IN OUT PTASK_ITEM TaskItem) { - BOOL bMinimize; - + BOOL bIsMinimized; + BOOL bIsActive; + if (IsWindow(TaskItem->hWnd)) { - bMinimize = !IsIconic(TaskItem->hWnd) && - TaskItem == This->ActiveTaskItem; - - if (!bMinimize && IsIconic(TaskItem->hWnd)) - { - PostMessage(TaskItem->hWnd, - WM_SYSCOMMAND, - SC_RESTORE, - 0); - } - - SetForegroundWindow(TaskItem->hWnd); - - if (bMinimize) + bIsMinimized = IsIconic(TaskItem->hWnd); + bIsActive = (TaskItem == This->ActiveTaskItem); + + if (!bIsMinimized && bIsActive) { PostMessage(TaskItem->hWnd, WM_SYSCOMMAND, SC_MINIMIZE, 0); + } + else + { + if (bIsMinimized) + { + PostMessage(TaskItem->hWnd, + WM_SYSCOMMAND, + SC_RESTORE, + 0); + } + + SetForegroundWindow(TaskItem->hWnd); } } }

15 years, 11 months

[tkreuzer] 41806: [FORMATTING] no code change

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jul 8 20:19:11 2009 New Revision: 41806 URL: http://svn.reactos.org/svn/reactos?rev=41806&view=rev Log: [FORMATTING] no code change Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Wed Jul 8 20:19:11 2009 @@ -27,18 +27,18 @@ BOOL APIENTRY NtGdiAlphaBlend( - HDC hDCDest, - LONG XOriginDest, - LONG YOriginDest, - LONG WidthDest, - LONG HeightDest, - HDC hDCSrc, - LONG XOriginSrc, - LONG YOriginSrc, - LONG WidthSrc, - LONG HeightSrc, - BLENDFUNCTION BlendFunc, - HANDLE hcmXform) + HDC hDCDest, + LONG XOriginDest, + LONG YOriginDest, + LONG WidthDest, + LONG HeightDest, + HDC hDCSrc, + LONG XOriginSrc, + LONG YOriginSrc, + LONG WidthSrc, + LONG HeightSrc, + BLENDFUNCTION BlendFunc, + HANDLE hcmXform) { PDC DCDest; PDC DCSrc; @@ -62,6 +62,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (DCDest->dctype == DC_TYPE_INFO) { DC_UnlockDc(DCDest); @@ -79,6 +80,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (DCSrc->dctype == DC_TYPE_INFO) { DC_UnlockDc(DCSrc); @@ -135,15 +137,13 @@ return FALSE; } - { - BitmapSrc = DCSrc->dclevel.pSurface; - if (!BitmapSrc) - { - if (hDCSrc != hDCDest) - DC_UnlockDc(DCSrc); - DC_UnlockDc(DCDest); - return FALSE; - } + BitmapSrc = DCSrc->dclevel.pSurface; + if (!BitmapSrc) + { + if (hDCSrc != hDCDest) + DC_UnlockDc(DCSrc); + DC_UnlockDc(DCDest); + return FALSE; } /* Create the XLATEOBJ. */ @@ -176,17 +176,17 @@ BOOL APIENTRY NtGdiBitBlt( - HDC hDCDest, - INT XDest, - INT YDest, - INT Width, - INT Height, - HDC hDCSrc, - INT XSrc, - INT YSrc, - DWORD ROP, - IN DWORD crBackColor, - IN FLONG fl) + HDC hDCDest, + INT XDest, + INT YDest, + INT Width, + INT Height, + HDC hDCSrc, + INT XSrc, + INT YSrc, + DWORD ROP, + IN DWORD crBackColor, + IN FLONG fl) { PDC DCDest; PDC DCSrc = NULL; @@ -204,6 +204,7 @@ DPRINT("Invalid destination dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCDest); return FALSE; } + if (DCDest->dctype == DC_TYPE_INFO) { DC_UnlockDc(DCDest); @@ -319,17 +320,17 @@ BOOL APIENTRY NtGdiTransparentBlt( - HDC hdcDst, - INT xDst, - INT yDst, - INT cxDst, - INT cyDst, - HDC hdcSrc, - INT xSrc, - INT ySrc, - INT cxSrc, - INT cySrc, - COLORREF TransColor) + HDC hdcDst, + INT xDst, + INT yDst, + INT cxDst, + INT cyDst, + HDC hdcSrc, + INT xSrc, + INT ySrc, + INT cxSrc, + INT cySrc, + COLORREF TransColor) { PDC DCDest, DCSrc; RECTL rcDest, rcSrc; @@ -361,10 +362,12 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if(hdcDst == hdcSrc) { DCSrc = DCDest; } + if (DCSrc->dctype == DC_TYPE_INFO) { DC_UnlockDc(DCSrc); @@ -487,12 +490,20 @@ #define DSTERASE 0x00220326 /* dest = dest & (~src) : DSna */ BOOL APIENTRY -NtGdiMaskBlt ( - HDC hdcDest, INT nXDest, INT nYDest, - INT nWidth, INT nHeight, HDC hdcSrc, - INT nXSrc, INT nYSrc, HBITMAP hbmMask, - INT xMask, INT yMask, DWORD dwRop, - IN DWORD crBackColor) +NtGdiMaskBlt( + HDC hdcDest, + INT nXDest, + INT nYDest, + INT nWidth, + INT nHeight, + HDC hdcSrc, + INT nXSrc, + INT nYSrc, + HBITMAP hbmMask, + INT xMask, + INT yMask, + DWORD dwRop, + IN DWORD crBackColor) { HBITMAP hOldMaskBitmap, hBitmap2, hOldBitmap2, hBitmap3, hOldBitmap3; HDC hDCMask, hDC1, hDC2; @@ -682,17 +693,17 @@ BOOL APIENTRY NtGdiPlgBlt( - IN HDC hdcTrg, - IN LPPOINT pptlTrg, - IN HDC hdcSrc, - IN INT xSrc, - IN INT ySrc, - IN INT cxSrc, - IN INT cySrc, - IN HBITMAP hbmMask, - IN INT xMask, - IN INT yMask, - IN DWORD crBackColor) + IN HDC hdcTrg, + IN LPPOINT pptlTrg, + IN HDC hdcSrc, + IN INT xSrc, + IN INT ySrc, + IN INT cxSrc, + IN INT cySrc, + IN HBITMAP hbmMask, + IN INT xMask, + IN INT yMask, + IN DWORD crBackColor) { UNIMPLEMENTED; return FALSE; @@ -700,19 +711,19 @@ BOOL APIENTRY GreStretchBltMask( - HDC hDCDest, - INT XOriginDest, - INT YOriginDest, - INT WidthDest, - INT HeightDest, - HDC hDCSrc, - INT XOriginSrc, - INT YOriginSrc, - INT WidthSrc, - INT HeightSrc, - DWORD ROP, - IN DWORD dwBackColor, - HDC hDCMask) + HDC hDCDest, + INT XOriginDest, + INT YOriginDest, + INT WidthDest, + INT HeightDest, + HDC hDCSrc, + INT XOriginSrc, + INT YOriginSrc, + INT WidthSrc, + INT HeightSrc, + DWORD ROP, + IN DWORD dwBackColor, + HDC hDCMask) { PDC DCDest; PDC DCSrc = NULL; @@ -732,6 +743,7 @@ SetLastWin32Error(ERROR_INVALID_PARAMETER); return FALSE; } + DCDest = DC_LockDc(hDCDest); if (NULL == DCDest) { @@ -739,6 +751,7 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } + if (DCDest->dctype == DC_TYPE_INFO) { DC_UnlockDc(DCDest); @@ -839,7 +852,7 @@ if (DCMask) { BitmapMask = DCMask->dclevel.pSurface; - if (BitmapMask && + if (BitmapMask && (BitmapMask->SurfObj.sizlBitmap.cx != WidthSrc || BitmapMask->SurfObj.sizlBitmap.cy != HeightSrc)) { @@ -857,7 +870,7 @@ XlateObj, &DestRect, &SourceRect, - NULL, + NULL, &DCDest->eboFill.BrushObject, &BrushOrigin, ROP3_TO_ROP4(ROP)); @@ -883,18 +896,18 @@ BOOL APIENTRY NtGdiStretchBlt( - HDC hDCDest, - INT XOriginDest, - INT YOriginDest, - INT WidthDest, - INT HeightDest, - HDC hDCSrc, - INT XOriginSrc, - INT YOriginSrc, - INT WidthSrc, - INT HeightSrc, - DWORD ROP, - IN DWORD dwBackColor) + HDC hDCDest, + INT XOriginDest, + INT YOriginDest, + INT WidthDest, + INT HeightDest, + HDC hDCSrc, + INT XOriginSrc, + INT YOriginSrc, + INT WidthSrc, + INT HeightSrc, + DWORD ROP, + IN DWORD dwBackColor) { return GreStretchBltMask( hDCDest, @@ -915,13 +928,13 @@ BOOL FASTCALL IntPatBlt( - PDC dc, - INT XLeft, - INT YLeft, - INT Width, - INT Height, - DWORD ROP, - PBRUSH BrushObj) + PDC dc, + INT XLeft, + INT YLeft, + INT Width, + INT Height, + DWORD ROP, + PBRUSH BrushObj) { RECTL DestRect; SURFACE *psurf; @@ -993,11 +1006,11 @@ BOOL FASTCALL IntGdiPolyPatBlt( - HDC hDC, - DWORD dwRop, - PPATRECT pRects, - int cRects, - ULONG Reserved) + HDC hDC, + DWORD dwRop, + PPATRECT pRects, + int cRects, + ULONG Reserved) { int i; PPATRECT r; @@ -1049,12 +1062,12 @@ BOOL APIENTRY NtGdiPatBlt( - HDC hDC, - INT XLeft, - INT YLeft, - INT Width, - INT Height, - DWORD ROP) + HDC hDC, + INT XLeft, + INT YLeft, + INT Width, + INT Height, + DWORD ROP) { PBRUSH pbrush; DC *dc; @@ -1094,14 +1107,7 @@ return FALSE; } - ret = IntPatBlt( - dc, - XLeft, - YLeft, - Width, - Height, - ROP, - pbrush); + ret = IntPatBlt(dc, XLeft, YLeft, Width, Height, ROP, pbrush); BRUSH_UnlockBrush(pbrush); DC_UnlockDc(dc); @@ -1111,11 +1117,11 @@ BOOL APIENTRY NtGdiPolyPatBlt( - HDC hDC, - DWORD dwRop, - IN PPOLYPATBLT pRects, - IN DWORD cRects, - IN DWORD Mode) + HDC hDC, + DWORD dwRop, + IN PPOLYPATBLT pRects, + IN DWORD cRects, + IN DWORD Mode) { PPATRECT rb = NULL; NTSTATUS Status = STATUS_SUCCESS;

15 years, 11 months

[weiden] 41805: Allow activating tasks

by weiden＠svn.reactos.org

Author: weiden Date: Wed Jul 8 18:33:25 2009 New Revision: 41805 URL: http://svn.reactos.org/svn/reactos?rev=41805&view=rev Log: Allow activating tasks Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta… ============================================================================== --- trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] Wed Jul 8 18:33:25 2009 @@ -1029,6 +1029,21 @@ } static BOOL +TaskSwitchWnd_ActivateTaskItem(IN OUT PTASK_SWITCH_WND This, + IN OUT PTASK_ITEM TaskItem) +{ + if (TaskItem != NULL) + { + DbgPrint("Activate window 0x%p on button %d\n", TaskItem->hWnd, TaskItem->Index); + } + + TaskSwitchWnd_CheckActivateTaskItem(This, + TaskItem); + + return FALSE; +} + +static BOOL TaskSwitchWnd_ActivateTask(IN OUT PTASK_SWITCH_WND This, IN HWND hWnd) { @@ -1041,20 +1056,14 @@ TaskItem = TaskSwitchWnd_FindOtherTaskItem(This, hWnd); } - - if (TaskItem != NULL) - { - DbgPrint("Activate window 0x%p on button %d\n", hWnd, TaskItem->Index); - } - else + + if (TaskItem == NULL) { DbgPrint("Activate window 0x%p, could not find task\n", hWnd); } - TaskSwitchWnd_CheckActivateTaskItem(This, - TaskItem); - - return FALSE; + return TaskSwitchWnd_ActivateTaskItem(This, + TaskItem); } static BOOL @@ -1634,6 +1643,75 @@ FALSE); } +static VOID +TaskSwitchWnd_HandleTaskItemClick(IN OUT PTASK_SWITCH_WND This, + IN OUT PTASK_ITEM TaskItem) +{ + BOOL bMinimize; + + if (IsWindow(TaskItem->hWnd)) + { + bMinimize = !IsIconic(TaskItem->hWnd) && + TaskItem == This->ActiveTaskItem; + + if (!bMinimize && IsIconic(TaskItem->hWnd)) + { + PostMessage(TaskItem->hWnd, + WM_SYSCOMMAND, + SC_RESTORE, + 0); + } + + SetForegroundWindow(TaskItem->hWnd); + + if (bMinimize) + { + PostMessage(TaskItem->hWnd, + WM_SYSCOMMAND, + SC_MINIMIZE, + 0); + } + } +} + +static VOID +TaskSwitchWnd_HandleTaskGroupClick(IN OUT PTASK_SWITCH_WND This, + IN OUT PTASK_GROUP TaskGroup) +{ + /* TODO: Show task group menu */ +} + +static BOOL +TaskSwitchWnd_HandleButtonClick(IN OUT PTASK_SWITCH_WND This, + IN WORD wIndex) +{ + PTASK_ITEM TaskItem; + PTASK_GROUP TaskGroup; + + if (This->IsGroupingEnabled) + { + TaskGroup = FindTaskGroupByIndex(This, + (INT)wIndex); + if (TaskGroup != NULL && TaskGroup->IsCollapsed) + { + TaskSwitchWnd_HandleTaskGroupClick(This, + TaskGroup); + return TRUE; + } + } + + TaskItem = FindTaskItemByIndex(This, + (INT)wIndex); + if (TaskItem != NULL) + { + TaskSwitchWnd_HandleTaskItemClick(This, + TaskItem); + return TRUE; + } + + return FALSE; +} + static LRESULT TaskSwichWnd_HandleItemPaint(IN OUT PTASK_SWITCH_WND This, IN OUT NMTBCUSTOMDRAW *nmtbcd) @@ -1860,7 +1938,8 @@ { if (lParam != 0 && (HWND)lParam == This->hWndToolbar) { - DbgPrint("WM_COMMAND %u:%u (%u)\n", (UINT)LOWORD(wParam), (UINT)HIWORD(wParam), (UINT)wParam); + TaskSwitchWnd_HandleButtonClick(This, + LOWORD(wParam)); } break; }

15 years, 11 months

[sserapion] 41804: Remove unneeded character in ROS_PREFIX case of invocation

by sserapion＠svn.reactos.org

Author: sserapion Date: Wed Jul 8 12:13:37 2009 New Revision: 41804 URL: http://svn.reactos.org/svn/reactos?rev=41804&view=rev Log: Remove unneeded character in ROS_PREFIX case of invocation Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Wed Jul 8 12:13:37 2009 @@ -993,7 +993,7 @@ if ( ROS_PREFIXValue.length () > 0 ) { binutilsPrefix = ROS_PREFIXValue; - binutilsCommand = binutilsPrefix + "-ld"; + binutilsCommand = binutilsPrefix + "ld"; manualBinutilsSetting = true; detectedBinutils = true; }

15 years, 11 months

[cgutman] 41803: - Fix retrieval of the default gateway (missing default gateway in ipconfig)

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Jul 8 11:33:12 2009 New Revision: 41803 URL: http://svn.reactos.org/svn/reactos?rev=41803&view=rev Log: - Fix retrieval of the default gateway (missing default gateway in ipconfig) Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Wed Jul 8 11:33:12 2009 @@ -103,7 +103,7 @@ for (ndx = 0; ndx < numRoutes; ndx++) { - if ((table->routes[ndx].ifIndex == (index - 1)) && (table->routes[ndx].dest == 0)) + if ((table->routes[ndx].ifIndex == (index)) && (table->routes[ndx].dest == 0)) retVal = table->routes[ndx].gateway; } HeapFree(GetProcessHeap(), 0, table);

15 years, 11 months

← Newer
1
...
49
50
51
52
53
54
55
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2009