Ros-diffs March 2007

ros-diffs@reactos.org

20 participants
287 discussions

[greatlrd] 26159: rewrite old NtGdiDdBlt I wrote so it match with the new caching of Dx pointers. Fixing varius problem in NtGdiDdCreateSurface. But some who the color are not being draw right with DdBlt work in Progress to figout why. But it works now partly yes dx start working. at kmode or syscall for real apps. or if they are using gdi32.dll or d3d8thk.dll

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Mar 23 20:07:49 2007 New Revision: 26159 URL: http://svn.reactos.org/svn/reactos?rev=26159&view=rev Log: rewrite old NtGdiDdBlt I wrote so it match with the new caching of Dx pointers. Fixing varius problem in NtGdiDdCreateSurface. But some who the color are not being draw right with DdBlt work in Progress to figout why. But it works now partly yes dx start working. at kmode or syscall for real apps. or if they are using gdi32.dll or d3d8thk.dll Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c Fri Mar 23 20:07:49 2007 @@ -44,49 +44,98 @@ DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; NTSTATUS Status = FALSE; PDD_DIRECTDRAW pDirectDraw; - HANDLE hsurface; PDD_SURFACE phsurface; PDD_SURFACE_LOCAL pLocal; PDD_SURFACE_MORE pMore; PDD_SURFACE_GLOBAL pGlobal; + DD_CREATESURFACEDATA CreateSurfaceData; + /* FIXME alloc so mayne we need */ - PHANDLE *myhSurface[1]; + PHANDLE *myhSurface; /* GCC4 warnns on value are unisitaed, but they are initated in seh */ - myhSurface[0] = 0; DPRINT1("NtGdiDdCreateSurface\n"); - _SEH_TRY - { - ProbeForRead(hSurface, sizeof(HANDLE), 1); - ProbeForRead(hSurface[0], sizeof(HANDLE), 1); - myhSurface[0] = hSurface[0]; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return ddRVal; - } - - - /* Create a surface */ - hsurface = GDIOBJ_AllocObj(DdHandleTable, GDI_OBJECT_TYPE_DD_SURFACE); - if (!hsurface) - { - return ddRVal; - } - - phsurface = GDIOBJ_LockObj(DdHandleTable, hsurface, GDI_OBJECT_TYPE_DD_SURFACE); + DPRINT1("Copy puCreateSurfaceData to kmode CreateSurfaceData\n"); + _SEH_TRY + { + ProbeForRead(puCreateSurfaceData, sizeof(DD_CREATESURFACEDATA), 1); + RtlCopyMemory( &CreateSurfaceData, puCreateSurfaceData, + sizeof( DD_CREATESURFACEDATA ) ); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return ddRVal; + } + + /* FIXME we only support one surface at moment + this is a hack to prevent more that one surface being create + */ + if (CreateSurfaceData.dwSCnt > 1) + { + CreateSurfaceData.dwSCnt = 1; + } + + + DPRINT1("Setup surface in put handler\n"); + myhSurface = ExAllocatePoolWithTag( PagedPool, CreateSurfaceData.dwSCnt * sizeof(HANDLE), 0); + + _SEH_TRY + { + ProbeForRead(hSurface, CreateSurfaceData.dwSCnt * sizeof(HANDLE), 1); + for (i=0;i<CreateSurfaceData.dwSCnt;i++) + { + myhSurface[i] = hSurface[i]; + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return ddRVal; + } + + /* see if a surface have been create or not */ + + for (i=0;i<CreateSurfaceData.dwSCnt;i++) + { + if (!myhSurface[i]) + { + myhSurface[i] = GDIOBJ_AllocObj(DdHandleTable, GDI_OBJECT_TYPE_DD_SURFACE); + if (!myhSurface[i]) + { + /* FIXME lock myhSurface*/ + /* FIXME free myhSurface, and the contain */ + /* add to attach list */ + return ddRVal; + } + else + { + /* FIXME lock myhSurface*/ + /* FIXME add to attach list */ + } + } + } + + /* FIXME we need continue fix more that one createsurface */ + /* FIXME we need release myhSurface before any exits*/ + + phsurface = GDIOBJ_LockObj(DdHandleTable, myhSurface[0], GDI_OBJECT_TYPE_DD_SURFACE); if (!phsurface) { return ddRVal; @@ -96,7 +145,7 @@ _SEH_TRY { ProbeForRead(puCreateSurfaceData, sizeof(DD_CREATESURFACEDATA), 1); - RtlCopyMemory( &phsurface->CreateSurfaceData, puCreateSurfaceData, + RtlCopyMemory( &CreateSurfaceData, puCreateSurfaceData, sizeof( DD_CREATESURFACEDATA ) ); } _SEH_HANDLE @@ -206,12 +255,8 @@ pLocal = &phsurface->Local; pMore = &phsurface->More; pGlobal = &phsurface->Global; - - - /* FIXME we only support one surface for now */ - phsurface->CreateSurfaceData.dwSCnt = 1; - - for (i = 0; i < phsurface->CreateSurfaceData.dwSCnt; i++) + + for (i = 0; i < CreateSurfaceData.dwSCnt; i++) { phsurface->lcllist[i] = (PDD_SURFACE_LOCAL)pLocal; pLocal->lpGbl = pGlobal; @@ -226,34 +271,104 @@ } - - /* FIXME support for more that one surface */ - /* setup DD_CREATESURFACEDATA CreateSurfaceData for the driver */ - phsurface->CreateSurfaceData.lplpSList = (PDD_SURFACE_LOCAL *) &phsurface->lcllist; - phsurface->CreateSurfaceData.lpDDSurfaceDesc = &phsurface->desc; - phsurface->CreateSurfaceData.CreateSurface = NULL; - phsurface->CreateSurfaceData.ddRVal = DDERR_GENERIC; - phsurface->CreateSurfaceData.lpDD = &pDirectDraw->Global; + CreateSurfaceData.lplpSList = (PDD_SURFACE_LOCAL *) &phsurface->lcllist; + CreateSurfaceData.lpDDSurfaceDesc = &phsurface->desc; + CreateSurfaceData.CreateSurface = NULL; + CreateSurfaceData.ddRVal = DDERR_GENERIC; + CreateSurfaceData.lpDD = &pDirectDraw->Global; /* the CreateSurface crash with lcl convering */ if ((pDirectDraw->DD.dwFlags & DDHAL_CB32_CREATESURFACE)) { DPRINT1("0x%04x",pDirectDraw->DD.CreateSurface); - ddRVal = pDirectDraw->DD.CreateSurface(&phsurface->CreateSurfaceData); - } - - /* FIXME copy data from DDRAWI_ sturct to DD_ struct */ + ddRVal = pDirectDraw->DD.CreateSurface(&CreateSurfaceData); + } + + DPRINT1("Retun value is %04x and driver return code is %04x\n",ddRVal,CreateSurfaceData.ddRVal); + + /* FIXME support for more that one surface */ + _SEH_TRY + { + ProbeForWrite(puSurfaceDescription, sizeof(DDSURFACEDESC), 1); + RtlCopyMemory( puSurfaceDescription, &phsurface->desc, sizeof( DDSURFACEDESC ) ); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + _SEH_TRY + { + ProbeForWrite(puCreateSurfaceData, sizeof(DD_CREATESURFACEDATA), 1); + puCreateSurfaceData->ddRVal = CreateSurfaceData.ddRVal; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + for (i = 0; i < CreateSurfaceData.dwSCnt; i++) + { + _SEH_TRY + { + ProbeForWrite(puSurfaceGlobalData, sizeof(DD_SURFACE_GLOBAL), 1); + RtlCopyMemory( puSurfaceGlobalData, &phsurface->Global, sizeof( DD_SURFACE_GLOBAL ) ); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + _SEH_TRY + { + ProbeForWrite(puSurfaceLocalData, sizeof(DD_SURFACE_LOCAL), 1); + RtlCopyMemory( puSurfaceLocalData, &phsurface->Local, sizeof( DD_SURFACE_LOCAL ) ); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + _SEH_TRY + { + ProbeForWrite(puSurfaceMoreData, sizeof(DD_SURFACE_MORE), 1); + RtlCopyMemory( puSurfaceMoreData, &phsurface->More, sizeof( DD_SURFACE_MORE ) ); + + puSurfaceLocalData->lpGbl = puSurfaceGlobalData; + puSurfaceLocalData->lpSurfMore = puSurfaceMoreData; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + DPRINT1("GDIOBJ_UnlockObjByPtr\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, phsurface); + _SEH_TRY + { + ProbeForWrite(puhSurface, sizeof(HANDLE), 1); + puhSurface[i] = myhSurface[i]; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + /* FIXME fillin the return handler */ DPRINT1("GDIOBJ_UnlockObjByPtr\n"); - GDIOBJ_UnlockObjByPtr(DdHandleTable, phsurface); - DPRINT1("GDIOBJ_UnlockObjByPtr\n"); GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - - DPRINT1("Retun value is %04x and driver return code is %04x\n",ddRVal,phsurface->CreateSurfaceData.ddRVal); + DPRINT1("Retun value is %04x and driver return code is %04x\n",ddRVal,CreateSurfaceData.ddRVal); return ddRVal; } Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Fri Mar 23 20:07:49 2007 @@ -667,40 +667,7 @@ return ddRVal; } -DWORD STDCALL NtGdiDdBlt( - HANDLE hSurfaceDest, - HANDLE hSurfaceSrc, - PDD_BLTDATA puBltData -) -{ - DWORD ddRVal; - PDD_DIRECTDRAW_GLOBAL lgpl; - - PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(DdHandleTable, hSurfaceDest, GDI_OBJECT_TYPE_DIRECTDRAW); -#ifdef DX_DEBUG - DPRINT1("NtGdiDdBlt\n"); -#endif - if (pDirectDraw == NULL) - return DDHAL_DRIVER_NOTHANDLED; - - /* backup the orignal PDev and info */ - lgpl = puBltData->lpDD; - - /* use our cache version instead */ - puBltData->lpDD = &pDirectDraw->Global; - - /* make the call */ - if (!(pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_BLT)) - ddRVal = DDHAL_DRIVER_NOTHANDLED; - else - ddRVal = pDirectDraw->Surf.Blt(puBltData); - - /* But back the orignal PDev */ - puBltData->lpDD = lgpl; - - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); - return ddRVal; - } + DWORD STDCALL NtGdiDdSetColorKey( HANDLE hSurface, Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c Fri Mar 23 20:07:49 2007 @@ -14,6 +14,107 @@ #include <debug.h> #define DdHandleTable GdiHandleTable + + + +DWORD STDCALL NtGdiDdBlt( + HANDLE hSurfaceDest, + HANDLE hSurfaceSrc, + PDD_BLTDATA puBltData +) +{ + NTSTATUS Status = FALSE; + DWORD ddRVal = DDHAL_DRIVER_NOTHANDLED; + DD_BLTDATA Blt; + PDD_SURFACE pDstSurface = NULL; + PDD_SURFACE pSrcSurface = NULL; + PDD_DIRECTDRAW pDirectDraw; + + DPRINT1("NtGdiDdBlt\n"); + + _SEH_TRY + { + ProbeForRead(puBltData, sizeof(DD_BLTDATA), 1); + RtlCopyMemory( &Blt, puBltData, sizeof( DD_BLTDATA ) ); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return ddRVal; + } + + pDstSurface = GDIOBJ_LockObj(DdHandleTable, hSurfaceDest, GDI_OBJECT_TYPE_DD_SURFACE); + if (!pDstSurface) + { + DPRINT1("Fail\n"); + return ddRVal; + } + + pDirectDraw = GDIOBJ_LockObj(DdHandleTable, pDstSurface->hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); + if (!pDirectDraw) + { + DPRINT1("Fail\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pSrcSurface); + return ddRVal; + } + + if (pSrcSurface) + { + pSrcSurface = GDIOBJ_LockObj(DdHandleTable, pSrcSurface, GDI_OBJECT_TYPE_DD_SURFACE); + if (!pSrcSurface) + { + DPRINT1("Fail\n"); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDstSurface); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return ddRVal; + } + } + + Blt.lpDDDestSurface = &pDstSurface->Local; + if (pDstSurface) + { + Blt.lpDDSrcSurface = &pDstSurface->Local; + } + + Blt.ddRVal = DDERR_GENERIC; + + if (pDirectDraw->Surf.dwFlags & DDHAL_SURFCB32_BLT) + { + Blt.lpDD = &pDirectDraw->Global; + Blt.Blt = NULL; + ddRVal = pDirectDraw->Surf.Blt(&Blt); + } + + DPRINT1("Retun value is %04x and driver return code is %04x\n",ddRVal,Blt.ddRVal); + + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDstSurface); + + if(pSrcSurface) + { + GDIOBJ_UnlockObjByPtr(DdHandleTable, pSrcSurface); + } + + _SEH_TRY + { + ProbeForWrite(puBltData, sizeof(DD_BLTDATA), 1); + puBltData->ddRVal = Blt.ddRVal; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + DPRINT1("Retun value is %04x and driver return code is %04x\n",ddRVal,Blt.ddRVal); + return ddRVal; + } + /************************************************************************/

17 years, 9 months

[weiden] 26158: Fix bugs in GetBinaryType reported by songlei@qihoo.net

by weiden＠svn.reactos.org

Author: weiden Date: Fri Mar 23 18:34:34 2007 New Revision: 26158 URL: http://svn.reactos.org/svn/reactos?rev=26158&view=rev Log: Fix bugs in GetBinaryType reported by songlei(a)qihoo.net Modified: trunk/reactos/dll/win32/kernel32/file/bintype.c Modified: trunk/reactos/dll/win32/kernel32/file/bintype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/bi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/bintype.c (original) +++ trunk/reactos/dll/win32/kernel32/file/bintype.c Fri Mar 23 18:34:34 2007 @@ -157,7 +157,7 @@ { IMAGE_FILE_HEADER FileHeader; if(!ReadFile(hFile, &FileHeader, sizeof(IMAGE_FILE_HEADER), &Read, NULL) || - (Read == sizeof(IMAGE_FILE_HEADER))) + (Read != sizeof(IMAGE_FILE_HEADER))) { return BINARY_DOS; } @@ -179,7 +179,7 @@ IMAGE_OS2_HEADER ne; if((SetFilePointer(hFile, Header.mz.e_lfanew, NULL, FILE_BEGIN) == 1) || !ReadFile(hFile, &ne, sizeof(IMAGE_OS2_HEADER), &Read, NULL) || - (Read == sizeof(IMAGE_OS2_HEADER))) + (Read != sizeof(IMAGE_OS2_HEADER))) { /* Couldn't read header, so abort. */ return BINARY_DOS;

17 years, 9 months

[greatlrd] 26157: Thank CodeMercenary (CodeMercenary at hotmail dot com) that provide ms ddk example driver code is wrong for how to write a graphice driver with dx support. he gave me input and provide the ddk example code is wrong. Now I change the desgin after correct infomations so it lead to even less overhead of code.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Mar 23 15:47:19 2007 New Revision: 26157 URL: http://svn.reactos.org/svn/reactos?rev=26157&view=rev Log: Thank CodeMercenary (CodeMercenary at hotmail dot com) that provide ms ddk example driver code is wrong for how to write a graphice driver with dx support. he gave me input and provide the ddk example code is wrong. Now I change the desgin after correct infomations so it lead to even less overhead of code. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c Fri Mar 23 15:47:19 2007 @@ -206,66 +206,37 @@ pLocal = &phsurface->Local; pMore = &phsurface->More; pGlobal = &phsurface->Global; + /* FIXME we only support one surface for now */ phsurface->CreateSurfaceData.dwSCnt = 1; - - phsurface->lcllist[0] = 0; - phsurface->lcllist[1] = 0; + for (i = 0; i < phsurface->CreateSurfaceData.dwSCnt; i++) + { + phsurface->lcllist[i] = (PDD_SURFACE_LOCAL)pLocal; + pLocal->lpGbl = pGlobal; + pLocal->lpSurfMore = pMore; + + /* FIXME ? + pLocal->lpAttachList; + pLocal->lpAttachListFrom; + */ + + /* FIXME a countup to next pLocal, pMore, pGlobal */ + + } + + + /* FIXME support for more that one surface */ + + /* setup DD_CREATESURFACEDATA CreateSurfaceData for the driver */ phsurface->CreateSurfaceData.lplpSList = (PDD_SURFACE_LOCAL *) &phsurface->lcllist; - - i = 0; - // for (i = 0; i < phsurface->CreateSurfaceData.dwSCnt; i++) - //{ - phsurface->lcl.hDDSurface = (ULONG_PTR)myhSurface[i]; - phsurface->lcl.ddsCaps.dwCaps = pLocal->ddsCaps.dwCaps; - phsurface->lcl.dwFlags =pLocal->dwFlags; - - phsurface->gpl.wWidth = pGlobal->wWidth; - phsurface->gpl.wHeight = pGlobal->wHeight; - phsurface->gpl.lPitch = pGlobal->lPitch; - phsurface->gpl.fpVidMem = pGlobal->fpVidMem; - phsurface->gpl.dwBlockSizeX = pGlobal->dwBlockSizeX; - phsurface->gpl.dwBlockSizeY = pGlobal->dwBlockSizeY; - RtlCopyMemory( &phsurface->gpl.ddpfSurface , &pGlobal->ddpfSurface, sizeof(DDPIXELFORMAT)); - - /* FIXME more ?? */ - if (pMore) - { - phsurface->more.ddsCapsEx.dwCaps2 = pMore->ddsCapsEx.dwCaps2; - phsurface->more.ddsCapsEx.dwCaps3 = pMore->ddsCapsEx.dwCaps3; - phsurface->more.ddsCapsEx.dwCaps4 = pMore->ddsCapsEx.dwCaps4; - phsurface->lcl.dbnOverlayNode.object_int = (LPDDRAWI_DDRAWSURFACE_INT)pMore->dwSurfaceHandle; - } - - phsurface->lcllist[0] = (PDD_SURFACE_LOCAL)&phsurface->lcl; - /* FIXME count up everthing to next position */ - // } - - - /* FIXME support for more that one surface */ - - DPRINT1("setup CreateSurfaceData \n"); - /* setup DD_CREATESURFACEDATA CreateSurfaceData for the driver */ - phsurface->lcl.lpGbl = &phsurface->gpl; - phsurface->lcl.lpSurfMore = &phsurface->more; - - /* FIXME all phsurface->lcl should be in a array then add to lplpSList */ - //phsurface->CreateSurfaceData.lplpSList = (PDD_SURFACE_LOCAL *)&phsurface->lcl; phsurface->CreateSurfaceData.lpDDSurfaceDesc = &phsurface->desc; phsurface->CreateSurfaceData.CreateSurface = NULL; phsurface->CreateSurfaceData.ddRVal = DDERR_GENERIC; phsurface->CreateSurfaceData.lpDD = &pDirectDraw->Global; - /* is this correct the 3d drv whant this data */ - // phsurface->lcl.lpGbl->lpDD = &pDirectDraw->Global; - - - - /* the CreateSurface crash with lcl convering */ - DPRINT1("DDHAL_CB32_CREATESURFACE\n"); if ((pDirectDraw->DD.dwFlags & DDHAL_CB32_CREATESURFACE)) { DPRINT1("0x%04x",pDirectDraw->DD.CreateSurface);

17 years, 9 months

[tkreuzer] 26156: fix build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Mar 23 04:52:24 2007 New Revision: 26156 URL: http://svn.reactos.org/svn/reactos?rev=26156&view=rev Log: fix build Modified: trunk/rosapps/demos/ddraw/ddraw.rbuild Modified: trunk/rosapps/demos/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/ddraw/ddraw.rbuild?r… ============================================================================== --- trunk/rosapps/demos/ddraw/ddraw.rbuild (original) +++ trunk/rosapps/demos/ddraw/ddraw.rbuild Fri Mar 23 04:52:24 2007 @@ -6,7 +6,6 @@ <library>gdi32</library> <library>ddraw</library> <library>dxguid</library> - <library>string</library> <library>user32</library> <file>main.cpp</file> </module>

17 years, 9 months

[fireball] 26155: When initial setup is running it asks to press enter to format the drive, then it displays the exact same message again before finally formatting the drive. Thanks Colin_Finck. See issue #1964 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Mar 22 21:38:48 2007 New Revision: 26155 URL: http://svn.reactos.org/svn/reactos?rev=26155&view=rev Log: When initial setup is running it asks to press enter to format the drive, then it displays the exact same message again before finally formatting the drive. Thanks Colin_Finck. See issue #1964 for more details. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Thu Mar 22 21:38:48 2007 @@ -2210,7 +2210,6 @@ PartEntry->PartInfo[0].PartitionType = PARTITION_FAT32_XINT13; } } - break; } else if (!FileSystemList->Selected->FormatFunc) return QUIT_PAGE;

17 years, 9 months

[gedmurphy] 26154: fix icon

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Mar 22 21:37:23 2007 New Revision: 26154 URL: http://svn.reactos.org/svn/reactos?rev=26154&view=rev Log: fix icon Modified: trunk/reactos/base/applications/calc/calculator.ico Modified: trunk/reactos/base/applications/calc/calculator.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/cal… ============================================================================== Binary files - no diff available.

17 years, 9 months

[hpoussin] 26153: Send service name to pnproot driver (not used yet)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Mar 22 20:13:14 2007 New Revision: 26153 URL: http://svn.reactos.org/svn/reactos?rev=26153&view=rev Log: Send service name to pnproot driver (not used yet) Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Thu Mar 22 20:13:14 2007 @@ -480,6 +480,7 @@ IopCreateDeviceNode( IN PDEVICE_NODE ParentNode, IN PDEVICE_OBJECT PhysicalDeviceObject, + IN PUNICODE_STRING ServiceName, OUT PDEVICE_NODE *DeviceNode ); @@ -781,6 +782,7 @@ NTSTATUS PnpRootCreateDevice( + IN PUNICODE_STRING ServiceName, IN OUT PDEVICE_OBJECT *PhysicalDeviceObject ); Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Thu Mar 22 20:13:14 2007 @@ -726,7 +726,9 @@ PWCHAR FileNameWithoutPath; LPWSTR FileExtension; PUNICODE_STRING ModuleName = &LdrEntry->BaseDllName; + UNICODE_STRING ServiceName; #if 1 // Disable for FreeLDR 2.5 + UNICODE_STRING ServiceNameWithExtension; PLDR_DATA_TABLE_ENTRY ModuleObject; #endif @@ -736,18 +738,6 @@ IopDisplayLoadingMessage(ModuleName->Buffer, TRUE); /* - * Determine the right device object - */ - /* Use IopRootDeviceNode for now */ - Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &DeviceNode); - if (!NT_SUCCESS(Status)) - { - CPRINT("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); - return(Status); - } - - - /* * Generate filename without path (not needed by freeldr) */ FileNameWithoutPath = wcsrchr(ModuleName->Buffer, L'\\'); @@ -763,13 +753,11 @@ /* * Load the module. */ - RtlCreateUnicodeString(&DeviceNode->ServiceName, FileNameWithoutPath); - #if 1 // Remove for FreeLDR 2.5. - Status = LdrProcessDriverModule(LdrEntry, &DeviceNode->ServiceName, &ModuleObject); - if (!NT_SUCCESS(Status)) - { - IopFreeDeviceNode(DeviceNode); + RtlCreateUnicodeString(&ServiceNameWithExtension, FileNameWithoutPath); + Status = LdrProcessDriverModule(LdrEntry, &ServiceNameWithExtension, &ModuleObject); + if (!NT_SUCCESS(Status)) + { CPRINT("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); return Status; } @@ -778,12 +766,25 @@ /* * Strip the file extension from ServiceName */ - FileExtension = wcsrchr(DeviceNode->ServiceName.Buffer, '.'); + RtlCreateUnicodeString(&ServiceName, FileNameWithoutPath); + FileExtension = wcsrchr(ServiceName.Buffer, '.'); if (FileExtension != NULL) { - DeviceNode->ServiceName.Length -= wcslen(FileExtension) * sizeof(WCHAR); + ServiceName.Length -= wcslen(FileExtension) * sizeof(WCHAR); FileExtension[0] = 0; } + + /* + * Determine the right device object + */ + /* Use IopRootDeviceNode for now */ + Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &ServiceName, &DeviceNode); + if (!NT_SUCCESS(Status)) + { + CPRINT("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); + return(Status); + } + DeviceNode->ServiceName = ServiceName; /* * Initialize the driver @@ -793,7 +794,7 @@ if (!NT_SUCCESS(Status)) { - IopFreeDeviceNode(DeviceNode); + IopFreeDeviceNode(DeviceNode); CPRINT("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); return Status; } @@ -830,7 +831,7 @@ NTSTATUS Status; /* Use IopRootDeviceNode for now */ - Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &DeviceNode); + Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, NULL, &DeviceNode); if (!NT_SUCCESS(Status)) return; /* Setup the module object for the RAW FS Driver */ @@ -1577,7 +1578,7 @@ */ /* Use IopRootDeviceNode for now */ - Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &DeviceNode); + Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &ServiceName, &DeviceNode); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Thu Mar 22 20:13:14 2007 @@ -789,14 +789,15 @@ NTSTATUS IopCreateDeviceNode(PDEVICE_NODE ParentNode, PDEVICE_OBJECT PhysicalDeviceObject, + PUNICODE_STRING ServiceName, PDEVICE_NODE *DeviceNode) { PDEVICE_NODE Node; NTSTATUS Status; KIRQL OldIrql; - DPRINT("ParentNode 0x%p PhysicalDeviceObject 0x%p\n", - ParentNode, PhysicalDeviceObject); + DPRINT("ParentNode 0x%p PhysicalDeviceObject 0x%p ServiceName %wZ\n", + ParentNode, PhysicalDeviceObject, ServiceName); Node = (PDEVICE_NODE)ExAllocatePool(NonPagedPool, sizeof(DEVICE_NODE)); if (!Node) @@ -808,7 +809,7 @@ if (!PhysicalDeviceObject) { - Status = PnpRootCreateDevice(&PhysicalDeviceObject); + Status = PnpRootCreateDevice(ServiceName, &PhysicalDeviceObject); if (!NT_SUCCESS(Status)) { ExFreePool(Node); @@ -2386,7 +2387,8 @@ DeviceNode->ServiceName.Buffer, Status); } } - } else + } + else { DPRINT("Service %S is disabled or already initialized\n", DeviceNode->ServiceName.Buffer); @@ -2531,6 +2533,7 @@ Status = IopCreateDeviceNode( DeviceNode, DeviceRelations->Objects[i], + NULL, &ChildDeviceNode); DeviceNode->Flags |= DNF_ENUMERATED; if (!NT_SUCCESS(Status)) @@ -3297,7 +3300,7 @@ KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); } - Status = IopCreateDeviceNode(NULL, Pdo, &IopRootDeviceNode); + Status = IopCreateDeviceNode(NULL, Pdo, NULL, &IopRootDeviceNode); if (!NT_SUCCESS(Status)) { CPRINT("Insufficient resources\n"); Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepo… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c Thu Mar 22 20:13:14 2007 @@ -45,8 +45,12 @@ Pdo = *DeviceObject; else { + UNICODE_STRING ServiceName; + ServiceName.Buffer = DriverObject->DriverName.Buffer + sizeof(DRIVER_ROOT_NAME) / sizeof(WCHAR) - 1; + ServiceName.Length = ServiceName.MaximumLength = DriverObject->DriverName.Length - sizeof(DRIVER_ROOT_NAME) + sizeof(WCHAR); + /* create a new PDO and return it in *DeviceObject */ - Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &DeviceNode); + Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &ServiceName, &DeviceNode); if (!NT_SUCCESS(Status)) { DPRINT("IopCreateDeviceNode() failed (Status 0x%08lx)\n", Status); Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Thu Mar 22 20:13:14 2007 @@ -108,6 +108,7 @@ NTSTATUS PnpRootCreateDevice( + PUNICODE_STRING ServiceName, PDEVICE_OBJECT *PhysicalDeviceObject) { PPNPROOT_PDO_DEVICE_EXTENSION PdoDeviceExtension;

17 years, 9 months

[fireball] 26152: - Clear DPC request when delivering DPCs from the idle loop (by Alex Ionescu).

by fireball＠svn.reactos.org

Author: fireball Date: Thu Mar 22 00:28:58 2007 New Revision: 26152 URL: http://svn.reactos.org/svn/reactos?rev=26152&view=rev Log: - Clear DPC request when delivering DPCs from the idle loop (by Alex Ionescu). Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Thu Mar 22 00:28:58 2007 @@ -679,6 +679,9 @@ #endif jz CheckSchedule + mov cl, DISPATCH_LEVEL + call @HalClearSoftwareInterrupt@4 + /* Handle the above */ lea ecx, [ebx+KPCR_PRCB_DATA] call @KiRetireDpcList@4

17 years, 9 months

[hpoussin] 26151: Add svn:eol-style property

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Mar 21 23:32:38 2007 New Revision: 26151 URL: http://svn.reactos.org/svn/reactos?rev=26151&view=rev Log: Add svn:eol-style property Modified: trunk/reactos/drivers/multimedia/sb16_nt4/control.c (props changed) trunk/reactos/drivers/multimedia/sb16_nt4/interrupt.c (props changed) trunk/reactos/drivers/multimedia/sb16_nt4/main.c (contents, props changed) trunk/reactos/drivers/multimedia/sb16_nt4/sb16_nt4.def (props changed) trunk/reactos/drivers/multimedia/sb16_nt4/sb16_nt4.rbuild (props changed) trunk/reactos/drivers/multimedia/sb16_nt4/sndblst.h (props changed) Propchange: trunk/reactos/drivers/multimedia/sb16_nt4/control.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/sb16_nt4/interrupt.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/multimedia/sb16_nt4/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/sb16_nt… ============================================================================== --- trunk/reactos/drivers/multimedia/sb16_nt4/main.c (original) +++ trunk/reactos/drivers/multimedia/sb16_nt4/main.c Wed Mar 21 23:32:38 2007 @@ -9,8 +9,10 @@ Compatible with NT4 */ +#define NDEBUG #include <sndblst.h> +#define TAG(A, B, C, D) (IN ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) /* IRP DISPATCH ROUTINES @@ -41,7 +43,7 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PSOUND_BLASTER_PARAMETERS sb_device = DeviceObject->DeviceExtension; + //PSOUND_BLASTER_PARAMETERS sb_device = DeviceObject->DeviceExtension; DPRINT("CloseSoundBlaster() called\n"); @@ -58,7 +60,7 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PSOUND_BLASTER_PARAMETERS sb_device = DeviceObject->DeviceExtension; + //PSOUND_BLASTER_PARAMETERS sb_device = DeviceObject->DeviceExtension; DPRINT("CleanupSoundBlaster() called\n"); @@ -76,7 +78,7 @@ PIRP Irp) { PIO_STACK_LOCATION stack; - PSOUND_BLASTER_PARAMETERS sb_device = DeviceObject->DeviceExtension; + //PSOUND_BLASTER_PARAMETERS sb_device = DeviceObject->DeviceExtension; DPRINT("ControlSoundBlaster() called\n"); @@ -100,7 +102,7 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PSOUND_BLASTER_PARAMETERS sb_device = DeviceObject->DeviceExtension; + //PSOUND_BLASTER_PARAMETERS sb_device = DeviceObject->DeviceExtension; DPRINT("WriteSoundBlaster() called\n"); @@ -205,8 +207,8 @@ ExFreePool(ptr) -#define TAG_REG_INFO (ULONG)'IgeR' -#define TAG_REG_NAME (ULONG)'NgeR' +#define TAG_REG_INFO TAG('I','g','e','R') +#define TAG_REG_NAME TAG('N','g','e','R') NTSTATUS STDCALL EnumerateSubkey( Propchange: trunk/reactos/drivers/multimedia/sb16_nt4/main.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/sb16_nt4/sb16_nt4.def ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/sb16_nt4/sb16_nt4.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/sb16_nt4/sndblst.h ------------------------------------------------------------------------------ svn:eol-style = native

17 years, 9 months

[hpoussin] 26150: Clear DO_DEVICE_INITIALIZING flag when device is initialized. See issue #1790 for more details.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Mar 21 21:13:32 2007 New Revision: 26150 URL: http://svn.reactos.org/svn/reactos?rev=26150&view=rev Log: Clear DO_DEVICE_INITIALIZING flag when device is initialized. See issue #1790 for more details. Modified: trunk/reactos/drivers/storage/cdrom/cdrom.c trunk/reactos/drivers/storage/disk/disk.c Modified: trunk/reactos/drivers/storage/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/cdrom/cdro… ============================================================================== --- trunk/reactos/drivers/storage/cdrom/cdrom.c (original) +++ trunk/reactos/drivers/storage/cdrom/cdrom.c Wed Mar 21 21:13:32 2007 @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: services/storage/cdrom/cdrom.c @@ -924,6 +923,8 @@ CdromTimerRoutine, NULL); IoStartTimer(DiskDeviceObject); + + DiskDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; DPRINT("CdromClassCreateDeviceObjects() done\n"); Modified: trunk/reactos/drivers/storage/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/disk/disk.… ============================================================================== --- trunk/reactos/drivers/storage/disk/disk.c (original) +++ trunk/reactos/drivers/storage/disk/disk.c Wed Mar 21 21:13:32 2007 @@ -919,6 +919,8 @@ if (PartitionList != NULL) ExFreePool(PartitionList); + DiskDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + DPRINT("DiskClassCreateDeviceObjects() done\n"); return(STATUS_SUCCESS); @@ -2056,6 +2058,8 @@ DiskData->NextPartition = DeviceExtension; DiskData = (PDISK_DATA)(DeviceExtension + 1); DiskData->NextPartition = NULL; + + DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; } else {

17 years, 9 months

← Newer
1
...
4
5
6
7
8
9
10
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2007