Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sserapion] 36673: Finally convert gdi32 to spec file.
by sserapion＠svn.reactos.org 07 Oct '08

07 Oct '08

Author: sserapion Date: Mon Oct 6 23:05:18 2008 New Revision: 36673 URL: http://svn.reactos.org/svn/reactos?rev=36673&view=rev Log: Finally convert gdi32 to spec file. Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/stubs.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Mon Oct 6 23:05:18 2008 @@ -1,5 +1,5 @@ <module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" allowwarnings="true"> - <importlibrary definition="gdi32.def" /> + <importlibrary definition="gdi32.spec.def" /> <include base="gdi32">include</include> <define name="_DISABLE_TIDENTS" /> <define name="WINVER">0x0600</define> @@ -51,4 +51,5 @@ <file>path.c</file> </directory> <file>gdi32.rc</file> + <file>gdi32.spec</file> </module> Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] Mon Oct 6 23:05:18 2008 @@ -1,10 +1,3 @@ -# ordinal exports -100 stdcall @(long long str str str) GDI_CallDevInstall16 -101 stdcall @(long str str ptr) GDI_CallExtDeviceModePropSheet16 -102 stdcall @(long ptr str str ptr str long) GDI_CallExtDeviceMode16 -103 stdcall @(long str ptr ptr) GDI_CallAdvancedSetupDialog16 -104 stdcall @(str str long ptr ptr) GDI_CallDeviceCapabilities16 - @ stdcall AbortDoc(long) @ stdcall AbortPath(long) @ stdcall AddFontMemResourceEx(ptr long ptr ptr) @@ -15,25 +8,35 @@ @ stdcall AddFontResourceW(wstr) @ stdcall AngleArc(long long long long long long) @ stdcall AnimatePalette(long long long ptr) -# @ stub AnyLinkedFonts +@ stdcall AnyLinkedFonts() NtGdiAnyLinkedFonts @ stdcall Arc(long long long long long long long long long) @ stdcall ArcTo(long long long long long long long long long) @ stdcall BeginPath(long) +@ stdcall bInitSystemAndFontsDirectoriesW(wstr wstr) @ stdcall BitBlt(long long long long long long long long long) +@ stdcall bMakePathNameW(wstr wstr wstr long) +@ stdcall BRUSHOBJ_hGetColorTransform(ptr) NtGdiBRUSHOBJ_hGetColorTransform +@ stdcall BRUSHOBJ_pvAllocRbrush(ptr long) NtGdiBRUSHOBJ_pvAllocRbrush +@ stdcall BRUSHOBJ_pvGetRbrush(ptr) NtGdiBRUSHOBJ_pvGetRbrush +@ stdcall BRUSHOBJ_ulGetBrushColor(ptr) NtGdiBRUSHOBJ_ulGetBrushColor @ stub ByeByeGDI @ stdcall CancelDC(long) -@ stub CheckColorsInGamut +@ stdcall cGetTTFFromFOT(long long long long long long long) +@ stdcall CheckColorsInGamut(ptr ptr ptr long) @ stdcall ChoosePixelFormat(long ptr) @ stdcall Chord(long long long long long long long long long) -# @ stub ClearBitmapAttributes -# @ stub ClearBrushAttributes +@ stdcall ClearBitmapAttributes(ptr long) +@ stdcall ClearBrushAttributes(ptr long) +@ stdcall CLIPOBJ_bEnum(ptr long long) NtGdiCLIPOBJ_bEnum +@ stdcall CLIPOBJ_cEnumStart(ptr long long long long) NtGdiCLIPOBJ_cEnumStart +@ stdcall CLIPOBJ_ppoGetPath(ptr) NtGdiCLIPOBJ_ppoGetPath @ stdcall CloseEnhMetaFile(long) @ stdcall CloseFigure(long) @ stdcall CloseMetaFile(long) -@ stub ColorCorrectPalette -@ stub ColorMatchToTarget +@ stdcall ColorCorrectPalette(ptr ptr long long) +@ stdcall ColorMatchToTarget(ptr ptr long) @ stdcall CombineRgn(long long long long) -@ stdcall CombineTransform(ptr ptr ptr) +@ stdcall CombineTransform(ptr ptr ptr) NtGdiCombineTransform @ stdcall CopyEnhMetaFileA(long str) @ stdcall CopyEnhMetaFileW(long wstr) @ stdcall CopyMetaFileA(long str) @@ -47,12 +50,12 @@ @ stdcall CreateCompatibleDC(long) @ stdcall CreateDCA(str str str ptr) @ stdcall CreateDCW(wstr wstr wstr ptr) +@ stdcall CreateDIBitmap(long ptr long ptr ptr long) @ stdcall CreateDIBPatternBrush(long long) @ stdcall CreateDIBPatternBrushPt(long long) @ stdcall CreateDIBSection(long ptr long ptr long long) -@ stdcall CreateDIBitmap(long ptr long ptr ptr long) @ stdcall CreateDiscardableBitmap(long long long) -@ stdcall CreateEllipticRgn(long long long long) +@ stdcall CreateEllipticRgn(long long long long) NtGdiCreateEllipticRgn @ stdcall CreateEllipticRgnIndirect(ptr) @ stdcall CreateEnhMetaFileA(long str ptr str) @ stdcall CreateEnhMetaFileW(long wstr ptr wstr) @@ -62,7 +65,7 @@ # @ stub CreateFontIndirectExW @ stdcall CreateFontIndirectW(ptr) @ stdcall CreateFontW(long long long long long long long long long long long long long wstr) -@ stdcall CreateHalftonePalette(long) +@ stdcall CreateHalftonePalette(long) NtGdiCreateHalftonePalette @ stdcall CreateHatchBrush(long long) @ stdcall CreateICA(str str str ptr) @ stdcall CreateICW(wstr wstr wstr ptr) @@ -76,27 +79,130 @@ @ stdcall CreatePolygonRgn(ptr long long) @ stdcall CreateRectRgn(long long long long) @ stdcall CreateRectRgnIndirect(ptr) -@ stdcall CreateRoundRectRgn(long long long long long long) +@ stdcall CreateRoundRectRgn(long long long long long long) NtGdiCreateRoundRectRgn @ stdcall CreateScalableFontResourceA(long str str str) @ stdcall CreateScalableFontResourceW(long wstr wstr wstr) @ stdcall CreateSolidBrush(long) -@ stdcall DPtoLP(long ptr long) -@ stdcall DeleteColorSpace(long) +@ stdcall DdEntry0(ptr ptr ptr ptr ptr ptr) NtGdiDxgGenericThunk +@ stdcall DdEntry10(ptr ptr) NtGdiDdBeginMoCompFrame +@ stdcall DdEntry11(ptr ptr ptr) NtGdiDdBlt +@ stdcall DdEntry12(ptr ptr) NtGdiDdCanCreateSurface +@ stdcall DdEntry13(ptr ptr) NtGdiDdCanCreateD3DBuffer +@ stdcall DdEntry14(ptr ptr) NtGdiDdColorControl +@ stdcall DdEntry15(ptr) NtGdiDdCreateDirectDrawObject +@ stdcall DdEntry16(ptr ptr ptr ptr ptr ptr ptr ptr) NtGdiDdCreateSurface +@ stdcall DdEntry17(ptr ptr ptr ptr ptr ptr ptr ptr) NtGdiDdCreateD3DBuffer +@ stdcall DdEntry18(ptr ptr) NtGdiDdCreateMoComp +@ stdcall DdEntry19(ptr ptr ptr ptr ptr long) NtGdiDdCreateSurfaceObject +@ stdcall DdEntry1(ptr ptr ptr ptr) NtGdiD3dContextCreate +@ stdcall DdEntry20(ptr) NtGdiDdDeleteDirectDrawObject +@ stdcall DdEntry21(ptr) NtGdiDdDeleteSurfaceObject +@ stdcall DdEntry22(ptr ptr) NtGdiDdDestroyMoComp +@ stdcall DdEntry23(ptr long) NtGdiDdDestroySurface +@ stdcall DdEntry24(ptr) NtGdiDdDestroyD3DBuffer +@ stdcall DdEntry25(ptr ptr) NtGdiDdEndMoCompFrame +@ stdcall DdEntry26(ptr ptr ptr ptr ptr) NtGdiDdFlip +@ stdcall DdEntry27(ptr long) NtGdiDdFlipToGDISurface +@ stdcall DdEntry28(ptr ptr) NtGdiDdGetAvailDriverMemory +@ stdcall DdEntry29(ptr ptr) NtGdiDdGetBltStatus +@ stdcall DdEntry2(ptr)NtGdiD3dContextDestroy +@ stdcall DdEntry30(ptr ptr) NtGdiDdGetDC +@ stdcall DdEntry31(ptr ptr) NtGdiDdGetDriverInfo +@ stdcall DdEntry32(ptr ptr long) NtGdiDdGetDxHandle +@ stdcall DdEntry33(ptr ptr) NtGdiDdGetFlipStatus +@ stdcall DdEntry34(ptr ptr) NtGdiDdGetInternalMoCompInfo +@ stdcall DdEntry35(ptr ptr) NtGdiDdGetMoCompBuffInfo +@ stdcall DdEntry36(ptr ptr) NtGdiDdGetMoCompGuids +@ stdcall DdEntry37(ptr ptr) NtGdiDdGetMoCompFormats +@ stdcall DdEntry38(ptr ptr) NtGdiDdGetScanLine +@ stdcall DdEntry39(ptr ptr ptr) NtGdiDdLock +@ stdcall DdEntry3(ptr) NtGdiD3dContextDestroyAll +@ stdcall DdEntry40(ptr ptr) NtGdiDdLockD3D +@ stdcall DdEntry41(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) NtGdiDdQueryDirectDrawObject +@ stdcall DdEntry42(ptr ptr) NtGdiDdQueryMoCompStatus +@ stdcall DdEntry43(ptr ptr) NtGdiDdReenableDirectDrawObject +@ stdcall DdEntry44(ptr) NtGdiDdReleaseDC +@ stdcall DdEntry45(ptr ptr) NtGdiDdRenderMoComp +@ stdcall DdEntry46(ptr ptr) NtGdiDdResetVisrgn +@ stdcall DdEntry47(ptr ptr) NtGdiDdSetColorKey +@ stdcall DdEntry48(ptr ptr) NtGdiDdSetExclusiveMode +@ stdcall DdEntry49(ptr ptr ptr) NtGdiDdSetGammaRamp +@ stdcall DdEntry4(ptr) NtGdiD3dValidateTextureStageState +@ stdcall DdEntry50(ptr ptr long)NtGdiDdCreateSurfaceEx +@ stdcall DdEntry51(ptr ptr ptr) NtGdiDdSetOverlayPosition +@ stdcall DdEntry52(ptr ptr) NtGdiDdUnattachSurface +@ stdcall DdEntry53(ptr ptr) NtGdiDdUnlock +@ stdcall DdEntry54(ptr ptr) NtGdiDdUnlockD3D +@ stdcall DdEntry55(ptr ptr long) NtGdiDdUpdateOverlay +@ stdcall DdEntry56(ptr ptr) NtGdiDdWaitForVerticalBlank +@ stdcall DdEntry5(ptr ptr ptr ptr ptr ptr ptr) NtGdiD3dDrawPrimitives2 +@ stdcall DdEntry6(ptr) NtGdiDdGetDriverState +@ stdcall DdEntry7(ptr ptr ptr) NtGdiDdAddAttachedSurface +@ stdcall DdEntry8(ptr ptr ptr) NtGdiDdAlphaBlt +@ stdcall DdEntry9(ptr ptr) NtGdiDdAttachSurface +@ stdcall DeleteColorSpace(long) NtGdiDeleteColorSpace @ stdcall DeleteDC(long) @ stdcall DeleteEnhMetaFile(long) @ stdcall DeleteMetaFile(long) @ stdcall DeleteObject(long) @ stdcall DescribePixelFormat(long long long ptr) @ stub DeviceCapabilitiesEx -@ stub DeviceCapabilitiesExA -@ stub DeviceCapabilitiesExW +@ stdcall DeviceCapabilitiesExA(str str long str ptr) +@ stdcall DeviceCapabilitiesExW(wstr wstr long wstr ptr) +@ stdcall DPtoLP(long ptr long) @ stdcall DrawEscape(long long long ptr) @ stdcall Ellipse(long long long long long) -@ stdcall EnableEUDC(long) +@ stdcall EnableEUDC(long) NtGdiEnableEudc @ stdcall EndDoc(long) -# @ stub EndFormPage +@ stdcall EndFormPage(ptr) @ stdcall EndPage(long) @ stdcall EndPath(long) +@ stdcall EngAcquireSemaphore(ptr) +@ stdcall EngAlphaBlend(ptr ptr ptr ptr ptr ptr ptr) NtGdiEngAlphaBlend +@ stdcall EngAssociateSurface(ptr ptr long) NtGdiEngAssociateSurface +@ stdcall EngBitBlt(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) NtGdiEngBitBlt +@ stdcall EngCheckAbort(ptr) NtGdiEngCheckAbort +@ stdcall EngComputeGlyphSet(ptr ptr ptr) +@ stdcall EngCopyBits(ptr ptr ptr ptr ptr ptr) NtGdiEngCopyBits +@ stdcall EngCreateBitmap(ptr long long ptr ptr) NtGdiEngCreateBitmap +@ stdcall EngCreateClip() NtGdiEngCreateClip +@ stdcall EngCreateDeviceBitmap(ptr ptr long) NtGdiEngCreateDeviceBitmap +@ stdcall EngCreateDeviceSurface(ptr ptr long) NtGdiEngCreateDeviceSurface +@ stdcall EngCreatePalette(long long ptr long long long) NtGdiEngCreatePalette +@ stdcall EngCreateSemaphore() +@ stdcall EngDeleteClip(ptr) NtGdiEngDeleteClip +@ stdcall EngDeletePalette(ptr) NtGdiEngDeletePalette +@ stdcall EngDeletePath(ptr) NtGdiEngDeletePath +@ stdcall EngDeleteSemaphore(ptr) +@ stdcall EngDeleteSurface(ptr) NtGdiEngDeleteSurface +@ stdcall EngEraseSurface(ptr ptr long) NtGdiEngEraseSurface +@ stdcall EngFillPath(ptr ptr ptr ptr ptr ptr ptr) NtGdiEngFillPath +@ stdcall EngFindResource(ptr long long ptr) +@ stdcall EngFreeModule(ptr) +@ stdcall EngGetCurrentCodePage(ptr ptr) +@ stdcall EngGetDriverName(ptr) +@ stdcall EngGetPrinterDataFileName(ptr) +@ stdcall EngGradientFill(ptr ptr ptr ptr long ptr long ptr ptr long) NtGdiEngGradientFill +@ stdcall EngLineTo(ptr ptr ptr long long long long ptr ptr) NtGdiEngLineTo +@ stdcall EngLoadModule(ptr) +@ stdcall EngLockSurface(ptr) NtGdiEngLockSurface +@ stdcall EngMarkBandingSurface(ptr) NtGdiEngMarkBandingSurface +@ stdcall EngMultiByteToUnicodeN(wstr long ptr str long) RtlMultiByteToUnicodeN +@ stdcall EngMultiByteToWideChar(long wstr long str long) +@ stdcall EngPaint(ptr ptr ptr ptr ptr) NtGdiEngPaint +@ stdcall EngPlgBlt(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr long) NtGdiEngPlgBlt +@ stdcall EngQueryEMFInfo(ptr ptr) +@ stdcall EngQueryLocalTime(ptr) +@ stdcall EngReleaseSemaphore(ptr) +@ stdcall EngStretchBlt(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr long) NtGdiEngStretchBlt +@ stdcall EngStretchBltROP(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr long ptr long) NtGdiEngStretchBltROP +@ stdcall EngStrokeAndFillPath(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) NtGdiEngStrokeAndFillPath +@ stdcall EngStrokePath(ptr ptr ptr ptr ptr ptr ptr ptr) NtGdiEngStrokePath +@ stdcall EngTextOut(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) NtGdiEngTextOut +@ stdcall EngTransparentBlt(ptr ptr ptr ptr ptr ptr long long) NtGdiEngTransparentBlt +@ stdcall EngUnicodeToMultiByteN(str long long wstr long) RtlUnicodeToMultiByteN +@ stdcall EngUnlockSurface(ptr) NtGdiEngUnlockSurface +@ stdcall EngWideCharToMultiByte(long wstr long str long) @ stdcall EnumEnhMetaFile(long long ptr ptr ptr) @ stdcall EnumFontFamiliesA(long str ptr long) @ stdcall EnumFontFamiliesExA(long ptr ptr long long) @@ -108,10 +214,10 @@ @ stdcall EnumICMProfilesW(long ptr long) @ stdcall EnumMetaFile(long long ptr ptr) @ stdcall EnumObjects(long long ptr long) -@ stdcall EqualRgn(long long) +@ stdcall EqualRgn(long long) NtGdiEqualRgn @ stdcall Escape(long long long ptr ptr) -# @ stub EudcLoadLinkW -# @ stub EudcUnloadLinkW +@ stdcall EudcLoadLinkW(wstr wstr long long) +@ stdcall EudcUnloadLinkW(wstr wstr) @ stdcall ExcludeClipRect(long long long long long) @ stdcall ExtCreatePen(long long ptr long ptr) @ stdcall ExtCreateRegion(ptr long ptr) @@ -125,28 +231,36 @@ @ stdcall FixBrushOrgEx(long long long ptr) @ stdcall FlattenPath(long) @ stdcall FloodFill(long long long long) -@ stdcall FontIsLinked(long) +@ stdcall FontIsLinked(long) NtGdiFontIsLinked +@ stdcall FONTOBJ_cGetAllGlyphHandles(ptr ptr) NtGdiFONTOBJ_cGetAllGlyphHandles +@ stdcall FONTOBJ_cGetGlyphs(ptr long long ptr ptr) NtGdiFONTOBJ_cGetGlyphs +@ stdcall FONTOBJ_pfdg(ptr) NtGdiFONTOBJ_pfdg +@ stdcall FONTOBJ_pifi(ptr) NtGdiFONTOBJ_pifi +@ stdcall FONTOBJ_pQueryGlyphAttrs(ptr long) NtGdiFONTOBJ_pQueryGlyphAttrs +@ stdcall FONTOBJ_pvTrueTypeFontFile(ptr ptr) NtGdiFONTOBJ_pvTrueTypeFontFile +@ stdcall FONTOBJ_pxoGetXform(ptr) NtGdiFONTOBJ_pxoGetXform +@ stdcall FONTOBJ_vGetInfo(ptr long ptr) NtGdiFONTOBJ_vGetInfo @ stdcall FrameRgn(long long long long long) @ stub FreeImageColorMatcher -# @ stub GdiAddFontResourceW -# @ stub GdiAddGlsBounds -# @ stub GdiAddGlsRecord +@ stdcall GdiAddFontResourceW(ptr ptr ptr) +@ stdcall GdiAddGlsBounds(ptr ptr) +@ stdcall GdiAddGlsRecord(ptr long ptr ptr) @ stdcall GdiAlphaBlend(long long long long long long long long long long long) -# @ stub GdiArtificialDecrementDriver +@ stdcall GdiArtificialDecrementDriver(wstr long) @ stub GdiAssociateObject -@ stub GdiCleanCacheDC +@ stdcall GdiCleanCacheDC(ptr) @ stdcall GdiComment(long long ptr) -# @ stub GdiConsoleTextOut +@ stdcall GdiConsoleTextOut(ptr ptr long ptr) NtGdiConsoleTextOut @ stub GdiConvertAndCheckDC @ stub GdiConvertBitmap -# @ stub GdiConvertBitmapV5 -@ stub GdiConvertBrush -@ stub GdiConvertDC -@ stub GdiConvertEnhMetaFile -@ stub GdiConvertFont -@ stub GdiConvertMetaFilePict -@ stub GdiConvertPalette -@ stub GdiConvertRegion +@ stdcall GdiConvertBitmapV5(ptr ptr long long) +@ stdcall GdiConvertBrush(ptr) +@ stdcall GdiConvertDC(ptr) +@ stdcall GdiConvertEnhMetaFile(ptr) +@ stdcall GdiConvertFont(ptr) +@ stdcall GdiConvertMetaFilePict(ptr) +@ stdcall GdiConvertPalette(ptr) +@ stdcall GdiConvertRegion(ptr) @ stdcall GdiConvertToDevmodeW(ptr) @ stub GdiCreateLocalBitmap @ stub GdiCreateLocalBrush @@ -168,126 +282,143 @@ @ stub GdiDciSetDestination @ stub GdiDeleteLocalDC @ stub GdiDeleteLocalObject -# @ stub GdiDeleteSpoolFileHandle -# @ stub GdiDescribePixelFormat -@ stub GdiDllInitialize -# @ stub GdiDrawStream -# @ stub GdiEndDocEMF -# @ stub GdiEndPageEMF -# @ stub GdiFixUpHandle +@ stdcall GdiDeleteSpoolFileHandle(ptr) +@ stdcall GdiDescribePixelFormat(ptr long long ptr) NtGdiDescribePixelFormat +@ stdcall GdiDllInitialize(ptr long ptr) +@ stdcall GdiDrawStream(ptr long ptr) +@ stdcall GdiEndDocEMF(ptr) +@ stdcall GdiEndPageEMF(ptr long) +#@ stdcall GdiEntry1 +#@ stdcall GdiEntry10 +#@ stdcall GdiEntry11 +#@ stdcall GdiEntry12 +#@ stdcall GdiEntry13 +#@ stdcall GdiEntry14 +#@ stdcall GdiEntry15 +#@ stdcall GdiEntry16 +#@ stdcall GdiEntry2 +#@ stdcall GdiEntry3 +#@ stdcall GdiEntry4 +#@ stdcall GdiEntry5 +#@ stdcall GdiEntry6 +#@ stdcall GdiEntry7 +#@ stdcall GdiEntry8 +#@ stdcall GdiEntry9 +@ stdcall GdiFixUpHandle(ptr) @ stdcall GdiFlush() -# @ stub GdiFullscreenControl +@ stdcall GdiFullscreenControl(ptr ptr long ptr ptr) NtGdiFullscreenControl @ stdcall GdiGetBatchLimit() @ stdcall GdiGetCharDimensions(long ptr ptr) @ stdcall GdiGetCodePage(long) -# @ stub GdiGetDC -# @ stub GdiGetDevmodeForPage +@ stdcall GdiGetDC(ptr) +@ stdcall GdiGetDevmodeForPage(ptr long ptr ptr) @ stub GdiGetLocalBitmap @ stub GdiGetLocalBrush @ stub GdiGetLocalDC @ stub GdiGetLocalFont -# @ stub GdiGetPageCount -# @ stub GdiGetPageHandle -# @ stub GdiGetSpoolFileHandle -@ stdcall GdiGetSpoolMessage(ptr long ptr long) +@ stdcall GdiGetPageCount(ptr) +@ stdcall GdiGetPageHandle(ptr long ptr) +@ stdcall GdiGetSpoolFileHandle(wstr ptr wstr) +@ stdcall GdiGetSpoolMessage(ptr long ptr long) NtGdiGetSpoolMessage @ stdcall GdiGradientFill(long ptr long ptr long long) -@ stdcall GdiInitSpool() -# @ stub GdiInitializeLanguagePack +@ stdcall GdiInitializeLanguagePack(long) +@ stdcall GdiInitSpool() NtGdiInitSpool @ stdcall GdiIsMetaFileDC(long) @ stdcall GdiIsMetaPrintDC(long) @ stdcall GdiIsPlayMetafileDC(long) -@ stub GdiPlayDCScript -# @ stub GdiPlayEMF -@ stub GdiPlayJournal -# @ stub GdiPlayPageEMF -# @ stub GdiPlayPrivatePageEMF -@ stub GdiPlayScript -# @ stub GdiPrinterThunk -# @ stub GdiProcessSetup -# @ stub GdiQueryFonts -# @ stub GdiQueryTable +@ stdcall GdiPlayDCScript(long long long long long long) +@ stdcall GdiPlayEMF(wstr ptr wstr ptr ptr) +@ stdcall GdiPlayJournal(long long long long long) +@ stdcall GdiPlayPageEMF(ptr ptr ptr ptr ptr) +@ stdcall GdiPlayPrivatePageEMF(ptr long ptr) +@ stdcall GdiPlayScript(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall GdiPlaySpoolStream(long long long long long long) +@ stdcall GdiPrinterThunk(ptr ptr long) +@ stdcall GdiProcessSetup() +@ stdcall GdiQueryFonts(ptr long ptr) NtGdiQueryFonts +@ stdcall GdiQueryTable() @ stdcall GdiRealizationInfo(long ptr) -# @ stub GdiReleaseDC -@ stub GdiReleaseLocalDC -# @ stub GdiResetDCEMF -@ stub GdiSetAttrs +@ stdcall GdiReleaseDC(ptr) +@ stdcall GdiReleaseLocalDC(ptr) +@ stdcall GdiResetDCEMF(ptr ptr) +@ stdcall GdiSetAttrs(ptr) @ stdcall GdiSetBatchLimit(long) -# @ stub GdiSetLastError -# @ stub GdiSetPixelFormat -@ stub GdiSetServerAttr -# @ stub GdiStartDocEMF -# @ stub GdiStartPageEMF -# @ stub GdiSwapBuffers +@ stdcall GdiSetLastError(long) +@ stdcall GdiSetPixelFormat(ptr long) NtGdiSetPixelFormat +@ stdcall GdiSetServerAttr(ptr long) +@ stdcall GdiStartDocEMF(ptr ptr) +@ stdcall GdiStartPageEMF(ptr) +@ stub GdiSwapBuffers @ stdcall GdiTransparentBlt(long long long long long long long long long long long) -# @ stub GdiValidateHandle +@ stdcall GdiValidateHandle(ptr) @ stub GdiWinWatchClose @ stub GdiWinWatchDidStatusChange @ stub GdiWinWatchGetClipList @ stub GdiWinWatchOpen @ stdcall GetArcDirection(long) @ stdcall GetAspectRatioFilterEx(long ptr) -# @ stub GetBitmapAttributes -@ stdcall GetBitmapBits(long long ptr) -@ stdcall GetBitmapDimensionEx(long ptr) +@ stdcall GetBitmapAttributes(ptr) +@ stdcall GetBitmapBits(long long ptr) NtGdiGetBitmapBits +@ stdcall GetBitmapDimensionEx(long ptr) NtGdiGetBitmapDimension @ stdcall GetBkColor(long) @ stdcall GetBkMode(long) @ stdcall GetBoundsRect(long ptr long) -# @ stub GetBrushAttributes +@ stdcall GetBrushAttributes(ptr) @ stdcall GetBrushOrgEx(long ptr) @ stdcall GetCharABCWidthsA(long long long ptr) @ stdcall GetCharABCWidthsFloatA(long long long ptr) @ stdcall GetCharABCWidthsFloatW(long long long ptr) @ stdcall GetCharABCWidthsI(long long long ptr ptr) @ stdcall GetCharABCWidthsW(long long long ptr) +@ stdcall GetCharacterPlacementA(long str long long ptr long) +@ stdcall GetCharacterPlacementW(long wstr long long ptr long) @ stdcall GetCharWidth32A(long long long long) @ stdcall GetCharWidth32W(long long long long) @ stdcall GetCharWidthA(long long long long) GetCharWidth32A @ stdcall GetCharWidthFloatA(long long long ptr) @ stdcall GetCharWidthFloatW(long long long ptr) @ stdcall GetCharWidthI(ptr long long ptr ptr) -# @ stub GetCharWidthInfo -@ stdcall GetCharWidthW(long long long long) GetCharWidth32W +@ stdcall GetCharWidthInfo(ptr ptr) NtGdiGetCharWidthInfo +@ stdcall GetCharWidthW(long long long long) @ stub GetCharWidthWOW -@ stdcall GetCharacterPlacementA(long str long long ptr long) -@ stdcall GetCharacterPlacementW(long wstr long long ptr long) @ stdcall GetClipBox(long ptr) @ stdcall GetClipRgn(long long) -@ stdcall GetColorAdjustment(long ptr) +@ stdcall GetColorAdjustment(long ptr) NtGdiGetColorAdjustment @ stdcall GetColorSpace(long) @ stdcall GetCurrentObject(long long) @ stdcall GetCurrentPositionEx(long ptr) @ stdcall GetDCBrushColor(long) @ stdcall GetDCOrgEx(long ptr) @ stdcall GetDCPenColor(long) +@ stdcall GetDeviceCaps(long long) +@ stdcall GetDeviceGammaRamp(long ptr) @ stdcall GetDIBColorTable(long long long ptr) @ stdcall GetDIBits(long long long long ptr ptr long) -@ stdcall GetDeviceCaps(long long) -@ stdcall GetDeviceGammaRamp(long ptr) -@ stub GetETM -# @ stub GetEUDCTimeStamp -# @ stub GetEUDCTimeStampExW @ stdcall GetEnhMetaFileA(str) @ stdcall GetEnhMetaFileBits(long long ptr) @ stdcall GetEnhMetaFileDescriptionA(long long ptr) @ stdcall GetEnhMetaFileDescriptionW(long long ptr) @ stdcall GetEnhMetaFileHeader(long long ptr) @ stdcall GetEnhMetaFilePaletteEntries (long long ptr) -# @ stub GetEnhMetaFilePixelFormat +@ stdcall GetEnhMetaFilePixelFormat(ptr long ptr) @ stdcall GetEnhMetaFileW(wstr) +@ stub GetETM +# @ stub GetEUDCTimeStamp +# @ stub GetEUDCTimeStampExW # @ stub GetFontAssocStatus @ stdcall GetFontData(long long long ptr long) @ stdcall GetFontLanguageInfo(long) @ stub GetFontResourceInfo @ stub GetFontResourceInfoW -@ stdcall GetFontUnicodeRanges(ptr ptr) +@ stdcall GetFontUnicodeRanges(ptr ptr) NtGdiGetFontUnicodeRanges @ stdcall GetGlyphIndicesA(long ptr long ptr long) -@ stdcall GetGlyphIndicesW(long ptr long ptr long) +@ stdcall GetGlyphIndicesW(long ptr long ptr long) NtGdiGetGlyphIndicesW @ stdcall GetGlyphOutline(long long long ptr long ptr ptr) GetGlyphOutlineA @ stdcall GetGlyphOutlineA(long long long ptr long ptr ptr) @ stdcall GetGlyphOutlineW(long long long ptr long ptr ptr) -@ stub GetGlyphOutlineWow +@ stdcall GetGlyphOutlineWow(long long long long long long long) @ stdcall GetGraphicsMode(long) -# @ stub GetHFONT +@ stdcall GetHFONT(ptr) @ stdcall GetICMProfileA(long ptr ptr) @ stdcall GetICMProfileW(long ptr ptr) @ stdcall GetKerningPairs(long long ptr) GetKerningPairsA @@ -301,9 +432,9 @@ @ stdcall GetMetaFileBitsEx(long long ptr) @ stdcall GetMetaFileW(wstr) @ stdcall GetMetaRgn(long long) -@ stdcall GetMiterLimit(long ptr) -@ stdcall GetNearestColor(long long) -@ stdcall GetNearestPaletteIndex(long long) +@ stdcall GetMiterLimit(long ptr) NtGdiGetMiterLimit +@ stdcall GetNearestColor(long long) NtGdiGetNearestColor +@ stdcall GetNearestPaletteIndex(long long) NtGdiGetNearestPaletteIndex @ stdcall GetObjectA(long long ptr) @ stdcall GetObjectType(long) @ stdcall GetObjectW(long long ptr) @@ -314,64 +445,71 @@ @ stdcall GetPixel(long long long) @ stdcall GetPixelFormat(long) @ stdcall GetPolyFillMode(long) -@ stdcall GetROP2(long) -@ stdcall GetRandomRgn(long long long) -@ stdcall GetRasterizerCaps(ptr long) +@ stdcall GetRandomRgn(long long long) NtGdiGetRandomRgn +@ stdcall GetRasterizerCaps(ptr long) NtGdiGetRasterizerCaps @ stdcall GetRegionData(long long ptr) @ stdcall GetRelAbs(long long) @ stdcall GetRgnBox(long ptr) +@ stdcall GetROP2(long) @ stdcall GetStockObject(long) @ stdcall GetStretchBltMode(long) -# @ stub GetStringBitmapA -# @ stub GetStringBitmapW +@ stdcall GetStringBitmapA(ptr str long long ptr) +@ stdcall GetStringBitmapW(ptr wstr long long ptr) @ stdcall GetSystemPaletteEntries(long long long ptr) -@ stdcall GetSystemPaletteUse(long) +@ stdcall GetSystemPaletteUse(long) NtGdiGetSystemPaletteUse @ stdcall GetTextAlign(long) @ stdcall GetTextCharacterExtra(long) @ stdcall GetTextCharset(long) -@ stdcall GetTextCharsetInfo(long ptr long) +@ stdcall GetTextCharsetInfo(long ptr long) NtGdiGetTextCharsetInfo @ stdcall GetTextColor(long) @ stdcall GetTextExtentExPointA(long str long long ptr ptr ptr) @ stdcall GetTextExtentExPointI(long ptr long long ptr ptr ptr) @ stdcall GetTextExtentExPointW(long wstr long long ptr ptr ptr) -# @ stub GetTextExtentExPointWPri +@ stdcall GetTextExtentExPointWPri(ptr wstr long long long ptr ptr) @ stdcall GetTextExtentPoint32A(long str long ptr) @ stdcall GetTextExtentPoint32W(long wstr long ptr) @ stdcall GetTextExtentPointA(long str long ptr) @ stdcall GetTextExtentPointI(long ptr long ptr) @ stdcall GetTextExtentPointW(long wstr long ptr) @ stdcall GetTextFaceA(long long ptr) -# @ stub GetTextFaceAliasW +@ stdcall GetTextFaceAliasW(ptr long wstr) @ stdcall GetTextFaceW(long long ptr) @ stdcall GetTextMetricsA(long ptr) @ stdcall GetTextMetricsW(long ptr) -@ stdcall GetTransform(long long ptr) +@ stdcall GetTransform(long long ptr) NtGdiGetTransform @ stdcall GetViewportExtEx(long ptr) @ stdcall GetViewportOrgEx(long ptr) -@ stdcall GetWinMetaFileBits(long long ptr long long) @ stdcall GetWindowExtEx(long ptr) @ stdcall GetWindowOrgEx(long ptr) +@ stdcall GetWinMetaFileBits(long long ptr long long) @ stdcall GetWorldTransform(long ptr) +@ stdcall HT_Get8BPPFormatPalette(ptr long long long) NtGdiHT_Get8BPPFormatPalette +@ stdcall HT_Get8BPPMaskPalette(ptr long long long long long) NtGdiHT_Get8BPPMaskPalette @ stdcall IntersectClipRect(long long long long long) @ stdcall InvertRgn(long long) -# @ stub IsValidEnhMetaRecord -# @ stub IsValidEnhMetaRecordOffExt -@ stdcall LPtoDP(long ptr long) +@ stdcall IsValidEnhMetaRecord(long long) +@ stdcall IsValidEnhMetaRecordOffExt(long long long long) @ stdcall LineDDA(long long long long ptr long) @ stdcall LineTo(long long long) +@ stdcall LPtoDP(long ptr long) @ stub LoadImageColorMatcherA @ stub LoadImageColorMatcherW @ stdcall MaskBlt(long long long long long long long long long long long long) -# @ stub MirrorRgn +@ stdcall MirrorRgn(ptr ptr) @ stdcall ModifyWorldTransform(long ptr long) @ stdcall MoveToEx(long long long ptr) -# @ stub NamedEscape +@ stdcall NamedEscape(ptr wstr long long str long str) @ stdcall OffsetClipRgn(long long long) @ stdcall OffsetRgn(long long long) @ stdcall OffsetViewportOrgEx(long long long ptr) @ stdcall OffsetWindowOrgEx(long long long ptr) @ stdcall PaintRgn(long long) @ stdcall PatBlt(long long long long long long) +@ stdcall PATHOBJ_bEnum(ptr ptr) NtGdiPATHOBJ_bEnum +@ stdcall PATHOBJ_bEnumClipLines(ptr long ptr) NtGdiPATHOBJ_bEnumClipLines +@ stdcall PATHOBJ_vEnumStart(ptr) NtGdiPATHOBJ_vEnumStart +@ stdcall PATHOBJ_vEnumStartClipLines(ptr ptr ptr ptr) NtGdiPATHOBJ_vEnumStartClipLines +@ stdcall PATHOBJ_vGetBounds(ptr ptr) NtGdiPATHOBJ_vGetBounds @ stdcall PathToRegion(long) @ stdcall Pie(long long long long long long long long long) @ stdcall PlayEnhMetaFile(long long ptr) @@ -382,26 +520,26 @@ @ stdcall PolyBezier(long ptr long) @ stdcall PolyBezierTo(long ptr long) @ stdcall PolyDraw(long ptr ptr long) -# @ stub PolyPatBlt +@ stdcall Polygon(long ptr long) +@ stdcall Polyline(long ptr long) +@ stdcall PolylineTo(long ptr long) +@ stdcall PolyPatBlt(ptr long ptr long long) @ stdcall PolyPolygon(long ptr ptr long) @ stdcall PolyPolyline(long ptr ptr long) @ stdcall PolyTextOutA(long ptr long) @ stdcall PolyTextOutW(long ptr long) -@ stdcall Polygon(long ptr long) -@ stdcall Polyline(long ptr long) -@ stdcall PolylineTo(long ptr long) @ stdcall PtInRegion(long long long) -@ stdcall PtVisible(long long long) -# @ stub QueryFontAssocStatus +@ stdcall PtVisible(long long long) NtGdiPtVisible +@ stdcall QueryFontAssocStatus() @ stdcall RealizePalette(long) +@ stdcall Rectangle(long long long long long) @ stdcall RectInRegion(long ptr) -@ stdcall RectVisible(long ptr) -@ stdcall Rectangle(long long long long long) +@ stdcall RectVisible(long ptr) NtGdiRectVisible @ stdcall RemoveFontMemResourceEx(ptr) @ stdcall RemoveFontResourceA(str) @ stdcall RemoveFontResourceExA(str long ptr) @ stdcall RemoveFontResourceExW(wstr long ptr) -@ stub RemoveFontResourceTracking +@ stdcall RemoveFontResourceTracking(ptr long) @ stdcall RemoveFontResourceW(wstr) @ stdcall ResetDCA(long ptr) @ stdcall ResetDCW(long ptr) @@ -411,122 +549,96 @@ @ stdcall SaveDC(long) @ stdcall ScaleViewportExtEx(long long long long long ptr) @ stdcall ScaleWindowExtEx(long long long long long ptr) -@ stub SelectBrushLocal +@ stdcall SelectBrushLocal(ptr ptr) @ stdcall SelectClipPath(long long) @ stdcall SelectClipRgn(long long) -@ stub SelectFontLocal +@ stdcall SelectFontLocal(ptr ptr) @ stdcall SelectObject(long long) @ stdcall SelectPalette(long long long) @ stdcall SetAbortProc(long ptr) @ stdcall SetArcDirection(long long) -# @ stub SetBitmapAttributes -@ stdcall SetBitmapBits(long long ptr) -@ stdcall SetBitmapDimensionEx(long long long ptr) +@ stdcall SetBitmapAttributes(ptr long) +@ stdcall SetBitmapBits(long long ptr) NtGdiSetBitmapBits +@ stdcall SetBitmapDimensionEx(long long long ptr) NtGdiSetBitmapDimension @ stdcall SetBkColor(long long) @ stdcall SetBkMode(long long) @ stdcall SetBoundsRect(long ptr long) -# @ stub SetBrushAttributes +@ stdcall SetBrushAttributes(ptr long) @ stdcall SetBrushOrgEx(long long long ptr) @ stdcall SetColorAdjustment(long ptr) @ stdcall SetColorSpace(long long) @ stdcall SetDCBrushColor(long long) @ stdcall SetDCPenColor(long long) +@ stdcall SetDeviceGammaRamp(long ptr) @ stdcall SetDIBColorTable(long long long ptr) @ stdcall SetDIBits(long long long long ptr ptr long) @ stdcall SetDIBitsToDevice(long long long long long long long long long ptr ptr long) -@ stdcall SetDeviceGammaRamp(long ptr) @ stdcall SetEnhMetaFileBits(long ptr) -@ stub SetFontEnumeration +@ stdcall SetFontEnumeration(ptr) NtGdiSetFontEnumeration @ stdcall SetGraphicsMode(long long) @ stdcall SetICMMode(long long) @ stdcall SetICMProfileA(long str) @ stdcall SetICMProfileW(long wstr) @ stdcall SetLayout(long long) -# @ stub SetLayoutWidth -@ stdcall SetMagicColors(ptr long long) +@ stdcall SetLayoutWidth(ptr long long) +@ stdcall SetMagicColors(ptr long long) NtGdiSetMagicColors @ stdcall SetMapMode(long long) @ stdcall SetMapperFlags(long long) @ stdcall SetMetaFileBitsEx(long ptr) @ stdcall SetMetaRgn(long) @ stdcall SetMiterLimit(long long ptr) -@ stdcall SetObjectOwner(long long) +#@ stdcall SetObjectOwner(long long) @ stdcall SetPaletteEntries(long long long ptr) @ stdcall SetPixel(long long long long) @ stdcall SetPixelFormat(long long ptr) @ stdcall SetPixelV(long long long long) @ stdcall SetPolyFillMode(long long) -@ stdcall SetROP2(long long) @ stdcall SetRectRgn(long long long long long) @ stdcall SetRelAbs(long long) +@ stdcall SetROP2(long long) @ stdcall SetStretchBltMode(long long) -@ stdcall SetSystemPaletteUse(long long) +@ stdcall SetSystemPaletteUse(long long) NtGdiSetSystemPaletteUse @ stdcall SetTextAlign(long long) @ stdcall SetTextCharacterExtra(long long) @ stdcall SetTextColor(long long) @ stdcall SetTextJustification(long long long) @ stdcall SetViewportExtEx(long long long ptr) @ stdcall SetViewportOrgEx(long long long ptr) -@ stdcall SetVirtualResolution(long long long long long) -@ stdcall SetWinMetaFileBits(long ptr long ptr) +@ stdcall SetVirtualResolution(long long long long long) NtGdiSetVirtualResolution @ stdcall SetWindowExtEx(long long long ptr) @ stdcall SetWindowOrgEx(long long long ptr) +@ stdcall SetWinMetaFileBits(long ptr long ptr) @ stdcall SetWorldTransform(long ptr) @ stdcall StartDocA(long ptr) @ stdcall StartDocW(long ptr) -# @ stub StartFormPage +@ stdcall StartFormPage(ptr) @ stdcall StartPage(long) @ stdcall StretchBlt(long long long long long long long long long long long) @ stdcall StretchDIBits(long long long long long long long long long ptr ptr long long) +@ stdcall STROBJ_bEnum(ptr ptr ptr) NtGdiSTROBJ_bEnum +@ stdcall STROBJ_bEnumPositionsOnly(ptr ptr ptr) NtGdiSTROBJ_bEnumPositionsOnly +@ stdcall STROBJ_bGetAdvanceWidths(ptr long long ptr) NtGdiSTROBJ_bGetAdvanceWidths +@ stdcall STROBJ_dwGetCodePage(ptr) NtGdiSTROBJ_dwGetCodePage +@ stdcall STROBJ_vEnumStart(ptr) NtGdiSTROBJ_vEnumStart @ stdcall StrokeAndFillPath(long) @ stdcall StrokePath(long) @ stdcall SwapBuffers(long) @ stdcall TextOutA(long long long str long) @ stdcall TextOutW(long long long wstr long) @ stdcall TranslateCharsetInfo(ptr ptr long) -@ stub UnloadNetworkFonts +@ stdcall UnloadNetworkFonts(long) @ stdcall UnrealizeObject(long) @ stdcall UpdateColors(long) @ stdcall UpdateICMRegKey(long str str long) UpdateICMRegKeyA @ stdcall UpdateICMRegKeyA(long str str long) @ stdcall UpdateICMRegKeyW(long wstr wstr long) @ stdcall WidenPath(long) -@ stub gdiPlaySpoolStream -@ extern pfnRealizePalette -@ extern pfnSelectPalette -@ stub pstackConnect - -################################################################ -# Wine extensions: OpenGL support -# -@ stdcall wglCopyContext(long long long) -@ stdcall wglCreateContext(long) -@ stdcall wglDeleteContext(long) -@ stdcall wglGetCurrentContext() -@ stdcall wglGetCurrentDC() -@ stdcall -private wglGetProcAddress(str) -@ stdcall wglMakeCurrent(long long) -@ stdcall wglShareLists(long long) -@ stdcall wglUseFontBitmapsA(long long long long) -@ stdcall wglUseFontBitmapsW(long long long long) - -################################################################ -# Wine extensions: Win16 functions that are needed by other dlls -# -@ stdcall CloseJob16(long) -@ stdcall DrvGetPrinterData16(str str ptr ptr long ptr) -@ stdcall DrvSetPrinterData16(str str long ptr long) -@ stdcall GetDCHook(long ptr) -@ stdcall OpenJob16(str str long) -@ stdcall SelectVisRgn(long long) -@ stdcall SetDCHook(long ptr long) -@ stdcall SetHookFlags(long long) -@ stdcall WriteSpool16(long ptr long) - -################################################################ -# Wine internal extensions -# -# All functions must be prefixed with '__wine_' (for internal functions) -# or 'wine_' (for user-visible functions) to avoid namespace conflicts. - -# GDI objects -@ cdecl __wine_make_gdi_object_system(long long) +@ stdcall XFORMOBJ_bApplyXform(ptr long long ptr ptr) NtGdiXFORMOBJ_bApplyXform +@ stdcall XFORMOBJ_iGetXform(ptr ptr) NtGdiXFORMOBJ_iGetXform +@ stdcall XLATEOBJ_cGetPalette(ptr long long ptr) NtGdiXLATEOBJ_cGetPalette +@ stdcall XLATEOBJ_hGetColorTransform(ptr) NtGdiXLATEOBJ_hGetColorTransform +@ stdcall XLATEOBJ_iXlate(ptr long) +@ stdcall XLATEOBJ_piVector(ptr) +#@ extern pfnRealizePalette +#@ extern pfnSelectPalette +#@ stub pstackConnect Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Mon Oct 6 23:05:18 2008 @@ -968,7 +968,7 @@ */ DWORD STDCALL -gdiPlaySpoolStream( +GdiPlaySpoolStream( DWORD a0, DWORD a1, DWORD a2,

1 0

[sserapion] 36672: Fix incorrect parameter counts for NtGdiEngCreateBitmap, NtGdiEngCreateDeviceSurface, NtGdiEngCreateDeviceBitmap. Don't worry these were just stubs.
by sserapion＠svn.reactos.org 07 Oct '08

07 Oct '08

Author: sserapion Date: Mon Oct 6 23:03:36 2008 New Revision: 36672 URL: http://svn.reactos.org/svn/reactos?rev=36672&view=rev Log: Fix incorrect parameter counts for NtGdiEngCreateBitmap, NtGdiEngCreateDeviceSurface, NtGdiEngCreateDeviceBitmap. Don't worry these were just stubs. Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/w32ksvc.db Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Mon Oct 6 23:03:36 2008 @@ -604,9 +604,9 @@ NtUserRemoteStopScreenUpdates 0 NtUserCtxDisplayIOCtl 3 NtGdiEngAssociateSurface 3 -NtGdiEngCreateBitmap 6 -NtGdiEngCreateDeviceSurface 4 -NtGdiEngCreateDeviceBitmap 4 +NtGdiEngCreateBitmap 5 +NtGdiEngCreateDeviceSurface 3 +NtGdiEngCreateDeviceBitmap 3 NtGdiEngCreatePalette 6 NtGdiEngComputeGlyphSet 3 NtGdiEngCopyBits 6

1 0

[dreimer] 36671: - Finally the one and only splitup of GCC Host and Target in different folders and a fix for the Header Usage Problem in one. This cures the MESS in our GCC Folder and simplifies the inclusion of new Arches, too. Great work, done By Samuel Serapion - Updated charch and chdefgcc to support the new way of accessing the different GCCs and some cleanup by me. chdefgcc got a new Param to choose if the Host of Target GCC will be edited. - Fixed MingW.cmd to use Host GCC again. - Sorta
by dreimer＠svn.reactos.org 07 Oct '08

07 Oct '08

Author: dreimer Date: Mon Oct 6 20:14:09 2008 New Revision: 36671 URL: http://svn.reactos.org/svn/reactos?rev=36671&view=rev Log: - Finally the one and only splitup of GCC Host and Target in different folders and a fix for the Header Usage Problem in one. This cures the MESS in our GCC Folder and simplifies the inclusion of new Arches, too. Great work, done By Samuel Serapion - Updated charch and chdefgcc to support the new way of accessing the different GCCs and some cleanup by me. chdefgcc got a new Param to choose if the Host of Target GCC will be edited. - Fixed MingW.cmd to use Host GCC again. - Sorta updated the install script for the 64 bit GCC Addon. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Mon Oct 6 20:14:09 2008 @@ -111,6 +111,11 @@ set CCACHE_DIR=%APPDATA%\RosBE\.ccache set HOST_CC=ccache gcc set HOST_CPP=ccache g++ + + :: + ::Target defaults to host(i386) + :: + set TARGET_CC=ccache gcc set TARGET_CPP=ccache g++ if .%ROS_ARCH%. == .arm. ( @@ -128,6 +133,11 @@ ) else ( set HOST_CC=gcc set HOST_CPP=g++ + + :: + ::Target defaults to host(i386) + :: + set TARGET_CC=gcc set TARGET_CPP=g++ if .%ROS_ARCH%. == .arm. ( Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Mon Oct 6 20:14:09 2008 @@ -38,7 +38,7 @@ ) if exist "%_ROSBE_BASEDIR%\chdefgcc.cmd" ( - echo chdefgcc [PATH] - Change the MinGW/GCC directory for the + echo chdefgcc [OPTIONS] - Change the MinGW/GCC directory for the echo current RosBE session. ) @@ -125,9 +125,11 @@ ) if exist "%_ROSBE_BASEDIR%\chdefgcc.cmd" ( if /i "%1" == "chdefgcc" ( - echo Usage: chdefgcc [PATH] - echo Change the MinGW/GCC directory for the current RosBE session. - echo. + echo Usage: chdefgcc [OPTIONS] + echo Change the MinGW/GCC Target/Host directory for the current RosBE session. + echo. + echo Path - Path to set the Host of Target GCC to. + echo Type - Set it to "target" or "host" goto :EOC ) ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Min… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd [iso-8859-1] Mon Oct 6 20:14:09 2008 @@ -25,7 +25,8 @@ set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1% set _ROSBE_MODE=MinGW set _ROSBE_ORIGINALPATH=%PATH% -set _ROSBE_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3 +set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3 +set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3 echo. echo. Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Mon Oct 6 20:14:09 2008 @@ -33,7 +33,8 @@ set _ROSBE_STRIP=0 set _ROSBE_NOSTRIP=0 set _ROSBE_MODULES=0 -set _ROSBE_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3 +set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3 +set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3 set _ROSBE_LOGDIR=%CD%\RosBE-Logs set _ROSBE_OBJPATH= set _ROSBE_OUTPATH= Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Mon Oct 6 20:14:09 2008 @@ -15,9 +15,7 @@ :: :: Parse the command line arguments. -:: ROS_ARCH: Default is i386, can be set to amd64, ppc or arm. -:: ROS_PREFIX: Default is mingw32. ppc could be ppc-pc-mingw32, -:: arm arm-pc-mingw32, x64 x86_64-pc-mingw32. +:: ROSBE_ARCH: Default is i386, can be set to amd64, ppc or arm. :: if "%1" == "" ( @@ -26,29 +24,32 @@ set _1=%1 ) if /i "%_1%" == "i386" ( - set ROS_ARCH= - set ROS_PREFIX= - goto :EOC + set _ROSBE_ARCH= + goto :EOA ) if /i "%_1%" == "arm" ( - set ROS_ARCH=arm - set ROS_PREFIX=arm-pc-mingw32 - goto :EOC + set _ROSBE_ARCH=1 + goto :EOA ) if /i "%_1%" == "ppc" ( - set ROS_ARCH=ppc - set ROS_PREFIX=ppc-pc-mingw32 - goto :EOC + set _ROSBE_ARCH=2 + goto :EOA ) if /i "%_1%" == "amd64" ( - set ROS_ARCH=amd64 - set ROS_PREFIX=x86_64-pc-mingw32 - goto :EOC + set _ROSBE_ARCH=3 + goto :EOA ) if not "%_1%" == "" ( echo Unknown parameter specified. Try 'help [COMMAND]'. goto :EOC ) + +:EOA + +:: +:: Refresh all needed Params by recalling the main Path setting CMD File. +:: +call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" goto :EOC :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] Mon Oct 6 20:14:09 2008 @@ -13,14 +13,18 @@ ) if "%_ROSBE_MODE%" == "RosBE" ( - title Change the current MinGW/GCC directory... + title Change the current MinGW/GCC Host/Target directory... ) :: :: Parse the command line arguments. :: for /f "usebackq tokens=*" %%i in (`""%_ROSBE_BASEDIR%\Tools\rquote.exe" %1"`) do set _1=%%i +set _2=%2 if "%_1%" == "" ( + call :INTERACTIVE +) +if "%_2%" == "" ( call :INTERACTIVE ) @@ -31,21 +35,38 @@ goto :EOC ) -if not exist "%_1%\bin\gcc.exe" ( +if not exist "%_1%\bin\*gcc.exe" ( echo ERROR: No MinGW/GCC found in the specified path. goto :EOC ) -set _ROSBE_MINGWPATH=%_1% -echo Location: %_ROSBE_MINGWPATH% -call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" +if /i "%_2%" == "target" ( + set _ROSBE_TARGET_MINGWPATH=%_1% + echo Target Location: %_ROSBE_TARGET_MINGWPATH% + goto :EOA +) +if /i "%_2%" == "host" ( + set _ROSBE_HOST_MINGWPATH=%_1% + echo Host Location: %_ROSBE_HOST_MINGWPATH% + goto :EOA +) else ( + echo ERROR: You specified wrong parameters. + goto :EOC +) +:EOA +call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" chdefgcc goto :EOC :INTERACTIVE set /p _1="Please enter a MinGW/GCC directory (don't use quotes): " if "%_1%" == "" ( echo ERROR: You must enter a MinGW/GCC directory. + goto :EOC + ) + set /p _2="Please specify, if this will be the Target or Host GCC: " + if "%_2%" == "" ( + echo ERROR: You must enter "target" or "host". goto :EOC ) goto :EOF @@ -59,3 +80,4 @@ :: Unload all used Vars. :: set _1= +set _2= Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Mon Oct 6 20:14:09 2008 @@ -17,9 +17,9 @@ :: Check if we are running within the RosBE, and if not :: initialize GCC for the current directory. :: -if not defined _ROSBE_MINGWPATH ( +if not defined _ROSBE_HOST_MINGWPATH ( set _ROSBE_MODE=MinGW - set _ROSBE_MINGWPATH=%CD% + set _ROSBE_HOST_MINGWPATH=%CD% set _ROSBE_ORIGINALPATH=%PATH% ) @@ -30,49 +30,66 @@ set ROS_ARCH= set ROS_PREFIX= +if "%1" == "chdefgcc" ( + goto :main +) + if .%_ROSBE_ARCH%. == .1. ( set ROS_ARCH=arm set ROS_PREFIX=arm-pc-mingw32 + REM set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.4.0 ) if .%_ROSBE_ARCH%. == .2. ( set ROS_ARCH=ppc set ROS_PREFIX=ppc-pc-mingw32 + REM set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.4.0 ) if .%_ROSBE_ARCH%. == .3. ( set ROS_ARCH=amd64 set ROS_PREFIX=x86_64-pc-mingw32 + set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.4.0 ) + +:main :: :: Set up the GCC 4.x.x build environment. :: -set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% -set _ROSBE_GCCVERSION= -set _ROSBE_GCCTARGET= +set PATH=%_ROSBE_HOST_MINGWPATH%\bin;%_ROSBE_TARGET_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% +set _ROSBE_MINGWMAKE=%_ROSBE_HOST_MINGWPATH%\bin\mingw32-make.exe + +if not .%ROS_ARCH%. == .. ( +for /f "usebackq tokens=3" %%i in (`"%ROS_PREFIX%-gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i +for /f "usebackq tokens=2" %%i in (`"%ROS_PREFIX%-gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i +) else ( for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i -set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_MINGWPATH%\libexec\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%;%_ROSBE_ORIGINALPATH% -set _ROSBE_MINGWMAKE=%_ROSBE_MINGWPATH%\bin\mingw32-make.exe +) + +for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_HOST_GCCVERSION=%%i +for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_HOST_GCCTARGET=%%i + if "%_ROSBE_MODE%" == "MinGW" ( - set C_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include - set CPLUS_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include + set C_INCLUDE_PATH=%_ROSBE_HOST_MINGWPATH%\include;%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include + set CPLUS_INCLUDE_PATH=%_ROSBE_HOST_MINGWPATH%\include;%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%;%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%;%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include ) else ( - set HOST_CFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" - set HOST_CPPFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%" -I"%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" + set HOST_CFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\include" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" + set HOST_CPPFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\include" -I"%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_HOST_GCCVERSION%" -I"%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_HOST_GCCVERSION%\%_ROSBE_HOST_GCCTARGET%" -I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include" + set TARGET_CFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" + set TARGET_CPPFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%" -I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%" -I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" ) -set LIBRARY_PATH=%_ROSBE_MINGWPATH%\lib;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION% :: :: Display the current version of GCC, NASM, ld and make. :: if not .%ROS_ARCH%. == .. ( - %ROS_PREFIX%-gcc -v 2>&1 | find "gcc version" + "%_ROSBE_TARGET_MINGWPATH%\bin\%ROS_PREFIX%-gcc" -v 2>&1 | find "gcc version" if .%ROS_PREFIX%. == .. ( echo gcc target^: %_ROSBE_GCCTARGET% ) else ( echo gcc target^: %ROS_PREFIX:~0,-11% ) - %ROS_PREFIX%-ld -v + "%_ROSBE_TARGET_MINGWPATH%\bin\%ROS_PREFIX%-ld" -v ) else ( gcc -v 2>&1 | find "gcc version" if .%ROS_PREFIX%. == .. ( @@ -83,10 +100,10 @@ ld -v ) -if exist "%_ROSBE_MINGWPATH%\bin\nasm.exe" ( +if exist "%_ROSBE_HOST_MINGWPATH%\bin\nasm.exe" ( nasm -v ) else ( - if exist "%_ROSBE_MINGWPATH%\bin\yasm.exe" ( + if exist "%_ROSBE_HOST_MINGWPATH%\bin\yasm.exe" ( yasm --version | find "yasm 0" ) else ( if "%_ROSBE_MODE%" == "RosBE" ( @@ -94,14 +111,14 @@ ) ) ) -if exist "%_ROSBE_MINGWPATH%\bin\bison.exe" ( +if exist "%_ROSBE_HOST_MINGWPATH%\bin\bison.exe" ( bison --version | find "GNU Bison" ) else ( if "%_ROSBE_MODE%" == "RosBE" ( echo WARNING: Bison will soon be required to build ReactOS, none found in the current MinGW/GCC. ) ) -if exist "%_ROSBE_MINGWPATH%\bin\flex.exe" ( +if exist "%_ROSBE_HOST_MINGWPATH%\bin\flex.exe" ( flex --version ) else ( if "%_ROSBE_MODE%" == "RosBE" ( Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Mon Oct 6 20:14:09 2008 @@ -116,7 +116,7 @@ SectionEnd Section -MinGWGCCNASM SEC02 - SetOutPath "$INSTDIR\4.1.3" + SetOutPath "$INSTDIR\4.4.0" SetOverwrite try File /r Components\4.4.0\*.* SectionEnd @@ -185,7 +185,7 @@ ;; ;; Clean up installed files. ;; - RMDir /r /REBOOTOK "$INSTDIR\4.1.3" + RMDir /r /REBOOTOK "$INSTDIR\4.4.0" Delete /REBOOTOK "$INSTDIR\charch.cmd" Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" ;; Whoever dares to change this back into: RMDir /r /REBOOTOK "$INSTDIR" will be KILLED!!!

1 0

[cgutman] 36670: - Partially implement ProtocolStatus in tcpip
by cgutman＠svn.reactos.org 06 Oct '08

06 Oct '08

Author: cgutman Date: Mon Oct 6 18:19:22 2008 New Revision: 36670 URL: http://svn.reactos.org/svn/reactos?rev=36670&view=rev Log: - Partially implement ProtocolStatus in tcpip Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Mon Oct 6 18:19:22 2008 @@ -517,19 +517,44 @@ VOID STDCALL ProtocolStatus( NDIS_HANDLE BindingContext, - NDIS_STATUS GenerelStatus, + NDIS_STATUS GeneralStatus, PVOID StatusBuffer, UINT StatusBufferSize) /* * FUNCTION: Called by NDIS when the underlying driver has changed state * ARGUMENTS: * BindingContext = Pointer to a device context (LAN_ADAPTER) - * GenerelStatus = A generel status code + * GeneralStatus = A general status code * StatusBuffer = Pointer to a buffer with medium-specific data * StatusBufferSize = Number of bytes in StatusBuffer */ { + PLAN_ADAPTER Adapter = BindingContext; + TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); + + switch(GeneralStatus) + { + case NDIS_STATUS_MEDIA_CONNECT: + DbgPrint("NDIS_STATUS_MEDIA_CONNECT\n"); + break; + + case NDIS_STATUS_MEDIA_DISCONNECT: + DbgPrint("NDIS_STATUS_MEDIA_DISCONNECT\n"); + break; + + case NDIS_STATUS_RESET_START: + Adapter->State = LAN_STATE_RESETTING; + break; + + case NDIS_STATUS_RESET_END: + Adapter->State = LAN_STATE_STARTED; + break; + + default: + DbgPrint("Unhandled status: %x", GeneralStatus); + break; + } }

1 0

[cgutman] 36669: - Implement a MiniportShutdown routine for both NIC drivers
by cgutman＠svn.reactos.org 06 Oct '08

06 Oct '08

Author: cgutman Date: Mon Oct 6 16:39:39 2008 New Revision: 36669 URL: http://svn.reactos.org/svn/reactos?rev=36669&view=rev Log: - Implement a MiniportShutdown routine for both NIC drivers Modified: branches/aicom-network-fixes/drivers/network/dd/ne2000/include/ne2000.h branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c branches/aicom-network-fixes/drivers/network/dd/pcnet/pcnet.c Modified: branches/aicom-network-fixes/drivers/network/dd/ne2000/include/ne2000.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/dd/ne2000/include/ne2000.h [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/dd/ne2000/include/ne2000.h [iso-8859-1] Mon Oct 6 16:39:39 2008 @@ -175,6 +175,7 @@ /* Flags used for driver cleanup */ BOOLEAN IOPortRangeRegistered; BOOLEAN InterruptRegistered; + BOOLEAN ShutdownHandlerRegistered; } NIC_ADAPTER, *PNIC_ADAPTER; /* Global driver information */ Modified: branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Mon Oct 6 16:39:39 2008 @@ -141,10 +141,13 @@ 0x20, Adapter->IOBase); + if (Adapter->ShutdownHandlerRegistered) + NdisMDeregisterAdapterShutdownHandler(Adapter->MiniportAdapterHandle); + /* Remove adapter from global adapter list */ if ((&Adapter->ListEntry)->Blink != NULL) { RemoveEntryList(&Adapter->ListEntry); - } + } /* Free adapter context area */ NdisFreeMemory(Adapter, sizeof(NIC_ADAPTER), 0); @@ -203,6 +206,14 @@ } } +VOID +STDCALL +MiniportShutdown(PVOID Context) +{ + #ifndef NOCARD + NICStop((PNIC_ADAPTER)Context); + #endif +} static NDIS_STATUS STDCALL MiniportInitialize( OUT PNDIS_STATUS OpenErrorStatus, @@ -414,6 +425,12 @@ /* Start the NIC */ NICStart(Adapter); #endif + + /* Register the shutdown handler */ + NdisMRegisterAdapterShutdownHandler(MiniportAdapterHandle, Adapter, MiniportShutdown); + + Adapter->ShutdownHandlerRegistered = TRUE; + /* Add adapter to the global adapter list */ InsertTailList(&DriverInfo.AdapterListHead, &Adapter->ListEntry); Modified: branches/aicom-network-fixes/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Mon Oct 6 16:39:39 2008 @@ -573,6 +573,9 @@ /* deregister i/o port range */ NdisMDeregisterIoPortRange(Adapter->MiniportAdapterHandle, Adapter->IoBaseAddress, NUMBER_OF_PORTS, (PVOID)Adapter->PortOffset); + /* deregister the shutdown routine */ + NdisMDeregisterAdapterShutdownHandler(Adapter->MiniportAdapterHandle); + /* free shared memory */ MiFreeSharedMemory(Adapter); @@ -780,6 +783,18 @@ return TRUE; } #endif + +VOID +STDCALL +MiniportShutdown( PVOID Context ) +{ + PADAPTER Adapter = Context; + + DPRINT("Stopping the chip\n"); + + NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR0); + NdisRawWritePortUshort(Adapter->PortOffset + RDP, CSR0_STOP); +} static NDIS_STATUS STDCALL @@ -952,6 +967,8 @@ ASSERT(0); #endif + NdisMRegisterAdapterShutdownHandler(Adapter->MiniportAdapterHandle, Adapter, MiniportShutdown); + DPRINT("returning 0x%x\n", Status); *OpenErrorStatus = Status; return Status;

1 0

[gedmurphy] 36668: It looked like we could get away with removing this hack, but it seems it still causes painting problems when increasing the width. No time to investigate at the moment. (anyone else wanna take a look?)
by gedmurphy＠svn.reactos.org 06 Oct '08

06 Oct '08

Author: gedmurphy Date: Mon Oct 6 14:15:09 2008 New Revision: 36668 URL: http://svn.reactos.org/svn/reactos?rev=36668&view=rev Log: It looked like we could get away with removing this hack, but it seems it still causes painting problems when increasing the width. No time to investigate at the moment. (anyone else wanna take a look?) Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] Mon Oct 6 14:15:09 2008 @@ -306,8 +306,15 @@ break; case WM_SIZE: { - resize_frame(LOWORD(lparam), HIWORD(lparam)); - SendMessage(_hwndrebar, WM_SIZE, 0, 0); +#ifdef __REACTOS__ ///@todo Work around to display rebar in ROS (with flickering) as long as the control isn't fixed + int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0); + MoveWindow(_hwndrebar, 0, 0, LOWORD(lparam), height, TRUE); +#else + resize_frame(LOWORD(lparam), HIWORD(lparam)); + SendMessage(_hwndrebar, WM_SIZE, 0, 0); +#endif + + break;} // do not pass message to DefFrameProc case WM_GETMINMAXINFO: {

1 0

[cgutman] 36667: - Call the MiniportShutdown handler at the right time - Now we call it upon system shutdown and if a bug check occurred
by cgutman＠svn.reactos.org 06 Oct '08

06 Oct '08

Author: cgutman Date: Mon Oct 6 13:56:44 2008 New Revision: 36667 URL: http://svn.reactos.org/svn/reactos?rev=36667&view=rev Log: - Call the MiniportShutdown handler at the right time - Now we call it upon system shutdown and if a bug check occurred Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Mon Oct 6 13:56:44 2008 @@ -1137,8 +1137,10 @@ NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - if(Adapter->BugcheckContext->ShutdownHandler) + if(Adapter->BugcheckContext->ShutdownHandler) { KeDeregisterBugCheckCallback(Adapter->BugcheckContext->CallbackRecord); + IoUnregisterShutdownNotification(Adapter->NdisMiniportBlock.DeviceObject); + } } @@ -1306,12 +1308,9 @@ */ { PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportHandle; - PMINIPORT_BUGCHECK_CONTEXT BugcheckContext = Adapter->BugcheckContext; + PMINIPORT_BUGCHECK_CONTEXT BugcheckContext; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - - if(BugcheckContext) - return; BugcheckContext = ExAllocatePool(NonPagedPool, sizeof(MINIPORT_BUGCHECK_CONTEXT)); if(!BugcheckContext) @@ -1324,11 +1323,19 @@ BugcheckContext->DriverContext = ShutdownContext; BugcheckContext->CallbackRecord = ExAllocatePool(NonPagedPool, sizeof(KBUGCHECK_CALLBACK_RECORD)); + if (!BugcheckContext->CallbackRecord) { + ExFreePool(BugcheckContext); + return; + } + + Adapter->BugcheckContext = BugcheckContext; KeInitializeCallbackRecord(BugcheckContext->CallbackRecord); KeRegisterBugCheckCallback(BugcheckContext->CallbackRecord, NdisIBugcheckCallback, BugcheckContext, sizeof(BugcheckContext), (PUCHAR)"Ndis Miniport"); + + IoRegisterShutdownNotification(Adapter->NdisMiniportBlock.DeviceObject); } @@ -1781,6 +1788,28 @@ return STATUS_SUCCESS; } +NTSTATUS +NTAPI +NdisIShutdown( + IN PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PLOGICAL_ADAPTER Adapter = DeviceObject->DeviceExtension; + PMINIPORT_BUGCHECK_CONTEXT Context = Adapter->BugcheckContext; + ADAPTER_SHUTDOWN_HANDLER ShutdownHandler = Context->ShutdownHandler; + + ASSERT(ShutdownHandler); + + ShutdownHandler(Context->DriverContext); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + NTSTATUS NTAPI @@ -2075,6 +2104,7 @@ *MiniportPtr = Miniport; Miniport->DriverObject->MajorFunction[IRP_MJ_PNP] = NdisIDispatchPnp; + Miniport->DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = NdisIShutdown; Miniport->DriverObject->DriverExtension->AddDevice = NdisIAddDevice; return NDIS_STATUS_SUCCESS;

1 0

[gedmurphy] 36666: - Add an address bar to serve as the web browser and folder history list (not yet functional) - Hide the drivebar by default. It's cleaner this way - Remove the old rebar hack. This should get rid of those annoying blue marks at the end of the toolbars
by gedmurphy＠svn.reactos.org 06 Oct '08

06 Oct '08

Author: gedmurphy Date: Mon Oct 6 13:42:17 2008 New Revision: 36666 URL: http://svn.reactos.org/svn/reactos?rev=36666&view=rev Log: - Add an address bar to serve as the web browser and folder history list (not yet functional) - Hide the drivebar by default. It's cleaner this way - Remove the old rebar hack. This should get rid of those annoying blue marks at the end of the toolbars Modified: trunk/reactos/base/shell/explorer/explorer-cz.rc trunk/reactos/base/shell/explorer/explorer-de.rc trunk/reactos/base/shell/explorer/explorer-en.rc trunk/reactos/base/shell/explorer/explorer-es.rc trunk/reactos/base/shell/explorer/explorer-fr.rc trunk/reactos/base/shell/explorer/explorer-jp.rc trunk/reactos/base/shell/explorer/explorer-ro.rc trunk/reactos/base/shell/explorer/explorer-ru.rc trunk/reactos/base/shell/explorer/explorer-sv.rc trunk/reactos/base/shell/explorer/explorer.h trunk/reactos/base/shell/explorer/shell/mainframe.cpp trunk/reactos/base/shell/explorer/shell/mainframe.h Modified: trunk/reactos/base/shell/explorer/explorer-cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-cz.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-cz.rc [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -38,7 +38,7 @@ BEGIN MENUITEM "Panel &nástrojù", ID_VIEW_TOOL_BAR MENUITEM "Panel &extra", ID_VIEW_EXTRA_BAR - MENUITEM "L&ita diskù", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "L&ita diskù", ID_VIEW_DRIVE_BAR MENUITEM "&Boèní panel", ID_VIEW_SIDE_BAR MENUITEM "&Stavový øádek", ID_VIEW_STATUSBAR MENUITEM SEPARATOR Modified: trunk/reactos/base/shell/explorer/explorer-de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-de.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-de.rc [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -41,7 +41,7 @@ BEGIN MENUITEM "&Werkzeugleiste", ID_VIEW_TOOL_BAR MENUITEM "&Extraleiste", ID_VIEW_EXTRA_BAR - MENUITEM "&Laufwerksleiste", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Laufwerksleiste", ID_VIEW_DRIVE_BAR MENUITEM "Se&itenleiste", ID_VIEW_SIDE_BAR MENUITEM "&Statusleiste", ID_VIEW_STATUSBAR MENUITEM SEPARATOR Modified: trunk/reactos/base/shell/explorer/explorer-en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-en.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-en.rc [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -38,7 +38,7 @@ BEGIN MENUITEM "&Toolbar", ID_VIEW_TOOL_BAR MENUITEM "&Extra Bar", ID_VIEW_EXTRA_BAR - MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR MENUITEM "&Status Bar", ID_VIEW_STATUSBAR MENUITEM SEPARATOR Modified: trunk/reactos/base/shell/explorer/explorer-es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-es.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-es.rc [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -38,7 +38,7 @@ BEGIN MENUITEM "&Herramientas", ID_VIEW_TOOL_BAR MENUITEM "Barra &Extra", ID_VIEW_EXTRA_BAR - MENUITEM "Barra de &Unidades", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "Barra de &Unidades", ID_VIEW_DRIVE_BAR MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR MENUITEM "Barra de &Estado", ID_VIEW_STATUSBAR MENUITEM SEPARATOR Modified: trunk/reactos/base/shell/explorer/explorer-fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-fr.rc [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -38,7 +38,7 @@ BEGIN MENUITEM "Barre d'&outils", ID_VIEW_TOOL_BAR MENUITEM "Barre d'&extras", ID_VIEW_EXTRA_BAR - MENUITEM "&Barre des lecteurs", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Barre des lecteurs", ID_VIEW_DRIVE_BAR MENUITEM "&Volet latéral", ID_VIEW_SIDE_BAR MENUITEM "Barre d'&état", ID_VIEW_STATUSBAR MENUITEM SEPARATOR Modified: trunk/reactos/base/shell/explorer/explorer-jp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-jp.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-jp.rc [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -38,7 +38,7 @@ BEGIN MENUITEM "c[ o[(&T)", ID_VIEW_TOOL_BAR MENUITEM "GLXg o[(&E)", ID_VIEW_EXTRA_BAR - MENUITEM "hCuo[(&D)", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "hCuo[(&D)", ID_VIEW_DRIVE_BAR MENUITEM "TCh o[(&I)", ID_VIEW_SIDE_BAR MENUITEM "Xe[^X o[(&S)", ID_VIEW_STATUSBAR MENUITEM SEPARATOR Modified: trunk/reactos/base/shell/explorer/explorer-ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ro.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-ro.rc [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -41,7 +41,7 @@ BEGIN MENUITEM "&Bara cu instrumente", ID_VIEW_TOOL_BAR MENUITEM "&Extra Bar", ID_VIEW_EXTRA_BAR - MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR MENUITEM "&Bara de stare", ID_VIEW_STATUSBAR MENUITEM "&Side Bar", ID_VIEW_SIDE_BAR MENUITEM SEPARATOR Modified: trunk/reactos/base/shell/explorer/explorer-ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-ru.rc [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -38,7 +38,7 @@ BEGIN MENUITEM "&Ïàíåëü èíñòðóìåíòîâ", ID_VIEW_TOOL_BAR MENUITEM "&Äîïîëíèòåëüíàÿ ïàíåëü", ID_VIEW_EXTRA_BAR - MENUITEM "&Äèñêè", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Äèñêè", ID_VIEW_DRIVE_BAR MENUITEM "È&çáðàííîå", ID_VIEW_SIDE_BAR MENUITEM "&Ñòðîêà ñîñòîÿíèÿ", ID_VIEW_STATUSBAR MENUITEM SEPARATOR Modified: trunk/reactos/base/shell/explorer/explorer-sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-sv.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-sv.rc [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -76,7 +76,7 @@ BEGIN MENUITEM "&Verktygsfält", ID_VIEW_TOOL_BAR MENUITEM "&Extrafält", ID_VIEW_EXTRA_BAR - MENUITEM "E&nhetsfält", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "E&nhetsfält", ID_VIEW_DRIVE_BAR MENUITEM "S&idfält", ID_VIEW_SIDE_BAR MENUITEM "&Statusfält", ID_VIEW_STATUSBAR MENUITEM SEPARATOR Modified: trunk/reactos/base/shell/explorer/explorer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.h [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -54,7 +54,6 @@ #define IDW_EXTRABAR 0x102 #define IDW_DRIVEBAR 0x103 #define IDW_ADDRESSBAR 0x104 -#define IDW_COMMANDBAR 0x105 #define IDW_SIDEBAR 0x106 #define IDW_FIRST_CHILD 0xC000 /*0x200*/ Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -186,10 +186,21 @@ CheckMenuItem(_menu_info._hMenuView, ID_VIEW_TOOL_BAR, MF_BYCOMMAND|MF_CHECKED); - // address & command bar - WindowCanvas canvas(hwnd); - RECT rect = {0, 0, 0, 0}; - DrawText(canvas, TEXT("My"), -1, &rect, DT_SINGLELINE|DT_NOPREFIX|DT_CALCRECT); + // address bar + _haddrcombo = CreateWindowEx(0, + WC_COMBOBOX, + TEXT("Address"), + WS_CHILD|WS_TABSTOP|WS_BORDER|WS_VISIBLE|CBS_DROPDOWN| + CCS_NOPARENTALIGN|CCS_NORESIZE|CCS_NODIVIDER|CCS_NOMOVEY, + 0, 0, 0, 0, + hwnd, + (HMENU)IDW_ADDRESSBAR, + g_Globals._hInstance, + 0); + + HFONT hFont = (HFONT)GetStockObject(ANSI_VAR_FONT); + SendMessageW(_haddrcombo, WM_SETFONT, (WPARAM)hFont, 0); + _hstatusbar = CreateStatusWindow(WS_CHILD|WS_VISIBLE, 0, hwnd, IDW_STATUSBAR); CheckMenuItem(_menu_info._hMenuView, ID_VIEW_STATUSBAR, MF_BYCOMMAND|MF_CHECKED); @@ -205,11 +216,16 @@ // create rebar window to manage toolbar and drivebar #ifndef _NO_REBAR - _hwndrebar = CreateWindowEx(WS_EX_TOOLWINDOW, REBARCLASSNAME, NULL, - WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN| - RBS_VARHEIGHT|RBS_DBLCLKTOGGLE| - WS_BORDER|RBS_AUTOSIZE|RBS_BANDBORDERS, - 0, 0, 0, 0, _hwnd, 0, g_Globals._hInstance, 0); + _hwndrebar = CreateWindowEx(WS_EX_TOOLWINDOW, + REBARCLASSNAME, + NULL, + WS_CHILD|WS_VISIBLE|WS_BORDER|WS_CLIPSIBLINGS|WS_CLIPCHILDREN| + RBS_VARHEIGHT|RBS_DBLCLKTOGGLE| RBS_AUTOSIZE|RBS_BANDBORDERS, + 0, 0, 0, 0, + _hwnd, + NULL, + g_Globals._hInstance, + 0); int btn_hgt = HIWORD(SendMessage(_htoolbar, TB_GETBUTTONSIZE, 0, 0)); @@ -217,9 +233,6 @@ rbBand.cbSize = sizeof(REBARBANDINFO); rbBand.fMask = RBBIM_TEXT|RBBIM_STYLE|RBBIM_CHILD|RBBIM_CHILDSIZE|RBBIM_SIZE; -#ifndef RBBS_HIDETITLE // missing in MinGW headers as of 25.02.2004 -#define RBBS_HIDETITLE 0x400 -#endif rbBand.fStyle = RBBS_CHILDEDGE|RBBS_GRIPPERALWAYS|RBBS_HIDETITLE; rbBand.cxMinChild = 0; @@ -233,7 +246,16 @@ rbBand.cxMinChild = 0; rbBand.cyMinChild = btn_hgt; rbBand.cx = 284; - SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); + SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)0, (LPARAM)&rbBand); + + rbBand.fStyle &= ~RBBS_HIDETITLE; + rbBand.fStyle |= RBBS_BREAK; + rbBand.lpText = TEXT("Address :"); + rbBand.hwndChild = _haddrcombo; + rbBand.cxMinChild = 0; + rbBand.cyMinChild = btn_hgt; + rbBand.cx = 400; + SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)3, (LPARAM)&rbBand); #endif } @@ -284,13 +306,8 @@ break; case WM_SIZE: { -#ifdef __REACTOS__ ///@todo Work around to display rebar in ROS (with flickering) as long as the control isn't fixed - int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0); - MoveWindow(_hwndrebar, 0, 0, LOWORD(lparam), height, TRUE); -#else resize_frame(LOWORD(lparam), HIWORD(lparam)); SendMessage(_hwndrebar, WM_SIZE, 0, 0); -#endif break;} // do not pass message to DefFrameProc case WM_GETMINMAXINFO: { @@ -472,6 +489,8 @@ int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0); rect.top += height; rect.top += 5; + + SetWindowPos(_haddrcombo, NULL, 0, 0, cx, height, SWP_NOMOVE); } else { if (IsWindowVisible(_htoolbar)) { SendMessage(_htoolbar, WM_SIZE, 0, 0); @@ -747,7 +766,7 @@ #endif #endif - CheckMenuItem(_menu_info._hMenuView, ID_VIEW_DRIVE_BAR, MF_BYCOMMAND|MF_CHECKED); + CheckMenuItem(_menu_info._hMenuView, ID_VIEW_DRIVE_BAR, MF_BYCOMMAND|MF_UNCHECKED); #ifndef _NO_WIN_FS @@ -795,7 +814,7 @@ rbBand.cxMinChild = 0; rbBand.cyMinChild = btn_hgt; rbBand.cx = 284; - SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); + SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)1, (LPARAM)&rbBand); #ifndef _NO_WIN_FS rbBand.fStyle |= RBBS_BREAK; @@ -805,7 +824,10 @@ rbBand.cxMinChild = 0; rbBand.cyMinChild = btn_hgt; rbBand.cx = 400; - SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); + SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)2, (LPARAM)&rbBand); + + // hide the drivebar by default + SendMessage(_hwndrebar, RB_SHOWBAND, 2, FALSE); #endif #endif } @@ -1587,6 +1609,15 @@ resize_children(); } +void SDIMainFrame::set_url(LPCTSTR url) +{ + if (_url != url) { + _url = url; + SetWindowText(_haddrcombo, url); + } +} + + void SDIMainFrame::jump_to(LPCTSTR path, int mode) {/*@@todo if (_shellBrowser.get() && (_shellpath_info._open_mode&~OWM_PIDL)==(mode&~OWM_PIDL)) { Modified: trunk/reactos/base/shell/explorer/shell/mainframe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/mainframe.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/mainframe.h [iso-8859-1] Mon Oct 6 13:42:17 2008 @@ -51,6 +51,7 @@ WindowHandle _hwndrebar; WindowHandle _htoolbar; + WindowHandle _haddrcombo; WindowHandle _hstatusbar; WindowHandle _hsidebar; @@ -176,4 +177,6 @@ // interface BrowserCallback virtual void entry_selected(Entry* entry); + + void set_url(LPCTSTR url); };

1 0

[gschneider] 36665: - Calculate the image size before the height is reported negative, remove redundant if - Set image size for coreheader in first pass and for both header types in second pass Fixes seven gdi32 bitmap winetests.
by gschneider＠svn.reactos.org 06 Oct '08

06 Oct '08

Author: gschneider Date: Mon Oct 6 07:39:27 2008 New Revision: 36665 URL: http://svn.reactos.org/svn/reactos?rev=36665&view=rev Log: - Calculate the image size before the height is reported negative, remove redundant if - Set image size for coreheader in first pass and for both header types in second pass Fixes seven gdi32 bitmap winetests. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Mon Oct 6 07:39:27 2008 @@ -555,7 +555,8 @@ coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); /* Resulting height may be smaller than original height */ coreheader->bcHeight = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan); - + coreheader->bcSize = DIB_GetDIBWidthBytes(coreheader->bcWidth, + coreheader->bcBitCount) * coreheader->bcHeight; if (BitmapObj->SurfObj.lDelta > 0) coreheader->bcHeight = -coreheader->bcHeight; } @@ -567,44 +568,41 @@ Info->bmiHeader.biWidth = BitmapObj->SurfObj.sizlBitmap.cx; /* Resulting height may be smaller than original height */ Info->bmiHeader.biHeight = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan); + Info->bmiHeader.biPlanes = 1; + Info->bmiHeader.biBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); + switch (BitmapObj->SurfObj.iBitmapFormat) + { + case BMF_1BPP: + case BMF_4BPP: + case BMF_8BPP: + case BMF_16BPP: + case BMF_24BPP: + case BMF_32BPP: + Info->bmiHeader.biCompression = BI_RGB; + break; + case BMF_4RLE: + Info->bmiHeader.biCompression = BI_RLE4; + break; + case BMF_8RLE: + Info->bmiHeader.biCompression = BI_RLE8; + break; + case BMF_JPEG: + Info->bmiHeader.biCompression = BI_JPEG; + break; + case BMF_PNG: + Info->bmiHeader.biCompression = BI_PNG; + break; + } + /* Image size has to be calculated */ + Info->bmiHeader.biSizeImage = DIB_GetDIBWidthBytes(Info->bmiHeader.biWidth, + Info->bmiHeader.biBitCount) * Info->bmiHeader.biHeight; + Info->bmiHeader.biXPelsPerMeter = 0; /* FIXME */ + Info->bmiHeader.biYPelsPerMeter = 0; /* FIXME */ + Info->bmiHeader.biClrUsed = 0; + Info->bmiHeader.biClrImportant = 1 << Info->bmiHeader.biBitCount; /* FIXME */ /* Report negtive height for top-down bitmaps. */ if (BitmapObj->SurfObj.lDelta > 0) Info->bmiHeader.biHeight = -Info->bmiHeader.biHeight; - Info->bmiHeader.biPlanes = 1; - Info->bmiHeader.biBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); - if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) - { - switch (BitmapObj->SurfObj.iBitmapFormat) - { - case BMF_1BPP: - case BMF_4BPP: - case BMF_8BPP: - case BMF_16BPP: - case BMF_24BPP: - case BMF_32BPP: - Info->bmiHeader.biCompression = BI_RGB; - break; - case BMF_4RLE: - Info->bmiHeader.biCompression = BI_RLE4; - break; - case BMF_8RLE: - Info->bmiHeader.biCompression = BI_RLE8; - break; - case BMF_JPEG: - Info->bmiHeader.biCompression = BI_JPEG; - break; - case BMF_PNG: - Info->bmiHeader.biCompression = BI_PNG; - break; - } - /* Image size has to be calculated */ - Info->bmiHeader.biSizeImage = DIB_GetDIBWidthBytes(Info->bmiHeader.biWidth, - Info->bmiHeader.biBitCount) * Info->bmiHeader.biHeight; - Info->bmiHeader.biXPelsPerMeter = 0; /* FIXME */ - Info->bmiHeader.biYPelsPerMeter = 0; /* FIXME */ - Info->bmiHeader.biClrUsed = 0; - Info->bmiHeader.biClrImportant = 1 << Info->bmiHeader.biBitCount; /* FIXME */ - } } } _SEH_HANDLE @@ -701,6 +699,8 @@ if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; + coreheader->bcSize = DIB_GetDIBWidthBytes(DestSize.cx, + coreheader->bcBitCount) * DestSize.cy; hDestBitmap = EngCreateBitmap(DestSize, DIB_GetDIBWidthBytes(DestSize.cx, coreheader->bcBitCount), @@ -711,6 +711,9 @@ if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) { + Info->bmiHeader.biSizeImage = DIB_GetDIBWidthBytes(DestSize.cx, + Info->bmiHeader.biBitCount) * DestSize.cy; + hDestBitmap = EngCreateBitmap(DestSize, DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression),

1 0

[gschneider] 36664: -rgbReserved must be 0 -don't just fill a coreheader and dismiss it -probe the full bitmap size, not only the first ulong -CreateDIBSection should fail for compressed bitmaps -set biClrUsed and copy the bitmapInfoHeader after it's filled Fixes eight gdi32 bitmap winetests.
by gschneider＠svn.reactos.org 06 Oct '08

06 Oct '08

Author: gschneider Date: Mon Oct 6 06:25:38 2008 New Revision: 36664 URL: http://svn.reactos.org/svn/reactos?rev=36664&view=rev Log: -rgbReserved must be 0 -don't just fill a coreheader and dismiss it -probe the full bitmap size, not only the first ulong -CreateDIBSection should fail for compressed bitmaps -set biClrUsed and copy the bitmapInfoHeader after it's filled Fixes eight gdi32 bitmap winetests. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Mon Oct 6 06:25:38 2008 @@ -142,6 +142,7 @@ Colors[Index - StartIndex].rgbRed = PalGDI->IndexedColors[Index].peRed; Colors[Index - StartIndex].rgbGreen = PalGDI->IndexedColors[Index].peGreen; Colors[Index - StartIndex].rgbBlue = PalGDI->IndexedColors[Index].peBlue; + Colors[Index - StartIndex].rgbReserved = 0; } PALETTE_UnlockPalette(PalGDI); } @@ -544,7 +545,7 @@ { if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { - BITMAPCOREHEADER* coreheader; + BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; ProbeForWrite(Info, sizeof(BITMAPINFO), 1); @@ -669,6 +670,7 @@ Info->bmiColors[Index].rgbRed = DestPalette->IndexedColors[Index].peRed; Info->bmiColors[Index].rgbGreen = DestPalette->IndexedColors[Index].peGreen; Info->bmiColors[Index].rgbBlue = DestPalette->IndexedColors[Index].peBlue; + Info->bmiColors[Index].rgbReserved = 0; } } @@ -694,7 +696,7 @@ hDestBitmap = NULL; - ProbeForWrite(Bits, sizeof(BitmapObj->SurfObj.cjBits), 1); + ProbeForWrite(Bits, BitmapObj->SurfObj.cjBits, 1); if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { @@ -1083,7 +1085,6 @@ BITMAPINFOHEADER *bi = &bmi->bmiHeader; INT effHeight; ULONG totalSize; - UINT Entries = 0; BITMAP bm; SIZEL Size; RGBQUAD *lpRGB; @@ -1091,6 +1092,12 @@ DPRINT("format (%ld,%ld), planes %d, bpp %d, size %ld, colors %ld (%s)\n", bi->biWidth, bi->biHeight, bi->biPlanes, bi->biBitCount, bi->biSizeImage, bi->biClrUsed, usage == DIB_PAL_COLORS? "PAL" : "RGB"); + + /* CreateDIBSection should fail for compressed formats */ + if (bi->biCompression == BI_RLE4 || bi->biCompression == BI_RLE8) + { + return (HBITMAP)NULL; + } effHeight = bi->biHeight >= 0 ? bi->biHeight : -bi->biHeight; bm.bmType = 0; @@ -1137,9 +1144,6 @@ if (dib) { dib->dsBm = bm; - dib->dsBmih = *bi; - dib->dsBmih.biSizeImage = totalSize; - /* Set dsBitfields values */ if ( usage == DIB_PAL_COLORS || bi->biBitCount <= 8) { @@ -1202,17 +1206,21 @@ /* WINE NOTE: WINE makes use of a colormap, which is a color translation table between the DIB and the X physical device. Obviously, this is left out of the ReactOS implementation. Instead, we call NtGdiSetDIBColorTable. */ - if(bi->biBitCount == 1) { Entries = 2; } else - if(bi->biBitCount == 4) { Entries = 16; } else - if(bi->biBitCount == 8) { Entries = 256; } - - if (Entries) - bmp->hDIBPalette = PALETTE_AllocPaletteIndexedRGB(Entries, lpRGB); + bi->biClrUsed = 0; + if(bi->biBitCount == 1) { bi->biClrUsed = 2; } else + if(bi->biBitCount == 4) { bi->biClrUsed = 16; } else + if(bi->biBitCount == 8) { bi->biClrUsed = 256; } + + if (bi->biClrUsed != 0) + bmp->hDIBPalette = PALETTE_AllocPaletteIndexedRGB(bi->biClrUsed, lpRGB); else bmp->hDIBPalette = PALETTE_AllocPalette(PAL_BITFIELDS, 0, NULL, dib->dsBitfields[0], dib->dsBitfields[1], dib->dsBitfields[2]); + + dib->dsBmih = *bi; + dib->dsBmih.biSizeImage = totalSize; } // Clean up in case of errors @@ -1341,6 +1349,7 @@ lpRGB[i].rgbRed = palGDI->IndexedColors[*lpIndex].peRed; lpRGB[i].rgbGreen = palGDI->IndexedColors[*lpIndex].peGreen; lpRGB[i].rgbBlue = palGDI->IndexedColors[*lpIndex].peBlue; + lpRGB[i].rgbReserved = 0; lpIndex++; } PALETTE_UnlockPalette(palGDI);

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