Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

[greatlrd] 15879: fix bug in color fill inline asm code. Did crash cirrus drv, vmware 5 drv and if the buffer was not align. Clean up inline asm code.

by greatlrd＠svn.reactos.com

fix bug in color fill inline asm code. Did crash cirrus drv, vmware 5 drv and if the buffer was not align. Clean up inline asm code. Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-12 19:06:38 UTC (rev 15878) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-12 19:23:40 UTC (rev 15879) @@ -344,24 +344,6 @@ PULONG DestBits; ULONG RoundedRight; - /* - switch (BltInfo->Rop4) - { - case ROP4_PATCOPY: - if (!BltInfo->PatternSurface) - { - Pattern = BltInfo->Brush->iSolidColor | (BltInfo->Brush->iSolidColor << 16); - DIB_16BPP_ColorFill(BltInfo->DestSurface, BltInfo->DestRect, Pattern); - return TRUE; - } - - break; - - default: - break; - } -*/ - UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); @@ -454,31 +436,34 @@ ULONG delta = DestSurface->lDelta; ULONG width = (DestRect->right - DestRect->left) ; PULONG pos = (PULONG) (DestSurface->pvScan0 + DestRect->top * delta + (DestRect->left<<1)); - color = (color<<16)|(color&0xffff); /* If the color value is "abcd", put "abcdabcd" into color */ + color = (color&0xffff); /* If the color value is "abcd", put "abcdabcd" into color */ + color += (color<<16); for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++) - { - int d0, d1, d2; + { __asm__ __volatile__ ( " cld\n" + " mov %0,%%eax\n" + " mov %1,%%ebx\n" " test $0x03, %%edi\n" /* Align to fullword boundary */ " jz .FL1\n" " stosw\n" - " dec %4\n" + " dec %%ebx\n" " jz .FL2\n" ".FL1:\n" - " mov %4,%%ecx\n" /* Setup count of fullwords to fill */ + " mov %%ebx,%%ecx\n" /* Setup count of fullwords to fill */ " shr $1,%%ecx\n" " rep stosl\n" /* The actual fill */ - " test $0x01, %4\n" /* One left to do at the right side? */ + " test $0x01, %%ebx\n" /* One left to do at the right side? */ " jz .FL2\n" " stosw\n" ".FL2:\n" - : "=&A" (d0), "=&r" (d1), "=&D" (d2) - : "0"(color), "1"(width), "2"(pos) - : "%ecx"); + : + : "r" (color), "r" (width), "D" (pos) + : "%eax", "%ecx","%ebx"); pos =(PULONG)((ULONG_PTR)pos + delta); } + #else /* _M_IX86 */ for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++)

19 years, 6 months

[gvg] 15878: Clip lines totally outside the clip region

by gvg＠svn.reactos.com

Clip lines totally outside the clip region Modified: trunk/reactos/subsys/win32k/eng/lineto.c _____ Modified: trunk/reactos/subsys/win32k/eng/lineto.c --- trunk/reactos/subsys/win32k/eng/lineto.c 2005-06-12 16:20:10 UTC (rev 15877) +++ trunk/reactos/subsys/win32k/eng/lineto.c 2005-06-12 19:06:38 UTC (rev 15878) @@ -486,7 +486,7 @@ BOOL STDCALL IntEngLineTo(BITMAPOBJ *DestObj, - CLIPOBJ *Clip, + CLIPOBJ *ClipObj, BRUSHOBJ *Brush, LONG x1, LONG y1, @@ -517,6 +517,26 @@ /* No success yet */ ret = FALSE; + /* Clip lines totally outside the clip region. This is not done as an + * optimization (there are very few lines drawn outside the region) but + * as a workaround for what seems to be a problem in the CL54XX driver */ + if (NULL == ClipObj || DC_TRIVIAL == ClipObj->iDComplexity) + { + b.left = 0; + b.right = DestSurf->sizlBitmap.cx; + b.top = 0; + b.bottom = DestSurf->sizlBitmap.cy; + } + else + { + b = ClipObj->rclBounds; + } + if ((x1 < b.left && x2 < b.left) || (b.right <= x1 && b.right <= x2) || + (y1 < b.top && y2 < b.top) || (b.bottom <= y1 && b.bottom <= y2)) + { + return TRUE; + } + b.left = min(x1, x2); b.right = max(x1, x2); b.top = min(y1, y2); @@ -529,7 +549,7 @@ { /* Call the driver's DrvLineTo */ ret = GDIDEVFUNCS(DestSurf).LineTo( - DestSurf, Clip, Brush, x1, y1, x2, y2, /*RectBounds*/&b, Mix); + DestSurf, ClipObj, Brush, x1, y1, x2, y2, &b, Mix); } #if 0 @@ -541,7 +561,7 @@ if (! ret) { - ret = EngLineTo(DestSurf, Clip, Brush, x1, y1, x2, y2, RectBounds, Mix); + ret = EngLineTo(DestSurf, ClipObj, Brush, x1, y1, x2, y2, RectBounds, Mix); } MouseSafetyOnDrawEnd(DestSurf);

19 years, 6 months

[hbirr] 15877: Print more informations on a BSOD by enabling the debug prints to the screen.

by hbirr＠svn.reactos.com

Print more informations on a BSOD by enabling the debug prints to the screen. Modified: trunk/reactos/ntoskrnl/ke/bug.c _____ Modified: trunk/reactos/ntoskrnl/ke/bug.c --- trunk/reactos/ntoskrnl/ke/bug.c 2005-06-12 15:33:34 UTC (rev 15876) +++ trunk/reactos/ntoskrnl/ke/bug.c 2005-06-12 16:20:10 UTC (rev 15877) @@ -299,11 +299,17 @@ PLIST_ENTRY CurrentEntry; MODULE_TEXT_SECTION* CurrentSection = NULL; extern LIST_ENTRY ModuleTextListHead; +#if 0 CHAR PrintString[100]; - +#endif /* Make sure we're switching back to the blue screen and print messages on it */ HalReleaseDisplayOwnership(); - KdpDebugMode.Screen = TRUE; + if (!KdpDebugMode.Screen) + { + /* Enable screen debug mode */ + KdpDebugMode.Screen = TRUE; + InitRoutines[0](&DispatchTable[0], 0); + } /* Try to find out who did this. For this, we need a Trap Frame. * Note: Some special BSODs pass the Frame/EIP as a Param. MSDN has the @@ -348,22 +354,32 @@ /* FIXMEs: Use inbv to clear, fill and write to screen. */ /* Show the STOP Message */ +#if 0 InbvDisplayString("A problem has been detected and ReactOS has been shut down to prevent " "damage to your computer.\n\n"); - +#else + DbgPrint("A problem has been detected and ReactOS has been shut down to prevent " + "damage to your computer.\n\n"); +#endif /* Show the module name of who caused this */ if (GotExtendedCrashInfo) { +#if 0 sprintf(PrintString, "The problem seems to be caused by the following file: %S\n\n", CurrentSection->Name); InbvDisplayString(PrintString); +#else + DbgPrint("The problem seems to be caused by the following file: %S\n\n", + CurrentSection->Name); +#endif } /* Find the Bug Code String */ KeGetBugMessageText(BugCheckCode, NULL); /* Show the techincal Data */ +#if 0 sprintf(PrintString, "Technical information:\n\n*** STOP: 0x%08lX (0x%p,0x%p,0x%p,0x%p)\n\n", BugCheckCode, @@ -372,10 +388,18 @@ (PVOID)BugCheckParameter3, (PVOID)BugCheckParameter4); InbvDisplayString(PrintString); - +#else + DbgPrint("Technical information:\n\n*** STOP: 0x%08lX (0x%p,0x%p,0x%p,0x%p)\n\n", + BugCheckCode, + (PVOID)BugCheckParameter1, + (PVOID)BugCheckParameter2, + (PVOID)BugCheckParameter3, + (PVOID)BugCheckParameter4); +#endif /* Show the module name and more data of who caused this */ if (GotExtendedCrashInfo) { +#if 0 sprintf(PrintString, "*** %S - Address 0x%p base at 0x%p, DateStamp 0x%x\n\n", CurrentSection->Name, @@ -383,6 +407,13 @@ (PVOID)CurrentSection->Base, 0); InbvDisplayString(PrintString); +#else + DbgPrint("*** %S - Address 0x%p base at 0x%p, DateStamp 0x%x\n\n", + CurrentSection->Name, + Address, + (PVOID)CurrentSection->Base, + 0); +#endif } /* There can only be one Bugcheck per Bootup */

19 years, 6 months

[chorns] 15876: Show execution time of tests

by chorns＠svn.reactos.com

Show execution time of tests Modified: trunk/reactos/regtests/regtests/regtests.c Modified: trunk/reactos/regtests/regtests/regtests.def Modified: trunk/reactos/regtests/shared/regtests.c Modified: trunk/reactos/regtests/shared/regtests.h Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/testsupportcode.cpp _____ Modified: trunk/reactos/regtests/regtests/regtests.c --- trunk/reactos/regtests/regtests/regtests.c 2005-06-12 14:09:39 UTC (rev 15875) +++ trunk/reactos/regtests/regtests/regtests.c 2005-06-12 15:33:34 UTC (rev 15876) @@ -54,3 +54,35 @@ return WaitForSingleObject(hHandle, dwMilliseconds); } +DWORD STDCALL +_GetLastError() +{ + return GetLastError(); +} + +VOID STDCALL +_CloseHandle(HANDLE handle) +{ + CloseHandle (handle); +} + +BOOL STDCALL +_GetThreadTimes(HANDLE hThread, LPFILETIME lpCreationTime, + LPFILETIME lpExitTime, LPFILETIME lpKernelTime, + LPFILETIME lpUserTime) +{ + return GetThreadTimes(hThread, lpCreationTime, lpExitTime, + lpKernelTime, lpUserTime); +} + +BOOL STDCALL +_SetPriorityClass(HANDLE hProcess, DWORD dwPriorityClass) +{ + return SetPriorityClass(hProcess, dwPriorityClass); +} + +BOOL STDCALL +_SetThreadPriority(HANDLE hThread, int nPriority) +{ + return SetThreadPriority(hThread, nPriority); +} _____ Modified: trunk/reactos/regtests/regtests/regtests.def --- trunk/reactos/regtests/regtests/regtests.def 2005-06-12 14:09:39 UTC (rev 15875) +++ trunk/reactos/regtests/regtests/regtests.def 2005-06-12 15:33:34 UTC (rev 15876) @@ -7,3 +7,8 @@ _CreateThread@24 _TerminateThread@8 _WaitForSingleObject@8 +_GetLastError@0 +_CloseHandle@4 +_GetThreadTimes@20 +_SetPriorityClass@8 +_SetThreadPriority@8 _____ Modified: trunk/reactos/regtests/shared/regtests.c --- trunk/reactos/regtests/shared/regtests.c 2005-06-12 14:09:39 UTC (rev 15875) +++ trunk/reactos/regtests/shared/regtests.c 2005-06-12 15:33:34 UTC (rev 15876) @@ -37,6 +37,17 @@ InitializeListHead(&AllTests); } +char* +FormatExecutionTime(char *buffer, LPFILETIME time) +{ + ULONG milliseconds = time->dwLowDateTime / 10000; + + sprintf(buffer, + "%ldms", + milliseconds); + return buffer; +} + DWORD WINAPI PerformTest(PVOID _arg) { @@ -44,11 +55,18 @@ TestOutputRoutine OutputRoutine = Args->OutputRoutine; PROS_TEST Test = Args->Test; LPSTR TestName = Args->TestName; + HANDLE hThread; + FILETIME time; + FILETIME ExecutionTime; char OutputBuffer[5000]; char Buffer[5000]; + char Format[100]; + hThread = GetCurrentThread(); + _SetThreadPriority(hThread, THREAD_PRIORITY_IDLE); + memset(Buffer, 0, sizeof(Buffer)); - + _SEH_TRY { _Result = TS_OK; _Buffer = Buffer; @@ -58,22 +76,30 @@ sprintf(Buffer, "due to exception 0x%lx", _SEH_GetExceptionCode()); } _SEH_END; - if (_Result != TS_OK) + if (_Result == TS_OK) { - sprintf(OutputBuffer, "[%s] Failed (%s)\n", TestName, Buffer); + if (!_GetThreadTimes(hThread, + &time, + &time, + &time, + &ExecutionTime)) + { + ExecutionTime.dwLowDateTime = 10; + ExecutionTime.dwHighDateTime = 10; + } + sprintf(OutputBuffer, + "[%s] Success [%s]\n", + TestName, + FormatExecutionTime(Format, + &ExecutionTime)); } else - { - sprintf(OutputBuffer, "[%s] Success\n", TestName); - } + sprintf(OutputBuffer, "[%s] Failed (%s)\n", TestName, Buffer); + if (OutputRoutine != NULL) - { (*OutputRoutine)(OutputBuffer); - } else - { DbgPrint(OutputBuffer); - } return 1; } @@ -108,19 +134,12 @@ if (_Result != TS_OK) { if (TestName != NULL) - { - continue; - } + continue; strcpy(Name, "Unnamed"); } - if (TestName != NULL) - { - if (_stricmp(Name, TestName) != 0) - { - continue; - } - } + if ((TestName != NULL) && (_stricmp(Name, TestName) != 0)) + continue; /* Get timeout for test */ TimeOut = 0; @@ -128,44 +147,34 @@ _Buffer = (char *)&TimeOut; (Current->Routine)(TESTCMD_TIMEOUT); if (_Result != TS_OK || TimeOut == INFINITE) - { TimeOut = 5000; - } /* Run test in thread */ hThread = _CreateThread(NULL, 0, PerformTest, (PVOID)&Args, 0, NULL); if (hThread == NULL) - { sprintf(OutputBuffer, - "[%s] Failed (CreateThread failed: 0x%x)\n", - Name, (unsigned int)GetLastError()); - } + "[%s] Failed (CreateThread() failed: %d)\n", + Name, (unsigned int)_GetLastError()); else if (_WaitForSingleObject(hThread, TimeOut) == WAIT_TIMEOUT) { if (!_TerminateThread(hThread, 0)) - { sprintf(OutputBuffer, - "[%s] Failed (Test timed out - %d ms, TerminateThread failed: 0x%x)\n", - Name, (int)TimeOut, (unsigned int)GetLastError()); - } + "[%s] Failed (timed out after %dms; TerminateThread() failed: %d)\n", + Name, (int)TimeOut, (unsigned int)_GetLastError()); else - { - sprintf(OutputBuffer, "[%s] Failed (Test timed out - %d ms)\n", Name, (int)TimeOut); - } + sprintf(OutputBuffer, "[%s] Failed (timed out after %dms)\n", Name, (int)TimeOut); + _CloseHandle(hThread); } else { + _CloseHandle(hThread); continue; } if (OutputRoutine != NULL) - { (*OutputRoutine)(OutputBuffer); - } else - { DbgPrint(OutputBuffer); - } } } _____ Modified: trunk/reactos/regtests/shared/regtests.h --- trunk/reactos/regtests/shared/regtests.h 2005-06-12 14:09:39 UTC (rev 15875) +++ trunk/reactos/regtests/shared/regtests.h 2005-06-12 15:33:34 UTC (rev 15876) @@ -188,7 +188,24 @@ DWORD STDCALL _WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds); +DWORD STDCALL +_GetLastError(); +VOID STDCALL +_CloseHandle(HANDLE handle); + +BOOL STDCALL +_GetThreadTimes(HANDLE hThread, LPFILETIME lpCreationTime, + LPFILETIME lpExitTime, LPFILETIME lpKernelTime, + LPFILETIME lpUserTime); + +BOOL STDCALL +_SetPriorityClass(HANDLE hProcess, DWORD dwPriorityClass); + +BOOL STDCALL +_SetThreadPriority(HANDLE hThread, int nPriority); + + static inline PCHAR FrameworkGetExportedFunctionNameInternal(PAPI_DESCRIPTION ApiDescription) { _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-06-12 14:09:39 UTC (rev 15875) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-06-12 15:33:34 UTC (rev 15876) @@ -608,7 +608,7 @@ fprintf ( fMakefile, "REGTESTS_RUN_TARGET = regtests.dll\n" ); fprintf ( fMakefile, - "$(REGTESTS_RUN_TARGET):\n" ); + "$(REGTESTS_RUN_TARGET): $(REGTESTS_TARGET)\n" ); fprintf ( fMakefile, "\t$(cp) $(REGTESTS_TARGET) $(REGTESTS_RUN_TARGET)\n" ); fprintf ( fMakefile, "\n" ); _____ Modified: trunk/reactos/tools/rbuild/testsupportcode.cpp --- trunk/reactos/tools/rbuild/testsupportcode.cpp 2005-06-12 14:09:39 UTC (rev 15875) +++ trunk/reactos/tools/rbuild/testsupportcode.cpp 2005-06-12 15:33:34 UTC (rev 15876) @@ -333,6 +333,7 @@ s = s + sprintf ( s, " LPSTR lpszCmdParam,\n" ); s = s + sprintf ( s, " int nCmdShow)\n" ); s = s + sprintf ( s, "{\n" ); + s = s + sprintf ( s, " _SetPriorityClass(GetCurrentProcess(), IDLE_PRIORITY_CLASS);\n" ); s = s + sprintf ( s, " InitializeTests();\n" ); s = s + sprintf ( s, " RegisterTests();\n" ); s = s + sprintf ( s, " SetupOnce();\n" );

19 years, 6 months

[mf] 15875: remove duplicate toolbar button

by mf＠svn.reactos.com

remove duplicate toolbar button Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-06-12 13:11:36 UTC (rev 15874) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-06-12 14:09:39 UTC (rev 15875) @@ -3746,7 +3746,7 @@ Globals.hdrivebar = CreateToolbarEx(Globals.hMainWnd, WS_CHILD|WS_VISIBLE|CCS_NOMOVEY|TBSTYLE_LIST, IDW_DRIVEBAR, 2, Globals.hInstance, IDB_DRIVEBAR, &drivebarBtn, - 1, 16, 13, 16, 13, sizeof(TBBUTTON)); + 0, 16, 13, 16, 13, sizeof(TBBUTTON)); #ifndef _NO_EXTENSIONS #ifdef __WINE__

19 years, 6 months

[gvg] 15874: Allow logging of calls into display driver (disabled by default)

by gvg＠svn.reactos.com

Allow logging of calls into display driver (disabled by default) Modified: trunk/reactos/subsys/win32k/misc/driver.c _____ Modified: trunk/reactos/subsys/win32k/misc/driver.c --- trunk/reactos/subsys/win32k/misc/driver.c 2005-06-12 11:30:17 UTC (rev 15873) +++ trunk/reactos/subsys/win32k/misc/driver.c 2005-06-12 13:11:36 UTC (rev 15874) @@ -39,6 +39,9 @@ #define NDEBUG #include <debug.h> +/* #define TRACE_DRV_CALLS to get a log of all calls into the display driver. */ +#undef TRACE_DRV_CALLS + typedef struct _GRAPHICS_DRIVER { PWSTR Name; @@ -164,11 +167,6 @@ switch(DED->pdrvfn[i].iFunc) \ { -#define DRIVER_FUNCTION(function) \ - case INDEX_Drv##function: \ - *(PVOID*)&DF->function = DED->pdrvfn[i].pfn; \ - break - #define END_FUNCTION_MAP() \ default: \ DPRINT1("Unsupported DDI function 0x%x\n", DED->pdrvfn[i].iFunc); \ @@ -176,6 +174,202 @@ } \ } +#ifdef TRACE_DRV_CALLS + +typedef struct _TRACEDRVINFO + { + unsigned Index; + char *Name; + PVOID DrvRoutine; + } +TRACEDRVINFO, *PTRACEDRVINFO; + +__asm__( +" .text\n" +"TraceDrv:\n" +" pushl %eax\n" +" call _FindTraceInfo\n" +" add $4,%esp\n" +" pushl %eax\n" +" pushl 4(%eax)\n" +" call _DbgPrint\n" +" addl $4,%esp\n" +" popl %eax\n" +" mov 8(%eax),%eax\n" +" jmp *%eax\n" +); + +#define TRACEDRV_ROUTINE(function) \ +unsigned TraceDrvIndex##function = INDEX_Drv##function; \ +__asm__ ( \ +" .text\n" \ +"_Trace" #function ":\n" \ +" movl _TraceDrvIndex" #function ",%eax\n" \ +" jmp TraceDrv\n" \ +); \ +extern PVOID Trace##function; + +TRACEDRV_ROUTINE(EnablePDEV) +TRACEDRV_ROUTINE(CompletePDEV) +TRACEDRV_ROUTINE(DisablePDEV) +TRACEDRV_ROUTINE(EnableSurface) +TRACEDRV_ROUTINE(DisableSurface) +TRACEDRV_ROUTINE(AssertMode) +TRACEDRV_ROUTINE(Offset) +TRACEDRV_ROUTINE(ResetPDEV) +TRACEDRV_ROUTINE(DisableDriver) +TRACEDRV_ROUTINE(CreateDeviceBitmap) +TRACEDRV_ROUTINE(DeleteDeviceBitmap) +TRACEDRV_ROUTINE(RealizeBrush) +TRACEDRV_ROUTINE(DitherColor) +TRACEDRV_ROUTINE(StrokePath) +TRACEDRV_ROUTINE(FillPath) +TRACEDRV_ROUTINE(StrokeAndFillPath) +TRACEDRV_ROUTINE(Paint) +TRACEDRV_ROUTINE(BitBlt) +TRACEDRV_ROUTINE(TransparentBlt) +TRACEDRV_ROUTINE(CopyBits) +TRACEDRV_ROUTINE(StretchBlt) +TRACEDRV_ROUTINE(StretchBltROP) +TRACEDRV_ROUTINE(SetPalette) +TRACEDRV_ROUTINE(TextOut) +TRACEDRV_ROUTINE(Escape) +TRACEDRV_ROUTINE(DrawEscape) +TRACEDRV_ROUTINE(QueryFont) +TRACEDRV_ROUTINE(QueryFontTree) +TRACEDRV_ROUTINE(QueryFontData) +TRACEDRV_ROUTINE(SetPointerShape) +TRACEDRV_ROUTINE(MovePointer) +TRACEDRV_ROUTINE(LineTo) +TRACEDRV_ROUTINE(SendPage) +TRACEDRV_ROUTINE(StartPage) +TRACEDRV_ROUTINE(EndDoc) +TRACEDRV_ROUTINE(StartDoc) +TRACEDRV_ROUTINE(GetGlyphMode) +TRACEDRV_ROUTINE(Synchronize) +TRACEDRV_ROUTINE(SaveScreenBits) +TRACEDRV_ROUTINE(GetModes) +TRACEDRV_ROUTINE(Free) +TRACEDRV_ROUTINE(DestroyFont) +TRACEDRV_ROUTINE(QueryFontCaps) +TRACEDRV_ROUTINE(LoadFontFile) +TRACEDRV_ROUTINE(UnloadFontFile) +TRACEDRV_ROUTINE(FontManagement) +TRACEDRV_ROUTINE(QueryTrueTypeTable) +TRACEDRV_ROUTINE(QueryTrueTypeOutline) +TRACEDRV_ROUTINE(GetTrueTypeFile) +TRACEDRV_ROUTINE(QueryFontFile) +TRACEDRV_ROUTINE(QueryAdvanceWidths) +TRACEDRV_ROUTINE(SetPixelFormat) +TRACEDRV_ROUTINE(DescribePixelFormat) +TRACEDRV_ROUTINE(SwapBuffers) +TRACEDRV_ROUTINE(StartBanding) +TRACEDRV_ROUTINE(NextBand) +TRACEDRV_ROUTINE(GetDirectDrawInfo) +TRACEDRV_ROUTINE(EnableDirectDraw) +TRACEDRV_ROUTINE(DisableDirectDraw) +TRACEDRV_ROUTINE(QuerySpoolType) +TRACEDRV_ROUTINE(GradientFill) +TRACEDRV_ROUTINE(SynchronizeSurface) +TRACEDRV_ROUTINE(AlphaBlend) + +#define TRACEDRVINFO_ENTRY(function) \ + { INDEX_Drv##function, "Drv" #function "\n", NULL } +static TRACEDRVINFO TraceDrvInfo[] = + { + TRACEDRVINFO_ENTRY(EnablePDEV), + TRACEDRVINFO_ENTRY(CompletePDEV), + TRACEDRVINFO_ENTRY(DisablePDEV), + TRACEDRVINFO_ENTRY(EnableSurface), + TRACEDRVINFO_ENTRY(DisableSurface), + TRACEDRVINFO_ENTRY(AssertMode), + TRACEDRVINFO_ENTRY(Offset), + TRACEDRVINFO_ENTRY(ResetPDEV), + TRACEDRVINFO_ENTRY(DisableDriver), + TRACEDRVINFO_ENTRY(CreateDeviceBitmap), + TRACEDRVINFO_ENTRY(DeleteDeviceBitmap), + TRACEDRVINFO_ENTRY(RealizeBrush), + TRACEDRVINFO_ENTRY(DitherColor), + TRACEDRVINFO_ENTRY(StrokePath), + TRACEDRVINFO_ENTRY(FillPath), + TRACEDRVINFO_ENTRY(StrokeAndFillPath), + TRACEDRVINFO_ENTRY(Paint), + TRACEDRVINFO_ENTRY(BitBlt), + TRACEDRVINFO_ENTRY(TransparentBlt), + TRACEDRVINFO_ENTRY(CopyBits), + TRACEDRVINFO_ENTRY(StretchBlt), + TRACEDRVINFO_ENTRY(StretchBltROP), + TRACEDRVINFO_ENTRY(SetPalette), + TRACEDRVINFO_ENTRY(TextOut), + TRACEDRVINFO_ENTRY(Escape), + TRACEDRVINFO_ENTRY(DrawEscape), + TRACEDRVINFO_ENTRY(QueryFont), + TRACEDRVINFO_ENTRY(QueryFontTree), + TRACEDRVINFO_ENTRY(QueryFontData), + TRACEDRVINFO_ENTRY(SetPointerShape), + TRACEDRVINFO_ENTRY(MovePointer), + TRACEDRVINFO_ENTRY(LineTo), + TRACEDRVINFO_ENTRY(SendPage), + TRACEDRVINFO_ENTRY(StartPage), + TRACEDRVINFO_ENTRY(EndDoc), + TRACEDRVINFO_ENTRY(StartDoc), + TRACEDRVINFO_ENTRY(GetGlyphMode), + TRACEDRVINFO_ENTRY(Synchronize), + TRACEDRVINFO_ENTRY(SaveScreenBits), + TRACEDRVINFO_ENTRY(GetModes), + TRACEDRVINFO_ENTRY(Free), + TRACEDRVINFO_ENTRY(DestroyFont), + TRACEDRVINFO_ENTRY(QueryFontCaps), + TRACEDRVINFO_ENTRY(LoadFontFile), + TRACEDRVINFO_ENTRY(UnloadFontFile), + TRACEDRVINFO_ENTRY(FontManagement), + TRACEDRVINFO_ENTRY(QueryTrueTypeTable), + TRACEDRVINFO_ENTRY(QueryTrueTypeOutline), + TRACEDRVINFO_ENTRY(GetTrueTypeFile), + TRACEDRVINFO_ENTRY(QueryFontFile), + TRACEDRVINFO_ENTRY(QueryAdvanceWidths), + TRACEDRVINFO_ENTRY(SetPixelFormat), + TRACEDRVINFO_ENTRY(DescribePixelFormat), + TRACEDRVINFO_ENTRY(SwapBuffers), + TRACEDRVINFO_ENTRY(StartBanding), + TRACEDRVINFO_ENTRY(NextBand), + TRACEDRVINFO_ENTRY(GetDirectDrawInfo), + TRACEDRVINFO_ENTRY(EnableDirectDraw), + TRACEDRVINFO_ENTRY(DisableDirectDraw), + TRACEDRVINFO_ENTRY(QuerySpoolType), + TRACEDRVINFO_ENTRY(GradientFill), + TRACEDRVINFO_ENTRY(SynchronizeSurface), + TRACEDRVINFO_ENTRY(AlphaBlend) + }; + +PTRACEDRVINFO +FindTraceInfo(unsigned Index) +{ + unsigned i; + + for (i = 0; i < sizeof(TraceDrvInfo) / sizeof(TRACEDRVINFO); i++) + { + if (TraceDrvInfo[i].Index == Index) + { + return TraceDrvInfo + i; + } + } + + return NULL; +} + +#define DRIVER_FUNCTION(function) \ + case INDEX_Drv##function: \ + FindTraceInfo(INDEX_Drv##function)->DrvRoutine = DED->pdrvfn[i].pfn; \ + *(PVOID*)&DF->function = &Trace##function; \ + break +#else +#define DRIVER_FUNCTION(function) \ + case INDEX_Drv##function: \ + *(PVOID*)&DF->function = DED->pdrvfn[i].pfn; \ + break +#endif + BOOL DRIVER_BuildDDIFunctions(PDRVENABLEDATA DED, PDRIVER_FUNCTIONS DF) {

19 years, 6 months

[mf] 15873: small adjustements:

by mf＠svn.reactos.com

small adjustements: - #ifdef for WINE specific menu item - C style comment - white space Modified: trunk/reactos/subsys/system/winefile/unixcalls.c Modified: trunk/reactos/subsys/system/winefile/winefile.c Modified: trunk/reactos/subsys/system/winefile/winefile.dsp _____ Modified: trunk/reactos/subsys/system/winefile/unixcalls.c --- trunk/reactos/subsys/system/winefile/unixcalls.c 2005-06-12 10:52:18 UTC (rev 15872) +++ trunk/reactos/subsys/system/winefile/unixcalls.c 2005-06-12 11:30:17 UTC (rev 15873) @@ -88,4 +88,3 @@ #endif /* _NO_EXTENSIONS */ #endif /* __WINE__ */ - _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-06-12 10:52:18 UTC (rev 15872) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-06-12 11:30:17 UTC (rev 15873) @@ -2386,11 +2386,11 @@ case ID_NO_WARRANTY: WineWarranty(Globals.hMainWnd); break; -#endif case ID_ABOUT_WINE: ShellAbout(hwnd, RS(b2,IDS_WINE), RS(b1,IDS_WINEFILE), 0); break; +#endif case ID_ABOUT: ShellAbout(hwnd, RS(b1,IDS_WINEFILE), NULL, 0); @@ -2779,7 +2779,7 @@ continue; break; - default: // TF_OTHERS + default: /* TF_OTHERS */ if (!(filter_flags & TF_OTHERS)) continue; } @@ -4008,7 +4008,7 @@ return target_attr&FILE_ATTRIBUTE_DIRECTORY? TRUE: FALSE; } - + static BOOL prompt_target(Pane* pane, LPTSTR source, LPTSTR target) { TCHAR path[MAX_PATH]; _____ Modified: trunk/reactos/subsys/system/winefile/winefile.dsp --- trunk/reactos/subsys/system/winefile/winefile.dsp 2005-06-12 10:52:18 UTC (rev 15872) +++ trunk/reactos/subsys/system/winefile/winefile.dsp 2005-06-12 11:30:17 UTC (rev 15873) @@ -208,10 +208,6 @@ # End Source File # Begin Source File -SOURCE=.\resource.h -# End Source File -# Begin Source File - SOURCE=.\resource.rc # PROP Exclude_From_Build 1 # End Source File @@ -259,6 +255,10 @@ # End Source File # Begin Source File +SOURCE=.\resource.h +# End Source File +# Begin Source File + SOURCE=.\splitpath.c # PROP Exclude_From_Build 1 # End Source File

19 years, 6 months

[chorns] 15872: Document well-known targets

by chorns＠svn.reactos.com

Document well-known targets Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-06-12 10:33:22 UTC (rev 15871) +++ trunk/reactos/Makefile 2005-06-12 10:52:18 UTC (rev 15872) @@ -1,3 +1,52 @@ +# Well-known targets: +# +# all (default target) +# This target builds all of ReactOS. +# +# module +# These targets builds a single module. Replace module with the name of +# the module you want to build. +# +# bootcd +# This target builds an ISO (ReactOS.iso) from which ReactOS can be booted +# and installed. +# +# livecd +# This target builds an ISO (ReactOS-Live.iso) from which ReactOS can be +# booted, but not installed. +# +# install +# This target installs all of ReactOS to a location specified by the +# ROS_INSTALL environment variable. +# +# module_install +# These targets installs a single module to a location specified by the +# ROS_INSTALL environment variable. Replace module with the name of the +# module you want to install. +# +# clean +# This target cleans (deletes) all files that are generated when building +# ReactOS. +# +# module_clean +# These targets cleans (deletes) files that are generated when building a +# single module. Replace module with the name of the module you want to +# clean. +# +# depends +# This target does a complete dependency check of the ReactOS codebase. +# This can require several minutes to complete. If you only need to check +# dependencies for a single or few modules then you can use the +# module_depends targets instead. This target can also repair a damaged or +# missing makefile.auto if needed. +# +# module_depends +# These targets do a dependency check of individual modules. Replace module +# with the name of the module for which you want to check dependencies. +# This is faster than the depends target which does a complete dependency +# check of the ReactOS codebase. +# +# # Accepted environment variables: # # ROS_PREFIX

19 years, 6 months

[hbirr] 15871: Preinitialize the Provider to prevent from crashing if no sockets were given.

by hbirr＠svn.reactos.com

Preinitialize the Provider to prevent from crashing if no sockets were given. Modified: trunk/reactos/lib/ws2_32/misc/dllmain.c _____ Modified: trunk/reactos/lib/ws2_32/misc/dllmain.c --- trunk/reactos/lib/ws2_32/misc/dllmain.c 2005-06-12 10:25:49 UTC (rev 15870) +++ trunk/reactos/lib/ws2_32/misc/dllmain.c 2005-06-12 10:33:22 UTC (rev 15871) @@ -339,7 +339,7 @@ * Number of ready socket descriptors, or SOCKET_ERROR if an error ocurred */ { - PCATALOG_ENTRY Provider; + PCATALOG_ENTRY Provider = NULL; INT Count; INT Errno;

19 years, 6 months

[hbirr] 15870: - Fixed the calculation of some offset values.

by hbirr＠svn.reactos.com

- Fixed the calculation of some offset values. - Used the correct flag for testing of a bss section. Modified: trunk/reactos/ntoskrnl/mm/section.c _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-06-12 10:23:04 UTC (rev 15869) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-06-12 10:25:49 UTC (rev 15870) @@ -657,7 +657,8 @@ } PAddress = MM_ROUND_DOWN(Address, PAGE_SIZE); - Offset = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress; + Offset = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress + + MemoryArea->Data.SectionData.ViewOffset; Segment = MemoryArea->Data.SectionData.Segment; Section = MemoryArea->Data.SectionData.Section; @@ -864,7 +865,7 @@ /* * Just map the desired physical page */ - Page = (Offset + MemoryArea->Data.SectionData.ViewOffset) >> PAGE_SHIFT; + Page = Offset >> PAGE_SHIFT; Status = MmCreateVirtualMappingUnsafe(AddressSpace->Process, Address, Region->Protect, @@ -940,7 +941,6 @@ /* * Get the entry corresponding to the offset within the section */ - Offset += MemoryArea->Data.SectionData.ViewOffset; Entry = MmGetPageEntrySectionSegment(Segment, Offset); if (Entry == 0) @@ -1172,7 +1172,8 @@ * Find the offset of the page */ PAddress = MM_ROUND_DOWN(Address, PAGE_SIZE); - Offset = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress; + Offset = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress + + MemoryArea->Data.SectionData.ViewOffset; Segment = MemoryArea->Data.SectionData.Segment; Section = MemoryArea->Data.SectionData.Section; @@ -1371,7 +1372,8 @@ Context.Segment = MemoryArea->Data.SectionData.Segment; Context.Section = MemoryArea->Data.SectionData.Section; - Context.Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress; + Context.Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + + MemoryArea->Data.SectionData.ViewOffset; FileOffset = Context.Offset + Context.Segment->FileOffset; IsImageSection = Context.Section->AllocationAttributes & SEC_IMAGE ? TRUE : FALSE; @@ -1425,7 +1427,7 @@ * Prepare the context structure for the rmap delete call. */ Context.WasDirty = FALSE; - if (Context.Segment->Characteristics & IMAGE_SCN_LNK_OTHER || + if (Context.Segment->Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA || IS_SWAP_FROM_SSE(Entry) || PFN_FROM_SSE(Entry) != Page) { @@ -1711,7 +1713,8 @@ Address = (PVOID)PAGE_ROUND_DOWN(Address); - Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress; + Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + + MemoryArea->Data.SectionData.ViewOffset; /* * Get the segment and section. @@ -1767,7 +1770,7 @@ /* * Check for a private (COWed) page. */ - if (Segment->Characteristics & IMAGE_SCN_LNK_OTHER || + if (Segment->Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA || IS_SWAP_FROM_SSE(Entry) || PFN_FROM_SSE(Entry) != Page) { @@ -1790,7 +1793,7 @@ if (DirectMapped && !Private) { ASSERT(SwapEntry == 0); - CcRosMarkDirtyCacheSegment(Bcb, Offset + MemoryArea->Data.SectionData.ViewOffset); + CcRosMarkDirtyCacheSegment(Bcb, Offset + Segment->FileOffset); PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); return(STATUS_SUCCESS); @@ -1875,12 +1878,13 @@ ULONG Entry; PFN_TYPE Page; - Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress; + Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + + MemoryArea->Data.SectionData.ViewOffset; Entry = MmGetPageEntrySectionSegment(Segment, Offset); Page = MmGetPfnForProcess(AddressSpace->Process, Address); Protect = PAGE_READONLY; - if (Segment->Characteristics & IMAGE_SCN_LNK_OTHER || + if (Segment->Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA || IS_SWAP_FROM_SSE(Entry) || PFN_FROM_SSE(Entry) != Page) { @@ -2125,6 +2129,7 @@ ObDereferenceObject(PhysSection); } PhysSection->AllocationAttributes |= SEC_PHYSICALMEMORY; + PhysSection->Segment->Flags &= ~MM_PAGEFILE_SEGMENT; return(STATUS_SUCCESS); } @@ -3730,7 +3735,7 @@ { FileObject = MemoryArea->Data.SectionData.Section->FileObject; Bcb = FileObject->SectionObjectPointer->SharedCacheMap; - CcRosMarkDirtyCacheSegment(Bcb, Offset); + CcRosMarkDirtyCacheSegment(Bcb, Offset + Segment->FileOffset); ASSERT(SwapEntry == 0); } }

19 years, 6 months

← Newer
1
...
46
47
48
49
50
51
52
...
65
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 June 2005