Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[khornicek] 43810: - sync ddraw with trunk - if anyone wishes to work on it, do it in this branch please
by khornicek＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: khornicek Date: Wed Oct 28 14:23:03 2009 New Revision: 43810 URL: http://svn.reactos.org/svn/reactos?rev=43810&view=rev Log: - sync ddraw with trunk - if anyone wishes to work on it, do it in this branch please Added: branches/reactx/reactos/dll/directx/ddraw/ddraw.spec (with props) Removed: branches/reactx/reactos/dll/directx/ddraw/ddraw.def Modified: branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c branches/reactx/reactos/dll/directx/ddraw/Surface/createsurface.c branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c branches/reactx/reactos/dll/directx/ddraw/Surface/surface_stubs.c branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild branches/reactx/reactos/dll/directx/ddraw/main.c branches/reactx/reactos/dll/directx/ddraw/rosdraw.h Modified: branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c [iso-8859-1] Wed Oct 28 14:23:03 2009 @@ -133,7 +133,7 @@ * @name DDraw->AddRef * @implemented * -* The function DDraw->AddRef count of all ref counter in the COM object DDraw-> +* The function DDraw->AddRef manages all ref counters in the COM object DDraw-> * @return * Returns the local Ref counter value for the COM object @@ -149,20 +149,20 @@ DX_WINDBG_trace(); - /* Lock the thread so nothing can change the COM while we updating it */ + /* Lock the thread */ AcquireDDThreadLock(); _SEH2_TRY { - /* Count up the internal ref counter */ + /* Increment the internal ref counter */ This->dwIntRefCnt++; - /* Count up the internal local ref counter */ + /* Increment the local internal ref counter */ This->lpLcl->dwLocalRefCnt++; if (This->lpLcl->lpGbl != NULL) { - /* Count up the internal gobal ref counter */ + /* Increment the gobal internal ref counter */ This->lpLcl->lpGbl->dwRefCnt++; } } @@ -198,7 +198,7 @@ DX_WINDBG_trace(); - /* Lock the thread so nothing can change the COM while we updating it */ + /* Lock the thread */ AcquireDDThreadLock(); _SEH2_TRY @@ -255,14 +255,13 @@ * @name DDraw->Compact * @implemented * -* The function DDraw->Compact only return two diffent return value, they are DD_OK and DERR_NOEXCLUSIVEMODE -* if we are in Exclusive mode we return DERR_NOEXCLUSIVEMODE, other wise we return DD_OK - +* In exlusive mode the function DDraw->Compact returns DERR_NOEXCLUSIVEMODE, otherwise it returns DD_OK +* * @return -* Returns only Error code DD_OK or DERR_NOEXCLUSIVEMODE +* Returns only error code DD_OK or DERR_NOEXCLUSIVEMODE * * @remarks. -* Microsoft say Compact is not implement in ddraw.dll, but Compact return DDERR_NOEXCLUSIVEMODE or DD_OK +* Microsoft says Compact is not implemented in ddraw.dll, but it returns DDERR_NOEXCLUSIVEMODE or DD_OK * *--*/ HRESULT WINAPI @@ -272,12 +271,12 @@ DX_WINDBG_trace(); - /* Lock the thread so nothing can change the COM while we updating it */ + /* Lock the thread */ AcquireDDThreadLock(); _SEH2_TRY { - /* Check see if Exclusive mode have been activate */ + /* Check if Exclusive mode has been activated */ if (This->lpLcl->lpGbl->lpExclusiveOwner != This->lpLcl) { retVal = DDERR_NOEXCLUSIVEMODE; Modified: branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c [iso-8859-1] Wed Oct 28 14:23:03 2009 @@ -102,7 +102,7 @@ _SEH2_LEAVE; } - if( (GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD) ) + if( (GetWindowLongPtr(hwnd, GWL_STYLE) & WS_CHILD) ) { retVal = DDERR_INVALIDPARAMS; _SEH2_LEAVE; Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] Wed Oct 28 14:23:03 2009 @@ -1,12 +1,13 @@ /* $Id$ -* -* COPYRIGHT: See COPYING in the top level directory -* PROJECT: ReactOS DirectX -* FILE: ddraw/surface/callbacks_surf_hel.c -* PURPOSE: HEL Callbacks For Surface APIs -* PROGRAMMER: Magnus Olsen -* -*/ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS DirectX + * FILE: ddraw/surface/callbacks_surf_hel.c + * PURPOSE: HEL Callbacks For Surface APIs + * PROGRAMMER: Magnus Olsen + * + */ + #include "rosdraw.h" DWORD CALLBACK HelDdSurfAddAttachedSurface(LPDDHAL_ADDATTACHEDSURFACEDATA lpDestroySurface) @@ -78,12 +79,12 @@ DX_WINDBG_trace(); - /* ToDo tell ddraw internal this surface are locked */ + /* ToDo tell ddraw internal this surface is locked */ /* ToDo add support for dwFlags */ - /* Get our hdc for the active windows */ - hDC = GetDC(lpLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hFocusWnd); + /* Get our hdc for the active window */ + hDC = GetDC((HWND)lpLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hFocusWnd); if (hDC != NULL) { @@ -91,7 +92,6 @@ if (!lpLockData->bHasRect) { - hImage = CreateCompatibleBitmap (hDC, lpLockData->lpDDSurface->lpGbl->wWidth, lpLockData->lpDDSurface->lpGbl->wHeight); } else @@ -121,7 +121,7 @@ SelectObject (hMemDC, hDCBmp); - /* Alloc memory buffer at usermode for the bitmap pixel data */ + /* Allocate memory buffer for the bitmap pixel data */ cbBuffer = bm.bmWidthBytes * bm.bmHeight ; pixels = (PDWORD) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbBuffer ); @@ -130,7 +130,7 @@ /* Get the bitmap bits */ GetBitmapBits(hImage,cbBuffer,pixels); - /* Fixme HACK check which member that store the hel bitmap buffer */ + /* Fixme HACK - check which member stores the HEL bitmap buffer */ lpLockData->lpDDSurface->lpSurfMore->lpDDRAWReserved2 = pixels; /* Setup return value */ @@ -164,10 +164,7 @@ DWORD CALLBACK HelDdSurfreserved4(DWORD *lpPtr) { - /* - This api is not doucment by MS So I leave it - as stub. - */ + /* This api is not doucmented by MS, keep it stubbed */ DX_STUB; } @@ -202,8 +199,8 @@ DX_WINDBG_trace(); - /* Get our hdc for the active windows */ - hDC = GetDC(lpUnLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hFocusWnd); + /* Get our hdc for the active window */ + hDC = GetDC((HWND)lpUnLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hFocusWnd); if (hDC != NULL) { Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/createsurface.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/createsurface.c [iso-8859-1] Wed Oct 28 14:23:03 2009 @@ -35,7 +35,7 @@ DWORD count; HRESULT ret; - if ( (pDDraw->lpLcl->dwLocalFlags & DDRAWILCL_SETCOOPCALLED) != DDRAWILCL_SETCOOPCALLED) + if((pDDraw->lpLcl->dwLocalFlags & DDRAWILCL_SETCOOPCALLED) != DDRAWILCL_SETCOOPCALLED) { return DDERR_NOCOOPERATIVELEVELSET; } @@ -67,7 +67,7 @@ } else if(((pDDSD->dwFlags & DDSD_HEIGHT) || (pDDSD->dwFlags & DDSD_WIDTH)) - && (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) + && (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) { return DDERR_INVALIDPARAMS; } Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] Wed Oct 28 14:23:03 2009 @@ -11,7 +11,6 @@ #include "rosdraw.h" - /* FIXME adding hal and hel stub DestroySurface; SetClipList; @@ -305,11 +304,11 @@ if (mDdBlt.Blt == NULL) { - /* This api are unsupported */ + /* This API is unsupported */ return DDERR_UNSUPPORTED; } - /* Prepare for draw, if we do not rest the DdResetVisrgn some graphice card will not draw on the screen */ + /* Prepare for draw, if we do not reset the DdResetVisrgn some graphics card will not draw on the screen */ if (!DdResetVisrgn( ThisDest->lpLcl->lpSurfMore->slist[0], NULL)) { DX_STUB_str("DdResetVisrgn failed"); @@ -340,7 +339,7 @@ } /* FIXME - * compare so we do not write to far + * compare so we do not write too far * ThisDest->lpLcl->lpGbl->wWidth; <- surface max width * ThisDest->lpLcl->lpGbl->wHeight <- surface max heght * ThisDest->lpLcl->lpGbl->lPitch <- surface bpp @@ -363,7 +362,7 @@ } /* FIXME - * compare so we do not write to far + * compare so we do not write too far * ThisDest->lpLcl->lpGbl->wWidth; <- surface max width * ThisDest->lpLcl->lpGbl->wHeight <- surface max heght * ThisDest->lpLcl->lpGbl->lPitch <- surface bpp Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/surface_stubs.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/surface_stubs.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/surface_stubs.c [iso-8859-1] Wed Oct 28 14:23:03 2009 @@ -260,7 +260,7 @@ DX_WINDBG_trace(); - if (!This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY) + if (!(This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY)) { return DDERR_GENERIC; } Removed: branches/reactx/reactos/dll/directx/ddraw/ddraw.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/ddraw.def [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/ddraw.def (removed) @@ -1,23 +1,0 @@ -EXPORTS -AcquireDDThreadLock@0 -D3DParseUnknownCommand@8 -ReleaseDDThreadLock@0 - -;CompleteCreateSysmemSurface -;DDGetAttachedSurfaceLcl@12 -;DDInternalLock@8 -;DDInternalUnlock@4 -;DSoundHelp@12 -DirectDrawCreate@12 -DirectDrawCreateClipper@12 -DirectDrawCreateEx@16 -DirectDrawEnumerateA@8 -DirectDrawEnumerateW@8 -DirectDrawEnumerateExA@12 -DirectDrawEnumerateExW@12 -;DllCanUnloadNow -;DllGetClassObject -;GetDDSurfaceLocal@12 -;GetOLEThunkData -;GetSurfaceFromDC@12 -;RegisterSpecialCase Modified: branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] Wed Oct 28 14:23:03 2009 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true" unicode="yes"> - <importlibrary definition="ddraw.def" /> +<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" unicode="yes" crt="msvcrt"> + <importlibrary definition="ddraw.spec" /> <include base="ddraw">.</include> <library>kernel32</library> <library>user32</library> @@ -71,5 +71,5 @@ <file>DirectD3D7_Vtable.c</file> </directory>  - <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compilerset="gcc">-fno-unit-at-a-time</compilerflag> </module> Added: branches/reactx/reactos/dll/directx/ddraw/ddraw.spec URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/ddraw.spec (added) +++ branches/reactx/reactos/dll/directx/ddraw/ddraw.spec [iso-8859-1] Wed Oct 28 14:23:03 2009 @@ -1,0 +1,21 @@ +@ stdcall AcquireDDThreadLock() +@ stdcall D3DParseUnknownCommand(ptr ptr) +@ stdcall ReleaseDDThreadLock() +#@ stdcall CompleteCreateSysmemSurface +#@ stdcall DDGetAttachedSurfaceLcl@12 +#@ stdcall DDInternalLock@8 +#@ stdcall DDInternalUnlock@4 +#@ stdcall DSoundHelp@12 +@ stdcall DirectDrawCreate(ptr ptr ptr) +@ stdcall DirectDrawCreateClipper(long ptr ptr) +@ stdcall DirectDrawCreateEx(ptr ptr ptr ptr) +@ stdcall DirectDrawEnumerateA(ptr ptr) +@ stdcall DirectDrawEnumerateW(ptr ptr) +@ stdcall DirectDrawEnumerateExA(ptr ptr long) +@ stdcall DirectDrawEnumerateExW(ptr ptr long) +#@ stdcall DllCanUnloadNow() +#@ stdcall DllGetClassObject(ptr ptr ptr) +#@ stdcall GetDDSurfaceLocal +#@ stdcall GetOLEThunkData +#@ stdcall GetSurfaceFromDC +#@ stdcall RegisterSpecialCase Propchange: branches/reactx/reactos/dll/directx/ddraw/ddraw.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactx/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/main.c [iso-8859-1] Wed Oct 28 14:23:03 2009 @@ -23,8 +23,8 @@ LPVOID lpContext; } DirectDrawEnumerateProcData; -BOOL -CALLBACK +BOOL +CALLBACK TranslateCallbackA(GUID *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, @@ -177,8 +177,8 @@ return retVal; } -HRESULT -WINAPI +HRESULT +WINAPI DirectDrawEnumerateA( LPDDENUMCALLBACKA lpCallback, LPVOID lpContext) { @@ -294,7 +294,7 @@ for more info about this command see msdn documentation - The buffer start with D3DHAL_DP2COMMAND struct afer that follows either one struct or + The buffer start with D3DHAL_DP2COMMAND struct afer that follows either one struct or no struct at at all example for command D3DDP2OP_VIEWPORTINFO Modified: branches/reactx/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/rosdraw.h [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/rosdraw.h [iso-8859-1] Wed Oct 28 14:23:03 2009 @@ -1,14 +1,8 @@ #ifndef __DDRAW_PRIVATE #define __DDRAW_PRIVATE -#define WIN32_NO_STATUS -#define NTOS_MODE_USER - /********* Includes *********/ #include <windows.h> -#include <ndk/ntndk.h> - - #include <stdio.h> #include <ddraw.h> #include <ddrawi.h>

1 0

[fireball] 43809: [fastfat_new] - Implement overwrite/supersede operations on an existing FCB, no on-disk writing yet.
by fireball＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: fireball Date: Wed Oct 28 12:29:34 2009 New Revision: 43809 URL: http://svn.reactos.org/svn/reactos?rev=43809&view=rev Log: [fastfat_new] - Implement overwrite/supersede operations on an existing FCB, no on-disk writing yet. Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h trunk/reactos/drivers/filesystems/fastfat_new/fcb.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Wed Oct 28 12:29:34 2009 @@ -115,6 +115,113 @@ /* Return status */ return Error; +} + +IO_STATUS_BLOCK +NTAPI +FatiOverwriteFile(PFAT_IRP_CONTEXT IrpContext, + PFILE_OBJECT FileObject, + PFCB Fcb, + ULONG AllocationSize, + PFILE_FULL_EA_INFORMATION EaBuffer, + ULONG EaLength, + UCHAR FileAttributes, + ULONG CreateDisposition, + BOOLEAN NoEaKnowledge) +{ + IO_STATUS_BLOCK Iosb = {{0}}; + PCCB Ccb; + LARGE_INTEGER Zero; + ULONG NotifyFilter; + + Zero.QuadPart = 0; + + /* Check Ea mismatch first */ + if (NoEaKnowledge && EaLength > 0) + { + Iosb.Status = STATUS_ACCESS_DENIED; + return Iosb; + } + + do + { + /* Check if it's not still mapped */ + if (!MmCanFileBeTruncated(&Fcb->SectionObjectPointers, + &Zero)) + { + /* Fail */ + Iosb.Status = STATUS_USER_MAPPED_FILE; + break; + } + + /* Set file object pointers */ + Ccb = FatCreateCcb(); + FatSetFileObject(FileObject, + UserFileOpen, + Fcb, + Ccb); + + FileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; + + /* Indicate that create is in progress */ + Fcb->Vcb->State |= VCB_STATE_CREATE_IN_PROGRESS; + + /* Purge the cache section */ + CcPurgeCacheSection(&Fcb->SectionObjectPointers, NULL, 0, FALSE); + + /* Add Eas */ + if (EaLength > 0) + { + ASSERT(FALSE); + } + + /* Acquire the paging resource */ + (VOID)ExAcquireResourceExclusiveLite(Fcb->Header.PagingIoResource, TRUE); + + /* Initialize FCB header */ + Fcb->Header.FileSize.QuadPart = 0; + Fcb->Header.ValidDataLength.QuadPart = 0; + + /* Let CC know about changed file size */ + CcSetFileSizes(FileObject, (PCC_FILE_SIZES)&Fcb->Header.AllocationSize); + + // TODO: Actually truncate the file + DPRINT1("TODO: Actually truncate the file with a fullfat handle %x\n", Fcb->FatHandle); + + /* Release the paging resource */ + ExReleaseResourceLite(Fcb->Header.PagingIoResource); + + /* Specify truncate on close */ + Fcb->State |= FCB_STATE_TRUNCATE_ON_CLOSE; + + // TODO: Delete previous EA if needed + + /* Send notification about changes */ + NotifyFilter = FILE_NOTIFY_CHANGE_LAST_WRITE | + FILE_NOTIFY_CHANGE_ATTRIBUTES | + FILE_NOTIFY_CHANGE_SIZE; + + FsRtlNotifyFullReportChange(Fcb->Vcb->NotifySync, + &Fcb->Vcb->NotifyList, + (PSTRING)&Fcb->FullFileName, + Fcb->FullFileName.Length - Fcb->FileNameLength, + NULL, + NULL, + NotifyFilter, + FILE_ACTION_MODIFIED, + NULL); + + /* Set success status */ + Iosb.Status = STATUS_SUCCESS; + + /* Set correct information code */ + Iosb.Information = (CreateDisposition == FILE_SUPERSEDE) ? FILE_SUPERSEDED : FILE_OVERWRITTEN; + } while (0); + + /* Remove the create in progress flag */ + ClearFlag(Fcb->Vcb->State, VCB_STATE_CREATE_IN_PROGRESS); + + return Iosb; } IO_STATUS_BLOCK Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Wed Oct 28 12:29:34 2009 @@ -94,6 +94,18 @@ IN BOOLEAN DeleteOnClose); /* -------------------------------------------------------- create.c */ + +IO_STATUS_BLOCK +NTAPI +FatiOverwriteFile(PFAT_IRP_CONTEXT IrpContext, + PFILE_OBJECT FileObject, + PFCB Fcb, + ULONG AllocationSize, + PFILE_FULL_EA_INFORMATION EaBuffer, + ULONG EaLength, + UCHAR FileAttributes, + ULONG CreateDisposition, + BOOLEAN NoEaKnowledge); NTSTATUS NTAPI FatCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Wed Oct 28 12:29:34 2009 @@ -248,10 +248,11 @@ FcbNeedsToBeVerified } FCB_CONDITION; -#define FCB_STATE_HAS_NAMES 0x01 -#define FCB_STATE_HAS_UNICODE_NAME 0x02 -#define FCB_STATE_PAGEFILE 0x04 -#define FCB_STATE_DELAY_CLOSE 0x08 +#define FCB_STATE_HAS_NAMES 0x01 +#define FCB_STATE_HAS_UNICODE_NAME 0x02 +#define FCB_STATE_PAGEFILE 0x04 +#define FCB_STATE_DELAY_CLOSE 0x08 +#define FCB_STATE_TRUNCATE_ON_CLOSE 0x10 typedef struct _FCB { Modified: trunk/reactos/drivers/filesystems/fastfat_new/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] Wed Oct 28 12:29:34 2009 @@ -195,7 +195,7 @@ BOOLEAN Hidden; BOOLEAN System; PCCB Ccb = NULL; - NTSTATUS Status; + NTSTATUS Status, StatusPrev; /* Acquire exclusive FCB lock */ (VOID)FatAcquireExclusiveFcb(IrpContext, Fcb); @@ -383,8 +383,27 @@ (CreateDisposition == FILE_OVERWRITE) || (CreateDisposition == FILE_OVERWRITE_IF)) { - UNIMPLEMENTED; - ASSERT(FALSE); + /* Remember previous status */ + StatusPrev = Iosb.Status; + + // TODO: Check system security access + + /* Perform overwrite operation */ + Iosb = FatiOverwriteFile(IrpContext, + FileObject, + Fcb, + AllocationSize, + EaBuffer, + EaLength, + FileAttributes, + CreateDisposition, + NoEaKnowledge); + + /* Restore previous status in case of success */ + if (Iosb.Status == STATUS_SUCCESS) + Iosb.Status = StatusPrev; + + /* Fall down to completion */ } else {

1 0

[cwittich] 43808: sync widl to wine 1.1.32
by cwittich＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: cwittich Date: Wed Oct 28 12:28:26 2009 New Revision: 43808 URL: http://svn.reactos.org/svn/reactos?rev=43808&view=rev Log: sync widl to wine 1.1.32 Modified: trunk/reactos/tools/widl/hash.c trunk/reactos/tools/widl/typegen.c Modified: trunk/reactos/tools/widl/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/hash.c?rev=4380… ============================================================================== --- trunk/reactos/tools/widl/hash.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/hash.c [iso-8859-1] Wed Oct 28 12:28:26 2009 @@ -636,4 +636,4 @@ nLoWord = (nLoWord % 65599) & 0xffff; return nHiWord | nLoWord; -} +} Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=4… ============================================================================== --- trunk/reactos/tools/widl/typegen.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Wed Oct 28 12:28:26 2009 @@ -482,7 +482,7 @@ /* ref pointers cannot just be block copied. unique pointers to * interfaces need special treatment. either case means the array is * complex */ - if (get_pointer_fc(elem_type, NULL, FALSE) == RPC_FC_RP) + if (get_pointer_fc(elem_type, NULL, FALSE) == RPC_FC_RP || pointer_size != 4) fc = RPC_FC_BOGUS_ARRAY; break; case TGT_BASIC: @@ -529,8 +529,7 @@ case TGT_POINTER: return TRUE; case TGT_ARRAY: - /* FIXME: array can be pointer */ - return type_has_pointers(type_array_get_element(type)); + return type_array_is_decl_as_ptr(type) || type_has_pointers(type_array_get_element(type)); case TGT_STRUCT: { var_list_t *fields = type_struct_get_fields(type); @@ -1574,6 +1573,30 @@ error("Unsupported member type %d\n", type_get_type(type)); } +static void write_array_element_type(FILE *file, const type_t *type, + int cont_is_complex, unsigned int *tfsoff) +{ + type_t *elem = type_array_get_element(type); + + if (!is_embedded_complex(elem) && is_ptr(elem)) + { + type_t *ref = type_pointer_get_ref(elem); + + if (processed(ref)) + { + write_nonsimple_pointer(file, NULL, elem, FALSE, ref->typestring_offset, tfsoff); + return; + } + if (!is_string_type(NULL, elem) && + (type_get_type(ref) == TYPE_BASIC || type_get_type(ref) == TYPE_ENUM)) + { + *tfsoff += write_simple_pointer(file, NULL, elem, FALSE); + return; + } + } + return write_member_type(file, type, cont_is_complex, NULL, elem, NULL, tfsoff); +} + static void write_end(FILE *file, unsigned int *tfsoff) { if (*tfsoff % 2 == 0) @@ -1615,7 +1638,7 @@ } } -static int write_no_repeat_pointer_descriptions( +static int write_pointer_description_offsets( FILE *file, const attr_list_t *attrs, type_t *type, unsigned int *offset_in_memory, unsigned int *offset_in_buffer, unsigned int *typestring_offset) @@ -1623,25 +1646,39 @@ int written = 0; unsigned int align; - if (is_ptr(type) || - (is_conformant_array(type) && type_array_is_decl_as_ptr(type))) - { - unsigned int memsize; - - print_file(file, 2, "0x%02x, /* FC_NO_REPEAT */\n", RPC_FC_NO_REPEAT); - print_file(file, 2, "0x%02x, /* FC_PAD */\n", RPC_FC_PAD); - - /* pointer instance */ - print_file(file, 2, "NdrFcShort(0x%hx),\t/* Memory offset = %d */\n", *offset_in_memory, *offset_in_memory); - print_file(file, 2, "NdrFcShort(0x%hx),\t/* Buffer offset = %d */\n", *offset_in_buffer, *offset_in_buffer); - *typestring_offset += 6; + if ((is_ptr(type) && type_get_type(type_pointer_get_ref(type)) != TYPE_INTERFACE) || + (is_array(type) && type_array_is_decl_as_ptr(type))) + { + if (offset_in_memory && offset_in_buffer) + { + unsigned int memsize; + + /* pointer instance */ + /* FIXME: sometimes from end of structure, sometimes from beginning */ + print_file(file, 2, "NdrFcShort(0x%hx),\t/* Memory offset = %d */\n", *offset_in_memory, *offset_in_memory); + print_file(file, 2, "NdrFcShort(0x%hx),\t/* Buffer offset = %d */\n", *offset_in_buffer, *offset_in_buffer); + + align = 0; + memsize = type_memsize(type, &align); + *offset_in_memory += memsize; + /* increment these separately as in the case of conformant (varying) + * structures these start at different values */ + *offset_in_buffer += memsize; + } + *typestring_offset += 4; if (is_ptr(type)) { + type_t *ref = type_pointer_get_ref(type); + if (is_string_type(attrs, type)) write_string_tfs(file, attrs, type, FALSE, NULL, typestring_offset); + else if (processed(ref)) + write_nonsimple_pointer(file, attrs, type, FALSE, ref->typestring_offset, typestring_offset); + else if (type_get_type(ref) == TYPE_BASIC || type_get_type(ref) == TYPE_ENUM) + *typestring_offset += write_simple_pointer(file, attrs, type, FALSE); else - write_pointer_tfs(file, attrs, type, FALSE, typestring_offset); + error("write_pointer_description_offsets: type format string unknown\n"); } else { @@ -1653,14 +1690,69 @@ write_nonsimple_pointer(file, attrs, type, FALSE, offset, typestring_offset); } - align = 0; - memsize = type_memsize(type, &align); - *offset_in_memory += memsize; - /* increment these separately as in the case of conformant (varying) - * structures these start at different values */ - *offset_in_buffer += memsize; - return 1; + } + + if (is_array(type)) + { + return write_pointer_description_offsets( + file, attrs, type_array_get_element(type), offset_in_memory, + offset_in_buffer, typestring_offset); + } + else if (is_non_complex_struct(type)) + { + /* otherwise search for interesting fields to parse */ + const var_t *v; + LIST_FOR_EACH_ENTRY( v, type_struct_get_fields(type), const var_t, entry ) + { + if (offset_in_memory && offset_in_buffer) + { + unsigned int padding; + align = 0; + type_memsize(v->type, &align); + padding = ROUNDING(*offset_in_memory, align); + *offset_in_memory += padding; + *offset_in_buffer += padding; + } + written += write_pointer_description_offsets( + file, v->attrs, v->type, offset_in_memory, offset_in_buffer, + typestring_offset); + } + } + else + { + if (offset_in_memory && offset_in_buffer) + { + unsigned int memsize; + align = 0; + memsize = type_memsize(type, &align); + *offset_in_memory += memsize; + /* increment these separately as in the case of conformant (varying) + * structures these start at different values */ + *offset_in_buffer += memsize; + } + } + + return written; +} + +static int write_no_repeat_pointer_descriptions( + FILE *file, const attr_list_t *attrs, type_t *type, + unsigned int *offset_in_memory, unsigned int *offset_in_buffer, + unsigned int *typestring_offset) +{ + int written = 0; + unsigned int align; + + if (is_ptr(type) || + (is_conformant_array(type) && type_array_is_decl_as_ptr(type))) + { + print_file(file, 2, "0x%02x, /* FC_NO_REPEAT */\n", RPC_FC_NO_REPEAT); + print_file(file, 2, "0x%02x, /* FC_PAD */\n", RPC_FC_PAD); + *typestring_offset += 2; + + return write_pointer_description_offsets(file, attrs, type, + offset_in_memory, offset_in_buffer, typestring_offset); } if (is_non_complex_struct(type)) @@ -1696,89 +1788,6 @@ return written; } -static int write_pointer_description_offsets( - FILE *file, const attr_list_t *attrs, type_t *type, - unsigned int *offset_in_memory, unsigned int *offset_in_buffer, - unsigned int *typestring_offset) -{ - int written = 0; - unsigned int align; - - if (is_ptr(type) && type_get_type(type_pointer_get_ref(type)) != TYPE_INTERFACE) - { - type_t *ref = type_pointer_get_ref(type); - - if (offset_in_memory && offset_in_buffer) - { - unsigned int memsize; - - /* pointer instance */ - /* FIXME: sometimes from end of structure, sometimes from beginning */ - print_file(file, 2, "NdrFcShort(0x%hx),\t/* Memory offset = %d */\n", *offset_in_memory, *offset_in_memory); - print_file(file, 2, "NdrFcShort(0x%hx),\t/* Buffer offset = %d */\n", *offset_in_buffer, *offset_in_buffer); - - align = 0; - memsize = type_memsize(type, &align); - *offset_in_memory += memsize; - /* increment these separately as in the case of conformant (varying) - * structures these start at different values */ - *offset_in_buffer += memsize; - } - *typestring_offset += 4; - - if (is_string_type(attrs, type)) - write_string_tfs(file, attrs, type, FALSE, NULL, typestring_offset); - else if (processed(ref) || type_get_type(ref) == TYPE_BASIC || type_get_type(ref) == TYPE_ENUM) - write_pointer_tfs(file, attrs, type, FALSE, typestring_offset); - else - error("write_pointer_description_offsets: type format string unknown\n"); - - return 1; - } - - if (is_array(type)) - { - return write_pointer_description_offsets( - file, attrs, type_array_get_element(type), offset_in_memory, - offset_in_buffer, typestring_offset); - } - else if (is_non_complex_struct(type)) - { - /* otherwise search for interesting fields to parse */ - const var_t *v; - LIST_FOR_EACH_ENTRY( v, type_struct_get_fields(type), const var_t, entry ) - { - if (offset_in_memory && offset_in_buffer) - { - unsigned int padding; - align = 0; - type_memsize(v->type, &align); - padding = ROUNDING(*offset_in_memory, align); - *offset_in_memory += padding; - *offset_in_buffer += padding; - } - written += write_pointer_description_offsets( - file, v->attrs, v->type, offset_in_memory, offset_in_buffer, - typestring_offset); - } - } - else - { - if (offset_in_memory && offset_in_buffer) - { - unsigned int memsize; - align = 0; - memsize = type_memsize(type, &align); - *offset_in_memory += memsize; - /* increment these separately as in the case of conformant (varying) - * structures these start at different values */ - *offset_in_buffer += memsize; - } - } - - return written; -} - /* Note: if file is NULL return value is number of pointers to write, else * it is the number of type format characters written */ static int write_fixed_array_pointer_descriptions( @@ -1935,7 +1944,7 @@ *typestring_offset += 8; pointer_count = write_pointer_description_offsets( - file, attrs, type, offset_in_memory, + file, attrs, type_array_get_element(type), offset_in_memory, offset_in_buffer, typestring_offset); } } @@ -2228,7 +2237,7 @@ *typestring_offset += 1; } - write_member_type(file, type, FALSE, NULL, type_array_get_element(type), NULL, typestring_offset); + write_array_element_type(file, type, FALSE, typestring_offset); write_end(file, typestring_offset); } else @@ -2242,7 +2251,8 @@ *typestring_offset += write_conf_or_var_desc(file, current_structure, baseoff, type, length_is); - write_member_type(file, type, TRUE, NULL, type_array_get_element(type), NULL, typestring_offset); + + write_array_element_type(file, type, TRUE, typestring_offset); write_end(file, typestring_offset); } @@ -4053,7 +4063,7 @@ fprintf( file, "#undef RpcAbnormalTermination\n"); fprintf( file, "\n"); fprintf( file, "struct __exception_frame;\n"); - fprintf( file, "typedef int (*__filter_func)(EXCEPTION_RECORD *, struct __exception_frame *);\n"); + fprintf( file, "typedef int (*__filter_func)(struct __exception_frame *);\n"); fprintf( file, "typedef void (*__finally_func)(struct __exception_frame *);\n"); fprintf( file, "\n"); fprintf( file, "#define __DECL_EXCEPTION_FRAME \\\n"); @@ -4100,7 +4110,7 @@ fprintf( file, " return ExceptionContinueSearch;\n"); fprintf( file, " }\n" ); fprintf( file, " exc_frame->code = record->ExceptionCode;\n"); - fprintf( file, " if (exc_frame->filter_level && exc_frame->filter( record, exc_frame ) == EXCEPTION_EXECUTE_HANDLER)\n" ); + fprintf( file, " if (exc_frame->filter_level && exc_frame->filter( exc_frame ) == EXCEPTION_EXECUTE_HANDLER)\n" ); fprintf( file, " __wine_rtl_unwind( frame, record, __widl_unwind_target );\n"); fprintf( file, " return ExceptionContinueSearch;\n"); fprintf( file, "}\n");

1 0

[janderwald] 43807: Add StringFromIID prototype
by janderwald＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: janderwald Date: Wed Oct 28 12:19:25 2009 New Revision: 43807 URL: http://svn.reactos.org/svn/reactos?rev=43807&view=rev Log: Add StringFromIID prototype Modified: trunk/reactos/include/psdk/objbase.h Modified: trunk/reactos/include/psdk/objbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/objbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/objbase.h [iso-8859-1] Wed Oct 28 12:19:25 2009 @@ -510,6 +510,7 @@ const WCHAR* pwcsTemplateFile; } STGOPTIONS; +HRESULT WINAPI StringFromIID(REFIID rclsid, LPOLESTR *lplpsz); HRESULT WINAPI StgCreateDocfile(LPCOLESTR pwcsName,DWORD grfMode,DWORD reserved,IStorage **ppstgOpen); HRESULT WINAPI StgCreateStorageEx(const WCHAR*,DWORD,DWORD,DWORD,STGOPTIONS*,void*,REFIID,void**); HRESULT WINAPI StgIsStorageFile(LPCOLESTR fn);

1 0

[fireball] 43806: [fastfat_new] - FatCreateCcb takes no parameters, so don't pass any. Spotted by Stefan's msvc.
by fireball＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: fireball Date: Wed Oct 28 11:18:57 2009 New Revision: 43806 URL: http://svn.reactos.org/svn/reactos?rev=43806&view=rev Log: [fastfat_new] - FatCreateCcb takes no parameters, so don't pass any. Spotted by Stefan's msvc. Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c trunk/reactos/drivers/filesystems/fastfat_new/fcb.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Wed Oct 28 11:18:57 2009 @@ -67,7 +67,7 @@ } /* Set file object pointers */ - Ccb = FatCreateCcb(IrpContext); + Ccb = FatCreateCcb(); FatSetFileObject(FileObject, UserDirectoryOpen, Dcb, Ccb); /* Increment counters */ @@ -336,7 +336,7 @@ } /* Set file object pointers */ - Ccb = FatCreateCcb(IrpContext); + Ccb = FatCreateCcb(); FatSetFileObject(FileObject, UserVolumeOpen, Vcb, Ccb); FileObject->SectionObjectPointer = &Vcb->SectionObjectPointers; Modified: trunk/reactos/drivers/filesystems/fastfat_new/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] Wed Oct 28 11:18:57 2009 @@ -367,7 +367,7 @@ } /* Set up file object */ - Ccb = FatCreateCcb(IrpContext); + Ccb = FatCreateCcb(); FatSetFileObject(FileObject, UserFileOpen, Fcb,

1 0

[cwittich] 43805: add ac97 as optional
by cwittich＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: cwittich Date: Wed Oct 28 11:16:17 2009 New Revision: 43805 URL: http://svn.reactos.org/svn/reactos?rev=43805&view=rev Log: add ac97 as optional Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Wed Oct 28 11:16:17 2009 @@ -670,6 +670,8 @@ modules\optional\netkvm2k.inf 6 optional modules\optional\netkvm2k.cat 6 optional modules\optional\netkvm.sys 2 optional +modules\optional\alcxwdm.inf 6 optional +modules\optional\alcxwdm.sys 2 optional modules\optional\mfc42.dll 1 optional modules\optional\mfc42u.dll 1 optional modules\optional\mfc71.dll 1 optional

1 0

[janderwald] 43804: The winner of the 1st ReactOS Logon Sound contest has been elected. It is irc:LoneRifle (alwyn-dot-tan-at-gmail-dot-com) Congratulations - See http://www.reactos.org/forum/viewtopic.php?f=2&t=7339 for more details
by janderwald＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: janderwald Date: Wed Oct 28 10:21:18 2009 New Revision: 43804 URL: http://svn.reactos.org/svn/reactos?rev=43804&view=rev Log: The winner of the 1st ReactOS Logon Sound contest has been elected. It is irc:LoneRifle (alwyn-dot-tan-at-gmail-dot-com) Congratulations - See http://www.reactos.org/forum/viewtopic.php?f=2&t=7339 for more details Modified: trunk/reactos/media/sounds/ReactOS_LogOn.wav Modified: trunk/reactos/media/sounds/ReactOS_LogOn.wav URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/sounds/ReactOS_LogOn… ============================================================================== Binary files - no diff available.

1 0

[jimtabor] 43803: - [User32] Update MenuShowPopup with wine and add menu check for MenuTrackMenu. MenuTrackMenu menu check fixed the first stop with wine menu test.
by jimtabor＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: jimtabor Date: Wed Oct 28 02:43:59 2009 New Revision: 43803 URL: http://svn.reactos.org/svn/reactos?rev=43803&view=rev Log: - [User32] Update MenuShowPopup with wine and add menu check for MenuTrackMenu. MenuTrackMenu menu check fixed the first stop with wine menu test. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Wed Oct 28 02:43:59 2009 @@ -1928,12 +1928,15 @@ * Display a popup menu. */ static BOOL FASTCALL -MenuShowPopup(HWND WndOwner, HMENU Menu, UINT Id, +MenuShowPopup(HWND WndOwner, HMENU Menu, UINT Id, UINT flags, INT X, INT Y, INT XAnchor, INT YAnchor ) { ROSMENUINFO MenuInfo; ROSMENUITEMINFO ItemInfo; UINT Width, Height; + POINT pt; + HMONITOR monitor; + MONITORINFO info; TRACE("owner=%x hmenu=%x id=0x%04x x=0x%04x y=0x%04x xa=0x%04x ya=0x%04x\n", WndOwner, Menu, Id, X, Y, XAnchor, YAnchor); @@ -1967,38 +1970,40 @@ Width = MenuInfo.Width + GetSystemMetrics(SM_CXBORDER); Height = MenuInfo.Height + GetSystemMetrics(SM_CYBORDER); - if (GetSystemMetrics(SM_CXSCREEN ) < X + Width) - { - if (0 != XAnchor && X >= Width - XAnchor) - { - X -= Width - XAnchor; - } - if (GetSystemMetrics(SM_CXSCREEN) < X + Width) - { - X = GetSystemMetrics(SM_CXSCREEN) - Width; - } - } - if (X < 0 ) - { - X = 0; - } - - if (GetSystemMetrics(SM_CYSCREEN) < Y + Height) - { - if (0 != YAnchor && Y >= Height + YAnchor) - { - Y -= Height + YAnchor; - } - if (GetSystemMetrics(SM_CYSCREEN) < Y + Height) - { - Y = GetSystemMetrics(SM_CYSCREEN) - Height; - } - } - if (Y < 0 ) - { - Y = 0; - } - + /* FIXME: should use item rect */ + pt.x = X; + pt.y = Y; + monitor = MonitorFromPoint( pt, MONITOR_DEFAULTTONEAREST ); + info.cbSize = sizeof(info); + GetMonitorInfoW( monitor, &info ); + + if( flags & TPM_RIGHTALIGN ) X -= Width; + if( flags & TPM_CENTERALIGN ) X -= Width / 2; + + if( flags & TPM_BOTTOMALIGN ) Y -= Height; + if( flags & TPM_VCENTERALIGN ) Y -= Height / 2; + + if (X + Width > info.rcWork.right) + { + if ( XAnchor && X >= Width - XAnchor) + X -= Width - XAnchor; + + if ( X + Width > info.rcWork.right) + X = info.rcWork.right - Width; + } + + if ( X < info.rcWork.left ) X = info.rcWork.left; + + if (Y + Height > info.rcWork.bottom) + { + if ( YAnchor && Y >= Height + YAnchor) + Y -= Height + YAnchor; + + if ( Y + Height > info.rcWork.bottom) + Y = info.rcWork.bottom - Height; + } + + if ( Y < info.rcWork.top ) Y = info.rcWork.top; /* NOTE: In Windows, top menu popup is not owned. */ MenuInfo.Wnd = CreateWindowExW(0, POPUPMENU_CLASS_ATOMW, NULL, @@ -2413,7 +2418,7 @@ } } - MenuShowPopup(WndOwner, ItemInfo.hSubMenu, MenuInfo->FocusedItem, + MenuShowPopup(WndOwner, ItemInfo.hSubMenu, MenuInfo->FocusedItem, Flags, Rect.left, Rect.top, Rect.right, Rect.bottom ); if (SelectFirst && MenuGetRosMenuInfo(&SubMenuInfo, ItemInfo.hSubMenu)) { @@ -3389,8 +3394,13 @@ SetCapture(Mt.OwnerWnd); (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, Mt.OwnerWnd); + ERR("MenuTrackMenu 1\n"); while (! fEndMenu) { + PVOID menu = ValidateHandle(Mt.CurrentMenu, VALIDATE_TYPE_MENU); + if (!menu) /* sometimes happens if I do a window manager close */ + break; + /* we have to keep the message in the queue until it's * clear that menu loop is not over yet. */ @@ -3665,6 +3675,7 @@ Mt.TrackFlags &= ~TF_SKIPREMOVE; } } + ERR("MenuTrackMenu 2\n"); (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, NULL); SetCapture(NULL); /* release the capture */ @@ -4787,9 +4798,8 @@ IsMenu( HMENU Menu) { - ROSMENUINFO MenuInfo; - - return MenuGetRosMenuInfo(&MenuInfo, Menu); + if (ValidateHandle(Menu, VALIDATE_TYPE_MENU)) return TRUE; + return FALSE; } @@ -5205,12 +5215,11 @@ SendMessageW(Wnd, WM_INITMENUPOPUP, (WPARAM) Menu, 0); } - if (MenuShowPopup(Wnd, Menu, 0, x, y, 0, 0 )) + if (MenuShowPopup(Wnd, Menu, 0, Flags, x, y, 0, 0 )) { ret = MenuTrackMenu(Menu, Flags | TPM_POPUPMENU, 0, 0, Wnd, Rect); } MenuExitTracking(Wnd); - return ret; }

1 0

[dreimer] 43802: A dozen of Rapps Updates. Thx to Victor Martinez for fixing many dl links..
by dreimer＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: dreimer Date: Wed Oct 28 01:18:45 2009 New Revision: 43802 URL: http://svn.reactos.org/svn/reactos?rev=43802&view=rev Log: A dozen of Rapps Updates. Thx to Victor Martinez for fixing many dl links.. Added: trunk/reactos/base/applications/rapps/rapps/7zip.txt (with props) trunk/reactos/base/applications/rapps/rapps/abyss.txt (with props) trunk/reactos/base/applications/rapps/rapps/scite.txt (with props) Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt trunk/reactos/base/applications/rapps/rapps/firefox3.txt trunk/reactos/base/applications/rapps/rapps/irfanview.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt trunk/reactos/base/applications/rapps/rapps/openttd.txt trunk/reactos/base/applications/rapps/rapps/rosbe.txt trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/winboard.txt Added: trunk/reactos/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/7zip.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -1,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = 7-Zip +Version = 4.65 +Licence = LGPL +Description = Utility to create and open 7zip, zip, tar, rar and other archive files. +Size = 0.9M +Category = 1 +URLSite = http://www.7-zip.org/ +URLDownload = http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z465.exe +CDPath = none + +[Section.0407] +Description = Tool zum Erstellen und Ãffnen von 7zip, zip, tar, rar und andrern Archiven. Propchange: trunk/reactos/base/applications/rapps/rapps/7zip.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abiword.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abiword.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -7,8 +7,8 @@ Description = Word processor. Size = 5.9MB Category = 6 -URLSite = http://www.abiword.org -URLDownload = http://www.abiword.org/downloads/abiword/2.6.4/Windows/abiword-setup-2.6.4.… +URLSite = http://www.abisource.com/ +URLDownload = http://www.abisource.com/downloads/abiword/2.6.4/Windows/abiword-setup-2.6.… CDPath = none [Section.0407] @@ -16,3 +16,6 @@ [Section.0415] Description = Edytor tekstu + +[Section.040a] +Description = Procesador de texto Added: trunk/reactos/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abyss.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/abyss.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -1,0 +1,15 @@ +; UTF-8 + +[Section] +Name = Abyss Web server X1 +Version = 2.6 +Licence = Freeware +Description = Abyss Web Server enables you to host your Web sites on your computer. It supports secure SSL/TLS connections (HTTPS) as well as a wide range of Web technologies. It can also run advanced PHP, Perl, Python, ASP, ASP.NET, and Ruby on Rails Web applications, which can be backed by databases such as MySQL, SQLite, MS SQL Server, MS Access, or Oracle</description> +Size = 0.8M +Category = 5 +URLSite = http://www.aprelium.com/ +URLDownload = http://www.aprelium.com/data/abwsx1.exe +CDPath = none + +[Section.0407] +Description = Abyss Web Server ermöglicht es Webseiten auf Ihrem Computer zu hosten. Er unterstützt sichere SSL/TLS Verbindungen (HTTPS) sowie eine Vielfalt an Web Technologien. Er kann ebenfalls PHP, Perl, Python, ASP, ASP.NET, und Ruby on Rails Web Anwendungen ausführen, welche von Datenbanken, wie MySQL, SQLite, MS SQL Server, MS Access, oder Oracle unterstützt werden können.</description> Propchange: trunk/reactos/base/applications/rapps/rapps/abyss.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -2,7 +2,7 @@ [Section] Name = Mozilla Firefox 3.0 -Version = 3.0.13 +Version = 3.0.15 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. Size = 7.1M Modified: trunk/reactos/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/irfanview.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/irfanview.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -2,7 +2,7 @@ [Section] Name = IrfanView -Version = 4.23 +Version = 4.25 Licence = Freeware (for personal use) Description = Viewer for all kinds of graphics/audio files/video files. Size = 1.3MB Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -2,13 +2,13 @@ [Section] Name = Miranda IM -Version = 0.8.5 +Version = 0.8.9 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. Size = 1.6MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.8.5-unicode.exe +URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.8.9-unicode.exe CDPath = none Modified: trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -2,13 +2,13 @@ [Section] Name = OpenOffice 2.4 -Version = 2.4.2 +Version = 2.4.3 Licence = LGPL Description = THE Open Source Office Suite. Size = 127MB Category = 6 URLSite = http://www.openoffice.org -URLDownload = http://ftp.plusline.de/OpenOffice/stable/2.4.2/OOo_2.4.2_Win32Intel_install… +URLDownload = http://ftp.plusline.de/OpenOffice/stable/2.4.3/OOo_2.4.3_Win32Intel_install… CDPath = none @@ -16,7 +16,7 @@ Description = DIE Open Source Office Suite URLSite = http://de.openoffice.org Size = 114.2MB -URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/de/2.4.2/OOo_2.4.2_Win32… +URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/de/2.4.3/OOo_2.4.3_Win32… [Section.0415] URLSite = http://pl.openoffice.org/ Modified: trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -2,13 +2,13 @@ [Section] Name = OpenOffice 3.0 -Version = 3.1.0 +Version = 3.1.1 Licence = LGPL Description = THE Open Source Office Suite. Size = 134.3MB Category = 6 URLSite = http://www.openoffice.org -URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/stable/3.1.0/OOo_3.1.0_Win32Intel_… +URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/stable/3.1.1/OOo_3.1.1_Win32Intel_… CDPath = none @@ -23,4 +23,4 @@ Description = Otwarty pakiet biurowy URLSite = http://pl.openoffice.org Size = 147.1MB -URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/pl/3.1.0/OOo_3.1.0_Win32… +URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/pl/3.1.1/OOo_3.1.1_Win32… Modified: trunk/reactos/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -2,13 +2,13 @@ [Section] Name = OpenTTD -Version = 0.7.2 +Version = 0.7.3 Licence = GPL v2 Description = Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon. Size = 2.9MB Category = 4 URLSite = http://www.openttd.org -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/openttd/openttd-0.7.2-win32.exe +URLDownload = http://ovh.dl.sourceforge.net/sourceforge/openttd/openttd-0.7.3-windows-win… CDPath = none Modified: trunk/reactos/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -2,13 +2,13 @@ [Section] Name = ReactOS Build Environment -Version = 1.4.4 +Version = 1.4.5 Licence = GPL Description = Allows you to build the ReactOS Source. For more instructions see ReactOS wiki. Size = 14.9MB Category = 7 URLSite = http://reactos.org/wiki/Build_Environment -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.4.4.exe +URLDownload = http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.4.5.exe CDPath = none Added: trunk/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scite.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -1,0 +1,15 @@ +; UTF-8 + +[Section] +Name = SciTE +Version = 2.01 +Licence = Freeware +Description = SciTE is a SCIntilla based Text Editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs. +Size = 0.6M +Category = 7 +URLSite = http://www.scintilla.org/ +URLDownload = http://fastbull.dl.sourceforge.net/sourceforge/scintilla/Sc201.exe +CDPath = none + +[Section.0407] +Description = SciTE ist ein SCIntilla basierter Text Editor. Ursprünglich wurde er erstellt, um Scintilla vorzuführen, wuchs aber zu einem nützlichen Editor mit der Fähigkeit Programme zu erstellen und auszuführen. Propchange: trunk/reactos/base/applications/rapps/rapps/scite.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -2,13 +2,13 @@ [Section] Name = Simple Direct Media Layer (SDL) Mixer -Version = 1.2.8 +Version = 1.2.9 Licence = LGPL Description = Needed for some Open Source Games to run. You need 7-Zip or a similar Utility to extract it. Size = 307kB Category = 14 URLSite = http://www.libsdl.org/projects/SDL_mixer/ -URLDownload = http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.8-win32.zip +URLDownload = http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.9-win32.zip CDPath = none Modified: trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -2,13 +2,13 @@ [Section] Name = Simple Direct Media Layer (SDL) Runtime -Version = 1.2.13 +Version = 1.2.14 Licence = LGPL Description = Needed for many Open Source Games to run. You need 7-Zip or a similar Utility to extract it. Size = 145kB Category = 14 URLSite = http://www.libsdl.org/ -URLDownload = http://www.libsdl.org/release/SDL-1.2.13-win32.zip +URLDownload = http://www.libsdl.org/release/SDL-1.2.14-win32.zip CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -2,26 +2,26 @@ [Section] Name = Mozilla SeaMonkey -Version = 1.1.17 +Version = 1.1.18 Licence = MPL/GPL/LGPL Description = Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need. Size = 12.4MB Category = 5 URLSite = http://www.seamonkey-project.org/ -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.17/seamonkey-1.1.17.en-… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.18/seamonkey-1.1.18.en-… CDPath = none [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 9.0MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.17/contr… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.18/contr… [Section.0407] Description = Mozilla Suite ist lebendig. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. Size = 9.0MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.17/contrib-localized/se… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.18/contrib-localized/se… [Section.0415] Description = Pakiet Mozilla Å¼yje. W zestawie: przeglÄdarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. Size = 12.4MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.17/contr… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.18/contr… Modified: trunk/reactos/base/applications/rapps/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -8,7 +8,7 @@ Size = 5.9MB Category = 4 URLSite = http://www.gnu.org/software/xboard/ -URLDownload = http://ftp.gnu.org/gnu/winboard/winboard-4_2_7b.exe +URLDownload = ftp://ftp.gnu.org/old-gnu/xboard/winboard/winboard-4_2_7b.exe CDPath = none [Section.0407]

1 0

[tkreuzer] 43801: Sync kdcom from amd64 branch
by tkreuzer＠svn.reactos.org 27 Oct '09

27 Oct '09

Author: tkreuzer Date: Wed Oct 28 00:38:56 2009 New Revision: 43801 URL: http://svn.reactos.org/svn/reactos?rev=43801&view=rev Log: Sync kdcom from amd64 branch Modified: trunk/reactos/drivers/base/kddll/kdcom.c trunk/reactos/drivers/base/kddll/kddll.c trunk/reactos/drivers/base/kddll/kddll.rbuild trunk/reactos/drivers/base/kddll/kdserial.c Modified: trunk/reactos/drivers/base/kddll/kdcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kdcom.c… ============================================================================== --- trunk/reactos/drivers/base/kddll/kdcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kdcom.c [iso-8859-1] Wed Oct 28 00:38:56 2009 @@ -216,6 +216,11 @@ /* Wait for the port to be ready */ while ((READ_PORT_UCHAR(ComPortBase + COM_LSR) & LSR_TBE) == 0); + /* This is needed due to subtle timing issues */ + READ_PORT_UCHAR(ComPortBase + COM_MSR); + while ((READ_PORT_UCHAR(ComPortBase + COM_LSR) & LSR_TBE) == 0); + READ_PORT_UCHAR(ComPortBase + COM_MSR); + /* Send the byte */ WRITE_PORT_UCHAR(ComPortBase + COM_DAT, Byte); } @@ -224,6 +229,8 @@ NTAPI KdpPollByte(OUT PBYTE OutByte) { + READ_PORT_UCHAR(ComPortBase + COM_MSR); // Timing + /* Check if data is available */ if ((READ_PORT_UCHAR(ComPortBase + COM_LSR) & LSR_DR)) { Modified: trunk/reactos/drivers/base/kddll/kddll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kddll.c… ============================================================================== --- trunk/reactos/drivers/base/kddll/kddll.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kddll.c [iso-8859-1] Wed Oct 28 00:38:56 2009 @@ -13,6 +13,7 @@ PFNDBGPRNT KdpDbgPrint = NULL; ULONG CurrentPacketId = INITIAL_PACKET_ID | SYNC_PACKET_ID; +ULONG RemotePacketId = 0; /* PRIVATE FUNCTIONS **********************************************************/ @@ -148,24 +149,31 @@ KdStatus = KdpReceiveBuffer(&Packet.PacketType, sizeof(USHORT)); if (KdStatus != KDP_PACKET_RECEIVED) { - /* Didn't receive a PacketType or PacketType is bad. Start over. */ - continue; + /* Didn't receive a PacketType. */ + return KdStatus; + } + + /* Check if we got a resend packet */ + if (Packet.PacketLeader == CONTROL_PACKET_LEADER && + Packet.PacketType == PACKET_TYPE_KD_RESEND) + { + return KDP_PACKET_RESEND; } /* Step 3 - Read ByteCount */ KdStatus = KdpReceiveBuffer(&Packet.ByteCount, sizeof(USHORT)); - if (KdStatus != KDP_PACKET_RECEIVED || Packet.ByteCount > PACKET_MAX_SIZE) - { - /* Didn't receive ByteCount or it's too big. Start over. */ - continue; + if (KdStatus != KDP_PACKET_RECEIVED) + { + /* Didn't receive ByteCount. */ + return KdStatus; } /* Step 4 - Read PacketId */ KdStatus = KdpReceiveBuffer(&Packet.PacketId, sizeof(ULONG)); if (KdStatus != KDP_PACKET_RECEIVED) { - /* Didn't receive PacketId. Start over. */ - continue; + /* Didn't receive PacketId. */ + return KdStatus; } /* @@ -180,8 +188,8 @@ KdStatus = KdpReceiveBuffer(&Packet.Checksum, sizeof(ULONG)); if (KdStatus != KDP_PACKET_RECEIVED) { - /* Didn't receive Checksum. Start over. */ - continue; + /* Didn't receive Checksum. */ + return KdStatus; } /* Step 6 - Handle control packets */ @@ -205,6 +213,7 @@ KDDBGPRINT("KdReceivePacket - got a reset packet\n"); KdpSendControlPacket(PACKET_TYPE_KD_RESET, 0); CurrentPacketId = INITIAL_PACKET_ID; + RemotePacketId = INITIAL_PACKET_ID; /* Fall through */ case PACKET_TYPE_KD_RESEND: @@ -227,43 +236,18 @@ return KDP_PACKET_RECEIVED; } - /* Did we get the right packet type? */ - if (PacketType != Packet.PacketType) - { - /* We received something different, start over */ - KDDBGPRINT("KdReceivePacket - wrong PacketType\n"); - KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); - continue; - } - /* Get size of the message header */ - switch (Packet.PacketType) - { - case PACKET_TYPE_KD_STATE_CHANGE64: - MessageHeader->Length = sizeof(DBGKD_WAIT_STATE_CHANGE64); - break; - - case PACKET_TYPE_KD_STATE_MANIPULATE: - MessageHeader->Length = sizeof(DBGKD_MANIPULATE_STATE64); - break; - - case PACKET_TYPE_KD_DEBUG_IO: - MessageHeader->Length = sizeof(DBGKD_DEBUG_IO); - break; - - default: - KDDBGPRINT("KdReceivePacket - unknown PacketType\n"); - return KDP_PACKET_RESEND; - } - - //KDDBGPRINT("KdReceivePacket - got normal PacketType\n"); - - /* Packet smaller than expected? */ - if (MessageHeader->Length > Packet.ByteCount) + MessageHeader->Length = MessageHeader->MaximumLength; + + /* Packet smaller than expected or too big? */ + if (Packet.ByteCount < MessageHeader->Length || + Packet.ByteCount > PACKET_MAX_SIZE) { KDDBGPRINT("KdReceivePacket - too few data (%d) for type %d\n", Packet.ByteCount, MessageHeader->Length); MessageHeader->Length = Packet.ByteCount; + KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); + continue; } //KDDBGPRINT("KdReceivePacket - got normal PacketType, Buffer = %p\n", MessageHeader->Buffer); @@ -316,6 +300,15 @@ } } + /* We must receive a PACKET_TRAILING_BYTE now */ + KdStatus = KdpReceiveBuffer(&Byte, sizeof(UCHAR)); + if (KdStatus != KDP_PACKET_RECEIVED || Byte != PACKET_TRAILING_BYTE) + { + KDDBGPRINT("KdReceivePacket - wrong trailing byte (0x%x), status 0x%x\n", Byte, KdStatus); + KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); + continue; + } + /* Compare checksum */ if (Packet.Checksum != Checksum) { @@ -325,21 +318,27 @@ continue; } - /* We must receive a PACKET_TRAILING_BYTE now */ - KdStatus = KdpReceiveBuffer(&Byte, sizeof(UCHAR)); - if (KdStatus != KDP_PACKET_RECEIVED || Byte != PACKET_TRAILING_BYTE) - { - KDDBGPRINT("KdReceivePacket - wrong trailing byte (0x%x), status 0x%x\n", Byte, KdStatus); - KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); - continue; - } - /* Acknowledge the received packet */ KdpSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE, Packet.PacketId); - //KDDBGPRINT("KdReceivePacket - all ok\n"); - - return KDP_PACKET_RECEIVED; + /* Check if the received PacketId is ok */ + if (Packet.PacketId != RemotePacketId) + { + /* Continue with next packet */ + continue; + } + + /* Did we get the right packet type? */ + if (PacketType == Packet.PacketType) + { + /* Yes, return success */ + //KDDBGPRINT("KdReceivePacket - all ok\n"); + RemotePacketId ^= 1; + return KDP_PACKET_RECEIVED; + } + + /* We received something different, ignore it. */ + KDDBGPRINT("KdReceivePacket - wrong PacketType\n"); } return KDP_PACKET_RECEIVED; @@ -352,10 +351,11 @@ IN ULONG PacketType, IN PSTRING MessageHeader, IN PSTRING MessageData, - IN OUT PKD_CONTEXT Context) + IN OUT PKD_CONTEXT KdContext) { KD_PACKET Packet; KDP_STATUS KdStatus; + ULONG Retries; /* Initialize a KD_PACKET */ Packet.PacketLeader = PACKET_LEADER; @@ -372,7 +372,9 @@ MessageData->Length); } - for (;;) + Retries = KdContext->KdpDefaultRetries; + + do { /* Set the packet id */ Packet.PacketId = CurrentPacketId; @@ -394,10 +396,10 @@ /* Wait for acknowledge */ KdStatus = KdReceivePacket(PACKET_TYPE_KD_ACKNOWLEDGE, - NULL, - NULL, - 0, - NULL); + NULL, + NULL, + 0, + KdContext); /* Did we succeed? */ if (KdStatus == KDP_PACKET_RECEIVED) @@ -413,9 +415,14 @@ return; } + if (KdStatus == KDP_PACKET_TIMEOUT) + { + Retries--; + } + /* Packet timed out, send it again */ + KDDBGPRINT("KdSendPacket got KdStatus 0x%x\n", KdStatus); } - - return; -} - + while (Retries > 0); +} + Modified: trunk/reactos/drivers/base/kddll/kddll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kddll.r… ============================================================================== --- trunk/reactos/drivers/base/kddll/kddll.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kddll.rbuild [iso-8859-1] Wed Oct 28 00:38:56 2009 @@ -10,6 +10,7 @@ <module name="kdserial" type="staticlibrary"> <include base="kdserial">.</include> + <library>ntoskrnl</library> <file>kdserial.c</file> </module> Modified: trunk/reactos/drivers/base/kddll/kdserial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kdseria… ============================================================================== --- trunk/reactos/drivers/base/kddll/kdserial.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kdserial.c [iso-8859-1] Wed Oct 28 00:38:56 2009 @@ -124,7 +124,7 @@ /* Check for breakin byte */ if (Byte == BREAKIN_PACKET_BYTE) { - KdpDbgPrint("BREAKIN_PACKET_BYTE\n"); + KDDBGPRINT("BREAKIN_PACKET_BYTE\n"); Index = 0; Buffer[0] = Byte; continue; @@ -138,7 +138,7 @@ while (Index < 4); /* Enable the debugger */ -// KdDebuggerNotPresent = FALSE; + KdDebuggerNotPresent = FALSE; SharedUserData->KdDebuggerEnabled |= 0x00000002; /* Return the received packet leader */

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2009