Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 32552: replace a bunch of #if's with GDIDBG_... macros
by tkreuzer＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: tkreuzer Date: Tue Mar 4 00:35:12 2008 New Revision: 32552 URL: http://svn.reactos.org/svn/reactos?rev=3D32552&view=3Drev Log: replace a bunch of #if's with GDIDBG_... macros Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/gdiobj.c?rev=3D32552&r1=3D32551&r2=3D32552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Tue Mar 4 00:35= :12 2008 @@ -304,6 +304,33 @@ = return nFrameCount; } + +#define GDIDBG_TRACECALLER() \ + DPRINT1("-> called from:\n"); \ + KeRosDumpStackFrames(NULL, 20); +#define GDIDBG_TRACEALLOCATOR(index) +// DPRINT1("-> allocated from:\n"); +// KeRosDumpStackFrames(GDIHandleAllocator[index], GDI_STACK_LEVELS); +#define GDIDBG_TRACELOCKER(index) +// DPRINT1("-> locked from:\n"); +// KeRosDumpStackFrames(GDIHandleLocker[index], GDI_STACK_LEVELS); +#define GDIDBG_CAPTUREALLOCATOR(index) \ + CaptureStackBackTace((PVOID*)GDIHandleAllocator[index], GDI_STACK_LEVELS= ); +#define GDIDBG_CAPTURELOCKER(index) \ + CaptureStackBackTace((PVOID*)GDIHandleLocker[index], GDI_STACK_LEVELS); + +#define GDIDBG_DUMPHANDLETABLE() \ + IntDumpHandleTable(GdiHandleTable) + +#else + +#define GDIDBG_TRACECALLER() +#define GDIDBG_TRACEALLOCATOR(index) +#define GDIDBG_TRACELOCKER(index) +#define GDIDBG_CAPTUREALLOCATOR(index) +#define GDIDBG_CAPTURELOCKER(index) +#define GDIDBG_DUMPHANDLETABLE() + #endif /* GDI_DEBUG */ = = @@ -501,9 +528,7 @@ /* unlock the entry */ (void)_InterlockedExchangePointer((PVOID*)&Entry->ProcessId, Curre= ntProcessId); = -#ifdef GDI_DEBUG - CaptureStackBackTace((PVOID*)GDIHandleAllocator[Index], GDI_STACK_= LEVELS); -#endif /* GDI_DEBUG */ + GDIDBG_CAPTUREALLOCATOR(Index); = if(W32Process !=3D NULL) { @@ -540,9 +565,7 @@ ExFreePool(newObject); } DPRINT1("Failed to insert gdi object into the handle table, no handles= left!\n"); -#ifdef GDI_DEBUG - IntDumpHandleTable(GdiHandleTable); -#endif /* GDI_DEBUG */ + GDIDBG_DUMPHANDLETABLE(); } else { @@ -578,10 +601,7 @@ if(GDI_HANDLE_IS_STOCKOBJ(hObj)) { DPRINT1("GDIOBJ_FreeObj() failed, can't delete stock object handle: 0x= %x !!!\n", hObj); -#ifdef GDI_DEBUG - DPRINT1("-> called from:\n"); - KeRosDumpStackFrames(NULL, 20); -#endif + GDIDBG_TRACECALLER(); return FALSE; } = @@ -601,11 +621,8 @@ { DPRINT1("Attempted to free object 0x%x of wrong type (Handle: 0x%x, ex= pected: 0x%x)\n", hObj, HandleType, ExpectedType); -#ifdef GDI_DEBUG - DPRINT1("-> called from:\n"); - KeRosDumpStackFrames(NULL, 20); -#endif - return FALSE; + GDIDBG_TRACECALLER(); + return FALSE; } = Entry =3D GDI_HANDLE_GET_ENTRY(GdiHandleTable, hObj); @@ -669,10 +686,7 @@ * The object is currently locked, so freeing is forbidden! */ DPRINT1("Object->cExclusiveLock =3D %d\n", Object->cExclusiveLock); -#ifdef GDI_DEBUG -// DPRINT1("Locked from:\n"); -// KeRosDumpStackFrames(GDIHandleLocker[GDI_HANDLE_GET_INDEX(hObj)]= , GDI_STACK_LEVELS); -#endif + GDIDBG_TRACELOCKER(GDI_HANDLE_GET_INDEX(hObj)); ASSERT(FALSE); } } @@ -709,12 +723,8 @@ { DPRINT1("Attempted to free foreign handle: 0x%x Owner: 0x%x from C= aller: 0x%x\n", hObj, (ULONG_PTR)PrevProcId & ~0x1, (ULONG_PTR)ProcessId & = ~0x1); } -#ifdef GDI_DEBUG - DPRINT1("-> called from:\n"); - KeRosDumpStackFrames(NULL, 20); -// DPRINT1("Allocated from:\n"); -// KeRosDumpStackFrames(GDIHandleAllocator[GDI_HANDLE_GET_INDEX(hObj)= ], GDI_STACK_LEVELS); -#endif + GDIDBG_TRACECALLER(); + GDIDBG_TRACEALLOCATOR(GDI_HANDLE_GET_INDEX(hObj)); } } = @@ -860,11 +870,8 @@ { DPRINT1("Attempted to lock object 0x%x of wrong type (Handle: 0x%x, = requested: 0x%x)\n", hObj, HandleType, ExpectedType); -#ifdef GDI_DEBUG - KeRosDumpStackFrames(NULL, 20); -// DPRINT1("Allocated from:\n"); -// KeRosDumpStackFrames(GDIHandleAllocator[GDI_HANDLE_GET_INDEX(hOb= j)], GDI_STACK_LEVELS); -#endif + GDIDBG_TRACECALLER(); + GDIDBG_TRACEALLOCATOR(GDI_HANDLE_GET_INDEX(hObj)); return NULL; } = @@ -874,12 +881,9 @@ /* Check for invalid owner. */ if (ProcessId !=3D HandleProcessId && HandleProcessId !=3D NULL) { - DPRINT1("Tried to lock object (0x%p) of wrong owner! ProcessId =3D= %p, HandleProcessId =3D %p\n", hObj, ProcessId, HandleProcessId); -#ifdef GDI_DEBUG - KeRosDumpStackFrames(NULL, 20); -// DPRINT1("Handle allocator:\n"); -// KeRosDumpStackFrames(GDIHandleAllocator[GDI_HANDLE_GET_INDEX(hOb= j)], GDI_STACK_LEVELS); -#endif + DPRINT1("Tried to lock object (0x%p) of wrong owner! ProcessId =3D %= p, HandleProcessId =3D %p\n", hObj, ProcessId, HandleProcessId); + GDIDBG_TRACECALLER(); + GDIDBG_TRACEALLOCATOR(GDI_HANDLE_GET_INDEX(hObj)); return NULL; } = @@ -921,9 +925,7 @@ { Object->Tid =3D Thread; Object->cExclusiveLock =3D 1; -#ifdef GDI_DEBUG - CaptureStackBackTace((PVOID*)GDIHandleLocker[GDI_HANDLE_GET= _INDEX(hObj)], GDI_STACK_LEVELS); -#endif + GDIDBG_CAPTURELOCKER(GDI_HANDLE_GET_INDEX(hObj)) } else {

1 0

[tkreuzer] 32551: fix a wrong typecast
by tkreuzer＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: tkreuzer Date: Tue Mar 4 00:01:28 2008 New Revision: 32551 URL: http://svn.reactos.org/svn/reactos?rev=3D32551&view=3Drev Log: fix a wrong typecast Modified: trunk/reactos/subsystems/win32/win32k/objects/palobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/palobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/palobj.c?rev=3D32551&r1=3D32550&r2=3D32551&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/objects/palobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/palobj.c Tue Mar 4 00:01= :28 2008 @@ -233,7 +233,7 @@ int *mapping; HPALETTE hSysPal =3D NtGdiGetStockObject(DEFAULT_PALETTE); PPALGDI pSysPal =3D PALETTE_LockPalette(hSysPal); - PPALGDI palGDI =3D (PPALGDI) palPtr; + PPALGDI palGDI =3D CONTAINING_RECORD(palPtr,PALGDI,PalObj); /* FIXME - handle pSysPal =3D=3D NULL!!!!!!! */ = COLOR_sysPal =3D pSysPal->IndexedColors;

1 0

[greatlrd] 32550: implemented DdCreateD3DBuffer callbacks and some cleanup
by greatlrd＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: greatlrd Date: Mon Mar 3 21:54:18 2008 New Revision: 32550 URL: http://svn.reactos.org/svn/reactos?rev=3D32550&view=3Drev Log: implemented DdCreateD3DBuffer callbacks and some cleanup Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/= gdientry.c?rev=3D32550&r1=3D32549&r2=3D32550&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Mon Mar 3 21:54:18 2008 @@ -139,7 +139,7 @@ /* Call win32k */ return NtGdiDdLock((HANDLE)Lock->lpDDSurface->hDDSurface, (PDD_LOCKDATA)Lock, - (HANDLE)Lock->lpDDSurface->hDC); + (HANDLE)Lock->lpDDSurface->hDC); } = /* @@ -312,10 +312,10 @@ * we create the size activate this IF when you start doing the optim= ze and please also * take report from user which value they got here */ = -#if 0 +#if 1 { char buffer[1024]; \ - sprintf ( buffer, "Function %s : Optimze max to %d Surface ? (%s:%= d)\n", __FUNCTION__,SurfaceCount,__FILE__,__LINE__ ); + sprintf ( buffer, "Function %s : Optimze max to %d Surface ? (%s:%= d)\n", __FUNCTION__, (int)SurfaceCount,__FILE__,__LINE__ ); OutputDebugStringA(buffer); } #endif @@ -691,7 +691,7 @@ */ = HANDLE phSurfaceVideo[10]; - HANDLE phSurfaceVbi[10]; = + HANDLE phSurfaceVbi[10]; = if (pDvdUpdateVideoPort->dwFlags !=3D DDRAWI_VPORTSTOP) { @@ -729,7 +729,7 @@ { dwNumVBIAutoflip =3D 10; } - memcpy(phSurfaceVbi,pDvdUpdateVideoPort->lplpDDVBISurface,dwNu= mVBIAutoflip*sizeof(HANDLE)); = + memcpy(phSurfaceVbi,pDvdUpdateVideoPort->lplpDDVBISurface,dwNu= mVBIAutoflip*sizeof(HANDLE)); } = } = @@ -761,7 +761,6 @@ return NtGdiDvpGetVideoPortInputFormats(pDvdGetVideoPortInputFormat->l= pVideoPort->hDDVideoPort, (PDD_GETVPORTINPUTFORMATDATA) pDvdGetVideoPortInp= utFormat); } = - /* * @implemented * @@ -786,7 +785,6 @@ return NtGdiDvpGetVideoPortLine(pDvdGetVideoPortOutputFormat->lpVideoP= ort->hDDVideoPort, (PDD_GETVPORTLINEDATA)pDvdGetVideoPortOutputFormat); } = - /* * @implemented * @@ -824,7 +822,7 @@ = if (pDdAlphaBlt->lpDDSrcSurface !=3D 0) { - hDDSrcSurface =3D (HANDLE) pDdAlphaBlt->lpDDSrcSurface->hDDSurface= ; = + hDDSrcSurface =3D (HANDLE) pDdAlphaBlt->lpDDSrcSurface->hDDSurface; } = return NtGdiDdAlphaBlt((HANDLE)pDdAlphaBlt->lpDDDestSurface->hDDSurfac= e, hDDSrcSurface, (PDD_BLTDATA)&pDdAlphaBlt); @@ -841,7 +839,7 @@ { pDdCreateSurfaceEx->ddRVal =3D NtGdiDdCreateSurfaceEx( GetDdHandle(pDd= CreateSurfaceEx->lpDDLcl->lpGbl->hDD), (HANDLE)pDdCreate= SurfaceEx->lpDDSLcl->hDDSurface, = - pDdCreateSurfaceE= x->lpDDSLcl->lpSurfMore->dwSurfaceHandle); = + pDdCreateSurfaceE= x->lpDDSLcl->lpSurfMore->dwSurfaceHandle); return TRUE; } = @@ -857,7 +855,6 @@ return NtGdiDdColorControl( (HANDLE) pDdColorControl->lpDDSurface->hDD= Surface, (PDD_COLORCONTROLDATA) &pDdColorControl); } = - /* * @implemented * @@ -881,9 +878,6 @@ { return NtGdiDdFlipToGDISurface( GetDdHandle(pDdFlipToGDISurface->lpDD-= >hDD), (PDD_FLIPTOGDISURFACEDATA) &pDdFlipToGDISurface); } - - - = /* TODO */ DWORD @@ -896,7 +890,7 @@ = /* FIXME add SEH around this functions */ = - RtlZeroMemory(&pDrvInfoData, sizeof (DDHAL_GETDRIVERINFODATA)); = = + RtlZeroMemory(&pDrvInfoData, sizeof (DDHAL_GETDRIVERINFODATA)); RtlCopyMemory(&pDrvInfoData.guidInfo, &pData->guidInfo, sizeof(GUI= D)); = hDD =3D GetDdHandle(pData->dwContext); @@ -910,15 +904,15 @@ if (IsEqualGUID(&pData->guidInfo, &GUID_VideoPortCallbacks)) { = DDHAL_DDVIDEOPORTCALLBACKS pDvdPort; - DDHAL_DDVIDEOPORTCALLBACKS* pUserDvdPort =3D (DDHAL_DDVIDEOPOR= TCALLBACKS *)pData->lpvData; = + DDHAL_DDVIDEOPORTCALLBACKS* pUserDvdPort =3D (DDHAL_DDVIDEOPOR= TCALLBACKS *)pData->lpvData; = /* Clear internal out buffer and set it up*/ RtlZeroMemory(&pDvdPort, DDVIDEOPORTCALLBACKSSIZE); pDvdPort.dwSize =3D DDVIDEOPORTCALLBACKSSIZE; = - /* set up internal buffer */ = = - pDrvInfoData.lpvData =3D (PVOID)&pDvdPort; = - pDrvInfoData.dwExpectedSize =3D DDVIDEOPORTCALLBACKSSIZE ; = + /* set up internal buffer */ + pDrvInfoData.lpvData =3D (PVOID)&pDvdPort; + pDrvInfoData.dwExpectedSize =3D DDVIDEOPORTCALLBACKSSIZE ; = /* Call win32k */ retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); @@ -1011,19 +1005,19 @@ RtlZeroMemory(&pColorControl, DDCOLORCONTROLCALLBACKSSIZE); pColorControl.dwSize =3D DDCOLORCONTROLCALLBACKSSIZE; = - /* set up internal buffer */ = = - pDrvInfoData.lpvData =3D (PVOID)&pColorControl; = - pDrvInfoData.dwExpectedSize =3D DDCOLORCONTROLCALLBACKSSIZE ; = - = + /* set up internal buffer */ + pDrvInfoData.lpvData =3D (PVOID)&pColorControl; + pDrvInfoData.dwExpectedSize =3D DDCOLORCONTROLCALLBACKSSIZE ; + /* Call win32k */ retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); - = + pData->dwActualSize =3D DDCOLORCONTROLCALLBACKSSIZE; pData->dwFlags =3D pDrvInfoData.dwFlags; = pUserColorControl->dwSize =3D DDCOLORCONTROLCALLBACKSSIZE; pUserColorControl->dwFlags =3D pUserColorControl->dwFlags; - = + if (pColorControl.ColorControl !=3D NULL) { pUserColorControl->ColorControl =3D (LPDDHALCOLORCB_COLORC= ONTROL) DdColorControl; @@ -1042,15 +1036,15 @@ { DDHAL_DDMISCELLANEOUSCALLBACKS pMisc; DDHAL_DDMISCELLANEOUSCALLBACKS* pUserMisc =3D (DDHAL_DDMISCELL= ANEOUSCALLBACKS *)pData->lpvData; - = + /* Clear internal out buffer and set it up*/ RtlZeroMemory(&pMisc, DDMISCELLANEOUSCALLBACKSSIZE); pMisc.dwSize =3D DDMISCELLANEOUSCALLBACKSSIZE; = - /* set up internal buffer */ = = - pDrvInfoData.lpvData =3D (PVOID)&pMisc; = - pDrvInfoData.dwExpectedSize =3D DDMISCELLANEOUSCALLBACKSSIZE ;= = - = + /* set up internal buffer */ + pDrvInfoData.lpvData =3D (PVOID)&pMisc; + pDrvInfoData.dwExpectedSize =3D DDMISCELLANEOUSCALLBACKSSIZE ; + /* Call win32k */ retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); = @@ -1083,9 +1077,9 @@ RtlZeroMemory(&pMisc, DDMISCELLANEOUS2CALLBACKSSIZE); pMisc.dwSize =3D DDMISCELLANEOUS2CALLBACKSSIZE; = - /* set up internal buffer */ = = - pDrvInfoData.lpvData =3D (PVOID)&pMisc; = - pDrvInfoData.dwExpectedSize =3D DDMISCELLANEOUS2CALLBACKSSIZE = ; = + /* set up internal buffer */ + pDrvInfoData.lpvData =3D (PVOID)&pMisc; + pDrvInfoData.dwExpectedSize =3D DDMISCELLANEOUS2CALLBACKSSIZE ; = /* Call win32k */ retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); @@ -1133,9 +1127,9 @@ RtlZeroMemory(&pNtKernel, sizeof(DD_NTCALLBACKS)); pNtKernel.dwSize =3D sizeof(DD_NTCALLBACKS); = - /* set up internal buffer */ = = - pDrvInfoData.lpvData =3D (PVOID)&pNtKernel; = - pDrvInfoData.dwExpectedSize =3D sizeof(DD_NTCALLBACKS) ; = + /* set up internal buffer */ + pDrvInfoData.lpvData =3D (PVOID)&pNtKernel; + pDrvInfoData.dwExpectedSize =3D sizeof(DD_NTCALLBACKS) ; = /* Call win32k */ retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); @@ -1143,11 +1137,11 @@ pData->dwActualSize =3D sizeof(DD_NTCALLBACKS); = pUserNtKernel->dwSize =3D sizeof(DD_NTCALLBACKS); - pUserNtKernel->dwFlags =3D pNtKernel.dwFlags; = + pUserNtKernel->dwFlags =3D pNtKernel.dwFlags; pUserNtKernel->FreeDriverMemory =3D 0; - = + if (pNtKernel.SetExclusiveMode) - { = + { pUserNtKernel->SetExclusiveMode =3D (PDD_SETEXCLUSIVEMODE)= DdSetExclusiveMode; = } = @@ -1161,7 +1155,7 @@ * ReactOS keep this behoir to be compatible with * Windows XP */ - pData->ddRVal =3D retValue; = + pData->ddRVal =3D retValue; } = /* D3D Callbacks version 2 check and setup for DirectX/ ReactX */ @@ -1196,15 +1190,15 @@ else { /* set up internal buffer */ = - pDrvInfoData.dwExpectedSize =3D pData->dwExpectedSize; = + pDrvInfoData.dwExpectedSize =3D pData->dwExpectedSize; pDrvInfoData.lpvData =3D pData->lpvData; = /* We do not cover all callbacks for user mode, they are only = cover by kmode */ retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); = - /* Setup return data */ = + /* Setup return data */ pData->dwActualSize =3D pDrvInfoData.dwActualSize; - pData->lpvData =3D pDrvInfoData.lpvData; = + pData->lpvData =3D pDrvInfoData.lpvData; /* Windows XP never repot back the true return value, = * it only report back if we have a driver or not * ReactOS keep this behoir to be compatible with @@ -1235,10 +1229,9 @@ = return NtGdiD3dContextCreate(GetDdHandle(pdcci->lpDDLcl->hDD), = (HANDLE)pdcci->lpDDSLcl->hDDSurface, - hSurfZ, = - (D3DNTHAL_CONTEXTCREATEI *)pdcci); = -} - + hSurfZ, + (D3DNTHAL_CONTEXTCREATEI *)pdcci); +} = /* * @implemented @@ -1262,24 +1255,73 @@ } = = -/* TODO : finish all fixme */ = +/* + * @implemented + * + * DdCreateD3DBuffer + */ DWORD WINAPI DdCreateD3DBuffer(LPDDHAL_CREATESURFACEDATA pCreateSurface) { - + HANDLE puhSurface =3D 0; + DDRAWI_DDRAWSURFACE_GBL *pSurfGBL; + DDRAWI_DDRAWSURFACE_LCL *pSurfLcl; DD_SURFACE_GLOBAL puSurfaceGlobalData; DD_SURFACE_MORE puSurfaceMoreData; DD_SURFACE_LOCAL puSurfaceLocalData; - = - memset(&puSurfaceGlobalData, 0, sizeof(DD_SURFACE_GLOBAL) ); - memset(&puSurfaceMoreData, 0, sizeof(DD_SURFACE_MORE) ) ; - memset(&puSurfaceLocalData, 0, sizeof(DD_SURFACE_LOCAL) ); - = - /* FIXME convert the struct to right ones and setup for syscall, then = retranslated the info back to pCreateSurface */ - - /* FIXME not supported yet */ - return 0; + DWORD retValue; + + /* Zero all local memory pointer */ + RtlZeroMemory(&puSurfaceGlobalData, sizeof(DD_SURFACE_GLOBAL) ); + RtlZeroMemory(&puSurfaceMoreData, sizeof(DD_SURFACE_MORE) ) ; + RtlZeroMemory(&puSurfaceLocalData, sizeof(DD_SURFACE_LOCAL) ); + + pCreateSurface->dwSCnt =3D 1; + pSurfLcl =3D pCreateSurface->lplpSList[0]; + pSurfGBL =3D pSurfLcl->lpGbl; + + /* Convert DDRAWI_DDRAWSURFACE_GBL to DD_SURFACE_GLOBAL */ + puSurfaceGlobalData.wWidth =3D pSurfGBL->wWidth; + puSurfaceGlobalData.wHeight =3D pSurfGBL->wHeight; + puSurfaceGlobalData.dwLinearSize =3D pSurfGBL->dwLinearSize; + puSurfaceGlobalData.fpVidMem =3D pSurfGBL->fpVidMem; + puSurfaceGlobalData.dwBlockSizeX =3D pSurfGBL->dwBlockSizeX; + puSurfaceGlobalData.dwBlockSizeY =3D pSurfGBL->dwBlockSizeY; + + /* Convert DDRAWI_DDRAWSURFACE_MORE to DD_SURFACE_MORE */ + puSurfaceMoreData.dwSurfaceHandle =3D pSurfLcl->lpSurfMore->dwSurfaceH= andle; + puSurfaceMoreData.ddsCapsEx.dwCaps2 =3D pSurfLcl->lpSurfMore->ddsCapsE= x.dwCaps2; + puSurfaceMoreData.ddsCapsEx.dwCaps3 =3D pSurfLcl->lpSurfMore->ddsCapsE= x.dwCaps3; + puSurfaceMoreData.ddsCapsEx.dwCaps4 =3D pSurfLcl->lpSurfMore->ddsCapsE= x.dwCaps4; + + /* Convert DDRAWI_DDRAWSURFACE_LCL to DD_SURFACE_LOCAL */ + puSurfaceLocalData.dwFlags =3D pSurfLcl->dwFlags; + puSurfaceLocalData.ddsCaps.dwCaps =3D pSurfLcl->ddsCaps.dwCaps; + + /* Call win32k */ + retValue =3D NtGdiDdCreateD3DBuffer( GetDdHandle(pCreateSurface->lpDD-= >hDD), + (HANDLE*)&pSurfLcl->hDDSurface, + pCreateSurface->lpDDSurfaceDesc, + &puSurfaceGlobalData, + &puSurfaceLocalData, + &puSurfaceMoreData, + (DD_CREATESURFACEDATA *) pCreateSur= face, + &puhSurface); + + /* Setup surface handle if we got one back */ + if ( puhSurface !=3D NULL ) + { + pCreateSurface->lplpSList[0]->hDDSurface =3D (ULONG_PTR)puhSurface; + } + + /* Convert DD_SURFACE_GLOBAL to DDRAWI_DDRAWSURFACE_GBL */ + pSurfGBL->dwLinearSize =3D puSurfaceGlobalData.dwLinearSize; + pSurfGBL->fpVidMem =3D puSurfaceGlobalData.fpVidMem; + pSurfGBL->dwBlockSizeX =3D puSurfaceGlobalData.dwBlockSizeX; + pSurfGBL->dwBlockSizeY =3D puSurfaceGlobalData.dwBlockSizeY; + + return retValue; } = /* @@ -1294,6 +1336,7 @@ DWORD retValue =3D 0; if ( pDestroySurface->lpDDSurface->hDDSurface) { + /* Call win32k */ retValue =3D NtGdiDdDestroyD3DBuffer((HANDLE)pDestroySurface->lpDD= Surface->hDDSurface); } =

1 0

[dreimer] 32549: Bug 3113: Czech translation update (radekliska@gmail.com) Bug 3110: some new slovak translations and small patches by Mario Kacmar (kario@szm.sk)
by dreimer＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: dreimer Date: Mon Mar 3 19:14:36 2008 New Revision: 32549 URL: http://svn.reactos.org/svn/reactos?rev=3D32549&view=3Drev Log: Bug 3113: Czech translation update (radekliska(a)gmail.com) Bug 3110: some new slovak translations and small patches by Mario Kacmar (k= ario(a)szm.sk) Added: trunk/reactos/base/applications/charmap/lang/cs-CZ.rc (with props) trunk/reactos/base/applications/logoff/lang/cs-CZ.rc (with props) trunk/reactos/base/applications/mmc/lang/cs-CZ.rc (with props) trunk/reactos/base/applications/mstsc/lang/sk-SK.rc (with props) trunk/reactos/base/setup/usetup/lang/cs-CZ.h (with props) trunk/reactos/boot/freeldr/fdebug/lang/sk-SK.rc (with props) trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc (with props) trunk/reactos/dll/cpl/input/lang/sk-SK.rc (with props) trunk/reactos/dll/cpl/powercfg/lang/sk-SK.rc (with props) trunk/reactos/subsystems/ntvdm/lang/sk-SK.rc (with props) Modified: trunk/reactos/base/applications/cacls/lang/cs-CZ.rc trunk/reactos/base/applications/charmap/rsrc.rc trunk/reactos/base/applications/cmdutils/find/lang/cs-CZ.rc trunk/reactos/base/applications/cmdutils/more/lang/cs-CZ.rc trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc trunk/reactos/base/applications/logoff/rsrc.rc trunk/reactos/base/applications/mmc/rsrc.rc trunk/reactos/base/applications/mstsc/rsrc.rc trunk/reactos/base/applications/notepad/lang/cs-CZ.rc trunk/reactos/base/applications/winhelp/lang/sk-SK.rc trunk/reactos/base/setup/reactos/lang/sk-SK.rc trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/shell/explorer/explorer-sk.rc trunk/reactos/boot/freeldr/fdebug/fdebug.rc trunk/reactos/dll/cpl/appwiz/rsrc.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/cpl/input/rsrc.rc trunk/reactos/dll/cpl/joy/lang/sk-SK.rc trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc trunk/reactos/dll/cpl/powercfg/rsrc.rc trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc trunk/reactos/dll/win32/netid/lang/sk-SK.rc trunk/reactos/dll/win32/newdev/lang/sk-SK.rc trunk/reactos/dll/win32/shdocvw/Bg.rc trunk/reactos/dll/win32/shdocvw/De.rc trunk/reactos/dll/win32/shdocvw/En.rc trunk/reactos/dll/win32/shdocvw/Es.rc trunk/reactos/dll/win32/shdocvw/Fi.rc trunk/reactos/dll/win32/shdocvw/Fr.rc trunk/reactos/dll/win32/shdocvw/Hu.rc trunk/reactos/dll/win32/shdocvw/Ko.rc trunk/reactos/dll/win32/shdocvw/Nl.rc trunk/reactos/dll/win32/shdocvw/No.rc trunk/reactos/dll/win32/shdocvw/Pl.rc trunk/reactos/dll/win32/shdocvw/Pt.rc trunk/reactos/dll/win32/shdocvw/Ru.rc trunk/reactos/dll/win32/shdocvw/Sk.rc trunk/reactos/dll/win32/shdocvw/Uk.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/syssetup.rc trunk/reactos/subsystems/ntvdm/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/cacls/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cac= ls/lang/cs-CZ.rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Added: trunk/reactos/base/applications/charmap/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cha= rmap/lang/cs-CZ.rc?rev=3D32549&view=3Dauto Modified: trunk/reactos/base/applications/charmap/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cha= rmap/rsrc.rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/base/applications/cmdutils/find/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmd= utils/find/lang/cs-CZ.rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/base/applications/cmdutils/more/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmd= utils/more/lang/cs-CZ.rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/gam= es/solitaire/lang/cs-CZ.rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Added: trunk/reactos/base/applications/logoff/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/log= off/lang/cs-CZ.rc?rev=3D32549&view=3Dauto Modified: trunk/reactos/base/applications/logoff/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/log= off/rsrc.rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Added: trunk/reactos/base/applications/mmc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc= /lang/cs-CZ.rc?rev=3D32549&view=3Dauto Modified: trunk/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc= /rsrc.rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Added: trunk/reactos/base/applications/mstsc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mst= sc/lang/sk-SK.rc?rev=3D32549&view=3Dauto Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mst= sc/rsrc.rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/base/applications/notepad/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/not= epad/lang/cs-CZ.rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/base/applications/winhelp/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/win= help/lang/sk-SK.rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/base/setup/reactos/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/la= ng/sk-SK.rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Added: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/cs-CZ.h?rev=3D32549&view=3Dauto Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/sk-SK.h?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/base/shell/explorer/explorer-sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/e= xplorer-sk.rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/f= debug.rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Added: trunk/reactos/boot/freeldr/fdebug/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/l= ang/sk-SK.rc?rev=3D32549&view=3Dauto Added: trunk/reactos/dll/cpl/appwiz/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/s= k-SK.rc?rev=3D32549&view=3Dauto Modified: trunk/reactos/dll/cpl/appwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rsrc.r= c?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-= SK.rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Added: trunk/reactos/dll/cpl/input/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/sk= -SK.rc?rev=3D32549&view=3Dauto Modified: trunk/reactos/dll/cpl/input/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/rsrc.rc= ?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/cpl/joy/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/sk-S= K.rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/cs= -CZ.rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Added: trunk/reactos/dll/cpl/powercfg/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang= /sk-SK.rc?rev=3D32549&view=3Dauto Modified: trunk/reactos/dll/cpl/powercfg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/rsrc= .rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sk= -SK.rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/win32/netid/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/= sk-SK.rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/win32/newdev/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang= /sk-SK.rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/win32/shdocvw/Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Bg.= rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/win32/shdocvw/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/De.= rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/win32/shdocvw/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/En.= rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/win32/shdocvw/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Es.= rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/win32/shdocvw/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Fi.= rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/win32/shdocvw/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Fr.= rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/win32/shdocvw/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Hu.= rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/win32/shdocvw/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Ko.= rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/win32/shdocvw/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Nl.= rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/win32/shdocvw/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/No.= rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/win32/shdocvw/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Pl.= rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/win32/shdocvw/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Pt.= rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/win32/shdocvw/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Ru.= rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/win32/shdocvw/Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Sk.= rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/win32/shdocvw/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Uk.= rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lan= g/sk-SK.rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/la= ng/sk-SK.rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/sy= ssetup.rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff Added: trunk/reactos/subsystems/ntvdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang= /sk-SK.rc?rev=3D32549&view=3Dauto Modified: trunk/reactos/subsystems/ntvdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/rsrc= .rc?rev=3D32549&r1=3D32548&r2=3D32549&view=3Ddiff

1 0

[dreimer] 32548: Bug 3035: Patch for RosBE that solves improper handling of a path with spaces by roelmessiant@gmail.com
by dreimer＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: dreimer Date: Mon Mar 3 19:07:10 2008 New Revision: 32548 URL: http://svn.reactos.org/svn/reactos?rev=3D32548&view=3Drev Log: Bug 3035: Patch for RosBE that solves improper handling of a path with spac= es by roelmessiant(a)gmail.com Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Roo= t/sSVN.cmd?rev=3D32548&r1=3D32547&r2=3D32548&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd Mon Mar 3 19:07:10 2008 @@ -86,7 +86,7 @@ = :UP2 set /p UP=3D"Please enter 'yes' or 'no': " -if /i "%UP%"=3D=3D"yes" %_ROSBE_BASEDIR%\ssvn update +if /i "%UP%"=3D=3D"yes" "%_ROSBE_BASEDIR%\ssvn" update if /i "%UP%"=3D=3D"no" goto :EOC = :EOC

1 0

[fireball] 32547: - Implement MiShutdownMemoryManager (stops MPW thread and writes all dirty pages to disk). - Move MiShutdownMemoryManager invocation to where it should really happen (before filesystems shutdown). - As a result, MPW doesn't have a chance to flush pages when filesystems are already down. However, 1st assertion as mentioned in bug 2872 still happens. 2nd one is gone. See issue #2872 for more details.
by fireball＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: fireball Date: Mon Mar 3 19:03:04 2008 New Revision: 32547 URL: http://svn.reactos.org/svn/reactos?rev=3D32547&view=3Drev Log: - Implement MiShutdownMemoryManager (stops MPW thread and writes all dirty = pages to disk). - Move MiShutdownMemoryManager invocation to where it should really happen = (before filesystems shutdown). - As a result, MPW doesn't have a chance to flush pages when filesystems ar= e already down. However, 1st assertion as mentioned in bug 2872 still happe= ns. 2nd one is gone. See issue #2872 for more details. Modified: trunk/reactos/ntoskrnl/ex/shutdown.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/mpw.c Modified: trunk/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.= c?rev=3D32547&r1=3D32546&r2=3D32547&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ex/shutdown.c (original) +++ trunk/reactos/ntoskrnl/ex/shutdown.c Mon Mar 3 19:03:04 2008 @@ -167,12 +167,11 @@ } = PspShutdownProcessManager(); - = + CmShutdownSystem(); + MiShutdownMemoryManager(); IoShutdownRegisteredFileSystems(); IoShutdownRegisteredDevices(); - - MiShutdownMemoryManager(); = if (Action =3D=3D ShutdownNoReboot) { Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?= rev=3D32547&r1=3D32546&r2=3D32547&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Mon Mar 3 19:03:04 2008 @@ -57,6 +57,9 @@ PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; MEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptorOrg; extern KMUTANT MmSystemLoadLock; +extern HANDLE MpwThreadHandle; +extern BOOLEAN MpwThreadShouldTerminate; +extern KEVENT MpwThreadEvent; BOOLEAN MiDbgEnableMdDump =3D #ifdef _ARM_ TRUE; @@ -70,7 +73,33 @@ NTAPI MiShutdownMemoryManager(VOID) { - + ULONG PagesWritten; + PETHREAD Thread; + + /* Ask MPW thread to shutdown */ + MpwThreadShouldTerminate =3D TRUE; + KeSetEvent(&MpwThreadEvent, IO_NO_INCREMENT, FALSE); + + /* Wait for it */ + ObReferenceObjectByHandle(MpwThreadHandle, + THREAD_ALL_ACCESS, + PsThreadType, + KernelMode, + (PVOID*)&Thread, + NULL); + + KeWaitForSingleObject(Thread, + Executive, + KernelMode, + FALSE, + NULL); + + ObDereferenceObject(Thread); + + /* Check if there are any dirty pages, and flush them. + There will be no other chance to do this later, since filesystems + are going to be shut down. */ + CcRosFlushDirtyPages(128, &PagesWritten); } = VOID @@ -401,13 +430,10 @@ MmPagedPoolBase =3D (PVOID)PAGE_ROUND_UP((ULONG_PTR)MiNonPagedPoolStar= t + MiNonPagedPoolLength); MmPagedPoolSize =3D MM_PAGED_POOL_SIZE; - = /* Dump kernel memory layout */ MiDbgKernelLayout(); - = /* Initialize the page list */ MmInitializePageList(); - = /* Unmap low memory */ MmDeletePageTable(NULL, 0); = Modified: trunk/reactos/ntoskrnl/mm/mpw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mpw.c?rev= =3D32547&r1=3D32546&r2=3D32547&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/mm/mpw.c (original) +++ trunk/reactos/ntoskrnl/mm/mpw.c Mon Mar 3 19:03:04 2008 @@ -17,10 +17,10 @@ = /* GLOBALS ***************************************************************= ****/ = -static HANDLE MpwThreadHandle; +HANDLE MpwThreadHandle; static CLIENT_ID MpwThreadId; -static KEVENT MpwThreadEvent; -static volatile BOOLEAN MpwThreadShouldTerminate; +KEVENT MpwThreadEvent; +BOOLEAN MpwThreadShouldTerminate; = /* FUNCTIONS *************************************************************= ****/ =

1 0

[cfinck] 32546: Put all the stuff from "ntoskrnl.rbuild" into a new file "ntoskrnl-generic.rbuild", which is then included by "ntoskrnl.rbuild". Simplifies building the kernel as the same stuff is also needed in "ntkrnlmp.rbuild", which now defines CONFIG_SMP and then just includes "ntoskrnl-generic.rbuild". Also added a disabled "ntkrnlmp.rbuild" entry to "ReactOS-generic.rbuild" (disabled, because building the SMP kernel is broken atm)
by cfinck＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: cfinck Date: Sun Mar 2 21:18:17 2008 New Revision: 32546 URL: http://svn.reactos.org/svn/reactos?rev=3D32546&view=3Drev Log: Put all the stuff from "ntoskrnl.rbuild" into a new file "ntoskrnl-generic.= rbuild", which is then included by "ntoskrnl.rbuild". Simplifies building the kernel as the same stuff is also needed in "ntkrnlm= p.rbuild", which now defines CONFIG_SMP and then just includes "ntoskrnl-ge= neric.rbuild". Also added a disabled "ntkrnlmp.rbuild" entry to "ReactOS-generic.rbuild" (= disabled, because building the SMP kernel is broken atm) Added: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild (with props) Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/ntoskrnl/ntkrnlmp.rbuild trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuil= d?rev=3D32546&r1=3D32545&r2=3D32546&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ReactOS-generic.rbuild (original) +++ trunk/reactos/ReactOS-generic.rbuild Sun Mar 2 21:18:17 2008 @@ -58,6 +58,7 @@ </directory> <directory name=3D"ntoskrnl"> <xi:include href=3D"ntoskrnl/ntoskrnl.rbuild" /> +  </directory> <directory name=3D"subsystems"> <xi:include href=3D"subsystems/subsystems.rbuild" /> Modified: trunk/reactos/ntoskrnl/ntkrnlmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntkrnlmp.rbu= ild?rev=3D32546&r1=3D32545&r2=3D32546&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ntkrnlmp.rbuild (original) +++ trunk/reactos/ntoskrnl/ntkrnlmp.rbuild Sun Mar 2 21:18:17 2008 @@ -1,436 +1,7 @@ <?xml version=3D"1.0"?> <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> <module name=3D"ntkrnlmp" type=3D"kernel" installbase=3D"system32" install= name=3D"ntkrnlmp.exe"> - <bootstrap installbase=3D"$(CDOUTPUT)" /> - <importlibrary definition=3D"ntoskrnl.def" /> - -  <define name=3D"CONFIG_SMP" /> = - <define name=3D"_DISABLE_TIDENTS" /> - <define name=3D"__NTOSKRNL__" /> - <define name=3D"_NTOSKRNL_" /> - <define name=3D"_NTSYSTEM_" /> - <define name=3D"__NO_CTYPE_INLINES" /> - <define name=3D"WIN9X_COMPAT_SPINLOCK" /> - <define name=3D"_IN_KERNEL_" /> - <if property=3D"_WINKD_" value=3D"1"> - <define name=3D"_WINKD_" /> - </if> - <if property=3D"_ELF" value=3D"1"> - <define name=3D"_ELF_" /> - </if> - <include base=3D"cmlib">.</include> - <include base=3D"ntoskrnl">include</include> - <include base=3D"ntoskrnl" root=3D"intermediate"></include> - <include base=3D"ntoskrnl" root=3D"intermediate">include</include> - <include base=3D"ntoskrnl" root=3D"intermediate">include/internal</includ= e> - <include base=3D"ReactOS">include/reactos/drivers</include> - <library>csq</library> - <library>hal</library> - <library>pseh</library> - <library>cmlib</library> - <library>rtl</library> - <library>rossym</library> - <library>libcntpr</library> - <library>kdcom</library> - <library>bootvid</library> - <library>wdmguid</library> - <library>ppcmmu</library> - <directory name=3D"include"> - <pch>ntoskrnl.h</pch> - </directory> - <directory name=3D"ke"> - <if property=3D"ARCH" value=3D"i386"> - <directory name=3D"i386"> - <file first=3D"true">boot.S</file> - <file>abios.c</file> - <file>cpu.c</file> - <file>ctxswitch.S</file> - <file>exp.c</file> - <file>irqobj.c</file> - <file>kiinit.c</file> - <file>ldt.c</file> - <file>mtrr.c</file> - <file>patpge.c</file> - <file>systimer.S</file> - <file>thrdini.c</file> - <file>trap.s</file> - <file>usercall_asm.S</file> - <file>usercall.c</file> - <file>v86vdm.c</file> - <file>v86m_sup.S</file> - </directory> - </if> - <if property=3D"ARCH" value=3D"powerpc"> - <directory name=3D"powerpc"> - <file first=3D"true">main_asm.S</file> - <file>cpu.c</file> - <file>exp.c</file> - <file>kiinit.c</file> - <file>ppc_irq.c</file> - <file>stubs.c</file> - <file>systimer.c</file> - <file>thrdini.c</file> - <file>ctxswitch.c</file> - <file>ctxhelp.S</file> - </directory> - </if> - <file>apc.c</file> - <file>balmgr.c</file> - <file>bug.c</file> - <file>clock.c</file> - <file>config.c</file> - <file>devqueue.c</file> - <file>dpc.c</file> - <file>eventobj.c</file> - <file>except.c</file> - <file>freeldr.c</file> - <file>gate.c</file> - <file>gmutex.c</file> - <file>ipi.c</file> - <file>krnlinit.c</file> - <file>mutex.c</file> - <file>procobj.c</file> - <file>profobj.c</file> - <file>queue.c</file> - <file>semphobj.c</file> - <file>spinlock.c</file> - <file>thrdschd.c</file> - <file>thrdobj.c</file> - <file>timerobj.c</file> - <file>wait.c</file> - </directory> - <directory name=3D"cc"> - <file>cacheman.c</file> - <file>copy.c</file> - <file>fs.c</file> - <file>mdl.c</file> - <file>pin.c</file> - <file>view.c</file> - </directory> - <directory name=3D"config"> - <if property=3D"ARCH" value=3D"i386"> - <directory name=3D"i386"> - <file>cmhardwr.c</file> - </directory> - </if> - <if property=3D"ARCH" value=3D"powerpc"> - <directory name=3D"powerpc"> - <file>cmhardwr.c</file> - </directory> - </if> - <file>cmalloc.c</file> - <file>cmapi.c</file> - <file>cmboot.c</file> - <file>cmcheck.c</file> - <file>cmcontrl.c</file> - <file>cmconfig.c</file> - <file>cmdata.c</file> - <file>cmdelay.c</file> - <file>cmindex.c</file> - <file>cminit.c</file> - <file>cmhook.c</file> - <file>cmkcbncb.c</file> - <file>cmkeydel.c</file> - <file>cmlazy.c</file> - <file>cmmapvw.c</file> - <file>cmname.c</file> - <file>cmparse.c</file> - <file>cmse.c</file> - <file>cmsecach.c</file> - <file>cmsysini.c</file> - <file>cmvalue.c</file> - <file>cmvalche.c</file> - <file>cmwraprs.c</file> - <file>ntapi.c</file> - </directory> - <directory name=3D"dbgk"> - <file>dbgkutil.c</file> - <file>dbgkobj.c</file> - </directory> - <directory name=3D"ex" root=3D"intermediate"> - <file>zw.S</file> - </directory> - <directory name=3D"ex"> - <if property=3D"ARCH" value=3D"i386"> - <directory name=3D"i386"> - <file>interlck_asm.S</file> - <file>fastinterlck_asm.S</file> - <file>ioport.S</file> - </directory> - </if> - <if property=3D"ARCH" value=3D"powerpc"> - <directory name=3D"powerpc"> - <file>ioport.s</file> - <file>fastinterlck.c</file> - </directory> - </if> - <file>atom.c</file> - <file>callback.c</file> - <file>dbgctrl.c</file> - <file>efi.c</file> - <file>event.c</file> - <file>evtpair.c</file> - <file>fmutex.c</file> - <file>handle.c</file> - <file>harderr.c</file> - <file>hdlsterm.c</file> - <file>init.c</file> - <file>keyedevt.c</file> - <file>locale.c</file> - <file>lookas.c</file> - <file>mutant.c</file> - <file>pushlock.c</file> - <file>profile.c</file> - <file>resource.c</file> - <file>rundown.c</file> - <file>sem.c</file> - <file>shutdown.c</file> - <file>sysinfo.c</file> - <file>time.c</file> - <file>timer.c</file> - <file>uuid.c</file> - <file>win32k.c</file> - <file>work.c</file> - <file>xipdisp.c</file> - <file>zone.c</file> - </directory> - <directory name=3D"fsrtl"> - <file>dbcsname.c</file> - <file>fastio.c</file> - <file>faulttol.c</file> - <file>filelock.c</file> - <file>filter.c</file> - <file>filtrctx.c</file> - <file>fsfilter.c</file> - <file>fsrtlpc.c</file> - <file>largemcb.c</file> - <file>name.c</file> - <file>notify.c</file> - <file>oplock.c</file> - <file>pnp.c</file> - <file>stackovf.c</file> - <file>tunnel.c</file> - <file>unc.c</file> - </directory> - <directory name=3D"fstub"> - <file>disksup.c</file> - <file>fstubex.c</file> - <file>halstub.c</file> - </directory> - <directory name=3D"inbv"> - <file>inbv.c</file> - </directory> - <directory name=3D"io"> - <directory name=3D"iomgr"> - <file>adapter.c</file> - <file>arcname.c</file> - <file>bootlog.c</file> - <file>controller.c</file> - <file>device.c</file> - <file>deviface.c</file> - <file>driver.c</file> - <file>drvrlist.c</file> - <file>error.c</file> - <file>file.c</file> - <file>iocomp.c</file> - <file>ioevent.c</file> - <file>iofunc.c</file> - <file>iomdl.c</file> - <file>iomgr.c</file> - <file>iorsrce.c</file> - <file>iotimer.c</file> - <file>iowork.c</file> - <file>irp.c</file> - <file>irq.c</file> - <file>rawfs.c</file> - <file>remlock.c</file> - <file>util.c</file> - <file>symlink.c</file> - <file>volume.c</file> - </directory> - <directory name=3D"pnpmgr"> - <file>plugplay.c</file> - <file>pnpdma.c</file> - <file>pnpmgr.c</file> - <file>pnpnotify.c</file> - <file>pnpreport.c</file> - <file>pnproot.c</file> - </directory> - </directory> - <if property=3D"_WINKD_" value=3D"0"> - <directory name=3D"kdbg"> - <if property=3D"ARCH" value=3D"i386"> - <directory name=3D"i386"> - <if property=3D"KDBG" value=3D"1"> - <group> - <file>i386-dis.c</file> - <file>kdb_help.S</file> - <file>longjmp.S</file> - <file>setjmp.S</file> - </group> - </if> - </directory> - </if> - <if property=3D"KDBG" value=3D"1"> - <file>kdb.c</file> - <file>kdb_cli.c</file> - <file>kdb_expr.c</file> - <file>kdb_keyboard.c</file> - <file>kdb_serial.c</file> - <file>kdb_string.c</file> - </if> - <if property=3D"DBG_OR_KDBG" value=3D"true"> - <file>kdb_symbols.c</file> - </if> - </directory> - <directory name=3D"kd"> - <directory name=3D"wrappers"> - <file>bochs.c</file> - <if property=3D"ARCH" value=3D"i386"> - <file>gdbstub.c</file> - </if> - <if property=3D"ARCH" value=3D"powerpc"> - <file>gdbstub_powerpc.c</file> - </if> - <file>kdbg.c</file> - </directory> - <file>kdinit.c</file> - <file>kdio.c</file> - <file>kdmain.c</file> - </directory> - </if> - <if property=3D"_WINKD_" value =3D"1"> - <directory name=3D"kd64"> - <file>kdapi.c</file> - <file>kdbreak.c</file> - <file>kddata.c</file> - <file>kdinit.c</file> - <file>kdlock.c</file> - <file>kdprint.c</file> - <file>kdtrap.c</file> - </directory> - </if> - <directory name=3D"lpc"> - <file>close.c</file> - <file>complete.c</file> - <file>connect.c</file> - <file>create.c</file> - <file>listen.c</file> - <file>port.c</file> - <file>reply.c</file> - <file>send.c</file> - </directory> - <directory name=3D"mm"> - <if property=3D"ARCH" value=3D"i386"> - <directory name=3D"i386"> - <file>page.c</file> - </directory> - </if> - <if property=3D"ARCH" value=3D"powerpc"> - <directory name=3D"powerpc"> - <file>pfault.c</file> - <file>page.c</file> - </directory> - </if> - <file>anonmem.c</file> - <file>aspace.c</file> - <file>balance.c</file> - <file>cont.c</file> - <file>drvlck.c</file> - <file>freelist.c</file> - <file>iospace.c</file> - <file>kmap.c</file> - <file>marea.c</file> - <file>mdlsup.c</file> - <file>mm.c</file> - <file>mminit.c</file> - <file>mpw.c</file> - <file>ncache.c</file> - <file>npool.c</file> - <file>pagefile.c</file> - <file>pageop.c</file> - <file>pager.c</file> - <file>pagfault.c</file> - <file>paging.c</file> - <file>pe.c</file> - <file>physical.c</file> - <file>pool.c</file> - <file>ppool.c</file> - <file>procsup.c</file> - <file>region.c</file> - <file>rmap.c</file> - <file>section.c</file> - <file>sysldr.c</file> - <file>verifier.c</file> - <file>virtual.c</file> - <file>wset.c</file> - <if property=3D"_ELF_" value=3D"1"> - <file>elf32.c</file> - <file>elf64.c</file> - </if> - </directory> - <directory name=3D"ob"> - <file>obdir.c</file> - <file>obinit.c</file> - <file>obhandle.c</file> - <file>obname.c</file> - <file>oblife.c</file> - <file>obref.c</file> - <file>sdcache.c</file> - <file>obsecure.c</file> - <file>oblink.c</file> - <file>obwait.c</file> - </directory> - <directory name=3D"po"> - <file>power.c</file> - <file>events.c</file> - </directory> - <directory name=3D"ps"> - <file>debug.c</file> - <file>job.c</file> - <file>kill.c</file> - <file>psnotify.c</file> - <file>process.c</file> - <file>psmgr.c</file> - <file>query.c</file> - <file>quota.c</file> - <file>security.c</file> - <file>state.c</file> - <file>thread.c</file> - <file>win32.c</file> - </directory> - <directory name=3D"rtl"> - <file>libsupp.c</file> - <file>misc.c</file> - <file>strtok.c</file> - </directory> - <directory name=3D"se"> - <file>access.c</file> - <file>acl.c</file> - <file>audit.c</file> - <file>lsa.c</file> - <file>luid.c</file> - <file>priv.c</file> - <file>sd.c</file> - <file>semgr.c</file> - <file>sid.c</file> - <file>token.c</file> - </directory> - <directory name=3D"vdm"> - <if property=3D"ARCH" value=3D"i386"> - <file>vdmmain.c</file> - <file>vdmexec.c</file> - </if> - </directory> - <directory name=3D"wmi"> - <file>wmi.c</file> - </directory> - <file>bugcodes.mc</file> - <file>ntoskrnl.rc</file> - <linkerflag>-nostartfiles</linkerflag> - <linkerflag>-nostdlib</linkerflag> - <linkerflag>-lgcc</linkerflag> - <linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript> + <xi:include href=3D"ntoskrnl-generic.rbuild" /> </module> Added: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-gen= eric.rbuild?rev=3D32546&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild (added) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Sun Mar 2 21:18:17 2008 @@ -1,0 +1,447 @@ +<?xml version=3D"1.0"?> +<!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> +<group xmlns:xi=3D"http://www.w3.org/2001/XInclude"> + <bootstrap installbase=3D"$(CDOUTPUT)" /> + <importlibrary definition=3D"ntoskrnl_$(ARCH).def" /> + <define name=3D"_DISABLE_TIDENTS" /> + <define name=3D"__NTOSKRNL__" /> + <define name=3D"_NTOSKRNL_" /> + <define name=3D"_NTSYSTEM_" /> + <define name=3D"__NO_CTYPE_INLINES" /> + <define name=3D"WIN9X_COMPAT_SPINLOCK" /> + <define name=3D"_IN_KERNEL_" /> + <if property=3D"_WINKD_" value=3D"1"> + <define name=3D"_WINKD_" /> + </if> + <if property=3D"_ELF" value=3D"1"> + <define name=3D"_ELF_" /> + </if> + <include base=3D"cmlib">.</include> + <include base=3D"ntoskrnl">include</include> + <include base=3D"ntoskrnl" root=3D"intermediate"></include> + <include base=3D"ntoskrnl" root=3D"intermediate">include</include> + <include base=3D"ntoskrnl" root=3D"intermediate">include/internal</includ= e> + <include base=3D"ReactOS">include/reactos/drivers</include> + <library>csq</library> + <library>hal</library> + <library>pseh</library> + <library>cmlib</library> + <library>rtl</library> + <library>rossym</library> + <library>libcntpr</library> + <library>kdcom</library> + <library>bootvid</library> + <library>wdmguid</library> + <directory name=3D"include"> + <pch>ntoskrnl.h</pch> + </directory> + <directory name=3D"ke"> + <if property=3D"ARCH" value=3D"i386"> + <directory name=3D"i386"> + <file first=3D"true">boot.S</file> + <file>abios.c</file> + <file>cpu.c</file> + <file>ctxswitch.S</file> + <file>exp.c</file> + <file>irqobj.c</file> + <file>kiinit.c</file> + <file>ldt.c</file> + <file>mtrr.c</file> + <file>patpge.c</file> + <file>systimer.S</file> + <file>thrdini.c</file> + <file>trap.s</file> + <file>usercall_asm.S</file> + <file>usercall.c</file> + <file>v86vdm.c</file> + <file>v86m_sup.S</file> + </directory> + </if> + <if property=3D"ARCH" value=3D"arm"> + <directory name=3D"arm"> + <file first=3D"true">boot.s</file> + <file>arm_kprintf.c</file> + <file>cpu.c</file> + <file>exp.c</file> + <file>kiinit.c</file> + <file>stubs_asm.s</file> + <file>stubs.c</file> + <file>thrdini.c</file> + </directory> + </if> + <if property=3D"ARCH" value=3D"powerpc"> + <directory name=3D"powerpc"> + <file first=3D"true">main_asm.S</file> + <file>cpu.c</file> + <file>exp.c</file> + <file>kiinit.c</file> + <file>ppc_irq.c</file> + <file>stubs.c</file> + <file>systimer.c</file> + <file>thrdini.c</file> + <file>ctxswitch.c</file> + <file>ctxhelp.S</file> + </directory> + </if> + <file>apc.c</file> + <file>balmgr.c</file> + <file>bug.c</file> + <file>clock.c</file> + <file>config.c</file> + <file>devqueue.c</file> + <file>dpc.c</file> + <file>eventobj.c</file> + <file>except.c</file> + <file>freeldr.c</file> + <file>gate.c</file> + <file>gmutex.c</file> + <file>ipi.c</file> + <file>krnlinit.c</file> + <file>mutex.c</file> + <file>procobj.c</file> + <file>profobj.c</file> + <file>queue.c</file> + <file>semphobj.c</file> + <file>spinlock.c</file> + <file>thrdschd.c</file> + <file>thrdobj.c</file> + <file>timerobj.c</file> + <file>wait.c</file> + </directory> + <directory name=3D"cc"> + <file>cacheman.c</file> + <file>copy.c</file> + <file>fs.c</file> + <file>mdl.c</file> + <file>pin.c</file> + <file>view.c</file> + </directory> + <directory name=3D"config"> + <if property=3D"ARCH" value=3D"i386"> + <directory name=3D"i386"> + <file>cmhardwr.c</file> + </directory> + </if> + <if property=3D"ARCH" value=3D"powerpc"> + <directory name=3D"powerpc"> + <file>cmhardwr.c</file> + </directory> + </if> + <file>cmalloc.c</file> + <file>cmapi.c</file> + <file>cmboot.c</file> + <file>cmcheck.c</file> + <file>cmcontrl.c</file> + <file>cmconfig.c</file> + <file>cmdata.c</file> + <file>cmdelay.c</file> + <file>cmindex.c</file> + <file>cminit.c</file> + <file>cmhook.c</file> + <file>cmkcbncb.c</file> + <file>cmkeydel.c</file> + <file>cmlazy.c</file> + <file>cmmapvw.c</file> + <file>cmname.c</file> + <file>cmparse.c</file> + <file>cmse.c</file> + <file>cmsecach.c</file> + <file>cmsysini.c</file> + <file>cmvalue.c</file> + <file>cmvalche.c</file> + <file>cmwraprs.c</file> + <file>ntapi.c</file> + </directory> + <directory name=3D"dbgk"> + <file>dbgkutil.c</file> + <file>dbgkobj.c</file> + </directory> + <directory name=3D"ex" root=3D"intermediate"> + <file>zw.S</file> + </directory> + <directory name=3D"ex"> + <if property=3D"ARCH" value=3D"i386"> + <directory name=3D"i386"> + <file>interlck_asm.S</file> + <file>fastinterlck_asm.S</file> + <file>ioport.S</file> + </directory> + </if> + <if property=3D"ARCH" value=3D"powerpc"> + <directory name=3D"powerpc"> + <file>ioport.s</file> + <file>fastinterlck.c</file> + </directory> + </if> + <file>atom.c</file> + <file>callback.c</file> + <file>dbgctrl.c</file> + <file>efi.c</file> + <file>event.c</file> + <file>evtpair.c</file> + <file>fmutex.c</file> + <file>handle.c</file> + <file>harderr.c</file> + <file>hdlsterm.c</file> + <file>init.c</file> + <file>keyedevt.c</file> + <file>locale.c</file> + <file>lookas.c</file> + <file>mutant.c</file> + <file>pushlock.c</file> + <file>profile.c</file> + <file>resource.c</file> + <file>rundown.c</file> + <file>sem.c</file> + <file>shutdown.c</file> + <file>sysinfo.c</file> + <file>time.c</file> + <file>timer.c</file> + <file>uuid.c</file> + <file>win32k.c</file> + <file>work.c</file> + <file>xipdisp.c</file> + <file>zone.c</file> + </directory> + <directory name=3D"fsrtl"> + <file>dbcsname.c</file> + <file>fastio.c</file> + <file>faulttol.c</file> + <file>filelock.c</file> + <file>filter.c</file> + <file>filtrctx.c</file> + <file>fsfilter.c</file> + <file>fsrtlpc.c</file> + <file>largemcb.c</file> + <file>name.c</file> + <file>notify.c</file> + <file>oplock.c</file> + <file>pnp.c</file> + <file>stackovf.c</file> + <file>tunnel.c</file> + <file>unc.c</file> + </directory> + <directory name=3D"fstub"> + <file>disksup.c</file> + <file>fstubex.c</file> + <file>halstub.c</file> + </directory> + <directory name=3D"inbv"> + <file>inbv.c</file> + </directory> + <directory name=3D"io"> + <directory name=3D"iomgr"> + <file>adapter.c</file> + <file>arcname.c</file> + <file>bootlog.c</file> + <file>controller.c</file> + <file>device.c</file> + <file>deviface.c</file> + <file>driver.c</file> + <file>drvrlist.c</file> + <file>error.c</file> + <file>file.c</file> + <file>iocomp.c</file> + <file>ioevent.c</file> + <file>iofunc.c</file> + <file>iomdl.c</file> + <file>iomgr.c</file> + <file>iorsrce.c</file> + <file>iotimer.c</file> + <file>iowork.c</file> + <file>irp.c</file> + <file>irq.c</file> + <file>rawfs.c</file> + <file>remlock.c</file> + <file>util.c</file> + <file>symlink.c</file> + <file>volume.c</file> + </directory> + <directory name=3D"pnpmgr"> + <file>plugplay.c</file> + <file>pnpdma.c</file> + <file>pnpmgr.c</file> + <file>pnpnotify.c</file> + <file>pnpreport.c</file> + <file>pnproot.c</file> + </directory> + </directory> + <if property=3D"_WINKD_" value=3D"0"> + <directory name=3D"kdbg"> + <if property=3D"ARCH" value=3D"i386"> + <directory name=3D"i386"> + <if property=3D"KDBG" value=3D"1"> + <group> + <file>i386-dis.c</file> + <file>kdb_help.S</file> + <file>longjmp.S</file> + <file>setjmp.S</file> + </group> + </if> + </directory> + </if> + <if property=3D"KDBG" value=3D"1"> + <file>kdb.c</file> + <file>kdb_cli.c</file> + <file>kdb_expr.c</file> + <file>kdb_keyboard.c</file> + <file>kdb_serial.c</file> + </if> + <if property=3D"DBG_OR_KDBG" value=3D"true"> + <file>kdb_symbols.c</file> + </if> + </directory> + <directory name=3D"kd"> + <directory name=3D"wrappers"> + <file>bochs.c</file> + <if property=3D"ARCH" value=3D"i386"> + <file>gdbstub.c</file> + </if> + <if property=3D"ARCH" value=3D"powerpc"> + <file>gdbstub_powerpc.c</file> + </if> + <file>kdbg.c</file> + </directory> + <file>kdinit.c</file> + <file>kdio.c</file> + <file>kdmain.c</file> + </directory> + </if> + <if property=3D"_WINKD_" value =3D"1"> + <directory name=3D"kd64"> + <file>kdapi.c</file> + <file>kdbreak.c</file> + <file>kddata.c</file> + <file>kdinit.c</file> + <file>kdlock.c</file> + <file>kdprint.c</file> + <file>kdtrap.c</file> + </directory> + </if> + <directory name=3D"lpc"> + <file>close.c</file> + <file>complete.c</file> + <file>connect.c</file> + <file>create.c</file> + <file>listen.c</file> + <file>port.c</file> + <file>reply.c</file> + <file>send.c</file> + </directory> + <directory name=3D"mm"> + <if property=3D"ARCH" value=3D"i386"> + <directory name=3D"i386"> + <file>page.c</file> + </directory> + </if> + <if property=3D"ARCH" value=3D"arm"> + <directory name=3D"arm"> + <file>stubs.c</file> + </directory> + </if> + <if property=3D"ARCH" value=3D"powerpc"> + <directory name=3D"powerpc"> + <file>pfault.c</file> + <file>page.c</file> + </directory> + </if> + <file>anonmem.c</file> + <file>aspace.c</file> + <file>balance.c</file> + <file>cont.c</file> + <file>drvlck.c</file> + <file>freelist.c</file> + <file>iospace.c</file> + <file>kmap.c</file> + <file>marea.c</file> + <file>mdlsup.c</file> + <file>mm.c</file> + <file>mminit.c</file> + <file>mpw.c</file> + <file>ncache.c</file> + <file>npool.c</file> + <file>pagefile.c</file> + <file>pageop.c</file> + <file>pager.c</file> + <file>pagfault.c</file> + <file>paging.c</file> + <file>pe.c</file> + <file>physical.c</file> + <file>pool.c</file> + <file>ppool.c</file> + <file>procsup.c</file> + <file>region.c</file> + <file>rmap.c</file> + <file>section.c</file> + <file>sysldr.c</file> + <file>verifier.c</file> + <file>virtual.c</file> + <file>wset.c</file> + <if property=3D"_ELF_" value=3D"1"> + <file>elf32.c</file> + <file>elf64.c</file> + </if> + </directory> + <directory name=3D"ob"> + <file>obdir.c</file> + <file>obinit.c</file> + <file>obhandle.c</file> + <file>obname.c</file> + <file>oblife.c</file> + <file>obref.c</file> + <file>sdcache.c</file> + <file>obsecure.c</file> + <file>oblink.c</file> + <file>obwait.c</file> + </directory> + <directory name=3D"po"> + <file>power.c</file> + <file>events.c</file> + </directory> + <directory name=3D"ps"> + <file>debug.c</file> + <file>job.c</file> + <file>kill.c</file> + <file>psnotify.c</file> + <file>process.c</file> + <file>psmgr.c</file> + <file>query.c</file> + <file>quota.c</file> + <file>security.c</file> + <file>state.c</file> + <file>thread.c</file> + <file>win32.c</file> + </directory> + <directory name=3D"rtl"> + <file>libsupp.c</file> + <file>misc.c</file> + <file>strtok.c</file> + </directory> + <directory name=3D"se"> + <file>access.c</file> + <file>acl.c</file> + <file>audit.c</file> + <file>lsa.c</file> + <file>luid.c</file> + <file>priv.c</file> + <file>sd.c</file> + <file>semgr.c</file> + <file>sid.c</file> + <file>token.c</file> + </directory> + <directory name=3D"vdm"> + <if property=3D"ARCH" value=3D"i386"> + <file>vdmmain.c</file> + <file>vdmexec.c</file> + </if> + </directory> + <directory name=3D"wmi"> + <file>wmi.c</file> + </directory> + <file>bugcodes.mc</file> + <file>ntoskrnl.rc</file> + <linkerflag>-nostartfiles</linkerflag> + <linkerflag>-nostdlib</linkerflag> + <linkerflag>-lgcc</linkerflag> + <linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript> +</group> Propchange: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbu= ild?rev=3D32546&r1=3D32545&r2=3D32546&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Sun Mar 2 21:18:17 2008 @@ -1,447 +1,5 @@ <?xml version=3D"1.0"?> <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> <module name=3D"ntoskrnl" type=3D"kernel" installbase=3D"system32" install= name=3D"ntoskrnl.exe"> - <bootstrap installbase=3D"$(CDOUTPUT)" /> - <importlibrary definition=3D"ntoskrnl_$(ARCH).def" /> - <define name=3D"_DISABLE_TIDENTS" /> - <define name=3D"__NTOSKRNL__" /> - <define name=3D"_NTOSKRNL_" /> - <define name=3D"_NTSYSTEM_" /> - <define name=3D"__NO_CTYPE_INLINES" /> - <define name=3D"WIN9X_COMPAT_SPINLOCK" /> - <define name=3D"_IN_KERNEL_" /> - <if property=3D"_WINKD_" value=3D"1"> - <define name=3D"_WINKD_" /> - </if> - <if property=3D"_ELF" value=3D"1"> - <define name=3D"_ELF_" /> - </if> - <include base=3D"cmlib">.</include> - <include base=3D"ntoskrnl">include</include> - <include base=3D"ntoskrnl" root=3D"intermediate"></include> - <include base=3D"ntoskrnl" root=3D"intermediate">include</include> - <include base=3D"ntoskrnl" root=3D"intermediate">include/internal</includ= e> - <include base=3D"ReactOS">include/reactos/drivers</include> - <library>csq</library> - <library>hal</library> - <library>pseh</library> - <library>cmlib</library> - <library>rtl</library> - <library>rossym</library> - <library>libcntpr</library> - <library>kdcom</library> - <library>bootvid</library> - <library>wdmguid</library> - <directory name=3D"include"> - <pch>ntoskrnl.h</pch> - </directory> - <directory name=3D"ke"> - <if property=3D"ARCH" value=3D"i386"> - <directory name=3D"i386"> - <file first=3D"true">boot.S</file> - <file>abios.c</file> - <file>cpu.c</file> - <file>ctxswitch.S</file> - <file>exp.c</file> - <file>irqobj.c</file> - <file>kiinit.c</file> - <file>ldt.c</file> - <file>mtrr.c</file> - <file>patpge.c</file> - <file>systimer.S</file> - <file>thrdini.c</file> - <file>trap.s</file> - <file>usercall_asm.S</file> - <file>usercall.c</file> - <file>v86vdm.c</file> - <file>v86m_sup.S</file> - </directory> - </if> - <if property=3D"ARCH" value=3D"arm"> - <directory name=3D"arm"> - <file first=3D"true">boot.s</file> - <file>arm_kprintf.c</file> - <file>cpu.c</file> - <file>exp.c</file> - <file>kiinit.c</file> - <file>stubs_asm.s</file> - <file>stubs.c</file> - <file>thrdini.c</file> - </directory> - </if> - <if property=3D"ARCH" value=3D"powerpc"> - <directory name=3D"powerpc"> - <file first=3D"true">main_asm.S</file> - <file>cpu.c</file> - <file>exp.c</file> - <file>kiinit.c</file> - <file>ppc_irq.c</file> - <file>stubs.c</file> - <file>systimer.c</file> - <file>thrdini.c</file> - <file>ctxswitch.c</file> - <file>ctxhelp.S</file> - </directory> - </if> - <file>apc.c</file> - <file>balmgr.c</file> - <file>bug.c</file> - <file>clock.c</file> - <file>config.c</file> - <file>devqueue.c</file> - <file>dpc.c</file> - <file>eventobj.c</file> - <file>except.c</file> - <file>freeldr.c</file> - <file>gate.c</file> - <file>gmutex.c</file> - <file>ipi.c</file> - <file>krnlinit.c</file> - <file>mutex.c</file> - <file>procobj.c</file> - <file>profobj.c</file> - <file>queue.c</file> - <file>semphobj.c</file> - <file>spinlock.c</file> - <file>thrdschd.c</file> - <file>thrdobj.c</file> - <file>timerobj.c</file> - <file>wait.c</file> - </directory> - <directory name=3D"cc"> - <file>cacheman.c</file> - <file>copy.c</file> - <file>fs.c</file> - <file>mdl.c</file> - <file>pin.c</file> - <file>view.c</file> - </directory> - <directory name=3D"config"> - <if property=3D"ARCH" value=3D"i386"> - <directory name=3D"i386"> - <file>cmhardwr.c</file> - </directory> - </if> - <if property=3D"ARCH" value=3D"powerpc"> - <directory name=3D"powerpc"> - <file>cmhardwr.c</file> - </directory> - </if> - <file>cmalloc.c</file> - <file>cmapi.c</file> - <file>cmboot.c</file> - <file>cmcheck.c</file> - <file>cmcontrl.c</file> - <file>cmconfig.c</file> - <file>cmdata.c</file> - <file>cmdelay.c</file> - <file>cmindex.c</file> - <file>cminit.c</file> - <file>cmhook.c</file> - <file>cmkcbncb.c</file> - <file>cmkeydel.c</file> - <file>cmlazy.c</file> - <file>cmmapvw.c</file> - <file>cmname.c</file> - <file>cmparse.c</file> - <file>cmse.c</file> - <file>cmsecach.c</file> - <file>cmsysini.c</file> - <file>cmvalue.c</file> - <file>cmvalche.c</file> - <file>cmwraprs.c</file> - <file>ntapi.c</file> - </directory> - <directory name=3D"dbgk"> - <file>dbgkutil.c</file> - <file>dbgkobj.c</file> - </directory> - <directory name=3D"ex" root=3D"intermediate"> - <file>zw.S</file> - </directory> - <directory name=3D"ex"> - <if property=3D"ARCH" value=3D"i386"> - <directory name=3D"i386"> - <file>interlck_asm.S</file> - <file>fastinterlck_asm.S</file> - <file>ioport.S</file> - </directory> - </if> - <if property=3D"ARCH" value=3D"powerpc"> - <directory name=3D"powerpc"> - <file>ioport.s</file> - <file>fastinterlck.c</file> - </directory> - </if> - <file>atom.c</file> - <file>callback.c</file> - <file>dbgctrl.c</file> - <file>efi.c</file> - <file>event.c</file> - <file>evtpair.c</file> - <file>fmutex.c</file> - <file>handle.c</file> - <file>harderr.c</file> - <file>hdlsterm.c</file> - <file>init.c</file> - <file>keyedevt.c</file> - <file>locale.c</file> - <file>lookas.c</file> - <file>mutant.c</file> - <file>pushlock.c</file> - <file>profile.c</file> - <file>resource.c</file> - <file>rundown.c</file> - <file>sem.c</file> - <file>shutdown.c</file> - <file>sysinfo.c</file> - <file>time.c</file> - <file>timer.c</file> - <file>uuid.c</file> - <file>win32k.c</file> - <file>work.c</file> - <file>xipdisp.c</file> - <file>zone.c</file> - </directory> - <directory name=3D"fsrtl"> - <file>dbcsname.c</file> - <file>fastio.c</file> - <file>faulttol.c</file> - <file>filelock.c</file> - <file>filter.c</file> - <file>filtrctx.c</file> - <file>fsfilter.c</file> - <file>fsrtlpc.c</file> - <file>largemcb.c</file> - <file>name.c</file> - <file>notify.c</file> - <file>oplock.c</file> - <file>pnp.c</file> - <file>stackovf.c</file> - <file>tunnel.c</file> - <file>unc.c</file> - </directory> - <directory name=3D"fstub"> - <file>disksup.c</file> - <file>fstubex.c</file> - <file>halstub.c</file> - </directory> - <directory name=3D"inbv"> - <file>inbv.c</file> - </directory> - <directory name=3D"io"> - <directory name=3D"iomgr"> - <file>adapter.c</file> - <file>arcname.c</file> - <file>bootlog.c</file> - <file>controller.c</file> - <file>device.c</file> - <file>deviface.c</file> - <file>driver.c</file> - <file>drvrlist.c</file> - <file>error.c</file> - <file>file.c</file> - <file>iocomp.c</file> - <file>ioevent.c</file> - <file>iofunc.c</file> - <file>iomdl.c</file> - <file>iomgr.c</file> - <file>iorsrce.c</file> - <file>iotimer.c</file> - <file>iowork.c</file> - <file>irp.c</file> - <file>irq.c</file> - <file>rawfs.c</file> - <file>remlock.c</file> - <file>util.c</file> - <file>symlink.c</file> - <file>volume.c</file> - </directory> - <directory name=3D"pnpmgr"> - <file>plugplay.c</file> - <file>pnpdma.c</file> - <file>pnpmgr.c</file> - <file>pnpnotify.c</file> - <file>pnpreport.c</file> - <file>pnproot.c</file> - </directory> - </directory> - <if property=3D"_WINKD_" value=3D"0"> - <directory name=3D"kdbg"> - <if property=3D"ARCH" value=3D"i386"> - <directory name=3D"i386"> - <if property=3D"KDBG" value=3D"1"> - <group> - <file>i386-dis.c</file> - <file>kdb_help.S</file> - <file>longjmp.S</file> - <file>setjmp.S</file> - </group> - </if> - </directory> - </if> - <if property=3D"KDBG" value=3D"1"> - <file>kdb.c</file> - <file>kdb_cli.c</file> - <file>kdb_expr.c</file> - <file>kdb_keyboard.c</file> - <file>kdb_serial.c</file> - </if> - <if property=3D"DBG_OR_KDBG" value=3D"true"> - <file>kdb_symbols.c</file> - </if> - </directory> - <directory name=3D"kd"> - <directory name=3D"wrappers"> - <file>bochs.c</file> - <if property=3D"ARCH" value=3D"i386"> - <file>gdbstub.c</file> - </if> - <if property=3D"ARCH" value=3D"powerpc"> - <file>gdbstub_powerpc.c</file> - </if> - <file>kdbg.c</file> - </directory> - <file>kdinit.c</file> - <file>kdio.c</file> - <file>kdmain.c</file> - </directory> - </if> - <if property=3D"_WINKD_" value =3D"1"> - <directory name=3D"kd64"> - <file>kdapi.c</file> - <file>kdbreak.c</file> - <file>kddata.c</file> - <file>kdinit.c</file> - <file>kdlock.c</file> - <file>kdprint.c</file> - <file>kdtrap.c</file> - </directory> - </if> - <directory name=3D"lpc"> - <file>close.c</file> - <file>complete.c</file> - <file>connect.c</file> - <file>create.c</file> - <file>listen.c</file> - <file>port.c</file> - <file>reply.c</file> - <file>send.c</file> - </directory> - <directory name=3D"mm"> - <if property=3D"ARCH" value=3D"i386"> - <directory name=3D"i386"> - <file>page.c</file> - </directory> - </if> - <if property=3D"ARCH" value=3D"arm"> - <directory name=3D"arm"> - <file>stubs.c</file> - </directory> - </if> - <if property=3D"ARCH" value=3D"powerpc"> - <directory name=3D"powerpc"> - <file>pfault.c</file> - <file>page.c</file> - </directory> - </if> - <file>anonmem.c</file> - <file>aspace.c</file> - <file>balance.c</file> - <file>cont.c</file> - <file>drvlck.c</file> - <file>freelist.c</file> - <file>iospace.c</file> - <file>kmap.c</file> - <file>marea.c</file> - <file>mdlsup.c</file> - <file>mm.c</file> - <file>mminit.c</file> - <file>mpw.c</file> - <file>ncache.c</file> - <file>npool.c</file> - <file>pagefile.c</file> - <file>pageop.c</file> - <file>pager.c</file> - <file>pagfault.c</file> - <file>paging.c</file> - <file>pe.c</file> - <file>physical.c</file> - <file>pool.c</file> - <file>ppool.c</file> - <file>procsup.c</file> - <file>region.c</file> - <file>rmap.c</file> - <file>section.c</file> - <file>sysldr.c</file> - <file>verifier.c</file> - <file>virtual.c</file> - <file>wset.c</file> - <if property=3D"_ELF_" value=3D"1"> - <file>elf32.c</file> - <file>elf64.c</file> - </if> - </directory> - <directory name=3D"ob"> - <file>obdir.c</file> - <file>obinit.c</file> - <file>obhandle.c</file> - <file>obname.c</file> - <file>oblife.c</file> - <file>obref.c</file> - <file>sdcache.c</file> - <file>obsecure.c</file> - <file>oblink.c</file> - <file>obwait.c</file> - </directory> - <directory name=3D"po"> - <file>power.c</file> - <file>events.c</file> - </directory> - <directory name=3D"ps"> - <file>debug.c</file> - <file>job.c</file> - <file>kill.c</file> - <file>psnotify.c</file> - <file>process.c</file> - <file>psmgr.c</file> - <file>query.c</file> - <file>quota.c</file> - <file>security.c</file> - <file>state.c</file> - <file>thread.c</file> - <file>win32.c</file> - </directory> - <directory name=3D"rtl"> - <file>libsupp.c</file> - <file>misc.c</file> - <file>strtok.c</file> - </directory> - <directory name=3D"se"> - <file>access.c</file> - <file>acl.c</file> - <file>audit.c</file> - <file>lsa.c</file> - <file>luid.c</file> - <file>priv.c</file> - <file>sd.c</file> - <file>semgr.c</file> - <file>sid.c</file> - <file>token.c</file> - </directory> - <directory name=3D"vdm"> - <if property=3D"ARCH" value=3D"i386"> - <file>vdmmain.c</file> - <file>vdmexec.c</file> - </if> - </directory> - <directory name=3D"wmi"> - <file>wmi.c</file> - </directory> - <file>bugcodes.mc</file> - <file>ntoskrnl.rc</file> - <linkerflag>-nostartfiles</linkerflag> - <linkerflag>-nostdlib</linkerflag> - <linkerflag>-lgcc</linkerflag> - <linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript> + <xi:include href=3D"ntoskrnl-generic.rbuild" /> </module>

1 0

[greatlrd] 32545: Fixed all known issue with DdCreateSurface in gdi32, it works with more that one surface now.
by greatlrd＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: greatlrd Date: Sun Mar 2 19:19:08 2008 New Revision: 32545 URL: http://svn.reactos.org/svn/reactos?rev=3D32545&view=3Drev Log: Fixed all known issue with DdCreateSurface in gdi32, it works with more tha= t one surface now. Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/= gdientry.c?rev=3D32545&r1=3D32544&r2=3D32545&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sun Mar 2 19:19:08 2008 @@ -274,11 +274,11 @@ (PDD_CANCREATESURFACEDATA)CanCreateSurf= ace); } = - - - - -/* TODO : finish all fixme */ = +/* + * @implemented + * + * DdCreateSurface + */ DWORD WINAPI DdCreateSurface(LPDDHAL_CREATESURFACEDATA pCreateSurface) @@ -301,6 +301,24 @@ PHANDLE phSurface =3D NULL, puhSurface =3D NULL; ULONG i; LPDDSURFACEDESC pSurfaceDesc =3D NULL; + + /* TODO : Speed optimze, most games/dx apps/program does not want 1 su= rface, they want lest 2 + * so we need incress the stack so it can contain 2 surface instead of= one, this will incress = + * the speed of the apps when it trying alloc buffer. How to incress t= he surface stack space + * we need create a own struct for DD_SURFACE_LOCAL DdSurfaceLocal, DD= _SURFACE_MORE DdSurfaceMore + * DD_SURFACE_GLOBAL DdSurfaceGlobal. HANDLE hPrevSurface, hSurface. l= ike + * struct { DD_SURFACE_LOCAL DdSurfaceLocal1, DD_SURFACE_LOCAL DdSurfa= ceLocal2 } + * lest so it contain two surface. maybe 4. we need watch what is most= common here before = + * we create the size activate this IF when you start doing the optim= ze and please also + * take report from user which value they got here + */ = +#if 0 + { + char buffer[1024]; \ + sprintf ( buffer, "Function %s : Optimze max to %d Surface ? (%s:%= d)\n", __FUNCTION__,SurfaceCount,__FILE__,__LINE__ ); + OutputDebugStringA(buffer); + } +#endif = /* Check how many surfaces there are */ if (SurfaceCount !=3D 1) @@ -475,12 +493,11 @@ lcl->lpSurfMore->ddsCapsEx.dwCaps3 =3D ptmpDdSurfaceMore->= ddsCapsEx.dwCaps3; lcl->lpSurfMore->ddsCapsEx.dwCaps4 =3D ptmpDdSurfaceMore->= ddsCapsEx.dwCaps4; } - /* FIXME count to next SurfaceCount for - ptmpDdSurfaceGlobal =3D pDdSurfaceGlobal; - ptmpDdSurfaceLocal =3D pDdSurfaceLocal; - ptmpDdSurfaceMore =3D pDdSurfaceMore; - we only support one surface create at moment - */ + + /* count to next SurfaceCount */ + ptmpDdSurfaceGlobal =3D (PDD_SURFACE_GLOBAL) (((PBYTE) ((ULONG= _PTR) ptmpDdSurfaceGlobal)) + sizeof(DD_SURFACE_GLOBAL)); + ptmpDdSurfaceLocal =3D (PDD_SURFACE_LOCAL) (((PBYTE) ((ULONG_P= TR) ptmpDdSurfaceLocal)) + sizeof(DD_SURFACE_LOCAL)); + ptmpDdSurfaceMore =3D (PDD_SURFACE_MORE) (((PBYTE) ((ULONG_PTR= ) ptmpDdSurfaceMore)) + sizeof(DD_SURFACE_MORE)); } } =

1 0

[greatlrd] 32544: small change in DdCreateSurface. now we pass down all usermode surface data to win32k. left todo is translate back all surface data.
by greatlrd＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: greatlrd Date: Sun Mar 2 18:50:11 2008 New Revision: 32544 URL: http://svn.reactos.org/svn/reactos?rev=3D32544&view=3Drev Log: small change in DdCreateSurface. now we pass down all usermode surface dat= a to win32k. left todo is translate back all surface data. = Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/= gdientry.c?rev=3D32544&r1=3D32543&r2=3D32544&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sun Mar 2 18:50:11 2008 @@ -409,13 +409,10 @@ ptmpDdSurfaceMore->dwSurfaceHandle =3D (DWORD) pCreateSurf= ace->lplpSList[i]->dbnOverlayNode.object_int; } = - /* FIXME count to next SurfaceCount for - ptmpDdSurfaceGlobal =3D pDdSurfaceGlobal; - ptmpDdSurfaceLocal =3D pDdSurfaceLocal; - ptmpDdSurfaceMore =3D pDdSurfaceMore; - - we only support one surface create at moment - */ + /* count to next SurfaceCount */ + ptmpDdSurfaceGlobal =3D (PDD_SURFACE_GLOBAL) (((PBYTE) ((ULONG= _PTR) ptmpDdSurfaceGlobal)) + sizeof(DD_SURFACE_GLOBAL)); + ptmpDdSurfaceLocal =3D (PDD_SURFACE_LOCAL) (((PBYTE) ((ULONG_P= TR) ptmpDdSurfaceLocal)) + sizeof(DD_SURFACE_LOCAL)); + ptmpDdSurfaceMore =3D (PDD_SURFACE_MORE) (((PBYTE) ((ULONG_PTR= ) ptmpDdSurfaceMore)) + sizeof(DD_SURFACE_MORE)); } } =

1 0

[greatlrd] 32543: started adding support for more that one surface in DdCreateSurface
by greatlrd＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: greatlrd Date: Sun Mar 2 17:28:54 2008 New Revision: 32543 URL: http://svn.reactos.org/svn/reactos?rev=3D32543&view=3Drev Log: started adding support for more that one surface in DdCreateSurface Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/= gdientry.c?rev=3D32543&r1=3D32542&r2=3D32543&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sun Mar 2 17:28:54 2008 @@ -274,6 +274,10 @@ (PDD_CANCREATESURFACEDATA)CanCreateSurf= ace); } = + + + + /* TODO : finish all fixme */ = DWORD WINAPI @@ -286,7 +290,6 @@ DD_SURFACE_GLOBAL DdSurfaceGlobal; = HANDLE hPrevSurface, hSurface; - = PDD_SURFACE_LOCAL pDdSurfaceLocal =3D NULL; PDD_SURFACE_MORE pDdSurfaceMore =3D NULL; @@ -302,8 +305,40 @@ /* Check how many surfaces there are */ if (SurfaceCount !=3D 1) { - /* We'll have to allocate more data, our stack isn't big enough */ - + /* We got more that one surface so we need alloc memory for them */ + pDdSurfaceLocal =3D (PDD_SURFACE_LOCAL) HeapAlloc(GetProcessHeap()= , HEAP_ZERO_MEMORY, (sizeof(DD_SURFACE_LOCAL) * SurfaceCount )); + pDdSurfaceMore =3D (PDD_SURFACE_MORE) HeapAlloc(GetProcessHeap(), = HEAP_ZERO_MEMORY, (sizeof(DD_SURFACE_MORE) * SurfaceCount )); + pDdSurfaceGlobal =3D (PDD_SURFACE_GLOBAL) HeapAlloc(GetProcessHea= p(), HEAP_ZERO_MEMORY, (sizeof(DD_SURFACE_GLOBAL) * SurfaceCount )); + phSurface =3D HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (sizeo= f(HANDLE) * SurfaceCount )); + puhSurface =3D HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (size= of(HANDLE) * SurfaceCount )); + + /* check if we sueese alloc all memory we need */ + if ((pDdSurfaceLocal =3D=3D NULL) || (pDdSurfaceMore =3D=3D NULL) = || (pDdSurfaceGlobal =3D=3D NULL) || (phSurface =3D=3D NULL) || (puhSurface= =3D=3D NULL)) + { + pCreateSurface->ddRVal =3D DDERR_OUTOFMEMORY; + + if ( pDdSurfaceLocal !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, pDdSurfaceLocal); + } + + if ( pDdSurfaceMore !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, pDdSurfaceMore); + } + + if ( phSurface !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, phSurface); + } + + if ( puhSurface !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, puhSurface); + } + + return DDHAL_DRIVER_HANDLED; + } } else { @@ -455,7 +490,25 @@ /* Check if we have to free all our local allocations */ if (SurfaceCount > 1) { - /* FIXME: */ + if ( pDdSurfaceLocal !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, pDdSurfaceLocal); + } + + if ( pDdSurfaceMore !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, pDdSurfaceMore); + } + + if ( phSurface !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, phSurface); + } + + if ( puhSurface !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, puhSurface); + } } = /* Return */ @@ -1094,9 +1147,7 @@ * ReactOS keep this behoir to be compatible with * Windows XP */ - pData->ddRVal =3D retValue; - = - + pData->ddRVal =3D retValue; = } = /* D3D Callbacks version 2 check and setup for DirectX/ ReactX */

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