Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Dec 25 05:36:51 2008 New Revision: 38344 URL: http://svn.reactos.org/svn/reactos?rev=38344&view=rev Log: - Fix typo. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Thu Dec 25 05:36:51 2008 @@ -778,7 +778,7 @@ CURSORINFO SafeCi; PSYSTEM_CURSORINFO CurInfo; PWINSTATION_OBJECT WinSta; - NTSTATUS Status = STATUS_SUCCESS;; + NTSTATUS Status = STATUS_SUCCESS; PCURICON_OBJECT CurIcon; BOOL Ret = FALSE; DECLARE_RETURN(BOOL);

15 years, 8 months

[jimtabor] 38343: - Check for same intput desktop with GetCursorPos. Cleanup GetCursorInfo.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Dec 25 05:29:53 2008 New Revision: 38343 URL: http://svn.reactos.org/svn/reactos?rev=38343&view=rev Log: - Check for same intput desktop with GetCursorPos. Cleanup GetCursorInfo. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Thu Dec 25 05:29:53 2008 @@ -778,39 +778,16 @@ CURSORINFO SafeCi; PSYSTEM_CURSORINFO CurInfo; PWINSTATION_OBJECT WinSta; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS;; PCURICON_OBJECT CurIcon; - HDC hDC; + BOOL Ret = FALSE; DECLARE_RETURN(BOOL); DPRINT("Enter NtUserGetCursorInfo\n"); UserEnterExclusive(); -#if 1 - - - /* FIXME - get the screen dc from the window station or desktop */ - if (!(hDC = IntGetScreenDC())) - { - RETURN( FALSE); - } -#endif - - Status = MmCopyFromCaller(&SafeCi.cbSize, pci, sizeof(DWORD)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( FALSE); - } - - if(SafeCi.cbSize != sizeof(CURSORINFO)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN( FALSE); - } - WinSta = IntGetWinStaObj(); - if(WinSta == NULL) + if (WinSta == NULL) { RETURN( FALSE); } @@ -823,16 +800,31 @@ IntGetCursorLocation(WinSta, &SafeCi.ptScreenPos); - Status = MmCopyToCaller(pci, &SafeCi, sizeof(CURSORINFO)); - if(!NT_SUCCESS(Status)) - { - ObDereferenceObject(WinSta); + _SEH2_TRY + { + if (pci->cbSize == sizeof(CURSORINFO)) + { + ProbeForWrite(pci, sizeof(CURSORINFO), 1); + RtlCopyMemory(pci, &SafeCi, sizeof(CURSORINFO)); + Ret = TRUE; + } + else + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + if (!NT_SUCCESS(Status)) + { SetLastNtError(Status); - RETURN( FALSE); } ObDereferenceObject(WinSta); - RETURN( TRUE); + RETURN(Ret); CLEANUP: DPRINT("Leave NtUserGetCursorInfo, ret=%i\n",_ret_); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Thu Dec 25 05:29:53 2008 @@ -404,6 +404,8 @@ { BOOL Ret = TRUE; PPOINTL pptl; + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + if (pti->hDesktop != InputDesktopHandle) RETURN(FALSE); _SEH2_TRY { pptl = (PPOINTL)Param;

15 years, 8 months

[jimtabor] 38342: - Use Cursor position from server information. I guess the logic is, one workstation per system with multiple desktops. So we would always have one cursor pointer, not one per desktop.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Dec 24 18:35:02 2008 New Revision: 38342 URL: http://svn.reactos.org/svn/reactos?rev=38342&view=rev Log: - Use Cursor position from server information. I guess the logic is, one workstation per system with multiple desktops. So we would always have one cursor pointer, not one per desktop. Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Wed Dec 24 18:35:02 2008 @@ -126,9 +126,9 @@ return FALSE; } if (pgp->MovePointer) - pgp->MovePointer(SurfObj, pgp->Pos.x, pgp->Pos.y, &pgp->Exclude); + pgp->MovePointer(SurfObj, gpsi->ptCursor.x, gpsi->ptCursor.y, &pgp->Exclude); else - EngMovePointer(SurfObj, pgp->Pos.x, pgp->Pos.y, &pgp->Exclude); + EngMovePointer(SurfObj, gpsi->ptCursor.x, gpsi->ptCursor.y, &pgp->Exclude); ppdev->SafetyRemoveLevel = 0; @@ -169,8 +169,8 @@ /* * Hide the cours */ - pt.x = pgp->Pos.x - pgp->HotSpot.x; - pt.y = pgp->Pos.y - pgp->HotSpot.y; + pt.x = gpsi->ptCursor.x - pgp->HotSpot.x; + pt.y = gpsi->ptCursor.y - pgp->HotSpot.y; if (pgp->SaveSurface != NULL) @@ -233,8 +233,8 @@ return ; } - pt.x = pgp->Pos.x - pgp->HotSpot.x; - pt.y = pgp->Pos.y - pgp->HotSpot.y; + pt.x = gpsi->ptCursor.x - pgp->HotSpot.x; + pt.y = gpsi->ptCursor.y - pgp->HotSpot.y; /* * Copy the pixels under the cursor to temporary surface. @@ -402,8 +402,8 @@ * done right after this. It helps IntShowMousePointer. */ if (x != -1) { - pgp->Pos.x = x; - pgp->Pos.y = y; + gpsi->ptCursor.x = x; + gpsi->ptCursor.y = y; } pgp->Size.cx = abs(psoMask->lDelta) << 3; @@ -552,8 +552,8 @@ { /* Actually this should be set by 'the other side', but it would be * done right after this. It helps IntShowMousePointer. */ - pgp->Pos.x = x; - pgp->Pos.y = y; + gpsi->ptCursor.x = x; + gpsi->ptCursor.y = y; IntShowMousePointer(ppdev, pso); if (prcl != NULL) { Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Wed Dec 24 18:35:02 2008 @@ -157,7 +157,6 @@ { /* private GDI pointer handling information, required for software emulation */ BOOL Enabled; - POINTL Pos; SIZEL Size; POINTL HotSpot; XLATEOBJ *XlateObject; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Wed Dec 24 18:35:02 2008 @@ -44,29 +44,11 @@ static PAGED_LOOKASIDE_LIST gProcessLookasideList; static LIST_ENTRY gCurIconList; -/* Look up the location of the cursor in the GDIDEVICE structure - * when all we know is the window station object - * Actually doesn't use the window station, but should... */ BOOL FASTCALL IntGetCursorLocation(PWINSTATION_OBJECT WinSta, POINT *loc) { - HDC hDC; - PDC dc; - GDIDEVICE *GDIDevice; - -#if 1 - /* FIXME - get the screen dc from the window station or desktop */ - if (!(hDC = IntGetScreenDC())) - return FALSE; -#endif - - if (!(dc = DC_LockDc(hDC))) - return FALSE; - GDIDevice = (GDIDEVICE *)dc->pPDev; - DC_UnlockDc(dc); - - loc->x = GDIDevice->Pointer.Pos.x; - loc->y = GDIDevice->Pointer.Pos.y; + loc->x = gpsi->ptCursor.x; + loc->y = gpsi->ptCursor.y; return TRUE; } @@ -259,8 +241,8 @@ SurfObj, soMask, soColor, XlateObj, NewCursor->IconInfo.xHotspot, NewCursor->IconInfo.yHotspot, - GDIDEV(SurfObj)->Pointer.Pos.x, - GDIDEV(SurfObj)->Pointer.Pos.y, + gpsi->ptCursor.x, + gpsi->ptCursor.y, &(GDIDEV(SurfObj)->Pointer.Exclude), SPS_CHANGE); DPRINT("SetCursor: DrvSetPointerShape() returned %x\n", @@ -277,8 +259,8 @@ SurfObj, soMask, soColor, XlateObj, NewCursor->IconInfo.xHotspot, NewCursor->IconInfo.yHotspot, - GDIDEV(SurfObj)->Pointer.Pos.x, - GDIDEV(SurfObj)->Pointer.Pos.y, + gpsi->ptCursor.x, + gpsi->ptCursor.y, &(GDIDEV(SurfObj)->Pointer.Exclude), SPS_CHANGE); GDIDEV(SurfObj)->Pointer.MovePointer = NULL; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Wed Dec 24 18:35:02 2008 @@ -1094,8 +1094,8 @@ } /* Only now, update the info in the GDIDEVICE, so EngMovePointer can * use the old values to move the pointer image */ - GDIDEV(SurfObj)->Pointer.Pos.x = MousePos.x; - GDIDEV(SurfObj)->Pointer.Pos.y = MousePos.y; + gpsi->ptCursor.x = MousePos.x; + gpsi->ptCursor.y = MousePos.y; BITMAPOBJ_UnlockBitmap(BitmapObj); } Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Wed Dec 24 18:35:02 2008 @@ -685,8 +685,8 @@ EngEraseSurface(SurfObj, &SurfaceRect, 0); */ /* Put the pointer in the center of the screen */ - GDIDEV(SurfObj)->Pointer.Pos.x = (SurfaceRect.right - SurfaceRect.left) / 2; - GDIDEV(SurfObj)->Pointer.Pos.y = (SurfaceRect.bottom - SurfaceRect.top) / 2; + gpsi->ptCursor.x = (SurfaceRect.right - SurfaceRect.left) / 2; + gpsi->ptCursor.y = (SurfaceRect.bottom - SurfaceRect.top) / 2; EngUnlockSurface(SurfObj); co_IntShowDesktop(IntGetActiveDesktop(), SurfSize.cx, SurfSize.cy);

15 years, 8 months

[tkreuzer] 38341: Initial x64 SEH support for rsym64. Together with the x64 SEH macros, it (partly) creates the needed tables. It has also revealed that there is something broken with DW_CFA_advance_loc4.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 24 18:20:47 2008 New Revision: 38341 URL: http://svn.reactos.org/svn/reactos?rev=38341&view=rev Log: Initial x64 SEH support for rsym64. Together with the x64 SEH macros, it (partly) creates the needed tables. It has also revealed that there is something broken with DW_CFA_advance_loc4. Modified: branches/ros-amd64-bringup/reactos/tools/rsym/dwarf2.h branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.h Modified: branches/ros-amd64-bringup/reactos/tools/rsym/dwarf2.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rsym/dwarf2.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rsym/dwarf2.h [iso-8859-1] Wed Dec 24 18:20:47 2008 @@ -812,6 +812,15 @@ char *Instructions; } DW2FDE, *PDW2FDE; +typedef struct _SEHBLOCK +{ + unsigned long BeginTry; + unsigned long EndTry; + unsigned long Target; + unsigned long Handler; + unsigned long End; +} SEHBLOCK, *PSEHBLOCK; + typedef struct _CFSTATE { unsigned long Location; @@ -823,6 +832,9 @@ long Offset; unsigned long IsUwop; unsigned long Scope; + unsigned long cScopes; + unsigned long TryLevel; + SEHBLOCK SehBlock[20]; } DW2CFSTATE, *PDW2CFSTATE; #define NextCIE(p) ((void*)((char*)p + p->Length + 4)) Modified: branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c [iso-8859-1] Wed Dec 24 18:20:47 2008 @@ -154,11 +154,15 @@ break; case DW_CFA_advance_loc2: Length = 3; +// printf("Found a DW_CFA_advance_loc2 : 0x%lx ->", *(WORD*)(pc + 1)); State->Location += *(WORD*)(pc + 1); +// printf(" 0x%lx\n", State->Location); break; case DW_CFA_advance_loc4: Length = 5; +// printf("Found a DW_CFA_advance_loc4 : 0x%lx ->", *(DWORD*)(pc + 1)); State->Location += *(DWORD*)(pc + 1); +// printf(" 0x%lx\n", State->Location); break; case DW_CFA_offset_extended: Length += DwDecodeUleb128(&State->Reg, pc + Length); @@ -212,19 +216,78 @@ Length += DwDecodeUleb128(&argsize, pc + Length); break; } - /* PSEH types */ - case 0x1c: - printf("found 1c at %lx\n", State->Location); - State->Scope = 1; - break; - case 0x1d: - printf("found 1d at %lx\n", State->Location); - State->Scope = 2; - break; - case 0x1e: - printf("found 1e at %lx\n", State->Location); - State->Scope = 3; - break; + /* PSEH */ + case 0x21: + { + unsigned long SehType; + +// printf("found 0x21 at %lx\n", State->Location); + Length += DwDecodeUleb128(&SehType, pc + Length); + switch (SehType) + { + case 1: /* Begin Try */ + State->TryLevel++; + if (State->TryLevel >= 20) + { + printf("WTF? Trylevel of 20 exceeded...\n"); + exit(1); + } + State->SehBlock[State->TryLevel-1].BeginTry = State->Location; +// printf("Found begintry at 0x%lx\n", State->Location); + State->Scope = 1; + break; + + case 2: /* End Try */ + State->SehBlock[State->TryLevel-1].EndTry = State->Location; + State->Scope = 2; + break; + + case 3: /* Jump target */ + State->SehBlock[State->TryLevel-1].Target = State->Location; + State->Scope = 3; + break; + + case 4: /* SEH End */ + if (State->TryLevel == 20) + { + printf("Ooops, end of SEH with trylevel at 0!\n"); + exit(1); + } + State->SehBlock[State->TryLevel-1].End = State->Location; + State->TryLevel--; + State->cScopes++; + State->Scope = 0; + break; + + case 5: /* Constant filter */ + { + unsigned long value; + Length += DwDecodeUleb128(&value, pc + Length); + State->SehBlock[State->TryLevel-1].Handler = value; +// printf("Found a constant filter at 0x%lx\n", State->Location); + break; + } + + /* These work differently. We are in a new function. + * We have to parse a lea opcode to find the adress of + * the jump target. This is the reference to find the + * appropriate C_SCOPE_TABLE. */ + case 6: /* Filter func */ +// printf("Found a filter func at 0x%lx\n", State->Location); + break; + + case 7: /* Finally func */ + { +// printf("Found a finally func at 0x%lx\n", State->Location); + break; + } + + default: + printf("Found unknow PSEH code 0x%lx\n", SehType); + exit(1); + } + break; + } default: fprintf(stderr, "unknown instruction 0x%x at 0x%p\n", Code, pc); exit(1); @@ -346,6 +409,8 @@ /* Initialize state */ State.Location = FunctionStart; State.FramePtr = 0; + State.TryLevel = 0; + State.cScopes = 0; /* Parse the CIE's initial instructions */ pInst = Cie.Instructions; @@ -368,6 +433,37 @@ } } cbSize = ROUND_UP(cbSize, 4); + + /* Do we have scope table to write? */ + if (State.cScopes > 0) + { + unsigned long i; + ULONG *pExceptionHandler; + PC_SCOPE_TABLE pScopeTable; + + /* Set flag for exception handler */ + Info->Flags |= UNW_FLAG_EHANDLER; + + /* Store address of handler and number of scope tables */ + pExceptionHandler = (ULONG*)((char*)Info + cbSize); + // HACK for testing purpose + *pExceptionHandler = FunctionStart; // _C_specific_handler + + pScopeTable = (PC_SCOPE_TABLE)(pExceptionHandler + 1); + pScopeTable->NumEntries = State.cScopes; + + /* Store the scope table entries */ + for (i = 0; i < State.cScopes; i++) + { + pScopeTable->Entry[i].Begin = State.SehBlock[i].BeginTry; + pScopeTable->Entry[i].End = State.SehBlock[i].EndTry; + pScopeTable->Entry[i].Handler = 1;//State.SehBlock[i].Handler; + pScopeTable->Entry[i].Target = State.SehBlock[i].Target; + } + + /* Update size */ + cbSize += 8 + State.cScopes * sizeof(C_SCOPE_TABLE_ENTRY); + } return cbSize; } @@ -384,6 +480,7 @@ File->cScopes = 0; File->cUWOP = 0; State.FramePtr = 0; + State.TryLevel = 0; p = File->eh_frame.p; pmax = (char*)p + File->eh_frame.psh->Misc.VirtualSize; Modified: branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.h [iso-8859-1] Wed Dec 24 18:20:47 2008 @@ -132,7 +132,7 @@ typedef struct _C_SCOPE_TABLE { ULONG NumEntries; - C_SCOPE_TABLE_ENTRY Table[1]; + C_SCOPE_TABLE_ENTRY Entry[1]; } C_SCOPE_TABLE, *PC_SCOPE_TABLE;

15 years, 8 months

[hyperion] 38340: This is why we can't have nice things. Fixes r38338 build regression

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Dec 24 17:31:09 2008 New Revision: 38340 URL: http://svn.reactos.org/svn/reactos?rev=38340&view=rev Log: This is why we can't have nice things. Fixes r38338 build regression Modified: trunk/reactos/include/ddk/ntdef.h trunk/reactos/include/psdk/windef.h Modified: trunk/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdef.h?rev=38… ============================================================================== --- trunk/reactos/include/ddk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntdef.h [iso-8859-1] Wed Dec 24 17:31:09 2008 @@ -11,7 +11,7 @@ // FIXME: Should we include these here? #include <stdarg.h> -#include <string.h> +#include <string.h> typedef unsigned long POINTER_64; // FIXME! HACK!!! @@ -225,12 +225,14 @@ #endif #endif +#ifndef DECLSPEC_NOINLINE #if (_MSC_VER >= 1300) #define DECLSPEC_NOINLINE __declspec(noinline) #elif defined(__GNUC__) #define DECLSPEC_NOINLINE __attribute__((noinline)) #else #define DECLSPEC_NOINLINE +#endif #endif #if !defined(_M_CEE_PURE) @@ -255,7 +257,7 @@ // -// Use to silence unused variable warnings when it is intentional +// Use to silence unused variable warnings when it is intentional // #define UNREFERENCED_PARAMETER(P) {(P)=(P);} #define UNREFERENCED_LOCAL_VARIABLE(L) {(L)=(L);} @@ -290,7 +292,7 @@ // Void Pointers // typedef void *PVOID; -//typedef void * POINTER_64 PVOID64; +//typedef void * POINTER_64 PVOID64; typedef PVOID PVOID64; // FIXME! // Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Wed Dec 24 17:31:09 2008 @@ -141,7 +141,15 @@ #define DECLSPEC_IMPORT __declspec(dllimport) #define DECLSPEC_EXPORT __declspec(dllexport) -#define DECLSPEC_NOINLINE __declspec(noinline) +#ifndef DECLSPEC_NOINLINE +#if (_MSC_VER >= 1300) +#define DECLSPEC_NOINLINE __declspec(noinline) +#elif defined(__GNUC__) +#define DECLSPEC_NOINLINE __attribute__((noinline)) +#else +#define DECLSPEC_NOINLINE +#endif +#endif #ifdef __GNUC__ #define DECLSPEC_NORETURN __declspec(noreturn) #define DECLARE_STDCALL_P( type ) __stdcall type

15 years, 9 months

[hyperion] 38339: Now a single test suite with 89 tests, instead of 89 test suites with 1 test each Added dummy implementations of sanity checks for compilers/architectures I didn't write them for yet. Long story short: now compiles and runs with Visual C++, both x86 and x64 Added copyright/license header

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Dec 24 17:22:04 2008 New Revision: 38339 URL: http://svn.reactos.org/svn/reactos?rev=38339&view=rev Log: Now a single test suite with 89 tests, instead of 89 test suites with 1 test each Added dummy implementations of sanity checks for compilers/architectures I didn't write them for yet. Long story short: now compiles and runs with Visual C++, both x86 and x64 Added copyright/license header Modified: trunk/rostests/tests/pseh2/psehtest.c trunk/rostests/tests/pseh2/psehtest2.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 Dec 24 17:22:04 2008 @@ -1,3 +1,25 @@ +/* + Copyright (c) 2008 KJK::Hyperion + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +*/ + #include <stddef.h> #include <stdio.h> #include <stdlib.h> @@ -42,12 +64,7 @@ static int call_test(int (*)(void)); -#define DEFINE_TEST(NAME_) \ - static int test_ ## NAME_(void); \ - \ - static void NAME_(void) { ok(call_test(test_ ## NAME_), "test failed\n"); } \ - \ - static int test_ ## NAME_(void) +#define DEFINE_TEST(NAME_) static int test_ ## NAME_(void) /* Empty statements *///{{{ DEFINE_TEST(empty_1) @@ -2240,121 +2257,6 @@ // TODO //}}} -#define USE_TEST_NAME_(NAME_) # NAME_ -#define USE_TEST_NAME(NAME_) USE_TEST_NAME_(NAME_) -#define USE_TEST(NAME_) { USE_TEST_NAME(NAME_), NAME_ } - -const struct test winetest_testlist[] = -{ - USE_TEST(empty_1), - USE_TEST(empty_2), - USE_TEST(empty_3), - USE_TEST(empty_4), - USE_TEST(empty_5), - USE_TEST(empty_6), - USE_TEST(empty_7), - USE_TEST(empty_8), - - USE_TEST(execute_handler_1), - USE_TEST(continue_execution_1), - USE_TEST(continue_search_1), - USE_TEST(execute_handler_2), - USE_TEST(continue_execution_2), - - USE_TEST(execute_handler_3), - USE_TEST(continue_execution_3), - USE_TEST(continue_search_2), - USE_TEST(execute_handler_4), - USE_TEST(continue_execution_4), - - USE_TEST(execute_handler_5), - USE_TEST(continue_execution_5), - USE_TEST(continue_search_3), - USE_TEST(execute_handler_6), - USE_TEST(continue_execution_6), - - USE_TEST(execute_handler_7), - USE_TEST(continue_execution_7), - USE_TEST(continue_search_4), - USE_TEST(execute_handler_8), - USE_TEST(continue_execution_8), - - USE_TEST(execute_handler_9), - USE_TEST(continue_execution_9), - USE_TEST(continue_search_5), - USE_TEST(execute_handler_10), - USE_TEST(continue_execution_10), - - USE_TEST(execute_handler_11), - USE_TEST(continue_execution_11), - USE_TEST(continue_search_6), - USE_TEST(execute_handler_12), - USE_TEST(continue_execution_12), - - USE_TEST(leave_1), - USE_TEST(leave_2), - USE_TEST(leave_3), - USE_TEST(leave_4), - USE_TEST(leave_5), - USE_TEST(leave_6), - - USE_TEST(yield_1), - USE_TEST(yield_2), - USE_TEST(yield_3), - USE_TEST(yield_4), - USE_TEST(yield_5), - USE_TEST(yield_6), - - USE_TEST(finally_1), - USE_TEST(finally_2), - USE_TEST(finally_3), - USE_TEST(finally_4), - USE_TEST(finally_5), - USE_TEST(finally_6), - USE_TEST(finally_7), - USE_TEST(finally_8), - USE_TEST(finally_9), - USE_TEST(finally_10), - USE_TEST(finally_11), - USE_TEST(finally_12), -#if 0 - USE_TEST(finally_13), - USE_TEST(finally_14), -#endif - - USE_TEST(xpointers_1), - USE_TEST(xpointers_2), - USE_TEST(xpointers_3), - USE_TEST(xpointers_4), - USE_TEST(xpointers_5), - USE_TEST(xpointers_6), - USE_TEST(xpointers_7), - USE_TEST(xpointers_8), - USE_TEST(xpointers_9), - USE_TEST(xpointers_10), - USE_TEST(xpointers_11), - USE_TEST(xpointers_12), - USE_TEST(xpointers_13), - USE_TEST(xpointers_14), - USE_TEST(xpointers_15), - USE_TEST(xpointers_16), - - USE_TEST(xcode_1), - USE_TEST(xcode_2), - USE_TEST(xcode_3), - - USE_TEST(abnorm_1), - USE_TEST(abnorm_2), - USE_TEST(abnorm_3), - USE_TEST(abnorm_4), - USE_TEST(abnorm_5), - USE_TEST(abnorm_6), - USE_TEST(abnorm_7), - USE_TEST(abnorm_8), - - { 0, 0 } -}; - static LONG WINAPI unhandled_exception(PEXCEPTION_POINTERS ExceptionInfo) { @@ -2372,12 +2274,14 @@ void * edi; }; #else -#error TODO +struct volatile_context +{ + int _ignore; +}; #endif -#if defined(__GNUC__) static -__attribute__((noinline)) +DECLSPEC_NOINLINE int sanity_check(int ret, struct volatile_context * before, struct volatile_context * after) { if(ret && memcmp(before, after, sizeof(before))) @@ -2387,17 +2291,16 @@ } static -__attribute__((noinline)) +DECLSPEC_NOINLINE int call_test(int (* func)(void)) { static int ret; + static struct volatile_context before, after; static LPTOP_LEVEL_EXCEPTION_FILTER prev_unhandled_exception; prev_unhandled_exception = SetUnhandledExceptionFilter(&unhandled_exception); -#if defined(__i386__) - static struct volatile_context before, after; - +#if defined(__GNUC__) && defined(__i386__) __asm__ __volatile__ ( "mov %%esp, 0x00 + %c[before]\n" @@ -2423,14 +2326,143 @@ "ebx", "ecx", "edx", "esi", "edi", "flags", "memory" ); #else -#error TODO + ret = func(); #endif SetUnhandledExceptionFilter(prev_unhandled_exception); return ret; } -#else -#error TODO -#endif + +#define USE_TEST_NAME_(NAME_) # NAME_ +#define USE_TEST_NAME(NAME_) USE_TEST_NAME_(NAME_) +#define USE_TEST(NAME_) { USE_TEST_NAME(test_ ## NAME_), test_ ## NAME_ } + +struct subtest +{ + const char * name; + int (* func)(void); +}; + +void testsuite_syntax(void) +{ + const struct subtest testsuite[] = + { + USE_TEST(empty_1), + USE_TEST(empty_2), + USE_TEST(empty_3), + USE_TEST(empty_4), + USE_TEST(empty_5), + USE_TEST(empty_6), + USE_TEST(empty_7), + USE_TEST(empty_8), + + USE_TEST(execute_handler_1), + USE_TEST(continue_execution_1), + USE_TEST(continue_search_1), + USE_TEST(execute_handler_2), + USE_TEST(continue_execution_2), + + USE_TEST(execute_handler_3), + USE_TEST(continue_execution_3), + USE_TEST(continue_search_2), + USE_TEST(execute_handler_4), + USE_TEST(continue_execution_4), + + USE_TEST(execute_handler_5), + USE_TEST(continue_execution_5), + USE_TEST(continue_search_3), + USE_TEST(execute_handler_6), + USE_TEST(continue_execution_6), + + USE_TEST(execute_handler_7), + USE_TEST(continue_execution_7), + USE_TEST(continue_search_4), + USE_TEST(execute_handler_8), + USE_TEST(continue_execution_8), + + USE_TEST(execute_handler_9), + USE_TEST(continue_execution_9), + USE_TEST(continue_search_5), + USE_TEST(execute_handler_10), + USE_TEST(continue_execution_10), + + USE_TEST(execute_handler_11), + USE_TEST(continue_execution_11), + USE_TEST(continue_search_6), + USE_TEST(execute_handler_12), + USE_TEST(continue_execution_12), + + USE_TEST(leave_1), + USE_TEST(leave_2), + USE_TEST(leave_3), + USE_TEST(leave_4), + USE_TEST(leave_5), + USE_TEST(leave_6), + + USE_TEST(yield_1), + USE_TEST(yield_2), + USE_TEST(yield_3), + USE_TEST(yield_4), + USE_TEST(yield_5), + USE_TEST(yield_6), + + USE_TEST(finally_1), + USE_TEST(finally_2), + USE_TEST(finally_3), + USE_TEST(finally_4), + USE_TEST(finally_5), + USE_TEST(finally_6), + USE_TEST(finally_7), + USE_TEST(finally_8), + USE_TEST(finally_9), + USE_TEST(finally_10), + USE_TEST(finally_11), + USE_TEST(finally_12), + #if 0 + USE_TEST(finally_13), + USE_TEST(finally_14), + #endif + + USE_TEST(xpointers_1), + USE_TEST(xpointers_2), + USE_TEST(xpointers_3), + USE_TEST(xpointers_4), + USE_TEST(xpointers_5), + USE_TEST(xpointers_6), + USE_TEST(xpointers_7), + USE_TEST(xpointers_8), + USE_TEST(xpointers_9), + USE_TEST(xpointers_10), + USE_TEST(xpointers_11), + USE_TEST(xpointers_12), + USE_TEST(xpointers_13), + USE_TEST(xpointers_14), + USE_TEST(xpointers_15), + USE_TEST(xpointers_16), + + USE_TEST(xcode_1), + USE_TEST(xcode_2), + USE_TEST(xcode_3), + + USE_TEST(abnorm_1), + USE_TEST(abnorm_2), + USE_TEST(abnorm_3), + USE_TEST(abnorm_4), + USE_TEST(abnorm_5), + USE_TEST(abnorm_6), + USE_TEST(abnorm_7), + USE_TEST(abnorm_8), + }; + + size_t i; + + for(i = 0; i < sizeof(testsuite) / sizeof(testsuite[0]); ++ i) + ok(call_test(testsuite[i].func), "%s failed\n", testsuite[i].name); +} + +const struct test winetest_testlist[] = { + { "pseh2_syntax", testsuite_syntax }, + { 0, 0 } +}; /* EOF */ Modified: trunk/rostests/tests/pseh2/psehtest2.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/psehtest2.c?r… ============================================================================== --- trunk/rostests/tests/pseh2/psehtest2.c [iso-8859-1] (original) +++ trunk/rostests/tests/pseh2/psehtest2.c [iso-8859-1] Wed Dec 24 17:22:04 2008 @@ -1,3 +1,25 @@ +/* + Copyright (c) 2008 KJK::Hyperion + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +*/ + extern int return_arg(int arg) {

15 years, 9 months

[hyperion] 38338: The macro fairy left a DECLSPEC_NOINLINE under my pillow

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Dec 24 17:18:55 2008 New Revision: 38338 URL: http://svn.reactos.org/svn/reactos?rev=38338&view=rev Log: The macro fairy left a DECLSPEC_NOINLINE under my pillow Modified: trunk/reactos/include/psdk/windef.h Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Wed Dec 24 17:18:55 2008 @@ -141,6 +141,7 @@ #define DECLSPEC_IMPORT __declspec(dllimport) #define DECLSPEC_EXPORT __declspec(dllexport) +#define DECLSPEC_NOINLINE __declspec(noinline) #ifdef __GNUC__ #define DECLSPEC_NORETURN __declspec(noreturn) #define DECLARE_STDCALL_P( type ) __stdcall type

15 years, 9 months

[jimtabor] 38337: - Someone needs to wine they are using the wrong ACP. They might not care since wine is not an OS but just a hacky add on.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Dec 24 17:07:13 2008 New Revision: 38337 URL: http://svn.reactos.org/svn/reactos?rev=38337&view=rev Log: - Someone needs to wine they are using the wrong ACP. They might not care since wine is not an OS but just a hacky add on. Modified: trunk/reactos/dll/win32/wininet/internet.h Modified: trunk/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… ============================================================================== --- trunk/reactos/dll/win32/wininet/internet.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/internet.h [iso-8859-1] Wed Dec 24 17:07:13 2008 @@ -52,6 +52,10 @@ #define ioctlsocket ioctl #endif /* __MINGW32__ */ +/* ReactOS-specific definitions */ +#undef CP_UNIXCP +#define CP_UNIXCP CP_THREAD_ACP + /* used for netconnection.c stuff */ typedef struct {

15 years, 9 months

[jimtabor] 38336: [sginsberg] fixed some warnings.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Dec 24 16:58:21 2008 New Revision: 38336 URL: http://svn.reactos.org/svn/reactos?rev=38336&view=rev Log: [sginsberg] fixed some warnings. Modified: trunk/reactos/dll/win32/wininet/internet.h Modified: trunk/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… ============================================================================== --- trunk/reactos/dll/win32/wininet/internet.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/internet.h [iso-8859-1] Wed Dec 24 16:58:21 2008 @@ -23,9 +23,6 @@ #ifndef _WINE_INTERNET_H_ #define _WINE_INTERNET_H_ -/* ReactOS-specific definitions */ -#define CP_UNIXCP CP_THREAD_ACP - #ifndef __WINE_CONFIG_H # error You must include config.h to use this header #endif

15 years, 9 months

[sserapion] 38335: From MSDN "If you are retrieving a pointer or a handle, this function supersedes the GetWindowLong function. To write code that is compatible with both 32-bit and 64-bit versions of Windows, use Get/SetWindowLongPtr."

by sserapion＠svn.reactos.org

Author: sserapion Date: Wed Dec 24 16:05:17 2008 New Revision: 38335 URL: http://svn.reactos.org/svn/reactos?rev=38335&view=rev Log: >From MSDN "If you are retrieving a pointer or a handle, this function supersedes the GetWindowLong function. To write code that is compatible with both 32-bit and 64-bit versions of Windows, use Get/SetWindowLongPtr." Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/dialogs.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/dialogs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] Wed Dec 24 16:05:17 2008 @@ -109,13 +109,13 @@ WCHAR szText[MAX_PATH], szTitle[100], szFilter[100]; OPENFILENAMEW ofn = {0}; - PPICK_ICON_CONTEXT pIconContext = (PPICK_ICON_CONTEXT)GetWindowLong(hwndDlg, DWLP_USER); + PPICK_ICON_CONTEXT pIconContext = (PPICK_ICON_CONTEXT)GetWindowLongPtr(hwndDlg, DWLP_USER); switch(uMsg) { case WM_INITDIALOG: pIconContext = (PPICK_ICON_CONTEXT)lParam; - SetWindowLong(hwndDlg, DWLP_USER, (LONG)pIconContext); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pIconContext); pIconContext->hDlgCtrl = GetDlgItem(hwndDlg, IDC_PICKICON_LIST); EnumResourceNamesW(pIconContext->hLibrary, RT_ICON, EnumPickIconResourceProc, (LPARAM)pIconContext); if (PathUnExpandEnvStringsW(pIconContext->szName, szText, MAX_PATH))

15 years, 9 months

← Newer
1
...
13
14
15
16
17
18
19
...
71
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 December 2008