Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 37679: fix a typo
by greatlrd＠svn.reactos.org 27 Nov '08

27 Nov '08

Author: greatlrd Date: Wed Nov 26 22:37:14 2008 New Revision: 37679 URL: http://svn.reactos.org/svn/reactos?rev=37679&view=rev Log: fix a typo Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Wed Nov 26 22:37:14 2008 @@ -1866,6 +1866,7 @@ pDDCallbacks->GetScanLine = DdGetScanLine; } + /* Check for DD Surface Callbacks */ if (pDDSurfaceCallbacks) { @@ -1893,6 +1894,7 @@ pDDSurfaceCallbacks->AddAttachedSurface = DdAddAttachedSurface; } + /* Check for DD Palette Callbacks, This interface are dead for user mode, * only what it can support are being report back. */ @@ -1920,6 +1922,7 @@ // FIXME pD3dCallbacks->ContextDestroyAll = (LPD3DHAL_CONTEXTDESTROYALLCB) NtGdiD3dContextDestroyAll; } + /* Check for D3D Driver Data */ if (pD3dDriverData) { @@ -1929,7 +1932,7 @@ /* Write the pointer to the texture formats */ //FIXME pD3dDriverData->lpTextureFormats = pD3dTextureFormats; } - else + /* Check for D3D Buffer Callbacks */ if (pD3dBufferCallbacks)

1 0

[greatlrd] 37678: convert parts of DdQueryDirectDrawObject (gdientry 2) to use wined3d.
by greatlrd＠svn.reactos.org 27 Nov '08

27 Nov '08

Author: greatlrd Date: Wed Nov 26 22:23:05 2008 New Revision: 37678 URL: http://svn.reactos.org/svn/reactos?rev=37678&view=rev Log: convert parts of DdQueryDirectDrawObject (gdientry 2) to use wined3d. Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Wed Nov 26 22:23:05 2008 @@ -1762,30 +1762,18 @@ { PVIDEOMEMORY VidMemList = NULL; - DD_HALINFO HalInfo; - D3DNTHAL_CALLBACKS D3dCallbacks; - D3DNTHAL_GLOBALDRIVERDATA D3dDriverData; - DD_D3DBUFCALLBACKS D3dBufferCallbacks; - DWORD CallbackFlags[3]; //DWORD dwNumHeaps=0, FourCCs=0; - DWORD Flags; + BOOL retVal = TRUE; IWineD3D* pWineD3d; WINED3DDISPLAYMODE d3ddm; - - /* Clear the structures */ - RtlZeroMemory(&HalInfo, sizeof(DD_HALINFO)); - RtlZeroMemory(&D3dCallbacks, sizeof(D3DNTHAL_CALLBACKS)); - RtlZeroMemory(&D3dDriverData, sizeof(D3DNTHAL_GLOBALDRIVERDATA)); - RtlZeroMemory(&D3dBufferCallbacks, sizeof(DD_D3DBUFCALLBACKS)); - RtlZeroMemory(CallbackFlags, sizeof(DWORD)*3); /* Note : XP always alloc 24*sizeof(VIDEOMEMORY) of pvmlist so we change it to it */ if ( (pvmList != NULL) && (pHalInfo->vmiData.dwNumHeaps != 0) ) { - VidMemList = (PVIDEOMEMORY) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (sizeof(VIDEOMEMORY) * 24 ) * pHalInfo->vmiData.dwNumHeaps); + VidMemList = (PVIDEOMEMORY) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (sizeof(VIDEOMEMORY) * 24 ) * pHalInfo->vmiData.dwNumHeaps); } /* Do the query */ @@ -1814,21 +1802,16 @@ pHalInfo->lpDDPaletteCallbacks = pDDPaletteCallbacks; /* Check for NT5+ D3D Data */ +/* FIXME if ( (D3dCallbacks.dwSize != 0) && (D3dDriverData.dwSize != 0) ) { - /* Write these down */ pHalInfo->lpD3DGlobalDriverData = (ULONG_PTR)pD3dDriverData; pHalInfo->lpD3DHALCallbacks = (ULONG_PTR)pD3dCallbacks; - - /* Check for Buffer Callbacks */ - if (D3dBufferCallbacks.dwSize) - { - /* Write this one too */ - pHalInfo->lpDDExeBufCallbacks = pD3dBufferCallbacks; - } - } - + pHalInfo->lpDDExeBufCallbacks = pD3dBufferCallbacks; + + } +*/ /* Continue converting the rest */ /* FIXME pHalInfo->vmiData.dwFlags */ //pHalInfo->vmiData.dwFlags = HalInfo.vmiData.dwFlags; @@ -1860,16 +1843,10 @@ */ /* always force rope 0x1000 for hal it mean only source copy is supported */ - pHalInfo->ddCaps.dwRops[6] = 0x1000; - - /* Set the HAL flags what ReactX got from the driver - * Windows XP force setting DDHALINFO_GETDRIVERINFOSET if the driver does not set it - * and ReactX doing same to keep compatible with drivers, but the driver are - * force support DdGetDriverInfo acoriding MSDN but it seam some driver do not set - * this flag even it is being supported. that is mean. It is small hack to keep - * bad driver working, that trust this is always being setting by it self at end - */ - pHalInfo->dwFlags = (HalInfo.dwFlags & ~DDHALINFO_GETDRIVERINFOSET) | DDHALINFO_GETDRIVERINFOSET; + pHalInfo->ddCaps.dwRops[6] = 0x1000; + + + pHalInfo->dwFlags = DDHALINFO_GETDRIVERINFOSET; pHalInfo->GetDriverInfo = (LPDDHAL_GETDRIVERINFO) DdGetDriverInfo; /* Now check if we got any DD callbacks */ @@ -1877,34 +1854,16 @@ { /* Zero the structure */ RtlZeroMemory(pDDCallbacks, sizeof(DDHAL_DDCALLBACKS)); + + /* Fill in the size and the flags for DDHAL_DDCALLBACKS */ pDDCallbacks->dwSize = sizeof(DDHAL_DDCALLBACKS); - - /* Set the flags for this structure - * Windows XP force setting DDHAL_CB32_CREATESURFACE if the driver does not set it - * and ReactX doing same to keep compatible with drivers, but the driver are - * force support pDDCallbacks acoriding MSDN but it seam some driver do not set - * this flag even it is being supported. that is mean. It is small hack to keep - * bad driver working, that trust this is always being setting by it self at end - */ - Flags = (CallbackFlags[0] & ~DDHAL_CB32_CREATESURFACE) | DDHAL_CB32_CREATESURFACE; - pDDCallbacks->dwFlags = Flags; + pDDCallbacks->dwFlags = DDHAL_CB32_CANCREATESURFACE | DDHAL_CB32_GETSCANLINE | DDHAL_CB32_CREATESURFACE | DDHAL_CB32_WAITFORVERTICALBLANK; /* Write the always-on functions */ pDDCallbacks->CreateSurface = DdCreateSurface; - - /* Now write the pointers, if applicable */ - if (Flags & DDHAL_CB32_WAITFORVERTICALBLANK) - { - pDDCallbacks->WaitForVerticalBlank = DdWaitForVerticalBlank; - } - if (Flags & DDHAL_CB32_CANCREATESURFACE) - { - pDDCallbacks->CanCreateSurface = DdCanCreateSurface; - } - if (Flags & DDHAL_CB32_GETSCANLINE) - { - pDDCallbacks->GetScanLine = DdGetScanLine; - } + pDDCallbacks->WaitForVerticalBlank = DdWaitForVerticalBlank; + pDDCallbacks->CanCreateSurface = DdCanCreateSurface; + pDDCallbacks->GetScanLine = DdGetScanLine; } /* Check for DD Surface Callbacks */ @@ -1912,24 +1871,11 @@ { /* Zero the structures */ RtlZeroMemory(pDDSurfaceCallbacks, sizeof(DDHAL_DDSURFACECALLBACKS)); + + /* Setup the size and flags for DDHAL_DDSURFACECALLBACKS */ pDDSurfaceCallbacks->dwSize = sizeof(DDHAL_DDSURFACECALLBACKS); - - /* Set the flags for this structure - * Windows XP force setting DDHAL_SURFCB32_LOCK, DDHAL_SURFCB32_UNLOCK, - * DDHAL_SURFCB32_SETCOLORKEY, DDHAL_SURFCB32_DESTROYSURFACE if the driver - * does not set it and ReactX doing same to keep compatible with drivers, - * but the driver are force support pDDSurfaceCallbacks acoriding MSDN but it seam - * some driver do not set this flag even it is being supported. that is mean. - * It is small hack to keep bad driver working, that trust this is always being - * setting by it self at end - */ - - Flags = (CallbackFlags[1] & ~(DDHAL_SURFCB32_LOCK | DDHAL_SURFCB32_UNLOCK | - DDHAL_SURFCB32_SETCOLORKEY | DDHAL_SURFCB32_DESTROYSURFACE)) | - (DDHAL_SURFCB32_LOCK | DDHAL_SURFCB32_UNLOCK | - DDHAL_SURFCB32_SETCOLORKEY | DDHAL_SURFCB32_DESTROYSURFACE); - - pDDSurfaceCallbacks->dwFlags = Flags; + pDDSurfaceCallbacks->dwFlags = DDHAL_SURFCB32_LOCK | DDHAL_SURFCB32_UNLOCK | DDHAL_SURFCB32_SETCOLORKEY | DDHAL_SURFCB32_DESTROYSURFACE; + /* Write the always-on functions */ pDDSurfaceCallbacks->Lock = DdLock; @@ -1937,35 +1883,14 @@ pDDSurfaceCallbacks->SetColorKey = DdSetColorKey; pDDSurfaceCallbacks->DestroySurface = DdDestroySurface; - /* Write the optional ones */ - if (Flags & DDHAL_SURFCB32_FLIP) - { - pDDSurfaceCallbacks->Flip = DdFlip; - } - if (Flags & DDHAL_SURFCB32_BLT) - { - pDDSurfaceCallbacks->Blt = DdBlt; - } - if (Flags & DDHAL_SURFCB32_GETBLTSTATUS) - { - pDDSurfaceCallbacks->GetBltStatus = DdGetBltStatus; - } - if (Flags & DDHAL_SURFCB32_GETFLIPSTATUS) - { - pDDSurfaceCallbacks->GetFlipStatus = DdGetFlipStatus; - } - if (Flags & DDHAL_SURFCB32_UPDATEOVERLAY) - { - pDDSurfaceCallbacks->UpdateOverlay = DdUpdateOverlay; - } - if (Flags & DDHAL_SURFCB32_SETOVERLAYPOSITION) - { - pDDSurfaceCallbacks->SetOverlayPosition = DdSetOverlayPosition; - } - if (Flags & DDHAL_SURFCB32_ADDATTACHEDSURFACE) - { - pDDSurfaceCallbacks->AddAttachedSurface = DdAddAttachedSurface; - } + /* Write the always-on functions */ + pDDSurfaceCallbacks->Flip = DdFlip; + pDDSurfaceCallbacks->Blt = DdBlt; + pDDSurfaceCallbacks->GetBltStatus = DdGetBltStatus; + pDDSurfaceCallbacks->GetFlipStatus = DdGetFlipStatus; + pDDSurfaceCallbacks->UpdateOverlay = DdUpdateOverlay; + pDDSurfaceCallbacks->SetOverlayPosition = DdSetOverlayPosition; + pDDSurfaceCallbacks->AddAttachedSurface = DdAddAttachedSurface; } /* Check for DD Palette Callbacks, This interface are dead for user mode, @@ -1977,8 +1902,8 @@ RtlZeroMemory(pDDPaletteCallbacks, sizeof(DDHAL_DDPALETTECALLBACKS)); /* Write the header */ - pDDPaletteCallbacks->dwSize = sizeof(DDHAL_DDPALETTECALLBACKS); - pDDPaletteCallbacks->dwFlags = CallbackFlags[2]; + pDDPaletteCallbacks->dwSize = sizeof(DDHAL_DDPALETTECALLBACKS); + pDDPaletteCallbacks->dwFlags = 0; } if (pD3dCallbacks) @@ -1989,32 +1914,22 @@ /* Write the header */ pD3dCallbacks->dwSize = sizeof(DDHAL_DDEXEBUFCALLBACKS); - /* Now check for each callback */ - if (D3dCallbacks.ContextCreate) - { - pD3dCallbacks->ContextCreate = (LPD3DHAL_CONTEXTCREATECB) D3dContextCreate; - } - if (D3dCallbacks.ContextDestroy) - { - /* FIXME */ - // pD3dCallbacks->ContextDestroy = (LPD3DHAL_CONTEXTDESTROYCB) NtGdiD3dContextDestroy; - } - if (D3dCallbacks.ContextDestroyAll) - { - /* FIXME */ - // pD3dCallbacks->ContextDestroyAll = (LPD3DHAL_CONTEXTDESTROYALLCB) NtGdiD3dContextDestroyAll; - } + /* Write the always-on functions */ + pD3dCallbacks->ContextCreate = (LPD3DHAL_CONTEXTCREATECB) D3dContextCreate; + // FIXME pD3dCallbacks->ContextDestroy = (LPD3DHAL_CONTEXTDESTROYCB) NtGdiD3dContextDestroy; + // FIXME pD3dCallbacks->ContextDestroyAll = (LPD3DHAL_CONTEXTDESTROYALLCB) NtGdiD3dContextDestroyAll; } /* Check for D3D Driver Data */ if (pD3dDriverData) { /* Copy the struct */ - RtlMoveMemory(pD3dDriverData, &D3dDriverData, sizeof(D3DHAL_GLOBALDRIVERDATA)); + //FIXME RtlMoveMemory(pD3dDriverData, &D3dDriverData, sizeof(D3DHAL_GLOBALDRIVERDATA)); /* Write the pointer to the texture formats */ //FIXME pD3dDriverData->lpTextureFormats = pD3dTextureFormats; } + else /* Check for D3D Buffer Callbacks */ if (pD3dBufferCallbacks) @@ -2022,34 +1937,15 @@ /* Zero the struct */ RtlZeroMemory(pD3dBufferCallbacks, sizeof(DDHAL_DDEXEBUFCALLBACKS)); - - pD3dBufferCallbacks->dwSize = D3dBufferCallbacks.dwSize; - - pD3dBufferCallbacks->dwFlags = D3dBufferCallbacks.dwFlags; - if ( D3dBufferCallbacks.CanCreateD3DBuffer) - { - pD3dBufferCallbacks->CanCreateExecuteBuffer = (LPDDHALEXEBUFCB_CANCREATEEXEBUF)DdCanCreateD3DBuffer; - } - - if ( D3dBufferCallbacks.CanCreateD3DBuffer) - { - pD3dBufferCallbacks->CreateExecuteBuffer = (LPDDHALEXEBUFCB_CREATEEXEBUF) DdCreateD3DBuffer; - } - - if ( D3dBufferCallbacks.DestroyD3DBuffer ) - { - pD3dBufferCallbacks->DestroyExecuteBuffer = (LPDDHALEXEBUFCB_DESTROYEXEBUF) DdDestroyD3DBuffer; - } - - if ( D3dBufferCallbacks.LockD3DBuffer ) - { - pD3dBufferCallbacks->LockExecuteBuffer = (LPDDHALEXEBUFCB_LOCKEXEBUF) DdLockD3D; - } - - if ( D3dBufferCallbacks.UnlockD3DBuffer ) - { - pD3dBufferCallbacks->UnlockExecuteBuffer = (LPDDHALEXEBUFCB_UNLOCKEXEBUF) DdUnlockD3D; - } + /* Write the header */ + pD3dBufferCallbacks->dwSize = sizeof(DDHAL_DDEXEBUFCALLBACKS); + pD3dBufferCallbacks->dwFlags = DDHAL_D3DBUFCB32_CREATED3DBUF | DDHAL_D3DBUFCB32_CANCREATED3DBUF | DDHAL_D3DBUFCB32_LOCKD3DBUF | DDHAL_D3DBUFCB32_UNLOCKD3DBUF; + + /* Write the always-on functions */ + pD3dBufferCallbacks->CanCreateExecuteBuffer = (LPDDHALEXEBUFCB_CANCREATEEXEBUF)DdCanCreateD3DBuffer; + pD3dBufferCallbacks->CreateExecuteBuffer = (LPDDHALEXEBUFCB_CREATEEXEBUF) DdCreateD3DBuffer; + pD3dBufferCallbacks->LockExecuteBuffer = (LPDDHALEXEBUFCB_LOCKEXEBUF) DdLockD3D; + pD3dBufferCallbacks->UnlockExecuteBuffer = (LPDDHALEXEBUFCB_UNLOCKEXEBUF) DdUnlockD3D; } /* FIXME VidMemList */

1 0

[jimtabor] 37677: - Fixed stock object creation for pens. Now pass all but 25 pen cross tests. Please use latest wine gdi tests.
by jimtabor＠svn.reactos.org 26 Nov '08

26 Nov '08

Author: jimtabor Date: Wed Nov 26 14:44:41 2008 New Revision: 37677 URL: http://svn.reactos.org/svn/reactos?rev=37677&view=rev Log: - Fixed stock object creation for pens. Now pass all but 25 pen cross tests. Please use latest wine gdi tests. Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h trunk/reactos/subsystems/win32/win32k/objects/pen.c trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] Wed Nov 26 14:44:41 2008 @@ -30,7 +30,7 @@ #define W32PF_MANUALGUICHECK (0x02000000) #define W32PF_CREATEDWINORDC (0x04000000) - +extern HGDIOBJ StockObjects[]; extern SHORT gusLanguageID; SHORT FASTCALL IntGdiGetLanguageID(); Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c [iso-8859-1] Wed Nov 26 14:44:41 2008 @@ -47,7 +47,7 @@ IN ULONG_PTR ulHatch, DWORD dwStyleCount, PULONG pStyle, - IN ULONG cjDIB, // FIXME! We are shipping this too! + IN ULONG cjDIB, IN BOOL bOldStylePen, IN OPTIONAL HBRUSH hbrush) { @@ -61,6 +61,11 @@ dwWidth = abs(dwWidth); + if ( (dwPenStyle & PS_STYLE_MASK) == PS_NULL) + { + return StockObjects[NULL_PEN]; + } + if (bOldStylePen) { PenObject = PENOBJ_AllocPenWithHandle(); @@ -79,7 +84,8 @@ hPen = PenObject->BaseObject.hHmgr; // If nWidth is zero, the pen is a single pixel wide, regardless of the current transformation. - if ((bOldStylePen) && (!dwWidth) && (dwPenStyle & PS_STYLE_MASK) != PS_SOLID) dwWidth = 1; + if ((bOldStylePen) && (!dwWidth) && (dwPenStyle & PS_STYLE_MASK) != PS_SOLID) + dwWidth = 1; PenObject->ptPenWidth.x = dwWidth; PenObject->ptPenWidth.y = 0; @@ -313,7 +319,7 @@ NULL, 0, TRUE, - 0); + hbr); } HPEN STDCALL @@ -369,24 +375,36 @@ } } - if (dwPenStyle != PS_NULL) - { - hPen = IntGdiExtCreatePen(dwPenStyle, + if (ulBrushStyle == BS_PATTERN) + { + _SEH_TRY + { + ProbeForRead((PVOID)ulHatch, cjDIB, 1); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + if (pSafeStyle) ExFreePoolWithTag(pSafeStyle, TAG_PENSTYLES); + return 0; + } + } + + hPen = IntGdiExtCreatePen(dwPenStyle, ulWidth, - ulBrushStyle, + ulBrushStyle, ulColor, - ulClientHatch, + ulClientHatch, ulHatch, - dwStyleCount, - pSafeStyle, - cjDIB, - bOldStylePen, - hBrush); - } - else - { - hPen = NtGdiGetStockObject(NULL_PEN); - } + dwStyleCount, + pSafeStyle, + cjDIB, + bOldStylePen, + hBrush); if (!hPen && pSafeStyle) { Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] Wed Nov 26 14:44:41 2008 @@ -107,7 +107,45 @@ { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" }; //Bitstream Vera Sans -static HGDIOBJ StockObjects[NB_STOCK_OBJECTS]; +HGDIOBJ StockObjects[NB_STOCK_OBJECTS]; + +static +HPEN +FASTCALL +IntCreateStockPen( DWORD dwPenStyle, + DWORD dwWidth, + ULONG ulBrushStyle, + ULONG ulColor) +{ + HPEN hPen; + PGDIBRUSHOBJ PenObject = PENOBJ_AllocPenWithHandle(); + + if ((!dwWidth) && (dwPenStyle & PS_STYLE_MASK) != PS_SOLID) dwWidth = 1; + + PenObject->ptPenWidth.x = dwWidth; + PenObject->ptPenWidth.y = 0; + PenObject->ulPenStyle = dwPenStyle; + PenObject->BrushAttr.lbColor = ulColor; + PenObject->ulStyle = ulBrushStyle; + PenObject->hbmClient = (HANDLE)NULL; + PenObject->dwStyleCount = 0; + PenObject->pStyle = 0; + PenObject->flAttrs = GDIBRUSH_IS_OLDSTYLEPEN; + + switch (dwPenStyle & PS_STYLE_MASK) + { + case PS_NULL: + PenObject->flAttrs |= GDIBRUSH_IS_NULL; + break; + + case PS_SOLID: + PenObject->flAttrs |= GDIBRUSH_IS_SOLID; + break; + } + hPen = PenObject->BaseObject.hHmgr; + PENOBJ_UnlockPen(PenObject); + return hPen; +} /*! * Creates a bunch of stock objects: brushes, pens, fonts. @@ -129,10 +167,10 @@ StockObjects[BLACK_BRUSH] = IntGdiCreateSolidBrush(RGB(0,0,0)); StockObjects[NULL_BRUSH] = IntGdiCreateNullBrush(); - StockObjects[WHITE_PEN] = IntGdiExtCreatePen(WhitePen.lopnStyle, WhitePen.lopnWidth.x, BS_SOLID, WhitePen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); - StockObjects[BLACK_PEN] = IntGdiExtCreatePen(BlackPen.lopnStyle, BlackPen.lopnWidth.x, BS_SOLID, BlackPen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); - StockObjects[DC_PEN] = IntGdiExtCreatePen(BlackPen.lopnStyle, BlackPen.lopnWidth.x, BS_SOLID, BlackPen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); - StockObjects[NULL_PEN] = IntGdiExtCreatePen(NullPen.lopnStyle, NullPen.lopnWidth.x, BS_SOLID, NullPen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); + StockObjects[WHITE_PEN] = IntCreateStockPen(WhitePen.lopnStyle, WhitePen.lopnWidth.x, BS_SOLID, WhitePen.lopnColor); + StockObjects[BLACK_PEN] = IntCreateStockPen(BlackPen.lopnStyle, BlackPen.lopnWidth.x, BS_SOLID, BlackPen.lopnColor); + StockObjects[DC_PEN] = IntCreateStockPen(BlackPen.lopnStyle, BlackPen.lopnWidth.x, BS_SOLID, BlackPen.lopnColor); + StockObjects[NULL_PEN] = IntCreateStockPen(NullPen.lopnStyle, NullPen.lopnWidth.x, BS_SOLID, NullPen.lopnColor); StockObjects[20] = NULL; /* TODO: Unknown internal stock object */ StockObjects[DEFAULT_BITMAP] = IntGdiCreateBitmap(1, 1, 1, 1, NULL); @@ -303,7 +341,7 @@ if(gpsi->SysColorPens[i] == NULL) { Pen.lopnColor = SysColors[i]; - gpsi->SysColorPens[i] = IntGdiExtCreatePen(Pen.lopnStyle, Pen.lopnWidth.x, BS_SOLID, Pen.lopnColor, 0, 0, 0, NULL, 0, TRUE, NULL); + gpsi->SysColorPens[i] = IntCreateStockPen(Pen.lopnStyle, Pen.lopnWidth.x, BS_SOLID, Pen.lopnColor); if(gpsi->SysColorPens[i] != NULL) { GDIOBJ_ConvertToStockObj((HGDIOBJ*)&gpsi->SysColorPens[i]);

1 0

[mkupfer] 37676: - tool for autoconverting INF files to utf-16le from an arbitrary unicode encoding
by mkupfer＠svn.reactos.org 26 Nov '08

26 Nov '08

Author: mkupfer Date: Wed Nov 26 14:38:15 2008 New Revision: 37676 URL: http://svn.reactos.org/svn/reactos?rev=37676&view=rev Log: - tool for autoconverting INF files to utf-16le from an arbitrary unicode encoding Added: trunk/reactos/tools/utf16le/ trunk/reactos/tools/utf16le/utf16le.cpp (with props) trunk/reactos/tools/utf16le/utf16le.rbuild (with props) Modified: trunk/reactos/tools/tools.rbuild Modified: trunk/reactos/tools/tools.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.rbuild?rev=376… ============================================================================== --- trunk/reactos/tools/tools.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/tools.rbuild [iso-8859-1] Wed Nov 26 14:38:15 2008 @@ -31,4 +31,7 @@ <directory name="wrc"> <xi:include href="wrc/wrc.rbuild" /> </directory> +<directory name="utf16le"> + <xi:include href="utf16le/utf16le.rbuild" /> +</directory> </group> Added: trunk/reactos/tools/utf16le/utf16le.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/utf16le/utf16le.cpp?… ============================================================================== --- trunk/reactos/tools/utf16le/utf16le.cpp (added) +++ trunk/reactos/tools/utf16le/utf16le.cpp [iso-8859-1] Wed Nov 26 14:38:15 2008 @@ -1,0 +1,290 @@ +/* + * Usage: utf16le inputfile outputfile + * + * This is a tool and is compiled using the host compiler, + * i.e. on Linux gcc and not mingw-gcc (cross-compiler). + * It's a converter from utf-8, utf-16 (LE/BE) and utf-32 (LE/BE) + * to utf-16 LE and especially made for automatic conversions of + * INF-files from utf-8 to utf-16LE (so we can furthermore + * store the INF files in utf-8 for subversion. + * + * Author: Matthias Kupfer (mkupfer(a)reactos.org) + */ + +#include <fstream> +#include <iostream> + +//#define DISPLAY_DETECTED_UNICODE + +using namespace std; + +class utf_converter +{ + public: + // detect can detect utf-8 and both utf-16 variants, but assume utf-32 only + // due to ambiguous BOM + enum enc_types { detect, utf8, utf16le, utf16be, utf32le, utf32be }; + enum err_types { none, iopen, oopen, eof, read, write, decode }; + protected: + err_types error; + enc_types encoding; + unsigned char buffer[4], fill, index; // need 4 char buffer for optional BOM handling + fstream inputfile,outputfile; + static const unsigned char utf8table[64]; + public: + utf_converter(string ifname, string ofname, enc_types enc = detect) : error(none), encoding(enc), fill(0), index(0) + { + enc_types tmp_enc; + inputfile.open(ifname.c_str(), ios::in); + if (!inputfile) + { + error = iopen; + return; + } + outputfile.open(ofname.c_str(), ios::out); + if (!outputfile) + { + error = oopen; + return; + } + tmp_enc = getBOM(); + if (enc != detect) + { + if (enc != tmp_enc) + cerr << "Warning: UTF-BOM doesn't match encoding setting, but given encoding forced" << endl; + } + else + encoding = tmp_enc; + } + err_types getError() + { + return error; + } + enc_types getBOM() + { + index = 0; + /* first byte can also detect with: + if ((buffer[0] & 0x11) || !buffer[0])) + valid values are 0xef, 0xff, 0xfe, 0x00 + */ + inputfile.read(reinterpret_cast<char*>(&buffer),4); + fill =inputfile.gcount(); + // stupid utf8 bom + if ((fill > 2) && + (buffer[0] == 0xef) && + (buffer[1] == 0xbb) && + (buffer[2] == 0xbf)) + { + index += 3; + fill -=3; +#ifdef DISPLAY_DETECTED_UNICODE + cerr << "UTF-8 BOM found" << endl; +#endif + return utf8; + } + if ((fill > 1) && + (buffer[0] == 0xfe) && + (buffer[1] == 0xff)) + { + index += 2; + fill -= 2; +#ifdef DISPLAY_DETECTED_UNICODE + cerr << "UTF-16BE BOM found" << endl; +#endif + return utf16be; + } + if ((fill > 1) && + (buffer[0] == 0xff) && + (buffer[1] == 0xfe)) + { + if ((fill == 4) && + (buffer[2] == 0x00) && + (buffer[3] == 0x00)) + { + cerr << "UTF Error: ambiguous BOM UTF-16 or UTF-32; assume UTF-32" << endl; + fill = 0; + index = 0; + return utf32le; + } + fill -= 2; + index += 2; +#ifdef DISPLAY_DETECTED_UNICODE + cerr << "UTF-16LE BOM found" << endl; +#endif + return utf16le; + } + if ((fill == 4) && + (buffer[0] == 0x00) && + (buffer[1] == 0x00) && + (buffer[2] == 0xfe) && + (buffer[3] == 0xff)) + { + fill = 0; + index = 0; +#ifdef DISPLAY_DETECTED_UNICODE + cerr << "UTF-32BE BOM found" << endl; +#endif + return utf32be; + } + return utf8; // no valid bom so use utf8 as default + } + int getByte(unsigned char &c) + { + if (fill) + { + index %= 4; + --fill; + c = buffer[index++]; + return 1; + } else + { + inputfile.read(reinterpret_cast<char*>(&c),1); + return inputfile.gcount(); + } + } + int getWord(unsigned short &w) + { + unsigned char c[2]; + if (!getByte(c[0])) + return 0; + if (!getByte(c[1])) + return 1; + if (encoding == utf16le) + w = c[0] | (c[1] << 8); + else + w = c[1] | (c[0] << 8); + return 2; + } + int getDWord(wchar_t &d) + { + unsigned char c[4]; + for (int i=0;i<4;i++) + if (!getByte(c[i])) + return i; + if (encoding == utf32le) + d = c[0] | (c[1] << 8) | (c[2] << 16) | (c[3] << 24); + else + d = c[3] | (c[2] << 8) | (c[1] << 16) | (c[0] << 24); + return 4; + } + wchar_t get_wchar_t() + { + wchar_t ret = -1; + switch (encoding) + { + case detect: // if still unknwon + encoding = utf8; // assume utf8 as default + case utf8: + unsigned char c, tmp; + if (!getByte(tmp)) + return ret; + // table for 64 bytes (all 11xxxxxx resp. >=192) + // resulting byte is determined: + // lower 3 bits: number of following bytes (max.8) 0=error + // upper 5 bits: data filled with 0 + if (tmp & 0x80) + { + if (tmp & 0xc0 != 0xc0) + { + cerr << "UTF-8 Error: invalid data byte" << endl; + return ret; + } + unsigned char i = utf8table[tmp & 0x3f]; + ret = i >> 3; + i &= 7; + while (i--) + { + ret <<= 6; + if (!getByte(c)) + return wchar_t(-1); + ret |= c & 0x3f; + } + return ret; + } + else + return wchar_t(tmp); + case utf16le: + case utf16be: + unsigned short w,w2; + if (getWord(w) != 2) + return ret; + if ((w & 0xfc00) == 0xd800) // high surrogate first + { + if (getWord(w2) != 2) + return ret; + if ((w2 & 0xfc00) != 0xdc00) + { + cerr << "UTF-16 Error: invalid low surrogate" << endl; + return ret; + } + return (((w & 0x3ff) + 0x40) << 10) | (w2 & 0x3ff); + } + return w; + case utf32le: + case utf32be: + if (getDWord(ret) != 4) + return wchar_t (-1); + return ret; + } + return ret; + } + void convert2utf16le() + { + wchar_t c; + unsigned char buffer[2] = {0xff, 0xfe}; + outputfile.write(reinterpret_cast<char*>(&buffer),2); // write BOM + c = get_wchar_t(); + while (!inputfile.eof()) + { + buffer[0] = c & 0xff; + buffer[1] = (c >> 8) & 0xff; // create utf16-le char + outputfile.write(reinterpret_cast<char*>(&buffer),2); // write char + c = get_wchar_t(); + } + } + ~utf_converter() + { + if (inputfile) + inputfile.close(); + if (outputfile) + outputfile.close(); + } +}; + +const unsigned char utf_converter::utf8table[64] = { +1, 9, 17, 25, 33, 41, 49, 57, 65, 73, 81, 89, 97, 105, 113, 121, +129, 137, 145, 153, 161, 169, 177, 185, 193, 201, 209, 217, 225, 233, 241, 249, +2, 10, 18, 26, 34, 42, 50, 58, 66, 74, 82, 90, 98, 106, 114, 122, +3, 11, 19, 27, 35, 43, 51, 59, 4, 12, 20, 28, 5, 13, 6, 7 +}; + + +int main(int argc, char* argv[]) +{ + utf_converter::err_types err; + if (argc < 3) + { + cout << "usage: " << argv[0] << " inputfile outputfile" << endl; + return -1; + } + utf_converter conv(argv[1],argv[2]); + if ((err = conv.getError())!=utf_converter::none) + { + switch (err) + { + case utf_converter::iopen: + cerr << "Couldn't open input file." << endl; + break; + case utf_converter::oopen: + cerr << "Couldn't open output file." << endl; + break; + default: + cerr << "Unknown error." << endl; + } + return -1; + } else + conv.convert2utf16le(); + return 0; +} + +// vim:set ts=4 sw=4: Propchange: trunk/reactos/tools/utf16le/utf16le.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/tools/utf16le/utf16le.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/utf16le/utf16le.rbui… ============================================================================== --- trunk/reactos/tools/utf16le/utf16le.rbuild (added) +++ trunk/reactos/tools/utf16le/utf16le.rbuild [iso-8859-1] Wed Nov 26 14:38:15 2008 @@ -1,0 +1,5 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name="utf16le" type="buildtool"> + <file>utf16le.cpp</file> +</module> Propchange: trunk/reactos/tools/utf16le/utf16le.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sginsberg] 37675: - Slightly reorder freeldr.h's include order
by sginsberg＠svn.reactos.org 26 Nov '08

26 Nov '08

Author: sginsberg Date: Wed Nov 26 14:33:34 2008 New Revision: 37675 URL: http://svn.reactos.org/svn/reactos?rev=37675&view=rev Log: - Slightly reorder freeldr.h's include order Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Wed Nov 26 14:33:34 2008 @@ -22,9 +22,6 @@ #define UINT64_C(val) val##ULL -#include <stdlib.h> -#include <stdio.h> -#include <ctype.h> #define NTOSAPI #define printf TuiPrintf #include <ntddk.h> @@ -32,6 +29,12 @@ #include <arc/arc.h> #include <ketypes.h> #include <mmtypes.h> +#include <ndk/asm.h> +#include <ndk/rtlfuncs.h> +#include <ndk/ldrtypes.h> +#include <stdlib.h> +#include <stdio.h> +#include <ctype.h> #include <rosldr.h> #include <arch.h> #include <rtl.h> @@ -46,10 +49,6 @@ #include <inffile.h> #include <video.h> #include <ramdisk.h> -/* NDK, needed for ReactOS/Windows loaders */ -#include <ndk/asm.h> -#include <ndk/rtlfuncs.h> -#include <ndk/ldrtypes.h> #include <reactos.h> #include <registry.h> #include <winldr.h>

1 0

[pschweitzer] 37674: Added a stubbed for VfatSetRenameInformation (it only handled one obvious case) Have a look to bug #3900
by pschweitzer＠svn.reactos.org 26 Nov '08

26 Nov '08

Author: pschweitzer Date: Wed Nov 26 14:00:18 2008 New Revision: 37674 URL: http://svn.reactos.org/svn/reactos?rev=37674&view=rev Log: Added a stubbed for VfatSetRenameInformation (it only handled one obvious case) Have a look to bug #3900 Modified: branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c Modified: branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Wed Nov 26 14:00:18 2008 @@ -748,6 +748,33 @@ return STATUS_SUCCESS; } +NTSTATUS +VfatSetRenameInformation(PVFAT_IRP_CONTEXT IrpContext) +{ + PIRP Irp; + PVFATFCB FCB, NewFCB; + PIO_STACK_LOCATION Stack; + PFILE_OBJECT FileObject, NewFileObject; + + DPRINT1("VfatSetRenameInformation is stubplemented!\n"); + + Irp = IrpContext->Irp; + Stack = IoGetCurrentIrpStackLocation(Irp); + + FileObject = IrpContext->FileObject; + FCB = FileObject->FsContext; + + NewFileObject = Stack->Parameters.SetFile.FileObject; + NewFCB = NewFileObject->FsContext; + + if (FsRtlAreNamesEqual(&(FCB->LongNameU), &(NewFCB->LongNameU), FALSE, NULL)) + { + return STATUS_SUCCESS; + } + + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS VfatQueryInformation(PVFAT_IRP_CONTEXT IrpContext) /* * FUNCTION: Retrieve the specified file information @@ -925,7 +952,7 @@ SystemBuffer); break; case FileRenameInformation: - RC = STATUS_NOT_IMPLEMENTED; + RC = VfatSetRenameInformation(IrpContext); break; default: RC = STATUS_NOT_SUPPORTED;

1 0

[sginsberg] 37673: - Fix some definitions, and remove __DD_INCLUDED__ hack
by sginsberg＠svn.reactos.org 26 Nov '08

26 Nov '08

Author: sginsberg Date: Wed Nov 26 14:00:14 2008 New Revision: 37673 URL: http://svn.reactos.org/svn/reactos?rev=37673&view=rev Log: - Fix some definitions, and remove __DD_INCLUDED__ hack Modified: trunk/reactos/include/ddk/ddrawi.h Modified: trunk/reactos/include/ddk/ddrawi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawi.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/ddrawi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ddrawi.h [iso-8859-1] Wed Nov 26 14:00:14 2008 @@ -216,15 +216,12 @@ } VIDMEM; - -#ifndef __DD_INCLUDED__ -#define VIDMEM_ISLINEAR 0x00000001 -#define VIDMEM_ISRECTANGULAR 0x00000002 -#define VIDMEM_ISHEAP 0x00000004 -#define VIDMEM_ISNONLOCAL 0x00000008 -#define VIDMEM_ISWC 0x00000010 -#define VIDMEM_ISDISABLED 0x00000020 -#endif +#define VIDMEM_ISLINEAR 0x00000001l +#define VIDMEM_ISRECTANGULAR 0x00000002l +#define VIDMEM_ISHEAP 0x00000004l +#define VIDMEM_ISNONLOCAL 0x00000008l +#define VIDMEM_ISWC 0x00000010l +#define VIDMEM_HEAPDISABLED 0x00000020l typedef struct _VIDMEMINFO { FLATPTR fpPrimary; @@ -338,11 +335,9 @@ /***************************************************************************** * ddraw->driver callbacks */ -#ifndef __DD_INCLUDED__ -#define DDHAL_DRIVER_NOTHANDLED 0 -#define DDHAL_DRIVER_HANDLED 1 -#define DDHAL_DRIVER_NOCKEYHW 2 -#endif +#define DDHAL_DRIVER_NOTHANDLED 0x00000000l +#define DDHAL_DRIVER_HANDLED 0x00000001l +#define DDHAL_DRIVER_NOCKEYHW 0x00000002l typedef struct _DDHAL_DESTROYDRIVERDATA *LPDDHAL_DESTROYDRIVERDATA; typedef struct _DDHAL_CREATESURFACEDATA *LPDDHAL_CREATESURFACEDATA; @@ -706,12 +701,10 @@ #define DDHAL_CB32_FLIPTOGDISURFACE 0x00000200l #define DDHAL_PALCB32_DESTROYPALETTE 0x00000001l #define DDHAL_PALCB32_SETENTRIES 0x00000002l -#ifndef __DD_INCLUDED__ #define DDHALINFO_ISPRIMARYDISPLAY 0x00000001 #define DDHALINFO_MODEXILLEGAL 0x00000002 #define DDHALINFO_GETDRIVERINFOSET 0x00000004 #define DDHALINFO_GETDRIVERINFO2 0x00000008 -#endif #define DDRAWI_VPORTSTART 0x0001 #define DDRAWI_VPORTSTOP 0x0002 #define DDRAWI_VPORTUPDATE 0x0003 @@ -739,13 +732,11 @@ #define DDHAL_MISC2CB32_CREATESURFACEEX 0x00000002 #define DDHAL_MISC2CB32_GETDRIVERSTATE 0x00000004 #define DDHAL_MISC2CB32_DESTROYDDLOCAL 0x00000008 -#ifndef __DD_INCLUDED__ -#define DDHAL_EXEBUFCB32_CANCREATEEXEBUF 0x00000001 -#define DDHAL_EXEBUFCB32_CREATEEXEBUF 0x00000002 -#define DDHAL_EXEBUFCB32_DESTROYEXEBUF 0x00000004 -#define DDHAL_EXEBUFCB32_LOCKEXEBUF 0x00000008 -#define DDHAL_EXEBUFCB32_UNLOCKEXEBUF 0x00000010 -#endif +#define DDHAL_EXEBUFCB32_CANCREATEEXEBUF 0x00000001l +#define DDHAL_EXEBUFCB32_CREATEEXEBUF 0x00000002l +#define DDHAL_EXEBUFCB32_DESTROYEXEBUF 0x00000004l +#define DDHAL_EXEBUFCB32_LOCKEXEBUF 0x00000008l +#define DDHAL_EXEBUFCB32_UNLOCKEXEBUF 0x00000010l #define DDHAL_VPORT32_CANCREATEVIDEOPORT 0x00000001 #define DDHAL_VPORT32_CREATEVIDEOPORT 0x00000002 #define DDHAL_VPORT32_FLIP 0x00000004 @@ -762,10 +753,8 @@ #define DDHAL_VPORT32_GETSIGNALSTATUS 0x00004000 #define DDHAL_VPORT32_COLORCONTROL 0x00008000 #define DDHAL_COLOR_COLORCONTROL 0x00000001 -#ifndef __DD_INCLUDED__ -#define DDHAL_KERNEL_SYNCSURFACEDATA 0x00000001 -#define DDHAL_KERNEL_SYNCVIDEOPORTDATA 0x00000002 -#endif +#define DDHAL_KERNEL_SYNCSURFACEDATA 0x00000001l +#define DDHAL_KERNEL_SYNCVIDEOPORTDATA 0x00000002l #define DDHAL_MOCOMP32_GETGUIDS 0x00000001 #define DDHAL_MOCOMP32_GETFORMATS 0x00000002 #define DDHAL_MOCOMP32_CREATE 0x00000004 @@ -1698,11 +1687,9 @@ #define DDRAWICLIP_INMASTERSPRITELIST 0x00000004 #define PFINDEX_UNINITIALIZED (0UL) #define PFINDEX_UNSUPPORTED (~0UL) -#ifndef __DD_INCLUDED__ -#define ROP_HAS_SOURCE 0x00000001 -#define ROP_HAS_PATTERN 0x00000002 -#define ROP_HAS_SOURCEPATTERN ROP_HAS_PATTERN | ROP_HAS_SOURCE -#endif +#define ROP_HAS_SOURCE 0x00000001l +#define ROP_HAS_PATTERN 0x00000002l +#define ROP_HAS_SOURCEPATTERN ROP_HAS_SOURCE | ROP_HAS_PATTERN #define DDRAWIVPORT_ON 0x00000001 #define DDRAWIVPORT_SOFTWARE_AUTOFLIP 0x00000002 #define DDRAWIVPORT_COLORKEYANDINTERP 0x00000004

1 0

[mkupfer] 37672: add myself
by mkupfer＠svn.reactos.org 26 Nov '08

26 Nov '08

Author: mkupfer Date: Wed Nov 26 13:48:01 2008 New Revision: 37672 URL: http://svn.reactos.org/svn/reactos?rev=37672&view=rev Log: add myself Modified: trunk/reactos/CREDITS Modified: trunk/reactos/CREDITS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CREDITS?rev=37672&r1=37671… ============================================================================== --- trunk/reactos/CREDITS [iso-8859-1] (original) +++ trunk/reactos/CREDITS [iso-8859-1] Wed Nov 26 13:48:01 2008 @@ -48,6 +48,7 @@ Mark Weaver <mark(a)npsl.co.uk> Martin Fuchs <martin-fuchs(a)gmx.net> Marty Dill <mdill(a)uvic.ca> +Matthias Kupfer <mkupfer(a)reactos.org> Matt Pyne Mike Nordell <"tamlin"> Nathan Woods <npwoods(a)mess.org>

1 0

[sginsberg] 37671: - Fix release build
by sginsberg＠svn.reactos.org 26 Nov '08

26 Nov '08

Author: sginsberg Date: Wed Nov 26 13:24:10 2008 New Revision: 37671 URL: http://svn.reactos.org/svn/reactos?rev=37671&view=rev Log: - Fix release build Modified: trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Wed Nov 26 13:24:10 2008 @@ -282,7 +282,6 @@ POBJECT_HEADER ObjectHeader; UNICODE_STRING ComponentName, RemainingName; BOOLEAN Reparse = FALSE, SymLink = FALSE; - PDEVICE_MAP DeviceMap = NULL; POBJECT_DIRECTORY Directory = NULL, ParentDirectory = NULL, RootDirectory; POBJECT_DIRECTORY ReferencedDirectory = NULL, ReferencedParentDirectory = NULL; KIRQL CalloutIrql; @@ -498,7 +497,6 @@ { ParseFromRoot: /* FIXME: Check if we have a device map */ - ASSERT(DeviceMap == NULL); /* Check if this is a possible DOS name */ if (!((ULONG_PTR)(ObjectName->Buffer) & 7))

1 0

[sginsberg] 37670: - Define NTSTATUS in a way compatible with the current header set
by sginsberg＠svn.reactos.org 26 Nov '08

26 Nov '08

Author: sginsberg Date: Wed Nov 26 13:22:33 2008 New Revision: 37670 URL: http://svn.reactos.org/svn/reactos?rev=37670&view=rev Log: - Define NTSTATUS in a way compatible with the current header set Modified: trunk/reactos/dll/directx/ksuser/ksuser.h Modified: trunk/reactos/dll/directx/ksuser/ksuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.h [iso-8859-1] Wed Nov 26 13:22:33 2008 @@ -1,5 +1,5 @@ #define _KSDDK_ #include <windows.h> -#include <ntsecapi.h> +typedef LONG NTSTATUS; #include <ks.h> #include <reactos/helper.h>

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