Ros-diffs

ros-diffs@reactos.org

81390 discussions

[amunger] 38350: Remove the entries for green, as they are imcomplete. Use the provided inf to install green.
by amunger＠svn.reactos.org 26 Dec '08

26 Dec '08

Author: amunger Date: Fri Dec 26 03:43:28 2008 New Revision: 38350 URL: http://svn.reactos.org/svn/reactos?rev=38350&view=rev Log: Remove the entries for green, as they are imcomplete. Use the provided inf to install green. Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Fri Dec 26 03:43:28 2008 @@ -890,14 +890,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Type",0x00010001,0x00000008 -; Green driver -;HKLM,"SYSTEM\CurrentControlSet\Services\green","ErrorControl",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\green","Group",0x00000000,"Extended base" -;HKLM,"SYSTEM\CurrentControlSet\Services\green","ImagePath",0x00020000,"system32\drivers\green.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\green","Start",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Services\green","Type",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Services\green\Parameters","AttachedDevice",0x00000000,"\Device\Serial0" - ; i8042 port driver HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Group",0x00000000,"Keyboard Port"

1 0

[jimtabor] 38349: - Patch by Andre Wisplinghoff: Text is auto-selected when mouse down is hovered outside window (notepad). See bug 953.
by jimtabor＠svn.reactos.org 26 Dec '08

26 Dec '08

Author: jimtabor Date: Thu Dec 25 18:42:13 2008 New Revision: 38349 URL: http://svn.reactos.org/svn/reactos?rev=38349&view=rev Log: - Patch by Andre Wisplinghoff: Text is auto-selected when mouse down is hovered outside window (notepad). See bug 953. Modified: trunk/reactos/dll/win32/user32/controls/edit.c Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Thu Dec 25 18:42:13 2008 @@ -4833,7 +4833,8 @@ EDIT_EM_SetSel(es, (keys & MK_SHIFT) ? es->selection_start : e, e, after_wrap); EDIT_EM_ScrollCaret(es); es->region_posx = es->region_posy = 0; - SetTimer(es->hwndSelf, 0, 100, NULL); + if (!(es->style & ES_MULTILINE)) + SetTimer(es->hwndSelf, 0, 100, NULL); if (!(es->flags & EF_FOCUSED)) SetFocus(es->hwndSelf);

1 0

[jimtabor] 38348: - Example of a thread overrun? HAX-Fixes wine cursoricon test.
by jimtabor＠svn.reactos.org 25 Dec '08

25 Dec '08

Author: jimtabor Date: Thu Dec 25 17:44:23 2008 New Revision: 38348 URL: http://svn.reactos.org/svn/reactos?rev=38348&view=rev Log: - Example of a thread overrun? HAX-Fixes wine cursoricon test. Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c [iso-8859-1] Thu Dec 25 17:44:23 2008 @@ -412,6 +412,7 @@ ULONG HeaderSize; ULONG ColorCount; PVOID Data; + BOOL Hit = FALSE; if (!(fuLoad & LR_LOADFROMFILE)) { @@ -470,8 +471,26 @@ UnmapViewOfFile(BitmapInfo); return NULL; } + + _SEH2_TRY + { memcpy(PrivateInfo, BitmapInfo, HeaderSize); - + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Hit = TRUE; + } + _SEH2_END; + + if (Hit) + { + DbgPrint("We have a thread overrun, these are already freed! pi -> %d bi -> %d\n", PrivateInfo, BitmapInfo); + RtlFreeHeap(GetProcessHeap(), 0, PrivateInfo); + if (fuLoad & LR_LOADFROMFILE) + UnmapViewOfFile(BitmapInfo); + return NULL; + } + /* FIXME: Handle color conversion and transparency. */ hScreenDc = CreateCompatibleDC(NULL);

1 0

[jmorlan] 38347: Allow the DIR command to be interrupted via Ctrl-C even while in the middle of a directory. (Bug 3967)
by jmorlan＠svn.reactos.org 25 Dec '08

25 Dec '08

Author: jmorlan Date: Thu Dec 25 17:12:54 2008 New Revision: 38347 URL: http://svn.reactos.org/svn/reactos?rev=38347&view=rev Log: Allow the DIR command to be interrupted via Ctrl-C even while in the middle of a directory. (Bug 3967) Modified: trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Thu Dec 25 17:12:54 2008 @@ -989,7 +989,7 @@ INT iSizeFormat; ULARGE_INTEGER u64FileSize; - for (i = 0;i < dwCount;i++) + for (i = 0; i < dwCount && !bCtrlBreak; i++) { /* Calculate size */ if (ptrFiles[i]->dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) @@ -1097,7 +1097,7 @@ /* Calculate the lines that will be printed */ iLines = (USHORT)((dwCount + iColumns - 1) / iColumns); - for (i = 0; i < iLines; i++) + for (i = 0; i < iLines && !bCtrlBreak; i++) { for (j = 0; j < iColumns; j++) { @@ -1154,7 +1154,7 @@ int iSizeFormat; /* The format of size field */ ULARGE_INTEGER u64FileSize; /* The file size */ - for(i = 0;i < dwCount;i++) + for (i = 0; i < dwCount && !bCtrlBreak; i++) { /* Broke 8.3 format */ if (*ptrFiles[i]->cAlternateFileName ) @@ -1228,7 +1228,7 @@ TCHAR szFullName[MAX_PATH]; DWORD i; - for (i = 0; i < dwCount; i++) + for (i = 0; i < dwCount && !bCtrlBreak; i++) { if ((_tcscmp(ptrFiles[i]->cFileName, _T(".")) == 0) || (_tcscmp(ptrFiles[i]->cFileName, _T("..")) == 0)) @@ -1681,6 +1681,15 @@ /* Free array */ cmd_free(ptrFileArray); + /* Free linked list */ + while (ptrStartNode) + { + ptrNextNode = ptrStartNode->ptrNext; + cmd_free(ptrStartNode); + ptrStartNode = ptrNextNode; + dwCount --; + } + if (CheckCtrlBreak(BREAK_INPUT)) return 1; @@ -1739,15 +1748,6 @@ } }while(FindNextFile(hRecSearch,&wfdFileInfo)); FindClose(hRecSearch); - } - - /* Free linked list */ - while (ptrStartNode) - { - ptrNextNode = ptrStartNode->ptrNext; - cmd_free(ptrStartNode); - ptrStartNode = ptrNextNode; - dwCount --; } return 0;

1 0

[mjmartin] 38346: - ipv4addrs should search for decimals not spaces when calling strtok. See bug 3962 for more info.
by mjmartin＠svn.reactos.org 25 Dec '08

25 Dec '08

Author: mjmartin Date: Thu Dec 25 06:43:32 2008 New Revision: 38346 URL: http://svn.reactos.org/svn/reactos?rev=38346&view=rev Log: - ipv4addrs should search for decimals not spaces when calling strtok. See bug 3962 for more info. Modified: trunk/reactos/base/services/dhcp/dhclient.c Modified: trunk/reactos/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhclien… ============================================================================== --- trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] Thu Dec 25 06:43:32 2008 @@ -2056,7 +2056,7 @@ note("Input: %s", buf); do { - tmp = strtok(buf, " "); + tmp = strtok(buf, "."); note("got %s", tmp); if( tmp && inet_aton(tmp, &jnk) ) i++; buf = NULL;

1 0

[cwittich] 38345: fix some more typos
by cwittich＠svn.reactos.org 25 Dec '08

25 Dec '08

Author: cwittich Date: Thu Dec 25 06:27:47 2008 New Revision: 38345 URL: http://svn.reactos.org/svn/reactos?rev=38345&view=rev Log: fix some more typos Modified: trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/activex.cpp trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c trunk/reactos/drivers/filesystems/ext2/src/misc.c trunk/reactos/drivers/filesystems/ext2/src/read.c trunk/reactos/drivers/filesystems/ext2/src/write.c trunk/reactos/drivers/storage/class/disk/disk.c trunk/reactos/drivers/storage/ide/uniata/scsi.h trunk/reactos/drivers/storage/scsiport/scsiport.c trunk/reactos/drivers/usb/nt4compat/usbdriver/etd.c trunk/reactos/drivers/usb/nt4compat/usbdriver/roothub.c trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c trunk/reactos/hal/halx86/generic/dma.c trunk/reactos/hal/halx86/mp/apic.c trunk/reactos/include/psdk/wingdi.h trunk/reactos/ntoskrnl/ke/powerpc/thrdini.c trunk/reactos/ntoskrnl/ke/profobj.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/global.cpp Modified: trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -588,7 +588,7 @@ #ifdef KEYDEBUG printit("\r \r"); #endif - AllOk = SA.Add(temps);; + AllOk = SA.Add(temps); if ( !AllOk ) break; } else { // cerr << "Unexpected line '" << buf << "'\n"; Modified: trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/activex.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/tsclient… ============================================================================== --- trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/activex.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/activex.cpp [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -4029,7 +4029,7 @@ wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wcex.lpszClassName = TEXT("MissTosca_Control"); - return RegisterClassEx(&wcex);; + return RegisterClassEx(&wcex); } static void Shutdown() Modified: trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -579,7 +579,7 @@ // BothDirInformation->ShortName[ j ] = PtrDirEntry->name[j]; BothDirInformation->FileName[ j ] = PtrDirEntry->name[j]; // if( j < 11 ) - // BothDirInformation->ShortName[j] = PtrDirEntry->name[j];; + // BothDirInformation->ShortName[j] = PtrDirEntry->name[j]; } /* Modified: trunk/reactos/drivers/filesystems/ext2/src/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/misc.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -1411,7 +1411,7 @@ PtrVCB->CommonVCBHeader.IsFastIoPossible = FastIoIsNotPossible; PtrVCB->CommonVCBHeader.Resource = &(PtrVCB->VCBResource); - PtrVCB->CommonVCBHeader.PagingIoResource = &(PtrVCB->PagingIoResource);; + PtrVCB->CommonVCBHeader.PagingIoResource = &(PtrVCB->PagingIoResource); // Create a stream file object for this volume. PtrVCB->PtrStreamFileObject = IoCreateStreamFileObject(NULL, Modified: trunk/reactos/drivers/filesystems/ext2/src/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/read.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -1045,7 +1045,7 @@ Ext2BreakPoint(); } - PtrIoRuns[ Index ].LogicalBlock = PtrTIArray[ IBlockIndex ].PtrSIBlocks[ BlockIndex ];; + PtrIoRuns[ Index ].LogicalBlock = PtrTIArray[ IBlockIndex ].PtrSIBlocks[ BlockIndex ]; DbgPrint( "LogicalBlock = 0x%lX", PtrIoRuns[ Index ].LogicalBlock ); } Modified: trunk/reactos/drivers/filesystems/ext2/src/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/write.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -1256,7 +1256,7 @@ Ext2BreakPoint(); } - PtrIoRuns[ Index ].LogicalBlock = PtrTIArray[ IBlockIndex ].PtrSIBlocks[ BlockIndex ];; + PtrIoRuns[ Index ].LogicalBlock = PtrTIArray[ IBlockIndex ].PtrSIBlocks[ BlockIndex ]; DbgPrint( "LogicalBlock = 0x%lX", PtrIoRuns[ Index ].LogicalBlock ); } Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -1923,7 +1923,7 @@ break; } - length += (sizeof(SENDCMDOUTPARAMS) > sizeof(SENDCMDINPARAMS)) ? sizeof(SENDCMDOUTPARAMS) : sizeof(SENDCMDINPARAMS);; + length += (sizeof(SENDCMDOUTPARAMS) > sizeof(SENDCMDINPARAMS)) ? sizeof(SENDCMDOUTPARAMS) : sizeof(SENDCMDINPARAMS); srbControl = ExAllocatePool(NonPagedPool, sizeof(SRB_IO_CONTROL) + length); Modified: trunk/reactos/drivers/storage/ide/uniata/scsi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/scsi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/scsi.h [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -172,7 +172,7 @@ } Byte2; UCHAR Reserved2[3]; - UCHAR Start_TrackSes;; + UCHAR Start_TrackSes; UCHAR AllocationLength[2]; UCHAR Control : 6; UCHAR Format : 2; Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -2752,7 +2752,7 @@ { PIO_STACK_LOCATION Stack; PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; - NTSTATUS Status = STATUS_SUCCESS;; + NTSTATUS Status = STATUS_SUCCESS; DPRINT("ScsiPortDeviceControl()\n"); Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/etd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/etd.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/etd.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -300,7 +300,7 @@ { if (plist == NULL) return 0; - return plist->total_count;; + return plist->total_count; } LONG Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/roothub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/roothub.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/roothub.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -186,7 +186,7 @@ pif->endp_count = 1; pendp = &pif->endp[0]; - pif->pusb_config = pconfig;; + pif->pusb_config = pconfig; pif->pusb_if_desc = pif_desc; pif->if_ext_size = 0; Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -2783,7 +2783,7 @@ uhci->fsbr_cnt++; if (uhci->fsbr_cnt == 1) { - uhci->skel_term_qh->link = uhci->skel_hs_control_qh->phy_addr;; + uhci->skel_term_qh->link = uhci->skel_hs_control_qh->phy_addr; } return TRUE; Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -1487,7 +1487,7 @@ */ /* FIXME: The correct bug check code isn't defined. */ /* KEBUGCHECKEX(HAL_MEMORY_ALLOCATION, PAGE_SIZE, 0, (ULONG_PTR)__FILE__, 0); */ - ASSERT(FALSE);; + ASSERT(FALSE); } CurrentAddress = (ULONG_PTR)VirtualAddress + Modified: trunk/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/apic.c?rev=3… ============================================================================== --- trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -250,7 +250,7 @@ { ULONG v, ver, maxlvt; ULONG r1, r2, w1, w2; - ULONG CPU = ThisCPU();; + ULONG CPU = ThisCPU(); r1 = lastregr[CPU]; @@ -770,12 +770,12 @@ tmp = GET_APIC_VERSION(APICRead(APIC_VER)); if (!APIC_INTEGRATED(tmp)) { - tmp = SET_APIC_TIMER_BASE(APIC_TIMER_BASE_DIV) | APIC_LVT_PERIODIC | LOCAL_TIMER_VECTOR;; + tmp = SET_APIC_TIMER_BASE(APIC_TIMER_BASE_DIV) | APIC_LVT_PERIODIC | LOCAL_TIMER_VECTOR; } else { /* Periodic timer */ - tmp = APIC_LVT_PERIODIC | LOCAL_TIMER_VECTOR;; + tmp = APIC_LVT_PERIODIC | LOCAL_TIMER_VECTOR; } APICWrite(APIC_LVTT, tmp); Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -1745,7 +1745,7 @@ BYTE bLetterform; BYTE bMidline; BYTE bXHeight; -} PANOSE, *LPPANOSE;; +} PANOSE, *LPPANOSE; typedef struct tagLOGFONTA { LONG lfHeight; LONG lfWidth; Modified: trunk/reactos/ntoskrnl/ke/powerpc/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/thrdin… ============================================================================== --- trunk/reactos/ntoskrnl/ke/powerpc/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/powerpc/thrdini.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -181,7 +181,7 @@ /* And set up the Context Switch Frame */ CtxSwitchFrame->RetAddr = KiThreadStartup; CtxSwitchFrame->ApcBypassDisable = TRUE; - CtxSwitchFrame->ExceptionList = EXCEPTION_CHAIN_END;; + CtxSwitchFrame->ExceptionList = EXCEPTION_CHAIN_END; /* Save back the new value of the kernel stack. */ Thread->KernelStack = (PVOID)CtxSwitchFrame; Modified: trunk/reactos/ntoskrnl/ke/profobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/profobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -54,7 +54,7 @@ KIRQL OldIrql; PKPROFILE_SOURCE_OBJECT SourceBuffer; PKPROFILE_SOURCE_OBJECT CurrentSource; - BOOLEAN FreeBuffer = TRUE, SourceFound = FALSE;; + BOOLEAN FreeBuffer = TRUE, SourceFound = FALSE; PKPROCESS ProfileProcess; PLIST_ENTRY NextEntry; Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=383… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -245,7 +245,7 @@ if (Type == MEMORY_AREA_SECTION_VIEW) { Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress - + MemoryArea->Data.SectionData.ViewOffset;; + + MemoryArea->Data.SectionData.ViewOffset; /* * Get or create a pageop Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -585,7 +585,7 @@ APIENTRY DxEngReferenceHdev(HDEV hDev) { - IntGdiReferencePdev((PGDIDEVICE) hDev);; + IntGdiReferencePdev((PGDIDEVICE) hDev); /* ALWAYS return true */ return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -3133,7 +3133,7 @@ DECLARE_RETURN(BOOL); USER_REFERENCE_ENTRY Ref; NTSTATUS Status; - PW32THREADINFO ti;; + PW32THREADINFO ti; DPRINT("Enter NtUserSetShellWindowEx\n"); UserEnterExclusive(); Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -3776,7 +3776,7 @@ ExFreePoolWithTag(Buffer, TAG_GDITEXT); } - return Result;; + return Result; } Modified: trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/devcp… ============================================================================== --- trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -244,6 +244,6 @@ m_devFile << "Link=1" << endl; m_devFile << "Priority=1000" << endl; m_devFile << "OverrideBuildCmd=0" << endl; - m_devFile << "BuildCmd=" << endl << endl;; - } -} + m_devFile << "BuildCmd=" << endl << endl; + } +} Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -590,7 +590,7 @@ Include& include = *includes[i]; if ( parameters.length () > 0 ) parameters += " "; - parameters += "-I" + backend->GetFullPath ( *include.directory );; + parameters += "-I" + backend->GetFullPath ( *include.directory ); } return parameters; } Modified: trunk/reactos/tools/rbuild/global.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/global.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/global.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/global.cpp [iso-8859-1] Thu Dec 25 06:27:47 2008 @@ -31,7 +31,7 @@ void InitializeEnvironment () { - char *SepValue, *ExePostfixValue, *ExePrefixValue;; + char *SepValue, *ExePostfixValue, *ExePrefixValue; SepValue = getenv ( "SEP" ); if ( SepValue && ( 0 == strcmp ( SepValue, DEF_SSEP ) || 0 == strcmp ( SepValue, DEF_SBAD_SEP ) ) )

1 0

[jimtabor] 38344: - Fix typo.
by jimtabor＠svn.reactos.org 25 Dec '08

25 Dec '08

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);

1 0

[jimtabor] 38343: - Check for same intput desktop with GetCursorPos. Cleanup GetCursorInfo.
by jimtabor＠svn.reactos.org 25 Dec '08

25 Dec '08

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;

1 0

[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 25 Dec '08

25 Dec '08

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);

1 0

[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 25 Dec '08

25 Dec '08

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;

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