Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 64043: [CONSRV]: Code reorganization part 2 (add some comments for future fixes).
by hbelusca＠svn.reactos.org 05 Sep '14

05 Sep '14

Author: hbelusca Date: Fri Sep 5 21:08:15 2014 New Revision: 64043 URL: http://svn.reactos.org/svn/reactos?rev=64043&view=rev Log: [CONSRV]: Code reorganization part 2 (add some comments for future fixes). Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/handle.c branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/settings.h branches/condrv_restructure/win32ss/user/winsrv/consrv/settings.c Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] Fri Sep 5 21:08:15 2014 @@ -96,7 +96,7 @@ * even of the last buffer, but having to deal with a lack of * any active buffer might be error-prone. */ if (Buffer->ListEntry.Flink != Buffer->ListEntry.Blink) - ConioDeleteScreenBuffer(Buffer); + ConDrvDeleteScreenBuffer(Buffer); } else if (Object->Type == INPUT_BUFFER) { Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Fri Sep 5 21:08:15 2014 @@ -191,7 +191,7 @@ { CONSOLE_IO_OBJECT Header; /* Object header - MUST BE IN FIRST PLACE */ - ULONG InputBufferSize; /* Size of this input buffer */ + ULONG InputBufferSize; /* Size of this input buffer -- UNUSED!! */ LIST_ENTRY InputEvents; /* List head for input event queue */ HANDLE ActiveEvent; /* Event set when an input event is added in its queue */ @@ -344,6 +344,11 @@ ConSrvConsoleCtrlEvent(IN ULONG CtrlEvent, IN PCONSOLE_PROCESS_DATA ProcessData); + +#define GetConsoleInputBufferMode(Console) \ + (Console)->InputBuffer.Mode + + /* conoutput.c */ PCHAR_INFO ConioCoordToPointer(PTEXTMODE_SCREEN_BUFFER Buff, ULONG X, ULONG Y); VOID ConioDrawConsole(PCONSOLE /*PCONSRV_CONSOLE*/ Console); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/settings.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/settings.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/settings.h [iso-8859-1] Fri Sep 5 21:08:15 2014 @@ -62,6 +62,9 @@ /* * Structure used to communicate with console.dll + * + * FIXME: It should overlap with the Windows' CONSOLE_STATE_INFO structure + * for GUI terminals!! */ typedef struct _CONSOLE_PROPS { Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/settings.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/settings.c [iso-8859-1] Fri Sep 5 21:08:15 2014 @@ -404,7 +404,7 @@ ConsoleInfo->QuickEdit = FALSE; ConsoleInfo->InsertMode = TRUE; - // ConsoleInfo->InputBufferSize; + // ConsoleInfo->InputBufferSize = 0; // Rule: ScreenBufferSize >= ConsoleSize ConsoleInfo->ScreenBufferSize.X = 80;

1 0

[hbelusca] 64042: [CONSRV]: Code reorganization part 1.
by hbelusca＠svn.reactos.org 05 Sep '14

05 Sep '14

Author: hbelusca Date: Fri Sep 5 21:06:36 2014 New Revision: 64042 URL: http://svn.reactos.org/svn/reactos?rev=64042&view=rev Log: [CONSRV]: Code reorganization part 1. Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.h branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.h Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] Fri Sep 5 21:06:36 2014 @@ -178,7 +178,7 @@ return Status; } -VOID +static VOID PurgeInputBuffer(PCONSOLE Console) { PLIST_ENTRY CurrentEntry; @@ -191,6 +191,36 @@ ConsoleFreeHeap(Event); } + // CloseHandle(Console->InputBuffer.ActiveEvent); +} + +NTSTATUS NTAPI +ConDrvInitInputBuffer(IN PCONSOLE Console, + IN ULONG InputBufferSize) +{ + SECURITY_ATTRIBUTES SecurityAttributes; + + ConSrvInitObject(&Console->InputBuffer.Header, INPUT_BUFFER, Console); + + SecurityAttributes.nLength = sizeof(SECURITY_ATTRIBUTES); + SecurityAttributes.lpSecurityDescriptor = NULL; + SecurityAttributes.bInheritHandle = TRUE; + + Console->InputBuffer.ActiveEvent = CreateEventW(&SecurityAttributes, TRUE, FALSE, NULL); + if (Console->InputBuffer.ActiveEvent == NULL) return STATUS_UNSUCCESSFUL; + + Console->InputBuffer.InputBufferSize = InputBufferSize; + InitializeListHead(&Console->InputBuffer.InputEvents); + Console->InputBuffer.Mode = ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | + ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT; + + return STATUS_SUCCESS; +} + +VOID NTAPI +ConDrvDeinitInputBuffer(IN PCONSOLE Console) +{ + PurgeInputBuffer(Console); CloseHandle(Console->InputBuffer.ActiveEvent); } Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] Fri Sep 5 21:06:36 2014 @@ -115,7 +115,7 @@ ConioSetActiveScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer); VOID NTAPI -ConioDeleteScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer) +ConDrvDeleteScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer) { PCONSOLE Console = Buffer->Header.Console; PCONSOLE_SCREEN_BUFFER NewBuffer; @@ -190,7 +190,7 @@ /* If old buffer has no handles, it's now unreferenced */ if (Console->ActiveBuffer->Header.ReferenceCount == 0) { - ConioDeleteScreenBuffer(Console->ActiveBuffer); + ConDrvDeleteScreenBuffer(Console->ActiveBuffer); } /* Tie console to new buffer and signal the change to the frontend */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] Fri Sep 5 21:06:36 2014 @@ -190,7 +190,6 @@ IN PCONSOLE_INFO ConsoleInfo) { NTSTATUS Status; - SECURITY_ATTRIBUTES SecurityAttributes; // CONSOLE_INFO CapturedConsoleInfo; TEXTMODE_BUFFER_INFO ScreenBufferInfo; PCONSOLE Console; @@ -236,26 +235,15 @@ Console->ConsoleSize = ConsoleInfo->ConsoleSize; Console->FixedSize = FALSE; // Value by default; is reseted by the terminals if needed. - /* - * Initialize the input buffer - */ - ConSrvInitObject(&Console->InputBuffer.Header, INPUT_BUFFER, Console); - - SecurityAttributes.nLength = sizeof(SECURITY_ATTRIBUTES); - SecurityAttributes.lpSecurityDescriptor = NULL; - SecurityAttributes.bInheritHandle = TRUE; - Console->InputBuffer.ActiveEvent = CreateEventW(&SecurityAttributes, TRUE, FALSE, NULL); - if (NULL == Console->InputBuffer.ActiveEvent) - { + /* Initialize the input buffer */ + Status = ConDrvInitInputBuffer(Console, 0 /* ConsoleInfo->InputBufferSize */); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ConDrvInitInputBuffer: failed, Status = 0x%08lx\n", Status); DeleteCriticalSection(&Console->Lock); ConsoleFreeHeap(Console); - return STATUS_UNSUCCESSFUL; - } - - Console->InputBuffer.InputBufferSize = 0; // FIXME! - InitializeListHead(&Console->InputBuffer.InputEvents); - Console->InputBuffer.Mode = ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | - ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT; + return Status; + } /* Set-up the code page */ Console->InputCodePage = Console->OutputCodePage = ConsoleInfo->CodePage; @@ -275,7 +263,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("ConDrvCreateScreenBuffer: failed, Status = 0x%08lx\n", Status); - CloseHandle(Console->InputBuffer.ActiveEvent); + ConDrvDeinitInputBuffer(Console); DeleteCriticalSection(&Console->Lock); ConsoleFreeHeap(Console); return Status; @@ -430,10 +418,10 @@ /* FIXME: Send a terminate message to all the processes owning this console */ - /* Cleanup the UI-oriented part */ - DPRINT("Deregister console\n"); + /* Deregister the terminal */ + DPRINT("Deregister terminal\n"); ConDrvDeregisterTerminal(Console); - DPRINT("Console deregistered\n"); + DPRINT("Terminal deregistered\n"); /*** * Check that the console is in terminating state before continuing @@ -458,19 +446,18 @@ /* Remove the console from the list */ RemoveConsole(Console); - /* Discard all entries in the input event queue */ - PurgeInputBuffer(Console); - /* Delete the last screen buffer */ - ConioDeleteScreenBuffer(Console->ActiveBuffer); + ConDrvDeleteScreenBuffer(Console->ActiveBuffer); Console->ActiveBuffer = NULL; if (!IsListEmpty(&Console->BufferList)) { - DPRINT1("BUG: screen buffer list not empty\n"); - ASSERT(FALSE); - } - - /**/ CloseHandle(Console->InputBuffer.ActiveEvent); /**/ + /***ConDrvUnlockConsoleList();***/ + ASSERTMSG("BUGBUGBUG!! screen buffer list not empty\n", FALSE); + } + + /* Deinitialize the input buffer */ + ConDrvDeinitInputBuffer(Console); + if (Console->UnpauseEvent) CloseHandle(Console->UnpauseEvent); ConsoleFreeUnicodeString(&Console->OriginalTitle); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.h [iso-8859-1] Fri Sep 5 21:06:36 2014 @@ -9,4 +9,8 @@ #pragma once -VOID PurgeInputBuffer(PCONSOLE Console); +NTSTATUS NTAPI +ConDrvInitInputBuffer(IN PCONSOLE Console, + IN ULONG InputBufferSize); +VOID NTAPI +ConDrvDeinitInputBuffer(IN PCONSOLE Console); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.h [iso-8859-1] Fri Sep 5 21:06:36 2014 @@ -37,7 +37,7 @@ IN OUT PCONSOLE Console, IN ULONG BufferType, IN PVOID ScreenBufferInfo); -VOID NTAPI ConioDeleteScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer); +VOID NTAPI ConDrvDeleteScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer); // VOID ConioSetActiveScreenBuffer(PCONSOLE_SCREEN_BUFFER Buffer); PCONSOLE_SCREEN_BUFFER

1 0

[tkreuzer] 64041: [GDI32] Add comment about broken #if 0'ed code, noticed by Hermes.
by tkreuzer＠svn.reactos.org 05 Sep '14

05 Sep '14

Author: tkreuzer Date: Fri Sep 5 20:55:01 2014 New Revision: 64041 URL: http://svn.reactos.org/svn/reactos?rev=64041&view=rev Log: [GDI32] Add comment about broken #if 0'ed code, noticed by Hermes. Modified: trunk/reactos/win32ss/gdi/gdi32/objects/region.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/region.c [iso-8859-1] Fri Sep 5 20:55:01 2014 @@ -646,6 +646,7 @@ { if ((pTeb->GdiTebBatch.Offset + sizeof(GDIBSEXTSELCLPRGN)) <= GDIBATCHBUFSIZE) { + // FIXME: This is broken, use GdiAllocBatchCommand! PGDIBSEXTSELCLPRGN pgO = (PGDIBSEXTSELCLPRGN)(&pTeb->GdiTebBatch.Buffer[0] + pTeb->GdiTebBatch.Offset); pgO->gbHdr.Cmd = GdiBCExtSelClipRgn;

1 0

[tkreuzer] 64040: [GDI32] Use GdiAllocBatchCommand in SetBrushOrgEx instead of manual and broken fiddling with GdiTebBatch. Fixes CID 716217.
by tkreuzer＠svn.reactos.org 05 Sep '14

05 Sep '14

Author: tkreuzer Date: Fri Sep 5 20:16:52 2014 New Revision: 64040 URL: http://svn.reactos.org/svn/reactos?rev=64040&view=rev Log: [GDI32] Use GdiAllocBatchCommand in SetBrushOrgEx instead of manual and broken fiddling with GdiTebBatch. Fixes CID 716217. Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h trunk/reactos/win32ss/gdi/gdi32/objects/brush.c Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h [iso-8859-1] Fri Sep 5 20:16:52 2014 @@ -323,7 +323,7 @@ else if (Cmd == GdiBCPolyPatBlt) cjSize = 0; else if (Cmd == GdiBCTextOut) cjSize = 0; else if (Cmd == GdiBCExtTextOut) cjSize = 0; - else if (Cmd == GdiBCSetBrushOrg) cjSize = 0; + else if (Cmd == GdiBCSetBrushOrg) cjSize = sizeof(GDIBSSETBRHORG); else if (Cmd == GdiBCExtSelClipRgn) cjSize = 0; else if (Cmd == GdiBCSelObj) cjSize = sizeof(GDIBSOBJECT); else if (Cmd == GdiBCDelRgn) cjSize = sizeof(GDIBSOBJECT); Modified: trunk/reactos/win32ss/gdi/gdi32/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/brush.c [iso-8859-1] Fri Sep 5 20:16:52 2014 @@ -393,44 +393,37 @@ return FALSE; } #endif - if (GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) - { - PTEB pTeb = NtCurrentTeb(); + if (GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID)&Dc_Attr)) + { + PGDIBSSETBRHORG pgSBO; + + /* Does the caller want the current brush origin to be returned? */ if (lppt) { lppt->x = Dc_Attr->ptlBrushOrigin.x; lppt->y = Dc_Attr->ptlBrushOrigin.y; } - if ((nXOrg == Dc_Attr->ptlBrushOrigin.x) && (nYOrg == Dc_Attr->ptlBrushOrigin.y)) + + /* Check if we have nothing to do */ + if ((nXOrg == Dc_Attr->ptlBrushOrigin.x) && + (nYOrg == Dc_Attr->ptlBrushOrigin.y)) return TRUE; - if(((pTeb->GdiTebBatch.HDC == NULL) || (pTeb->GdiTebBatch.HDC == hdc)) && - ((pTeb->GdiTebBatch.Offset + sizeof(GDIBSSETBRHORG)) <= GDIBATCHBUFSIZE) && - (!(Dc_Attr->ulDirty_ & DC_DIBSECTION)) ) - { - PGDIBSSETBRHORG pgSBO = (PGDIBSSETBRHORG)(&pTeb->GdiTebBatch.Buffer[0] + - pTeb->GdiTebBatch.Offset); - + /* Allocate a batch command buffer */ + pgSBO = GdiAllocBatchCommand(hdc, GdiBCSetBrushOrg); + if (pgSBO != NULL) + { + /* Set current brush origin in the DC attribute */ Dc_Attr->ptlBrushOrigin.x = nXOrg; Dc_Attr->ptlBrushOrigin.y = nYOrg; - pgSBO->gbHdr.Cmd = GdiBCSetBrushOrg; - pgSBO->gbHdr.Size = sizeof(GDIBSSETBRHORG); + /* Setup the GDI batch command */ pgSBO->ptlBrushOrigin = Dc_Attr->ptlBrushOrigin; - pTeb->GdiTebBatch.Offset += sizeof(GDIBSSETBRHORG); - pTeb->GdiTebBatch.HDC = hdc; - pTeb->GdiBatchCount++; - DPRINT("Loading the Flush!! COUNT-> %lu\n", pTeb->GdiBatchCount); - - if (pTeb->GdiBatchCount >= GDI_BatchLimit) - { - DPRINT("Call GdiFlush!!\n"); - NtGdiFlush(); - DPRINT("Exit GdiFlush!!\n"); - } return TRUE; } } - return NtGdiSetBrushOrg(hdc,nXOrg,nYOrg,lppt); -} + + /* Fall back to the slower kernel path */ + return NtGdiSetBrushOrg(hdc, nXOrg, nYOrg, lppt); +}

1 0

[tkreuzer] 64039: [SPEC2DEF] Add support for ARM asm stub generation [HALARM] Add a dummy CMakeLists.txt [BOOTVID] Fix ARM compilation
by tkreuzer＠svn.reactos.org 05 Sep '14

05 Sep '14

Author: tkreuzer Date: Fri Sep 5 20:07:53 2014 New Revision: 64039 URL: http://svn.reactos.org/svn/reactos?rev=64039&view=rev Log: [SPEC2DEF] Add support for ARM asm stub generation [HALARM] Add a dummy CMakeLists.txt [BOOTVID] Fix ARM compilation Added: trunk/reactos/hal/halarm/CMakeLists.txt (with props) Modified: trunk/reactos/drivers/base/bootvid/precomp.h trunk/reactos/hal/CMakeLists.txt trunk/reactos/include/crt/crtdefs.h trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/drivers/base/bootvid/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/preco… ============================================================================== --- trunk/reactos/drivers/base/bootvid/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/precomp.h [iso-8859-1] Fri Sep 5 20:07:53 2014 @@ -1,7 +1,7 @@ #ifndef _BOOTVID_PCH_ #define _BOOTVID_PCH_ -#include <wdm.h> +#include <ntddk.h> #include <drivers/bootvid/bootvid.h> /* Define if FontData has upside down characters */ Modified: trunk/reactos/hal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/CMakeLists.txt?rev=640… ============================================================================== --- trunk/reactos/hal/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/CMakeLists.txt [iso-8859-1] Fri Sep 5 20:07:53 2014 @@ -3,7 +3,7 @@ if((ARCH STREQUAL "i386") OR (ARCH STREQUAL "amd64")) add_subdirectory(halx86) elseif(ARCH STREQUAL "arm") -# add_subdirectory(halarm) + add_subdirectory(halarm) elseif(ARCH STREQUAL "powerpc") # add_subdirectory(halppc) endif() Added: trunk/reactos/hal/halarm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/CMakeLists.txt?… ============================================================================== --- trunk/reactos/hal/halarm/CMakeLists.txt (added) +++ trunk/reactos/hal/halarm/CMakeLists.txt [iso-8859-1] Fri Sep 5 20:07:53 2014 @@ -0,0 +1,17 @@ + +spec2def(hal.dll ../hal.spec ADD_IMPORTLIB) + +add_definitions( + -D_NTHALDLL_ + -D_NTHAL_) + +include_directories( + include + ${REACTOS_SOURCE_DIR}/ntoskrnl/include) + +list(APPEND SOURCES + omap3/halinit_up.c + omap3/halup.rc) + +add_library(hal SHARED + ${SOURCES}) Propchange: trunk/reactos/hal/halarm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/crtdefs.h?rev=… ============================================================================== --- trunk/reactos/include/crt/crtdefs.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/crtdefs.h [iso-8859-1] Fri Sep 5 20:07:53 2014 @@ -126,7 +126,7 @@ #endif #ifndef UNALIGNED -#if defined(__ia64__) || defined(__x86_64) +#if defined(__ia64__) || defined(__x86_64) || defined(__arm__) #define UNALIGNED __unaligned #else #define UNALIGNED Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Fri Sep 5 20:07:53 2014 @@ -259,56 +259,82 @@ if (giArch == ARCH_X86) { - fprintf(file, ".586\n.model flat\n"); + fprintf(file, ".586\n.model flat\n.code\n"); + } + else if (giArch == ARCH_AMD64) + { + fprintf(file, ".code\n"); } else if (giArch == ARCH_ARM) { - fprintf(file, "#include <kxarm.h>\n TEXTAREA\n"); - } - - fprintf(file, ".code\n"); + fprintf(file, + " AREA |.text|,ALIGN=2,CODE,READONLY\n\n"); + } +} + +void +Output_symbol(FILE *fileDest, char* pszSymbolName) +{ + if (giArch == ARCH_ARM) + { + fprintf(fileDest, + " EXPORT %s [FUNC]\n%s\n", + pszSymbolName, + pszSymbolName); + } + else + { + fprintf(fileDest, + "PUBLIC %s\n%s: nop\n", + pszSymbolName, + pszSymbolName); + } } int OutputLine_asmstub(FILE *fileDest, EXPORT *pexp) { + char szNameBuffer[128]; + /* Handle autoname */ if (pexp->strName.len == 1 && pexp->strName.buf[0] == '@') { - fprintf(fileDest, "PUBLIC %sordinal%d\n%sordinal%d: nop\n", + sprintf(szNameBuffer, "%sordinal%d\n%sordinal%d: nop\n", gpszUnderscore, pexp->nOrdinal, gpszUnderscore, pexp->nOrdinal); } else if (giArch != ARCH_X86) { - fprintf(fileDest, "PUBLIC _stub_%.*s\n_stub_%.*s: nop\n", + sprintf(szNameBuffer, "_stub_%.*s", pexp->strName.len, pexp->strName.buf, pexp->strName.len, pexp->strName.buf); } else if (pexp->nCallingConvention == CC_STDCALL) { - fprintf(fileDest, "PUBLIC __stub_%.*s@%d\n__stub_%.*s@%d: nop\n", + sprintf(szNameBuffer, "__stub_%.*s@%d", pexp->strName.len, pexp->strName.buf, pexp->nStackBytes, pexp->strName.len, pexp->strName.buf, pexp->nStackBytes); } else if (pexp->nCallingConvention == CC_FASTCALL) { - fprintf(fileDest, "PUBLIC @_stub_%.*s@%d\n@_stub_%.*s@%d: nop\n", + sprintf(szNameBuffer, "@_stub_%.*s@%d", pexp->strName.len, pexp->strName.buf, pexp->nStackBytes, pexp->strName.len, pexp->strName.buf, pexp->nStackBytes); } else if (pexp->nCallingConvention == CC_CDECL || pexp->nCallingConvention == CC_STUB) { - fprintf(fileDest, "PUBLIC __stub_%.*s\n__stub_%.*s: nop\n", + sprintf(szNameBuffer, "__stub_%.*s", pexp->strName.len, pexp->strName.buf, pexp->strName.len, pexp->strName.buf); } else if (pexp->nCallingConvention == CC_EXTERN) { - fprintf(fileDest, "PUBLIC __stub_%.*s\n__stub_%.*s:\n", + sprintf(szNameBuffer, "__stub_%.*s", pexp->strName.len, pexp->strName.buf, pexp->strName.len, pexp->strName.buf); } + + Output_symbol(fileDest, szNameBuffer); return 1; } @@ -1038,7 +1064,7 @@ OutputHeader_asmstub(file, pszDllName); result = ParseFile(pszSource, file, OutputLine_asmstub); - fprintf(file, "\nEND\n"); + fprintf(file, "\n END\n"); fclose(file); }

1 0

[tkreuzer] 64038: [PSEH] Add dummy seh_prolog.s for arm. Dedicated to Z98
by tkreuzer＠svn.reactos.org 05 Sep '14

05 Sep '14

Author: tkreuzer Date: Fri Sep 5 17:55:35 2014 New Revision: 64038 URL: http://svn.reactos.org/svn/reactos?rev=64038&view=rev Log: [PSEH] Add dummy seh_prolog.s for arm. Dedicated to Z98 Added: trunk/reactos/lib/pseh/arm/ (with props) trunk/reactos/lib/pseh/arm/seh_prolog.s (with props) Propchange: trunk/reactos/lib/pseh/arm/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Sep 5 17:55:35 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/lib/pseh/arm/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/lib/pseh/arm/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/lib/pseh/arm/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/lib/pseh/arm/seh_prolog.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/arm/seh_prolog.s?… ============================================================================== --- trunk/reactos/lib/pseh/arm/seh_prolog.s (added) +++ trunk/reactos/lib/pseh/arm/seh_prolog.s [iso-8859-1] Fri Sep 5 17:55:35 2014 @@ -0,0 +1,31 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS CRT + * FILE: lib/pseh/arm/seh_prolog.S + * PURPOSE: SEH Support for MSVC / ARM + * PROGRAMMERS: Timo Kreuzer + */ + +/* INCLUDES ******************************************************************/ + +#include "ksarm.h" + + TEXTAREA + + IMPORT __except_handler + + LEAF_ENTRY _SEH_prolog + + + LEAF_END _SEH_prolog + + + + LEAF_ENTRY _SEH_epilog + + + LEAF_END _SEH_epilog + + + + END Propchange: trunk/reactos/lib/pseh/arm/seh_prolog.s ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 64037: [NTOS:LPC] * Remove unused pointer and logically dead code paths. CID 1237020. CORE-7975
by akhaldi＠svn.reactos.org 05 Sep '14

05 Sep '14

Author: akhaldi Date: Fri Sep 5 09:41:25 2014 New Revision: 64037 URL: http://svn.reactos.org/svn/reactos?rev=64037&view=rev Log: [NTOS:LPC] * Remove unused pointer and logically dead code paths. CID 1237020. CORE-7975 Modified: trunk/reactos/ntoskrnl/lpc/reply.c Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] Fri Sep 5 09:41:25 2014 @@ -188,7 +188,7 @@ NtReplyPort(IN HANDLE PortHandle, IN PPORT_MESSAGE ReplyMessage) { - PLPCP_PORT_OBJECT Port, ConnectionPort = NULL; + PLPCP_PORT_OBJECT Port; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); NTSTATUS Status; PLPCP_MESSAGE Message; @@ -256,7 +256,6 @@ { /* No thread found, fail */ ObDereferenceObject(Port); - if (ConnectionPort) ObDereferenceObject(ConnectionPort); return Status; } @@ -265,7 +264,6 @@ if (!Message) { /* Fail if we couldn't allocate a message */ - if (ConnectionPort) ObDereferenceObject(ConnectionPort); ObDereferenceObject(WakeupThread); ObDereferenceObject(Port); return STATUS_NO_MEMORY; @@ -282,7 +280,6 @@ { /* It isn't, fail */ LpcpFreeToPortZone(Message, LPCP_LOCK_HELD | LPCP_LOCK_RELEASE); - if (ConnectionPort) ObDereferenceObject(ConnectionPort); ObDereferenceObject(WakeupThread); ObDereferenceObject(Port); return STATUS_REPLY_MESSAGE_MISMATCH;

1 0

[akhaldi] 64036: [NTOS:OB] * Fix a nasty typo in ObOpenObjectByName(). CID 1237016. CORE-7975
by akhaldi＠svn.reactos.org 05 Sep '14

05 Sep '14

Author: akhaldi Date: Fri Sep 5 09:20:37 2014 New Revision: 64036 URL: http://svn.reactos.org/svn/reactos?rev=64036&view=rev Log: [NTOS:OB] * Fix a nasty typo in ObOpenObjectByName(). CID 1237016. CORE-7975 Modified: trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] Fri Sep 5 09:20:37 2014 @@ -2567,7 +2567,7 @@ AccessMode, NULL, Handle); - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status2)) { ObDereferenceObject(Object); Status = Status2;

1 0

[akhaldi] 64035: [MSVCRT] * Use Wine's _pclose(). Fixes msvcrt:misc crash. CORE-8080
by akhaldi＠svn.reactos.org 04 Sep '14

04 Sep '14

Author: akhaldi Date: Thu Sep 4 13:39:51 2014 New Revision: 64035 URL: http://svn.reactos.org/svn/reactos?rev=64035&view=rev Log: [MSVCRT] * Use Wine's _pclose(). Fixes msvcrt:misc crash. CORE-8080 Modified: trunk/reactos/lib/sdk/crt/stdio/popen.c Modified: trunk/reactos/lib/sdk/crt/stdio/popen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/popen.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/popen.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/popen.c [iso-8859-1] Thu Sep 4 13:39:51 2014 @@ -20,6 +20,14 @@ int alloc_fd(HANDLE hand, int flag); //FIXME: Remove unsigned split_oflags(unsigned oflags); //FIXME: Remove + +#ifndef _UNICODE +static struct popen_handle { + FILE *f; + HANDLE proc; +} *popen_handles; +static DWORD popen_handles_size; +#endif /* * @implemented @@ -130,16 +138,40 @@ /* * @implemented */ -int _pclose (FILE *pp) +int CDECL _pclose(FILE* file) { - TRACE("_pclose(%x)",pp); + HANDLE h; + DWORD i; - fclose(pp); - //if (!TerminateProcess(pp->_tmpfname ,0)) - // return( -1 ); - return( 0 ); + if (!MSVCRT_CHECK_PMT(file != NULL)) return -1; + + _mlock(_POPEN_LOCK); + for(i=0; i<popen_handles_size; i++) + { + if (popen_handles[i].f == file) + break; + } + if(i == popen_handles_size) + { + _munlock(_POPEN_LOCK); + *_errno() = EBADF; + return -1; + } + + h = popen_handles[i].proc; + popen_handles[i].f = NULL; + _munlock(_POPEN_LOCK); + + fclose(file); + if(WaitForSingleObject(h, INFINITE)==WAIT_FAILED || !GetExitCodeProcess(h, &i)) + { + _dosmaperr(GetLastError()); + CloseHandle(h); + return -1; + } + + CloseHandle(h); + return i; } #endif - -

1 0

[spetreolle] 64034: [EVENTLOG] Remove the event log handle from the list *before* destroying it. Fixes failure in advapi32:eventlog double close test.
by spetreolle＠svn.reactos.org 03 Sep '14

03 Sep '14

Author: spetreolle Date: Wed Sep 3 23:07:47 2014 New Revision: 64034 URL: http://svn.reactos.org/svn/reactos?rev=64034&view=rev Log: [EVENTLOG] Remove the event log handle from the list *before* destroying it. Fixes failure in advapi32:eventlog double close test. Modified: trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Wed Sep 3 23:07:47 2014 @@ -1252,7 +1252,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("NtWriteFile() failed!\n"); + DPRINT1("NtWriteFile() failed! (Status: 0x%08lx)\n", Status); goto Done; } @@ -1311,7 +1311,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("NtWriteFile() failed!\n"); + DPRINT1("NtWriteFile() failed! (Status: 0x%08lx)\n", Status); } Done: Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Wed Sep 3 23:07:47 2014 @@ -215,9 +215,9 @@ if (!ElfGetLogHandleEntryByHandle(lpLogHandle)) return STATUS_INVALID_HANDLE; + RemoveEntryList(&lpLogHandle->LogHandleListEntry); LogfClose(lpLogHandle->LogFile, FALSE); - RemoveEntryList(&lpLogHandle->LogHandleListEntry); HeapFree(GetProcessHeap(),0,lpLogHandle); return STATUS_SUCCESS; @@ -291,7 +291,7 @@ PLOGHANDLE lpLogHandle; PLOGFILE lpLogFile; - DPRINT("ElfrNumberOfRecords()"); + DPRINT("ElfrNumberOfRecords()\n"); lpLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); if (!lpLogHandle)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs