Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gschneider] 40395: commit #100: add me to credits
by gschneider＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: gschneider Date: Mon Apr 6 19:03:57 2009 New Revision: 40395 URL: http://svn.reactos.org/svn/reactos?rev=40395&view=rev Log: commit #100: add me to credits Modified: trunk/reactos/CREDITS Modified: trunk/reactos/CREDITS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CREDITS?rev=40395&r1=40394… ============================================================================== --- trunk/reactos/CREDITS [iso-8859-1] (original) +++ trunk/reactos/CREDITS [iso-8859-1] Mon Apr 6 19:03:57 2009 @@ -23,6 +23,7 @@ Ge van Geldorp <ge(a)gse.nl> Ged Murphy <gedmurphy(a)reactos.org> Gregor Brunmar <gregor brunmar at home se> +Gregor Schneider <grschneider(a)gmail.com> Guido de Jong Gunnar Andre' Dalsnes <hardon(a)online.no> Hans Kremer

1 0

[gschneider] 40394: - include/crt/math.h: float type math functions are not c++ specific, they are especially needed in the c language - move code accordingly - dll/win32/gdiplus: sync with current wine, correct sqrtf usage
by gschneider＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: gschneider Date: Mon Apr 6 18:58:12 2009 New Revision: 40394 URL: http://svn.reactos.org/svn/reactos?rev=40394&view=rev Log: - include/crt/math.h: float type math functions are not c++ specific, they are especially needed in the c language - move code accordingly - dll/win32/gdiplus: sync with current wine, correct sqrtf usage Modified: trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/graphicspath.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/include/crt/math.h Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Mon Apr 6 18:58:12 2009 @@ -172,6 +172,164 @@ } } +static ARGB blend_colors(ARGB start, ARGB end, int current, int total) +{ + ARGB result=0; + ARGB i; + for (i=0xff; i<=0xff0000; i = i << 8) + result |= (((start&i)*(total - current)+(end&i)*(current))/total)&i; + return result; +} + +static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) +{ + switch (brush->bt) + { + case BrushTypeLinearGradient: + { + GpLineGradient *line = (GpLineGradient*)brush; + RECT rc; + int num_steps = 255; + + SelectClipPath(graphics->hdc, RGN_AND); + if (GetClipBox(graphics->hdc, &rc) != NULLREGION) + { + GpPointF endpointsf[2]; + POINT endpointsi[2]; + POINT poly[4]; + + SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); + + /* fill with starting color */ + FillRect(graphics->hdc, &rc, brush->gdibrush); + + endpointsf[0] = line->startpoint; + endpointsf[1] = line->endpoint; + transform_and_round_points(graphics, endpointsi, endpointsf, 2); + + if (abs(endpointsi[0].x-endpointsi[1].x) > abs(endpointsi[0].y-endpointsi[1].y)) + { + /* vertical-ish gradient */ + int endborderx; /* vertical rectangle boundary near endpoint */ + int startx, endx; /* x co-ordinates of endpoints shifted to intersect the top of the visible rectangle */ + int startbottomx, endbottomx; /* x co-ordinate of endpoints shifted to intersect the bottom of the visible rectangle */ + int width; + COLORREF col; + HBRUSH hbrush, hprevbrush; + int i; + + if (endpointsi[1].x > endpointsi[0].x) + endborderx = rc.right; + else + endborderx = rc.left; + + startx = roundr((rc.top - endpointsf[0].Y) * (endpointsf[1].Y - endpointsf[0].Y) / (endpointsf[0].X - endpointsf[1].X) + endpointsf[0].X); + endx = roundr((rc.top - endpointsf[1].Y) * (endpointsf[1].Y - endpointsf[0].Y) / (endpointsf[0].X - endpointsf[1].X) + endpointsf[1].X); + width = endx - startx; + startbottomx = roundr((rc.bottom - endpointsf[0].Y) * (endpointsf[1].Y - endpointsf[0].Y) / (endpointsf[0].X - endpointsf[1].X) + endpointsf[0].X); + endbottomx = startbottomx+width; + + if (num_steps > abs(width)) num_steps = abs(width); + + poly[0].x = endborderx; + poly[0].y = rc.bottom; + poly[1].x = endborderx; + poly[1].y = rc.top; + poly[2].y = rc.top; + poly[3].y = rc.bottom; + + for (i=1; i<num_steps; i++) + { + ARGB argb = blend_colors(line->startcolor, line->endcolor, i, num_steps); + int ofs = width * i / num_steps; + col = ARGB2COLORREF(argb); + hbrush = CreateSolidBrush(col); + hprevbrush = SelectObject(graphics->hdc, hbrush); + poly[2].x = startx + ofs; + poly[3].x = startbottomx + ofs; + Polygon(graphics->hdc, poly, 4); + SelectObject(graphics->hdc, hprevbrush); + DeleteObject(hbrush); + } + + poly[2].x = endx; + poly[3].x = endbottomx; + + /* draw the ending color */ + col = ARGB2COLORREF(line->endcolor); + hbrush = CreateSolidBrush(col); + hprevbrush = SelectObject(graphics->hdc, hbrush); + Polygon(graphics->hdc, poly, 4); + SelectObject(graphics->hdc, hprevbrush); + DeleteObject(hbrush); + } + else if (endpointsi[0].y != endpointsi[1].y) + { + /* horizontal-ish gradient */ + int endbordery; /* horizontal rectangle boundary near endpoint */ + int starty, endy; /* y co-ordinates of endpoints shifted to intersect the left of the visible rectangle */ + int startrighty, endrighty; /* y co-ordinate of endpoints shifted to intersect the right of the visible rectangle */ + int height; + COLORREF col; + HBRUSH hbrush, hprevbrush; + int i; + + if (endpointsi[1].y > endpointsi[0].y) + endbordery = rc.bottom; + else + endbordery = rc.top; + + starty = roundr((rc.left - endpointsf[0].X) * (endpointsf[0].X - endpointsf[1].X) / (endpointsf[1].Y - endpointsf[0].Y) + endpointsf[0].Y); + endy = roundr((rc.left - endpointsf[1].X) * (endpointsf[0].X - endpointsf[1].X) / (endpointsf[1].Y - endpointsf[0].Y) + endpointsf[1].Y); + height = endy - starty; + startrighty = roundr((rc.right - endpointsf[0].X) * (endpointsf[0].X - endpointsf[1].X) / (endpointsf[1].Y - endpointsf[0].Y) + endpointsf[0].Y); + endrighty = startrighty+height; + + if (num_steps > abs(height)) num_steps = abs(height); + + poly[0].x = rc.right; + poly[0].y = endbordery; + poly[1].x = rc.left; + poly[1].y = endbordery; + poly[2].x = rc.left; + poly[3].x = rc.right; + + for (i=1; i<num_steps; i++) + { + ARGB argb = blend_colors(line->startcolor, line->endcolor, i, num_steps); + int ofs = height * i / num_steps; + col = ARGB2COLORREF(argb); + hbrush = CreateSolidBrush(col); + hprevbrush = SelectObject(graphics->hdc, hbrush); + poly[2].y = starty + ofs; + poly[3].y = startrighty + ofs; + Polygon(graphics->hdc, poly, 4); + SelectObject(graphics->hdc, hprevbrush); + DeleteObject(hbrush); + } + + poly[2].y = endy; + poly[3].y = endrighty; + + /* draw the ending color */ + col = ARGB2COLORREF(line->endcolor); + hbrush = CreateSolidBrush(col); + hprevbrush = SelectObject(graphics->hdc, hbrush); + Polygon(graphics->hdc, poly, 4); + SelectObject(graphics->hdc, hprevbrush); + DeleteObject(hbrush); + } + /* else startpoint == endpoint */ + } + break; + } + default: + SelectObject(graphics->hdc, brush->gdibrush); + FillPath(graphics->hdc); + break; + } +} + /* GdipDrawPie/GdipFillPie helper function */ static void draw_pie(GpGraphics *graphics, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) @@ -1853,20 +2011,35 @@ rectcpy[3].Y = rectcpy[2].Y = rect->Y + rect->Height; transform_and_round_points(graphics, corners, rectcpy, 4); - if(roundr(rect->Width) == 0 && roundr(rect->Height) == 0){ - rel_width = rel_height = 1.0; - nwidth = nheight = INT_MAX; - } - else{ + if (roundr(rect->Width) == 0) + { + rel_width = 1.0; + nwidth = INT_MAX; + } + else + { rel_width = sqrt((corners[1].x - corners[0].x) * (corners[1].x - corners[0].x) + (corners[1].y - corners[0].y) * (corners[1].y - corners[0].y)) / rect->Width; + nwidth = roundr(rel_width * rect->Width); + } + + if (roundr(rect->Height) == 0) + { + rel_height = 1.0; + nheight = INT_MAX; + } + else + { rel_height = sqrt((corners[2].x - corners[1].x) * (corners[2].x - corners[1].x) + (corners[2].y - corners[1].y) * (corners[2].y - corners[1].y)) / rect->Height; - - nwidth = roundr(rel_width * rect->Width); nheight = roundr(rel_height * rect->Height); + } + + if (roundr(rect->Width) != 0 && roundr(rect->Height) != 0) + { + /* FIXME: If only the width or only the height is 0, we should probably still clip */ rgn = CreatePolygonRgn(corners, 4, ALTERNATE); SelectClipRgn(graphics->hdc, rgn); } @@ -1894,7 +2067,7 @@ DeleteObject(SelectObject(graphics->hdc, CreateFontIndirectW(&lfw))); for(i = 0, j = 0; i < length; i++){ - if(!isprint(string[i]) && (string[i] != '\n')) + if(!isprintW(string[i]) && (string[i] != '\n')) continue; stringdup[j] = string[i]; @@ -2086,7 +2259,6 @@ save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); - SelectObject(graphics->hdc, brush->gdibrush); SetPolyFillMode(graphics->hdc, (path->fill == FillModeAlternate ? ALTERNATE : WINDING)); @@ -2098,7 +2270,7 @@ goto end; EndPath(graphics->hdc); - FillPath(graphics->hdc); + brush_fill_path(graphics, brush); retval = Ok; @@ -2749,7 +2921,7 @@ nwidth = nheight = INT_MAX; for(i = 0, j = 0; i < length; i++){ - if(!isprint(string[i]) && (string[i] != '\n')) + if(!isprintW(string[i]) && (string[i] != '\n')) continue; stringdup[j] = string[i]; Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] Mon Apr 6 18:58:12 2009 @@ -147,7 +147,7 @@ /* check flatness as a half of distance between middle point and a linearized path */ if(fabs(((pt.Y - pt_st.Y)*mp[2].X + (pt_st.X - pt.X)*mp[2].Y + (pt_st.Y*pt.X - pt_st.X*pt.Y))) <= - (0.5 * flatness*sqrt((powf(pt.Y - pt_st.Y, 2.0) + powf(pt_st.X - pt.X, 2.0))))){ + (0.5 * flatness*sqrtf((powf(pt.Y - pt_st.Y, 2.0) + powf(pt_st.X - pt.X, 2.0))))){ return TRUE; } else Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Mon Apr 6 18:58:12 2009 @@ -249,6 +249,14 @@ return Ok; } +GpStatus WINGDIPAPI GdipCloneBitmapAreaI(INT x, INT y, INT width, INT height, + PixelFormat format, GpBitmap* srcBitmap, GpBitmap** dstBitmap) +{ + FIXME("(%i,%i,%i,%i,%i,%p,%p)\n", x, y, width, height, format, srcBitmap, dstBitmap); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) { IStream* stream; @@ -549,6 +557,7 @@ ERR("could not make stream\n"); GdipFree(*bitmap); GdipFree(buff); + *bitmap = NULL; return GenericError; } @@ -558,6 +567,7 @@ IStream_Release(stream); GdipFree(*bitmap); GdipFree(buff); + *bitmap = NULL; return GenericError; } Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=403… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Mon Apr 6 18:58:12 2009 @@ -189,6 +189,9 @@ return res; } __CRT_INLINE float __cdecl ldexpf (float x, int expn) { return (float) ldexp (x, expn); } +#endif +#endif + #ifndef __x86_64 __CRT_INLINE float acosf(float _X) { return ((float)acos((double)_X)); } __CRT_INLINE float asinf(float _X) { return ((float)asin((double)_X)); } @@ -214,8 +217,6 @@ __CRT_INLINE float tanf(float _X) { return ((float)tan((double)_X)); } __CRT_INLINE float tanhf(float _X) { return ((float)tanh((double)_X)); } #endif -#endif -#endif #ifndef NO_OLDNAMES #define DOMAIN _DOMAIN

1 0

[fireball] 40393: - Specify NTAPI for all functions without calling convention specified (Alexey Komarov <q4a@reactos.org>). - Remove (unsupported) -mrtd compiler flag.
by fireball＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: fireball Date: Mon Apr 6 18:38:21 2009 New Revision: 40393 URL: http://svn.reactos.org/svn/reactos?rev=40393&view=rev Log: - Specify NTAPI for all functions without calling convention specified (Alexey Komarov <q4a(a)reactos.org>). - Remove (unsupported) -mrtd compiler flag. Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/badblock.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp trunk/reactos/drivers/storage/ide/uniata/id_queue.h trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.h trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -984,18 +984,21 @@ #ifndef USER_MODE PSCSI_REQUEST_BLOCK +NTAPI BuildMechanismStatusSrb ( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb ); PSCSI_REQUEST_BLOCK +NTAPI BuildRequestSenseSrb ( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb ); VOID +NTAPI AtapiHwInitializeChanger ( IN PVOID HwDeviceExtension, IN ULONG TargetId, @@ -1003,6 +1006,7 @@ ); ULONG +NTAPI AtapiSendCommand( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, @@ -1010,6 +1014,7 @@ ); ULONG +NTAPI IdeSendCommand( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, @@ -1019,6 +1024,7 @@ #define AtapiCopyMemory RtlCopyMemory VOID +NTAPI AtapiHexToString ( ULONG Value, PCHAR *Buffer @@ -1027,28 +1033,33 @@ #define AtapiStringCmp(s1, s2, n) _strnicmp(s1, s2, n) BOOLEAN +NTAPI AtapiInterrupt( IN PVOID HwDeviceExtension ); BOOLEAN +NTAPI AtapiInterrupt__( IN PVOID HwDeviceExtension, IN UCHAR c ); BOOLEAN +NTAPI AtapiHwInitialize( IN PVOID HwDeviceExtension ); ULONG +NTAPI IdeBuildSenseBuffer( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb ); VOID +NTAPI IdeMediaStatus( IN BOOLEAN EnableMSN, IN PVOID HwDeviceExtension, @@ -1066,12 +1077,14 @@ ); ULONG +NTAPI AtapiParseArgumentString( IN PCCH String, IN PCCH KeyWord ); BOOLEAN +NTAPI IssueIdentify( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1081,6 +1094,7 @@ ); BOOLEAN +NTAPI SetDriveParameters( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1088,6 +1102,7 @@ ); ULONG +NTAPI CheckDevice( IN PVOID HwDeviceExtension, IN ULONG Channel, @@ -1098,6 +1113,7 @@ #define UNIATA_FIND_DEV_UNHIDE 0x01 BOOLEAN +NTAPI FindDevices( IN PVOID HwDeviceExtension, IN ULONG Flags, @@ -1113,18 +1129,21 @@ #ifndef USER_MODE BOOLEAN +NTAPI AtapiResetController( IN PVOID HwDeviceExtension, IN ULONG PathId ); BOOLEAN +NTAPI AtapiStartIo( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb ); BOOLEAN +NTAPI AtapiStartIo__( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, @@ -1132,6 +1151,7 @@ ); extern UCHAR +NTAPI AtaCommand48( // IN PVOID HwDeviceExtension, IN struct _HW_DEVICE_EXTENSION* deviceExtension, @@ -1145,6 +1165,7 @@ ); extern UCHAR +NTAPI AtaCommand( // IN PVOID HwDeviceExtension, IN struct _HW_DEVICE_EXTENSION* deviceExtension, @@ -1160,15 +1181,19 @@ ); extern LONG +NTAPI AtaPioMode(PIDENTIFY_DATA2 ident); extern LONG +NTAPI AtaWmode(PIDENTIFY_DATA2 ident); extern LONG +NTAPI AtaUmode(PIDENTIFY_DATA2 ident); extern VOID +NTAPI AtapiDpcDispatch( IN PKDPC Dpc, IN PVOID DeferredContext, @@ -1179,18 +1204,22 @@ //#define AtaCommand(de, devn, chan, cmd, cyl, hd, sec, cnt, feat, flg) extern LONG +NTAPI AtaPio2Mode(LONG pio); extern LONG +NTAPI AtaPioMode(PIDENTIFY_DATA2 ident); extern VOID +NTAPI AtapiEnableInterrupts( IN PVOID HwDeviceExtension, IN ULONG c ); extern VOID +NTAPI AtapiDisableInterrupts( IN PVOID HwDeviceExtension, IN ULONG c @@ -1202,6 +1231,7 @@ #define IOMODE_NOT_SPECIFIED (0xffffffffL) extern ULONG +NTAPI AtapiRegCheckDevValue( IN PVOID HwDeviceExtension, IN ULONG chan, @@ -1211,6 +1241,7 @@ ); extern ULONG +NTAPI AtapiRegCheckParameterValue( IN PVOID HwDeviceExtension, IN PCWSTR PathSuffix, @@ -1218,7 +1249,7 @@ IN ULONG Default ); -extern ULONG g_LogToDisplay; +extern ULONG g_LogToDisplay; extern "C" VOID @@ -1229,6 +1260,7 @@ ); VOID +NTAPI UniataInitMapBM( IN struct _HW_DEVICE_EXTENSION* deviceExtension, IN struct _IDE_BUSMASTER_REGISTERS* BaseIoAddressBM_0, @@ -1236,6 +1268,7 @@ ); VOID +NTAPI UniataInitMapBase( IN struct _HW_CHANNEL* chan, IN PIDE_REGISTERS_1 BaseIoAddress1, @@ -1243,6 +1276,7 @@ ); VOID +NTAPI UniataInitSyncBaseIO( IN struct _HW_CHANNEL* chan ); @@ -1255,11 +1289,13 @@ ); VOID +NTAPI UniataDumpATARegs( IN struct _HW_CHANNEL* chan ); ULONG +NTAPI EncodeVendorStr( OUT PWCHAR Buffer, IN PUCHAR Str, @@ -1267,12 +1303,14 @@ ); ULONGLONG +NTAPI UniAtaCalculateLBARegsBack( struct _HW_LU_EXTENSION* LunExt, ULONGLONG lba ); BOOLEAN +NTAPI UniataAnybodyHome( IN PVOID HwDeviceExtension, IN ULONG Channel, Modified: trunk/reactos/drivers/storage/ide/uniata/badblock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/badblock.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/badblock.h [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -58,16 +58,19 @@ #pragma pack(pop) void +NTAPI InitBadBlocks( IN PHW_LU_EXTENSION LunExt ); void +NTAPI ForgetBadBlocks( IN PHW_LU_EXTENSION LunExt ); bool +NTAPI CheckIfBadBlock( IN PHW_LU_EXTENSION LunExt, // IN UCHAR command, Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -1009,6 +1009,7 @@ //extern const CHAR retry_Udma[MAX_RETRIES+1]; extern VOID +NTAPI UniataEnumBusMasterController( IN PVOID DriverObject, PVOID Argument2 @@ -1037,6 +1038,7 @@ #define UNIATA_ALLOCATE_NEW_LUNS 0x00 extern BOOLEAN +NTAPI UniataAllocateLunExt( PHW_DEVICE_EXTENSION deviceExtension, ULONG NewNumberChannels @@ -1063,16 +1065,19 @@ ); extern NTSTATUS +NTAPI UniataConnectIntr2( IN PVOID HwDeviceExtension ); extern NTSTATUS +NTAPI UniataDisconnectIntr2( IN PVOID HwDeviceExtension ); extern ULONG +NTAPI ScsiPortGetBusDataByOffset( IN PVOID HwDeviceExtension, IN BUS_DATA_TYPE BusDataType, @@ -1087,6 +1092,7 @@ #define PCISLOTNUM_NOT_SPECIFIED (0xffffffffL) extern ULONG +NTAPI AtapiFindListedDev( PBUSMASTER_CONTROLLER_INFORMATION BusMasterAdapters, ULONG lim, @@ -1097,6 +1103,7 @@ ); extern ULONG +NTAPI AtapiFindDev( IN PVOID HwDeviceExtension, IN BUS_DATA_TYPE BusDataType, @@ -1107,6 +1114,7 @@ ); extern VOID +NTAPI AtapiDmaAlloc( IN PVOID HwDeviceExtension, IN PPORT_CONFIGURATION_INFORMATION ConfigInfo, @@ -1114,6 +1122,7 @@ ); extern BOOLEAN +NTAPI AtapiDmaSetup( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1124,6 +1133,7 @@ ); extern BOOLEAN +NTAPI AtapiDmaPioSync( PVOID HwDeviceExtension, PSCSI_REQUEST_BLOCK Srb, @@ -1132,12 +1142,14 @@ ); extern BOOLEAN +NTAPI AtapiDmaDBSync( PHW_CHANNEL chan, PSCSI_REQUEST_BLOCK Srb ); extern VOID +NTAPI AtapiDmaStart( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1146,6 +1158,7 @@ ); extern UCHAR +NTAPI AtapiDmaDone( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1154,6 +1167,7 @@ ); extern VOID +NTAPI AtapiDmaReinit( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG ldev, @@ -1161,12 +1175,14 @@ ); extern VOID +NTAPI AtapiDmaInit__( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG ldev ); extern VOID +NTAPI AtapiDmaInit( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1186,6 +1202,7 @@ extern PDRIVER_OBJECT SavedDriverObject; extern BOOLEAN +NTAPI UniataChipDetectChannels( IN PVOID HwDeviceExtension, IN PPCI_COMMON_CONFIG pciData, // optional @@ -1194,6 +1211,7 @@ ); extern BOOLEAN +NTAPI UniataChipDetect( IN PVOID HwDeviceExtension, IN PPCI_COMMON_CONFIG pciData, // optional @@ -1203,6 +1221,7 @@ ); extern BOOLEAN +NTAPI AtapiChipInit( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1210,6 +1229,7 @@ ); extern ULONG +NTAPI AtapiGetIoRange( IN PVOID HwDeviceExtension, IN PPORT_CONFIGURATION_INFORMATION ConfigInfo, @@ -1462,6 +1482,7 @@ } BOOLEAN +NTAPI AtapiReadChipConfig( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1469,6 +1490,7 @@ ); VOID +NTAPI UniataForgetDevice( PHW_LU_EXTENSION LunExt ); Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -102,6 +102,7 @@ ); VOID +NTAPI AtapiHwInitialize__( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG lChannel @@ -140,6 +141,7 @@ ); VOID +NTAPI AtapiQueueTimerDpc( IN PVOID HwDeviceExtension, IN ULONG lChannel, @@ -158,6 +160,7 @@ #endif //UNIATA_CORE BOOLEAN +NTAPI AtapiCheckInterrupt__( IN PVOID HwDeviceExtension, IN UCHAR c @@ -167,6 +170,7 @@ #ifndef UNIATA_CORE BOOLEAN +NTAPI AtapiRegGetStringParameterValue( IN PWSTR RegistryPath, IN PWSTR Name, @@ -718,6 +722,7 @@ Translate to 48-Lba form if required */ UCHAR +NTAPI AtaCommand48( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG DeviceNumber, @@ -896,6 +901,7 @@ This is simply wrapper for AtaCommand48() */ UCHAR +NTAPI AtaCommand( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG DeviceNumber, @@ -916,6 +922,7 @@ } // end AtaCommand() LONG +NTAPI AtaPio2Mode(LONG pio) { switch (pio) { @@ -930,6 +937,7 @@ } // end AtaPio2Mode() LONG +NTAPI AtaPioMode(PIDENTIFY_DATA2 ident) { if (ident->PioTimingsValid) { @@ -950,6 +958,7 @@ } // end AtaPioMode() LONG +NTAPI AtaWmode(PIDENTIFY_DATA2 ident) { if (ident->MultiWordDMASupport & 0x04) @@ -962,6 +971,7 @@ } // end AtaWmode() LONG +NTAPI AtaUmode(PIDENTIFY_DATA2 ident) { if (!ident->UdmaModesValid) @@ -1067,6 +1077,7 @@ cancels previous Dpc request (if any), but we need Dpc queue. */ VOID +NTAPI AtapiQueueTimerDpc( IN PVOID HwDeviceExtension, IN ULONG lChannel, @@ -1128,6 +1139,7 @@ #endif //UNIATA_CORE VOID +NTAPI UniataDumpATARegs( IN PHW_CHANNEL chan ) @@ -1175,6 +1187,7 @@ --*/ BOOLEAN +NTAPI IssueIdentify( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1769,6 +1782,7 @@ --*/ BOOLEAN +NTAPI SetDriveParameters( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1811,6 +1825,7 @@ } // end SetDriveParameters() VOID +NTAPI UniataForgetDevice( PHW_LU_EXTENSION LunExt ) @@ -1845,6 +1860,7 @@ BOOLEAN +NTAPI AtapiResetController__( IN PVOID HwDeviceExtension, IN ULONG PathId, @@ -2193,6 +2209,7 @@ --*/ ULONG +NTAPI MapError( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb @@ -2604,6 +2621,7 @@ } // end AtapiHwInitialize() VOID +NTAPI AtapiHwInitialize__( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG lChannel @@ -2826,6 +2844,7 @@ #ifndef UNIATA_CORE VOID +NTAPI AtapiHwInitializeChanger( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, @@ -2860,6 +2879,7 @@ --*/ ULONG +NTAPI AtapiParseArgumentString( IN PCCH String, IN PCCH KeyWord @@ -3026,6 +3046,7 @@ Timer callback */ VOID +NTAPI AtapiCallBack__( IN PVOID HwDeviceExtension, IN UCHAR lChannel @@ -3155,6 +3176,7 @@ } // end AtapiCallBack__() VOID +NTAPI AtapiCallBack_X( IN PVOID HwDeviceExtension ) @@ -3300,6 +3322,7 @@ #ifndef UNIATA_CORE BOOLEAN +NTAPI AtapiInterrupt2( IN PKINTERRUPT Interrupt, IN PVOID Isr2HwDeviceExtension @@ -3470,6 +3493,7 @@ VOID +NTAPI AtapiEnableInterrupts( IN PVOID HwDeviceExtension, IN ULONG c @@ -3492,6 +3516,7 @@ } // end AtapiEnableInterrupts() VOID +NTAPI AtapiDisableInterrupts( IN PVOID HwDeviceExtension, IN ULONG c @@ -3517,6 +3542,7 @@ Check hardware for interrupt state */ BOOLEAN +NTAPI AtapiCheckInterrupt__( IN PVOID HwDeviceExtension, IN UCHAR c // logical channel @@ -3895,6 +3921,7 @@ BOOLEAN +NTAPI AtapiInterrupt__( IN PVOID HwDeviceExtension, IN UCHAR c @@ -5281,6 +5308,7 @@ --*/ ULONG +NTAPI IdeSendSmartCommand( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb @@ -5394,6 +5422,7 @@ #endif //UNIATA_CORE ULONGLONG +NTAPI UniAtaCalculateLBARegs( PHW_LU_EXTENSION LunExt, ULONG startingSector, @@ -5434,6 +5463,7 @@ } // end UniAtaCalculateLBARegs() ULONGLONG +NTAPI UniAtaCalculateLBARegsBack( PHW_LU_EXTENSION LunExt, ULONGLONG lba @@ -5478,6 +5508,7 @@ --*/ ULONG +NTAPI IdeReadWrite( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, @@ -5736,6 +5767,7 @@ --*/ ULONG +NTAPI IdeVerify( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb @@ -5837,6 +5869,7 @@ --*/ ULONG +NTAPI AtapiSendCommand( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, @@ -6409,6 +6442,7 @@ #endif ULONG +NTAPI IdeSendCommand( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, @@ -7003,6 +7037,7 @@ --*/ VOID +NTAPI IdeMediaStatus( BOOLEAN EnableMSN, IN PVOID HwDeviceExtension, @@ -7077,6 +7112,7 @@ --*/ ULONG +NTAPI IdeBuildSenseBuffer( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb @@ -7129,6 +7165,7 @@ }// End of IdeBuildSenseBuffer VOID +NTAPI UniataUserDeviceReset( PHW_DEVICE_EXTENSION deviceExtension, PHW_LU_EXTENSION LunExt, @@ -7152,6 +7189,7 @@ } // end UniataUserDeviceReset() BOOLEAN +NTAPI UniataNeedQueueing( PHW_DEVICE_EXTENSION deviceExtension, PHW_CHANNEL chan, @@ -7214,6 +7252,7 @@ } // end AtapiStartIo() BOOLEAN +NTAPI AtapiStartIo__( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, @@ -8163,6 +8202,7 @@ void +NTAPI UniataInitAtaCommands() { int i; @@ -8666,6 +8706,7 @@ PSCSI_REQUEST_BLOCK +NTAPI BuildMechanismStatusSrb( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb @@ -8707,6 +8748,7 @@ #endif //UNIATA_CORE PSCSI_REQUEST_BLOCK +NTAPI BuildRequestSenseSrb ( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb @@ -8748,6 +8790,7 @@ #ifndef UNIATA_CORE ULONG +NTAPI AtapiRegCheckDevLunValue( IN PVOID HwDeviceExtension, IN PCWCH NamePrefix, @@ -8777,6 +8820,7 @@ } // end AtapiRegCheckDevLunValue() ULONG +NTAPI EncodeVendorStr( OUT PWCHAR Buffer, IN PUCHAR Str, @@ -8816,6 +8860,7 @@ } // end EncodeVendorStr() ULONG +NTAPI AtapiRegCheckDevValue( IN PVOID HwDeviceExtension, IN ULONG chan, @@ -8936,6 +8981,7 @@ Returns: Registry Key value */ ULONG +NTAPI AtapiRegCheckParameterValue( IN PVOID HwDeviceExtension, IN PCWSTR PathSuffix, Modified: trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -122,6 +122,7 @@ void +NTAPI InitBadBlocks( IN PHW_LU_EXTENSION LunExt ) @@ -222,6 +223,7 @@ void +NTAPI ForgetBadBlocks( IN PHW_LU_EXTENSION LunExt ) @@ -235,6 +237,7 @@ } // end ForgetBadBlocks() bool +NTAPI CheckIfBadBlock( IN PHW_LU_EXTENSION LunExt, // IN UCHAR command, Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -53,6 +53,7 @@ PHYSICAL_ADDRESS ph4gb = {{0xFFFFFFFF, 0}}; VOID +NTAPI cyrix_timing ( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG dev, // physical device number (0-3) @@ -60,6 +61,7 @@ ); VOID +NTAPI promise_timing ( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG dev, // physical device number (0-3) @@ -67,6 +69,7 @@ ); VOID +NTAPI hpt_timing ( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG dev, // physical device number (0-3) @@ -74,6 +77,7 @@ ); VOID +NTAPI via82c_timing ( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG dev, // physical device number (0-3) @@ -81,6 +85,7 @@ ); ULONG +NTAPI hpt_cable80( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG channel // physical channel number (0-1) @@ -89,6 +94,7 @@ #define ATAPI_DEVICE(de, ldev) (de->lun[ldev].DeviceFlags & DFLAGS_ATAPI_DEVICE) ULONG +NTAPI AtapiVirtToPhysAddr_( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, @@ -124,6 +130,7 @@ } // end AtapiVirtToPhysAddr_() VOID +NTAPI AtapiDmaAlloc( IN PVOID HwDeviceExtension, IN PPORT_CONFIGURATION_INFORMATION ConfigInfo, @@ -204,6 +211,7 @@ } // end AtapiDmaAlloc() BOOLEAN +NTAPI AtapiDmaSetup( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -352,6 +360,7 @@ } // end AtapiDmaSetup() BOOLEAN +NTAPI AtapiDmaPioSync( PVOID HwDeviceExtension, PSCSI_REQUEST_BLOCK Srb, @@ -416,6 +425,7 @@ } // end AtapiDmaPioSync() BOOLEAN +NTAPI AtapiDmaDBSync( PHW_CHANNEL chan, PSCSI_REQUEST_BLOCK Srb @@ -436,6 +446,7 @@ } // end AtapiDmaDBSync() VOID +NTAPI AtapiDmaStart( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -528,6 +539,7 @@ } // end AtapiDmaStart() UCHAR +NTAPI AtapiDmaDone( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -589,6 +601,7 @@ } // end AtapiDmaDone() VOID +NTAPI AtapiDmaReinit( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG ldev, @@ -671,6 +684,7 @@ } // end AtapiDmaReinit() VOID +NTAPI AtapiDmaInit__( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG ldev @@ -706,6 +720,7 @@ } // end AtapiDmaInit__() BOOLEAN +NTAPI AtaSetTransferMode( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG DeviceNumber, @@ -749,6 +764,7 @@ } // end AtaSetTransferMode() VOID +NTAPI AtapiDmaInit( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1796,6 +1812,7 @@ VOID +NTAPI cyrix_timing( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG dev, // physical device number (0-3) @@ -1825,6 +1842,7 @@ } // cyrix_timing() VOID +NTAPI promise_timing( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG dev, // physical device number (0-3) @@ -1888,6 +1906,7 @@ VOID +NTAPI hpt_timing( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG dev, // physical device number (0-3) @@ -2032,6 +2051,7 @@ #define FIT(v,min,max) (((v)>(max)?(max):(v))<(min)?(min):(v)) VOID +NTAPI via82c_timing( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG dev, // physical device number (0-3) Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -44,6 +44,7 @@ #include "stdafx.h" BOOLEAN +NTAPI UniataChipDetectChannels( IN PVOID HwDeviceExtension, IN PPCI_COMMON_CONFIG pciData, // optional @@ -140,6 +141,7 @@ } // end UniataChipDetectChannels() BOOLEAN +NTAPI UniataChipDetect( IN PVOID HwDeviceExtension, IN PPCI_COMMON_CONFIG pciData, // optional @@ -916,6 +918,7 @@ This will prevent data losses */ VOID +NTAPI AtapiViaSouthBridgeFixup( IN PVOID HwDeviceExtension, IN BUS_DATA_TYPE BusDataType, @@ -980,6 +983,7 @@ This will prevent data losses */ VOID +NTAPI AtapiRosbSouthBridgeFixup( IN PVOID HwDeviceExtension, IN BUS_DATA_TYPE BusDataType, @@ -1031,6 +1035,7 @@ This will prevent data losses */ VOID +NTAPI AtapiAliSouthBridgeFixup( IN PVOID HwDeviceExtension, IN BUS_DATA_TYPE BusDataType, @@ -1082,6 +1087,7 @@ } // end AtapiRosbSouthBridgeFixup() ULONG +NTAPI hpt_cable80( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG channel // physical channel number (0-1) @@ -1116,6 +1122,7 @@ ULONG +NTAPI via_cable80( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG channel // physical channel number (0-1) @@ -1163,6 +1170,7 @@ } // end via_cable80() BOOLEAN +NTAPI generic_cable80( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG channel, // physical channel number (0-1) @@ -1192,6 +1200,7 @@ } // end generic_cable80() VOID +NTAPI UniAtaReadLunConfig( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG channel, // physical channel @@ -1241,6 +1250,7 @@ } // end UniAtaReadLunConfig() BOOLEAN +NTAPI AtapiReadChipConfig( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1322,6 +1332,7 @@ } // end AtapiReadChipConfig() BOOLEAN +NTAPI AtapiChipInit( IN PVOID HwDeviceExtension, IN ULONG DeviceNumber, @@ -1880,6 +1891,7 @@ } // end AtapiChipInit() VOID +NTAPI UniataInitMapBM( IN PHW_DEVICE_EXTENSION deviceExtension, IN PIDE_BUSMASTER_REGISTERS BaseIoAddressBM_0, @@ -1906,6 +1918,7 @@ } // end UniataInitMapBM() VOID +NTAPI UniataInitMapBase( IN PHW_CHANNEL chan, IN PIDE_REGISTERS_1 BaseIoAddress1, @@ -1926,6 +1939,7 @@ } // end UniataInitMapBase() VOID +NTAPI UniataInitSyncBaseIO( IN PHW_CHANNEL chan ) Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -64,6 +64,7 @@ // local routines ULONG +NTAPI UniataEnumBusMasterController__( /* IN PVOID HwDeviceExtension, IN PVOID Context, @@ -74,6 +75,7 @@ ); VOID +NTAPI AtapiDoNothing(VOID) { return; @@ -85,6 +87,7 @@ Get PCI address by ConfigInfo and RID */ ULONG +NTAPI AtapiGetIoRange( IN PVOID HwDeviceExtension, IN PPORT_CONFIGURATION_INFORMATION ConfigInfo, @@ -163,6 +166,7 @@ Hal routines directly in order to scan PCI bus. */ VOID +NTAPI UniataEnumBusMasterController( IN PVOID DriverObject, PVOID Argument2 @@ -173,6 +177,7 @@ } // end UniataEnumBusMasterController() BOOLEAN +NTAPI UniataCheckPCISubclass( BOOLEAN known, ULONG RaidFlags, @@ -212,6 +217,7 @@ Builds PCI device list using Hal routines (not ScsiPort wrappers) */ ULONG +NTAPI UniataEnumBusMasterController__( ) { @@ -560,6 +566,7 @@ Wrapper for read PCI config space */ ULONG +NTAPI ScsiPortGetBusDataByOffset( IN PVOID HwDeviceExtension, IN BUS_DATA_TYPE BusDataType, @@ -598,6 +605,7 @@ If no matching record found, -1 is returned */ ULONG +NTAPI AtapiFindListedDev( PBUSMASTER_CONTROLLER_INFORMATION BusMasterAdapters, ULONG lim, @@ -676,6 +684,7 @@ on specified Bus/Slot */ ULONG +NTAPI AtapiFindDev( IN PVOID HwDeviceExtension, IN BUS_DATA_TYPE BusDataType, @@ -728,6 +737,7 @@ ULONG +NTAPI UniataFindCompatBusMasterController1( IN PVOID HwDeviceExtension, IN PVOID Context, @@ -748,6 +758,7 @@ } // end UniataFindCompatBusMasterController1() ULONG +NTAPI UniataFindCompatBusMasterController2( IN PVOID HwDeviceExtension, IN PVOID Context, @@ -768,6 +779,7 @@ } // end UniataFindCompatBusMasterController2() BOOLEAN +NTAPI UniataAllocateLunExt( PHW_DEVICE_EXTENSION deviceExtension, ULONG NewNumberChannels @@ -828,6 +840,7 @@ --*/ ULONG +NTAPI UniataFindBusMasterController( IN PVOID HwDeviceExtension, IN PVOID Context, @@ -1705,6 +1718,7 @@ This is for claiming PCI Busmaster in compatible mode under WDM OSes */ ULONG +NTAPI UniataFindFakeBusMasterController( IN PVOID HwDeviceExtension, IN PVOID Context, @@ -2045,6 +2059,7 @@ --*/ NTSTATUS +NTAPI UniataConnectIntr2( IN PVOID HwDeviceExtension ) @@ -2147,6 +2162,7 @@ } // end UniataConnectIntr2() NTSTATUS +NTAPI UniataDisconnectIntr2( IN PVOID HwDeviceExtension ) @@ -2198,6 +2214,7 @@ --*/ ULONG +NTAPI AtapiFindController( IN PVOID HwDeviceExtension, IN PVOID Context, @@ -2614,6 +2631,7 @@ } // end AtapiFindController() BOOLEAN +NTAPI UniataAnybodyHome( IN PVOID HwDeviceExtension, IN ULONG lChannel, @@ -2689,6 +2707,7 @@ } // end UniataAnybodyHome() ULONG +NTAPI CheckDevice( IN PVOID HwDeviceExtension, IN ULONG lChannel, @@ -2873,6 +2892,7 @@ --*/ BOOLEAN +NTAPI FindDevices( IN PVOID HwDeviceExtension, IN ULONG Flags, Modified: trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -4,6 +4,7 @@ Get cost of insertion Req1 before Req2 */ LONGLONG +NTAPI UniataGetCost( PHW_LU_EXTENSION LunExt, IN PATA_REQ AtaReq1, @@ -52,6 +53,7 @@ Perform reorder if necessary */ VOID +NTAPI UniataQueueRequest( IN PHW_CHANNEL chan, IN PSCSI_REQUEST_BLOCK Srb @@ -218,6 +220,7 @@ Remove request from queue and get next request */ VOID +NTAPI UniataRemoveRequest( IN PHW_CHANNEL chan, IN PSCSI_REQUEST_BLOCK Srb @@ -306,6 +309,7 @@ (from head of the queue) */ PSCSI_REQUEST_BLOCK +NTAPI UniataGetCurRequest( IN PHW_CHANNEL chan ) @@ -323,6 +327,7 @@ (used in simplex mode only) */ PHW_CHANNEL +NTAPI UniataGetNextChannel( IN PHW_CHANNEL chan ) Modified: trunk/reactos/drivers/storage/ide/uniata/id_queue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_queue.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_queue.h [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -6,6 +6,7 @@ Perform reorder if necessary */ VOID +NTAPI UniataQueueRequest( IN PHW_CHANNEL chan, IN PSCSI_REQUEST_BLOCK Srb @@ -15,6 +16,7 @@ Remove request from queue and get next request */ VOID +NTAPI UniataRemoveRequest( IN PHW_CHANNEL chan, IN PSCSI_REQUEST_BLOCK Srb @@ -25,6 +27,7 @@ (from head of the queue) */ PSCSI_REQUEST_BLOCK +NTAPI UniataGetCurRequest( IN PHW_CHANNEL chan ); @@ -34,6 +37,7 @@ (used in simplex mode only) */ PHW_CHANNEL +NTAPI UniataGetNextChannel( IN PHW_CHANNEL chan ); Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -1,6 +1,7 @@ #include "stdafx.h" UCHAR +NTAPI UniataSataConnect( IN PVOID HwDeviceExtension, IN ULONG lChannel // logical channel @@ -61,6 +62,7 @@ } // end UniataSataConnect() UCHAR +NTAPI UniataSataPhyEnable( IN PVOID HwDeviceExtension, IN ULONG lChannel // logical channel @@ -118,6 +120,7 @@ } // end UniataSataPhyEnable() BOOLEAN +NTAPI UniataSataClearErr( IN PVOID HwDeviceExtension, IN ULONG lChannel, // logical channel @@ -162,6 +165,7 @@ } // end UniataSataClearErr() BOOLEAN +NTAPI UniataSataEvent( IN PVOID HwDeviceExtension, IN ULONG lChannel, // logical channel @@ -197,6 +201,7 @@ } // end UniataSataEvent() BOOLEAN +NTAPI UniataAhciInit( IN PVOID HwDeviceExtension ) @@ -308,6 +313,7 @@ } // end UniataAhciInit() UCHAR +NTAPI UniataAhciStatus( IN PVOID HwDeviceExtension, IN ULONG lChannel @@ -367,6 +373,7 @@ } // end UniataAhciStatus() ULONG +NTAPI UniataAhciSetupFIS( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG DeviceNumber, Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.h [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -2,12 +2,14 @@ #define __UNIATA_SATA__H__ UCHAR +NTAPI UniataSataConnect( IN PVOID HwDeviceExtension, IN ULONG lChannel // logical channel ); UCHAR +NTAPI UniataSataPhyEnable( IN PVOID HwDeviceExtension, IN ULONG lChannel // logical channel @@ -17,6 +19,7 @@ #define UNIATA_SATA_IGNORE_CONNECT FALSE BOOLEAN +NTAPI UniataSataClearErr( IN PVOID HwDeviceExtension, IN ULONG lChannel, // logical channel @@ -27,6 +30,7 @@ #define UNIATA_SATA_EVENT_DETACH 0x02 BOOLEAN +NTAPI UniataSataEvent( IN PVOID HwDeviceExtension, IN ULONG lChannel, // logical channel @@ -39,17 +43,20 @@ (deviceExtension->chan[lChannel].RegTranslation[IDX_SATA_SStatus].Addr)) BOOLEAN +NTAPI UniataAhciInit( IN PVOID HwDeviceExtension ); UCHAR +NTAPI UniataAhciStatus( IN PVOID HwDeviceExtension, IN ULONG lChannel ); ULONG +NTAPI UniataAhciSetupFIS( IN PHW_DEVICE_EXTENSION deviceExtension, IN ULONG DeviceNumber, Modified: trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -28,6 +28,7 @@ extern "C" NTSTATUS +NTAPI CrNtInit( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath @@ -35,12 +36,14 @@ extern "C" PVOID +NTAPI CrNtGetModuleBase( IN PCHAR pModuleName ); extern "C" PVOID +NTAPI CrNtFindModuleBaseByPtr( IN PVOID ptrInSection, IN PCHAR ptrExportedName @@ -48,6 +51,7 @@ extern "C" PVOID +NTAPI CrNtGetProcAddress( PVOID ModuleBase, PCHAR pFunctionName Modified: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] Mon Apr 6 18:38:21 2009 @@ -4,7 +4,6 @@ <bootstrap installbase="$(CDOUTPUT)" /> <include base="uniata">.</include> <include base="uniata">inc</include> - <compilerflag>-mrtd</compilerflag>  <library>ntoskrnl</library> <library>hal</library>

1 0

[gschneider] 40392: - Remove error case shortcut, allows results to be computed correctly - Fixes two oleaut32 vartest winetests
by gschneider＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: gschneider Date: Mon Apr 6 15:39:53 2009 New Revision: 40392 URL: http://svn.reactos.org/svn/reactos?rev=40392&view=rev Log: - Remove error case shortcut, allows results to be computed correctly - Fixes two oleaut32 vartest winetests Modified: trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s Modified: trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/pow_… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s [iso-8859-1] Mon Apr 6 15:39:53 2009 @@ -76,8 +76,7 @@ and ah, 0b10111010 // Turn off CF, PF and ZF or ah,al // Set new CF, PF and ZF sahf // Store AH into Flags - ja __fpow2 // Re-direct if y > 0 - jmp __fpow4 // End of case + jmp __fpow2 // Re-direct __fpow1: fxch // Put y on top of stack fld st // Duplicate y as st(1) frndint // Round to integer

1 0

[dgoette] 40391: * get Rank and Help into class structure * resolve some variables
by dgoette＠svn.reactos.org 06 Apr '09

06 Apr '09

1 0

[tkreuzer] 40390: [FORMATTING] - fix indentation - remove the large file header, fix the small one
by tkreuzer＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: tkreuzer Date: Mon Apr 6 07:20:25 2009 New Revision: 40390 URL: http://svn.reactos.org/svn/reactos?rev=40390&view=rev Log: [FORMATTING] - fix indentation - remove the large file header, fix the small one Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Mon Apr 6 07:20:25 2009 @@ -1,26 +1,7 @@ -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * PROJECT: ReactOS kernel - * PURPOSE: Mouse - * FILE: subsys/win32k/eng/mouse.c +/* + * PROJECT: ReactOS win32 subsystem + * PURPOSE: Mouse pointer functions + * FILE: subsystems/win32k/eng/mouse.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * REVISION HISTORY: * 06-06-2001 CSH Created @@ -34,495 +15,481 @@ /* FUNCTIONS *****************************************************************/ -INT INTERNAL_CALL -MouseSafetyOnDrawStart(SURFOBJ *SurfObj, LONG HazardX1, - LONG HazardY1, LONG HazardX2, LONG HazardY2) /* * FUNCTION: Notify the mouse driver that drawing is about to begin in * a rectangle on a particular surface. */ -{ - LONG tmp; - PDEVOBJ *ppdev; - GDIPOINTER *pgp; - - ASSERT(SurfObj != NULL); - - ppdev = GDIDEV(SurfObj); - - if(ppdev == NULL) - { - return(FALSE); - } - - pgp = &ppdev->Pointer; - - if (SPS_ACCEPT_NOEXCLUDE == pgp->Status || - pgp->Exclude.right == -1) - { - return(FALSE); - } - - if (HazardX1 > HazardX2) - { - tmp = HazardX2; HazardX2 = HazardX1; HazardX1 = tmp; - } - if (HazardY1 > HazardY2) - { - tmp = HazardY2; HazardY2 = HazardY1; HazardY1 = tmp; - } - - if (ppdev->SafetyRemoveLevel != 0) - { - ppdev->SafetyRemoveCount++; - return FALSE; - } - - ppdev->SafetyRemoveCount++; - - if (pgp->Exclude.right >= HazardX1 - && pgp->Exclude.left <= HazardX2 - && pgp->Exclude.bottom >= HazardY1 - && pgp->Exclude.top <= HazardY2) - { - ppdev->SafetyRemoveLevel = ppdev->SafetyRemoveCount; - if (pgp->MovePointer) - pgp->MovePointer(SurfObj, -1, -1, NULL); - else - EngMovePointer(SurfObj, -1, -1, NULL); - } - - return(TRUE); -} - INT INTERNAL_CALL -MouseSafetyOnDrawEnd(SURFOBJ *SurfObj) +MouseSafetyOnDrawStart( + SURFOBJ *SurfObj, + LONG HazardX1, + LONG HazardY1, + LONG HazardX2, + LONG HazardY2) +{ + LONG tmp; + PDEVOBJ *ppdev; + GDIPOINTER *pgp; + + ASSERT(SurfObj != NULL); + + ppdev = GDIDEV(SurfObj); + if (ppdev == NULL) + { + return(FALSE); + } + + pgp = &ppdev->Pointer; + + if (SPS_ACCEPT_NOEXCLUDE == pgp->Status || + pgp->Exclude.right == -1) + { + return(FALSE); + } + + if (HazardX1 > HazardX2) + { + tmp = HazardX2; + HazardX2 = HazardX1; + HazardX1 = tmp; + } + if (HazardY1 > HazardY2) + { + tmp = HazardY2; + HazardY2 = HazardY1; + HazardY1 = tmp; + } + + if (ppdev->SafetyRemoveLevel != 0) + { + ppdev->SafetyRemoveCount++; + return FALSE; + } + + ppdev->SafetyRemoveCount++; + + if (pgp->Exclude.right >= HazardX1 + && pgp->Exclude.left <= HazardX2 + && pgp->Exclude.bottom >= HazardY1 + && pgp->Exclude.top <= HazardY2) + { + ppdev->SafetyRemoveLevel = ppdev->SafetyRemoveCount; + if (pgp->MovePointer) + pgp->MovePointer(SurfObj, -1, -1, NULL); + else + EngMovePointer(SurfObj, -1, -1, NULL); + } + + return(TRUE); +} + /* * FUNCTION: Notify the mouse driver that drawing has finished on a surface. */ -{ - PDEVOBJ *ppdev; - GDIPOINTER *pgp; - - ASSERT(SurfObj != NULL); - - ppdev = GDIDEV(SurfObj); - - if(ppdev == NULL) - { - return(FALSE); - } - - pgp = &ppdev->Pointer; - - if(SPS_ACCEPT_NOEXCLUDE == pgp->Status || - pgp->Exclude.right == -1) - { - return FALSE; - } - - if (--ppdev->SafetyRemoveCount >= ppdev->SafetyRemoveLevel) - { - return FALSE; - } - if (pgp->MovePointer) - pgp->MovePointer(SurfObj, gpsi->ptCursor.x, gpsi->ptCursor.y, &pgp->Exclude); - else - EngMovePointer(SurfObj, gpsi->ptCursor.x, gpsi->ptCursor.y, &pgp->Exclude); - - ppdev->SafetyRemoveLevel = 0; - - return(TRUE); +INT INTERNAL_CALL +MouseSafetyOnDrawEnd( + SURFOBJ *SurfObj) +{ + PDEVOBJ *ppdev; + GDIPOINTER *pgp; + + ASSERT(SurfObj != NULL); + + ppdev = GDIDEV(SurfObj); + + if (ppdev == NULL) + { + return(FALSE); + } + + pgp = &ppdev->Pointer; + + if (SPS_ACCEPT_NOEXCLUDE == pgp->Status || + pgp->Exclude.right == -1) + { + return FALSE; + } + + if (--ppdev->SafetyRemoveCount >= ppdev->SafetyRemoveLevel) + { + return FALSE; + } + if (pgp->MovePointer) + pgp->MovePointer(SurfObj, gpsi->ptCursor.x, gpsi->ptCursor.y, &pgp->Exclude); + else + EngMovePointer(SurfObj, gpsi->ptCursor.x, gpsi->ptCursor.y, &pgp->Exclude); + + ppdev->SafetyRemoveLevel = 0; + + return(TRUE); } /* SOFTWARE MOUSE POINTER IMPLEMENTATION **************************************/ VOID INTERNAL_CALL -IntHideMousePointer(PDEVOBJ *ppdev, SURFOBJ *psoDest) -{ - GDIPOINTER *pgp; - POINTL pt; - - ASSERT(ppdev); - ASSERT(psoDest); - - pgp = &ppdev->Pointer; - - if (!pgp->Enabled) - { - return; - } - - - - pgp->Enabled = FALSE; - - /* - * The mouse is hide from ShowCours and it is frist ?? - */ - if (pgp->ShowPointer < 0) - { - return ; - } - - - /* - * Hide the cours - */ - pt.x = gpsi->ptCursor.x - pgp->HotSpot.x; - pt.y = gpsi->ptCursor.y - pgp->HotSpot.y; - - - if (pgp->SaveSurface != NULL) - { - RECTL DestRect; - POINTL SrcPoint; - SURFOBJ *SaveSurface; - SURFOBJ *MaskSurface; - - DestRect.left = max(pt.x, 0); - DestRect.top = max(pt.y, 0); - DestRect.right = min( - pt.x + pgp->Size.cx, - psoDest->sizlBitmap.cx); - DestRect.bottom = min( - pt.y + pgp->Size.cy, - psoDest->sizlBitmap.cy); - - SrcPoint.x = max(-pt.x, 0); - SrcPoint.y = max(-pt.y, 0); - - if((SaveSurface = EngLockSurface(pgp->SaveSurface))) - { - if((MaskSurface = EngLockSurface(pgp->MaskSurface))) - { - IntEngBitBltEx(psoDest, SaveSurface, MaskSurface, NULL, NULL, - &DestRect, &SrcPoint, &SrcPoint, NULL, NULL, - ROP3_TO_ROP4(SRCCOPY), FALSE); - EngUnlockSurface(MaskSurface); - } - EngUnlockSurface(SaveSurface); - } - } +IntHideMousePointer( + PDEVOBJ *ppdev, + SURFOBJ *psoDest) +{ + GDIPOINTER *pgp; + POINTL pt; + + ASSERT(ppdev); + ASSERT(psoDest); + + pgp = &ppdev->Pointer; + + if (!pgp->Enabled) + { + return; + } + + pgp->Enabled = FALSE; + + /* The mouse is hide from ShowCours and it is frist ?? */ + if (pgp->ShowPointer < 0) + { + return ; + } + + /* Hide the cours */ + pt.x = gpsi->ptCursor.x - pgp->HotSpot.x; + pt.y = gpsi->ptCursor.y - pgp->HotSpot.y; + + + if (pgp->SaveSurface != NULL) + { + RECTL DestRect; + POINTL SrcPoint; + SURFOBJ *SaveSurface; + SURFOBJ *MaskSurface; + + DestRect.left = max(pt.x, 0); + DestRect.top = max(pt.y, 0); + DestRect.right = min( + pt.x + pgp->Size.cx, + psoDest->sizlBitmap.cx); + DestRect.bottom = min( + pt.y + pgp->Size.cy, + psoDest->sizlBitmap.cy); + + SrcPoint.x = max(-pt.x, 0); + SrcPoint.y = max(-pt.y, 0); + + if ((SaveSurface = EngLockSurface(pgp->SaveSurface))) + { + if ((MaskSurface = EngLockSurface(pgp->MaskSurface))) + { + IntEngBitBltEx(psoDest, SaveSurface, MaskSurface, NULL, NULL, + &DestRect, &SrcPoint, &SrcPoint, NULL, NULL, + ROP3_TO_ROP4(SRCCOPY), FALSE); + EngUnlockSurface(MaskSurface); + } + EngUnlockSurface(SaveSurface); + } + } } VOID INTERNAL_CALL IntShowMousePointer(PDEVOBJ *ppdev, SURFOBJ *psoDest) { - GDIPOINTER *pgp; - SURFOBJ *SaveSurface; - POINTL pt; - - ASSERT(ppdev); - ASSERT(psoDest); - - pgp = &ppdev->Pointer; - - if (pgp->Enabled) - { - return; - } - - pgp->Enabled = TRUE; - - /* - * Do not blt the mouse if it in hide - */ - if (pgp->ShowPointer < 0) - { - return ; - } - - pt.x = gpsi->ptCursor.x - pgp->HotSpot.x; - pt.y = gpsi->ptCursor.y - pgp->HotSpot.y; - - /* - * Copy the pixels under the cursor to temporary surface. - */ - - if (pgp->SaveSurface != NULL && - (SaveSurface = EngLockSurface(pgp->SaveSurface))) - { - RECTL DestRect; - POINTL SrcPoint; - - SrcPoint.x = max(pt.x, 0); - SrcPoint.y = max(pt.y, 0); - - DestRect.left = SrcPoint.x - pt.x; - DestRect.top = SrcPoint.y - pt.y; - DestRect.right = min( - pgp->Size.cx, - psoDest->sizlBitmap.cx - pt.x); - DestRect.bottom = min( - pgp->Size.cy, - psoDest->sizlBitmap.cy - pt.y); - - IntEngBitBltEx(SaveSurface, psoDest, NULL, NULL, NULL, - &DestRect, &SrcPoint, NULL, NULL, NULL, - ROP3_TO_ROP4(SRCCOPY), FALSE); - EngUnlockSurface(SaveSurface); - } - - - /* - * Blit the cursor on the screen. - */ - - { - RECTL DestRect; - POINTL SrcPoint; - SURFOBJ *psoColor; - SURFOBJ *psoMask = NULL; - - DestRect.left = max(pt.x, 0); - DestRect.top = max(pt.y, 0); - DestRect.right = min( - pt.x + pgp->Size.cx, - psoDest->sizlBitmap.cx); - DestRect.bottom = min( - pt.y + pgp->Size.cy, - psoDest->sizlBitmap.cy); - - SrcPoint.x = max(-pt.x, 0); - SrcPoint.y = max(-pt.y, 0); - - - if (pgp->MaskSurface) - psoMask = EngLockSurface(pgp->MaskSurface); - - if (psoMask != NULL) - { - if (pgp->ColorSurface != NULL) - { - if((psoColor = EngLockSurface(pgp->ColorSurface))) - { - IntEngBitBltEx(psoDest, psoColor, psoMask, NULL, - pgp->XlateObject, &DestRect, &SrcPoint, &SrcPoint, - NULL, NULL, R4_MASK, FALSE); - EngUnlockSurface(psoColor); - } - } - else - { - IntEngBitBltEx(psoDest, psoMask, NULL, NULL, pgp->XlateObject, - &DestRect, &SrcPoint, NULL, NULL, NULL, - ROP3_TO_ROP4(SRCAND), FALSE); - SrcPoint.y += pgp->Size.cy; - IntEngBitBltEx(psoDest, psoMask, NULL, NULL, pgp->XlateObject, - &DestRect, &SrcPoint, NULL, NULL, NULL, - ROP3_TO_ROP4(SRCINVERT), FALSE); - } - EngUnlockSurface(psoMask); - } - } + GDIPOINTER *pgp; + SURFOBJ *SaveSurface; + POINTL pt; + + ASSERT(ppdev); + ASSERT(psoDest); + + pgp = &ppdev->Pointer; + + if (pgp->Enabled) + { + return; + } + + pgp->Enabled = TRUE; + + /* Do not blt the mouse if it in hide */ + if (pgp->ShowPointer < 0) + { + return ; + } + + pt.x = gpsi->ptCursor.x - pgp->HotSpot.x; + pt.y = gpsi->ptCursor.y - pgp->HotSpot.y; + + /* Copy the pixels under the cursor to temporary surface. */ + if (pgp->SaveSurface != NULL && + (SaveSurface = EngLockSurface(pgp->SaveSurface))) + { + RECTL DestRect; + POINTL SrcPoint; + + SrcPoint.x = max(pt.x, 0); + SrcPoint.y = max(pt.y, 0); + + DestRect.left = SrcPoint.x - pt.x; + DestRect.top = SrcPoint.y - pt.y; + DestRect.right = min( + pgp->Size.cx, + psoDest->sizlBitmap.cx - pt.x); + DestRect.bottom = min( + pgp->Size.cy, + psoDest->sizlBitmap.cy - pt.y); + + IntEngBitBltEx(SaveSurface, psoDest, NULL, NULL, NULL, + &DestRect, &SrcPoint, NULL, NULL, NULL, + ROP3_TO_ROP4(SRCCOPY), FALSE); + EngUnlockSurface(SaveSurface); + } + + + /* Blit the cursor on the screen. */ + { + RECTL DestRect; + POINTL SrcPoint; + SURFOBJ *psoColor; + SURFOBJ *psoMask = NULL; + + DestRect.left = max(pt.x, 0); + DestRect.top = max(pt.y, 0); + DestRect.right = min( + pt.x + pgp->Size.cx, + psoDest->sizlBitmap.cx); + DestRect.bottom = min( + pt.y + pgp->Size.cy, + psoDest->sizlBitmap.cy); + + SrcPoint.x = max(-pt.x, 0); + SrcPoint.y = max(-pt.y, 0); + + if (pgp->MaskSurface) + psoMask = EngLockSurface(pgp->MaskSurface); + + if (psoMask != NULL) + { + if (pgp->ColorSurface != NULL) + { + if ((psoColor = EngLockSurface(pgp->ColorSurface))) + { + IntEngBitBltEx(psoDest, psoColor, psoMask, NULL, + pgp->XlateObject, &DestRect, &SrcPoint, &SrcPoint, + NULL, NULL, R4_MASK, FALSE); + EngUnlockSurface(psoColor); + } + } + else + { + IntEngBitBltEx(psoDest, psoMask, NULL, NULL, pgp->XlateObject, + &DestRect, &SrcPoint, NULL, NULL, NULL, + ROP3_TO_ROP4(SRCAND), FALSE); + SrcPoint.y += pgp->Size.cy; + IntEngBitBltEx(psoDest, psoMask, NULL, NULL, pgp->XlateObject, + &DestRect, &SrcPoint, NULL, NULL, NULL, + ROP3_TO_ROP4(SRCINVERT), FALSE); + } + EngUnlockSurface(psoMask); + } + } } /* * @implemented */ - ULONG APIENTRY EngSetPointerShape( - IN SURFOBJ *pso, - IN SURFOBJ *psoMask, - IN SURFOBJ *psoColor, - IN XLATEOBJ *pxlo, - IN LONG xHot, - IN LONG yHot, - IN LONG x, - IN LONG y, - IN RECTL *prcl, - IN FLONG fl) -{ - PDEVOBJ *ppdev; - SURFOBJ *psoTemp; - GDIPOINTER *pgp; - - ASSERT(pso); - - ppdev = GDIDEV(pso); - pgp = &ppdev->Pointer; - - IntHideMousePointer(ppdev, pso); - - if (pgp->ColorSurface != NULL) - { - /* FIXME: Is this really needed? */ - if((psoTemp = EngLockSurface(pgp->ColorSurface))) - { - EngFreeMem(psoTemp->pvBits); - psoTemp->pvBits = 0; - EngUnlockSurface(psoTemp); - } - - EngDeleteSurface(pgp->ColorSurface); - pgp->MaskSurface = NULL; - } - - if (pgp->MaskSurface != NULL) - { - /* FIXME: Is this really needed? */ - if((psoTemp = EngLockSurface(pgp->MaskSurface))) - { - EngFreeMem(psoTemp->pvBits); - psoTemp->pvBits = 0; - EngUnlockSurface(psoTemp); - } - - EngDeleteSurface(pgp->MaskSurface); - pgp->MaskSurface = NULL; - } - - if (pgp->SaveSurface != NULL) - { - EngDeleteSurface(pgp->SaveSurface); - pgp->SaveSurface = NULL; - } - - if (pgp->XlateObject != NULL) - { - EngDeleteXlate(pgp->XlateObject); - pgp->XlateObject = NULL; - } - - /* - * See if we are being asked to hide the pointer. - */ - - if (psoMask == NULL) - { - return SPS_ACCEPT_NOEXCLUDE; - } - - pgp->HotSpot.x = xHot; - pgp->HotSpot.y = yHot; - - /* Actually this should be set by 'the other side', but it would be - * done right after this. It helps IntShowMousePointer. */ - if (x != -1) - { - gpsi->ptCursor.x = x; - gpsi->ptCursor.y = y; - } - - pgp->Size.cx = abs(psoMask->lDelta) << 3; - pgp->Size.cy = (psoMask->cjBits / abs(psoMask->lDelta)) >> 1; - - if (psoColor != NULL) - { - PBYTE Bits; - - Bits = EngAllocMem(0, psoColor->cjBits, TAG_MOUSE); - if (Bits == NULL) - { - return SPS_ERROR; - } - - memcpy(Bits, psoColor->pvBits, psoColor->cjBits); - - pgp->ColorSurface = (HSURF)EngCreateBitmap(pgp->Size, - psoColor->lDelta, psoColor->iBitmapFormat, - psoColor->lDelta < 0 ? 0 : BMF_TOPDOWN, Bits); - } - else - { - pgp->ColorSurface = NULL; - } - - { - SIZEL Size; - PBYTE Bits; - - Size.cx = pgp->Size.cx; - Size.cy = pgp->Size.cy << 1; - Bits = EngAllocMem(0, psoMask->cjBits, TAG_MOUSE); - if (Bits == NULL) - { - return SPS_ERROR; - } - - memcpy(Bits, psoMask->pvBits, psoMask->cjBits); - - pgp->MaskSurface = (HSURF)EngCreateBitmap(Size, - psoMask->lDelta, psoMask->iBitmapFormat, - psoMask->lDelta < 0 ? 0 : BMF_TOPDOWN, Bits); - } - - /* - * Create an XLATEOBJ that will be used for drawing masks. - * FIXME: We should get this in pxlo parameter! - */ - - if (pxlo == NULL) - { - HPALETTE BWPalette, DestPalette; - ULONG BWColors[] = {0, 0xFFFFFF}; - - BWPalette = EngCreatePalette(PAL_INDEXED, sizeof(BWColors) / sizeof(ULONG), - BWColors, 0, 0, 0); - - DestPalette = ppdev->DevInfo.hpalDefault; - pgp->XlateObject = IntEngCreateXlate(0, PAL_INDEXED, - DestPalette, BWPalette); - EngDeletePalette(BWPalette); - } - else - { - pgp->XlateObject = pxlo; - } - - /* - * Create surface for saving the pixels under the cursor. - */ - - { - LONG lDelta; - - switch (pso->iBitmapFormat) - { - case BMF_1BPP: - lDelta = pgp->Size.cx >> 3; - break; - case BMF_4BPP: - lDelta = pgp->Size.cx >> 1; - break; - case BMF_8BPP: - lDelta = pgp->Size.cx; - break; - case BMF_16BPP: - lDelta = pgp->Size.cx << 1; - break; - case BMF_24BPP: - lDelta = pgp->Size.cx * 3; - break; - case BMF_32BPP: - lDelta = pgp->Size.cx << 2; - break; - default: - lDelta = 0; - break; - } - - pgp->SaveSurface = (HSURF)EngCreateBitmap( - pgp->Size, lDelta, pso->iBitmapFormat, BMF_TOPDOWN | BMF_NOZEROINIT, NULL); - } - - if(x != -1) - { - IntShowMousePointer(ppdev, pso); - - if (prcl != NULL) - { - prcl->left = x - pgp->HotSpot.x; - prcl->top = y - pgp->HotSpot.x; - prcl->right = prcl->left + pgp->Size.cx; - prcl->bottom = prcl->top + pgp->Size.cy; - } - } else if (prcl != NULL) - prcl->left = prcl->top = prcl->right = prcl->bottom = -1; - - return SPS_ACCEPT_EXCLUDE; + IN SURFOBJ *pso, + IN SURFOBJ *psoMask, + IN SURFOBJ *psoColor, + IN XLATEOBJ *pxlo, + IN LONG xHot, + IN LONG yHot, + IN LONG x, + IN LONG y, + IN RECTL *prcl, + IN FLONG fl) +{ + PDEVOBJ *ppdev; + SURFOBJ *psoTemp; + GDIPOINTER *pgp; + + ASSERT(pso); + + ppdev = GDIDEV(pso); + pgp = &ppdev->Pointer; + + IntHideMousePointer(ppdev, pso); + + if (pgp->ColorSurface != NULL) + { + /* FIXME: Is this really needed? */ + if ((psoTemp = EngLockSurface(pgp->ColorSurface))) + { + EngFreeMem(psoTemp->pvBits); + psoTemp->pvBits = 0; + EngUnlockSurface(psoTemp); + } + + EngDeleteSurface(pgp->ColorSurface); + pgp->MaskSurface = NULL; + } + + if (pgp->MaskSurface != NULL) + { + /* FIXME: Is this really needed? */ + if ((psoTemp = EngLockSurface(pgp->MaskSurface))) + { + EngFreeMem(psoTemp->pvBits); + psoTemp->pvBits = 0; + EngUnlockSurface(psoTemp); + } + + EngDeleteSurface(pgp->MaskSurface); + pgp->MaskSurface = NULL; + } + + if (pgp->SaveSurface != NULL) + { + EngDeleteSurface(pgp->SaveSurface); + pgp->SaveSurface = NULL; + } + + if (pgp->XlateObject != NULL) + { + EngDeleteXlate(pgp->XlateObject); + pgp->XlateObject = NULL; + } + + /* See if we are being asked to hide the pointer. */ + if (psoMask == NULL) + { + return SPS_ACCEPT_NOEXCLUDE; + } + + pgp->HotSpot.x = xHot; + pgp->HotSpot.y = yHot; + + /* Actually this should be set by 'the other side', but it would be + * done right after this. It helps IntShowMousePointer. */ + if (x != -1) + { + gpsi->ptCursor.x = x; + gpsi->ptCursor.y = y; + } + + pgp->Size.cx = abs(psoMask->lDelta) << 3; + pgp->Size.cy = (psoMask->cjBits / abs(psoMask->lDelta)) >> 1; + + if (psoColor != NULL) + { + PBYTE Bits; + + Bits = EngAllocMem(0, psoColor->cjBits, TAG_MOUSE); + if (Bits == NULL) + { + return SPS_ERROR; + } + + memcpy(Bits, psoColor->pvBits, psoColor->cjBits); + + pgp->ColorSurface = (HSURF)EngCreateBitmap(pgp->Size, + psoColor->lDelta, psoColor->iBitmapFormat, + psoColor->lDelta < 0 ? 0 : BMF_TOPDOWN, Bits); + } + else + { + pgp->ColorSurface = NULL; + } + + { + SIZEL Size; + PBYTE Bits; + + Size.cx = pgp->Size.cx; + Size.cy = pgp->Size.cy << 1; + Bits = EngAllocMem(0, psoMask->cjBits, TAG_MOUSE); + if (Bits == NULL) + { + return SPS_ERROR; + } + + memcpy(Bits, psoMask->pvBits, psoMask->cjBits); + + pgp->MaskSurface = (HSURF)EngCreateBitmap(Size, + psoMask->lDelta, psoMask->iBitmapFormat, + psoMask->lDelta < 0 ? 0 : BMF_TOPDOWN, Bits); + } + + /* Create an XLATEOBJ that will be used for drawing masks. + * FIXME: We should get this in pxlo parameter! */ + if (pxlo == NULL) + { + HPALETTE BWPalette, DestPalette; + ULONG BWColors[] = {0, 0xFFFFFF}; + + BWPalette = EngCreatePalette(PAL_INDEXED, sizeof(BWColors) / sizeof(ULONG), + BWColors, 0, 0, 0); + + DestPalette = ppdev->DevInfo.hpalDefault; + pgp->XlateObject = IntEngCreateXlate(0, PAL_INDEXED, + DestPalette, BWPalette); + EngDeletePalette(BWPalette); + } + else + { + pgp->XlateObject = pxlo; + } + + /* Create surface for saving the pixels under the cursor. */ + { + LONG lDelta; + + switch (pso->iBitmapFormat) + { + case BMF_1BPP: + lDelta = pgp->Size.cx >> 3; + break; + case BMF_4BPP: + lDelta = pgp->Size.cx >> 1; + break; + case BMF_8BPP: + lDelta = pgp->Size.cx; + break; + case BMF_16BPP: + lDelta = pgp->Size.cx << 1; + break; + case BMF_24BPP: + lDelta = pgp->Size.cx * 3; + break; + case BMF_32BPP: + lDelta = pgp->Size.cx << 2; + break; + default: + lDelta = 0; + break; + } + + pgp->SaveSurface = (HSURF)EngCreateBitmap(pgp->Size, + lDelta, + pso->iBitmapFormat, + BMF_TOPDOWN | BMF_NOZEROINIT, NULL); + } + + if (x != -1) + { + IntShowMousePointer(ppdev, pso); + + if (prcl != NULL) + { + prcl->left = x - pgp->HotSpot.x; + prcl->top = y - pgp->HotSpot.x; + prcl->right = prcl->left + pgp->Size.cx; + prcl->bottom = prcl->top + pgp->Size.cy; + } + } else if (prcl != NULL) + prcl->left = prcl->top = prcl->right = prcl->bottom = -1; + + return SPS_ACCEPT_EXCLUDE; } /* @@ -531,61 +498,61 @@ VOID APIENTRY EngMovePointer( - IN SURFOBJ *pso, - IN LONG x, - IN LONG y, - IN RECTL *prcl) -{ - PDEVOBJ *ppdev; - GDIPOINTER *pgp; - - ASSERT(pso); - - ppdev = GDIDEV(pso); - - ASSERT(ppdev); - - pgp = &ppdev->Pointer; - - IntHideMousePointer(ppdev, pso); - if (x != -1) - { - /* Actually this should be set by 'the other side', but it would be - * done right after this. It helps IntShowMousePointer. */ - gpsi->ptCursor.x = x; - gpsi->ptCursor.y = y; - IntShowMousePointer(ppdev, pso); - if (prcl != NULL) - { - prcl->left = x - pgp->HotSpot.x; - prcl->top = y - pgp->HotSpot.x; - prcl->right = prcl->left + pgp->Size.cx; - prcl->bottom = prcl->top + pgp->Size.cy; - } - } else if (prcl != NULL) - prcl->left = prcl->top = prcl->right = prcl->bottom = -1; + IN SURFOBJ *pso, + IN LONG x, + IN LONG y, + IN RECTL *prcl) +{ + PDEVOBJ *ppdev; + GDIPOINTER *pgp; + + ASSERT(pso); + + ppdev = GDIDEV(pso); + + ASSERT(ppdev); + + pgp = &ppdev->Pointer; + + IntHideMousePointer(ppdev, pso); + if (x != -1) + { + /* Actually this should be set by 'the other side', but it would be + * done right after this. It helps IntShowMousePointer. */ + gpsi->ptCursor.x = x; + gpsi->ptCursor.y = y; + IntShowMousePointer(ppdev, pso); + if (prcl != NULL) + { + prcl->left = x - pgp->HotSpot.x; + prcl->top = y - pgp->HotSpot.x; + prcl->right = prcl->left + pgp->Size.cx; + prcl->bottom = prcl->top + pgp->Size.cy; + } + } else if (prcl != NULL) + prcl->left = prcl->top = prcl->right = prcl->bottom = -1; } VOID APIENTRY IntEngMovePointer( - IN SURFOBJ *pso, - IN LONG x, - IN LONG y, - IN RECTL *prcl) -{ - SURFACE *psurf = CONTAINING_RECORD(pso, SURFACE, SurfObj); - - SURFACE_LockBitmapBits(psurf); - if (GDIDEV(pso)->Pointer.MovePointer) - { - GDIDEV(pso)->Pointer.MovePointer(pso, x, y, prcl); - } - else - { - EngMovePointer(pso, x, y, prcl); - } - SURFACE_UnlockBitmapBits(psurf); + IN SURFOBJ *pso, + IN LONG x, + IN LONG y, + IN RECTL *prcl) +{ + SURFACE *psurf = CONTAINING_RECORD(pso, SURFACE, SurfObj); + + SURFACE_LockBitmapBits(psurf); + if (GDIDEV(pso)->Pointer.MovePointer) + { + GDIDEV(pso)->Pointer.MovePointer(pso, x, y, prcl); + } + else + { + EngMovePointer(pso, x, y, prcl); + } + SURFACE_UnlockBitmapBits(psurf); } /* EOF */

1 0

[tkreuzer] 40389: Improve tests for NtGdiDeleteObjectApp
by tkreuzer＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: tkreuzer Date: Mon Apr 6 06:49:47 2009 New Revision: 40389 URL: http://svn.reactos.org/svn/reactos?rev=40389&view=rev Log: Improve tests for NtGdiDeleteObjectApp Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c [iso-8859-1] Mon Apr 6 06:49:47 2009 @@ -5,12 +5,10 @@ HDC hdc; HBITMAP hbmp; HBRUSH hbrush; - BOOL ret; /* Try to delete 0 */ SetLastError(0); - ret = NtGdiDeleteObjectApp(0); - TEST(ret == 0); + TEST(NtGdiDeleteObjectApp(0) == 0); TEST(GetLastError() == 0); /* Try to delete something with a stockbit */ @@ -21,40 +19,32 @@ /* Delete a DC */ SetLastError(0); hdc = CreateCompatibleDC(NULL); - ASSERT(hdc); - TEST(IsHandleValid(hdc) == 1); - ret = NtGdiDeleteObjectApp(hdc); - TEST(ret == 1); + ASSERT(IsHandleValid(hdc) == 1); + TEST(NtGdiDeleteObjectApp(hdc) == 1); TEST(GetLastError() == 0); TEST(IsHandleValid(hdc) == 0); /* Delete a brush */ SetLastError(0); hbrush = CreateSolidBrush(0x123456); - ASSERT(hbrush); - TEST(IsHandleValid(hbrush) == 1); - ret = NtGdiDeleteObjectApp(hbrush); - TEST(ret == 1); + ASSERT(IsHandleValid(hbrush) == 1); + TEST(NtGdiDeleteObjectApp(hbrush) == 1); TEST(GetLastError() == 0); TEST(IsHandleValid(hbrush) == 0); /* Try to delete a stock brush */ SetLastError(0); hbrush = GetStockObject(BLACK_BRUSH); - ASSERT(hbrush); - TEST(IsHandleValid(hbrush) == 1); - ret = NtGdiDeleteObjectApp(hbrush); - TEST(ret == 1); + ASSERT(IsHandleValid(hbrush) == 1); + TEST(NtGdiDeleteObjectApp(hbrush) == 1); TEST(GetLastError() == 0); TEST(IsHandleValid(hbrush) == 1); /* Delete a bitmap */ SetLastError(0); hbmp = CreateBitmap(10, 10, 1, 1, NULL); - ASSERT(hbmp); - TEST(IsHandleValid(hbmp) == 1); - ret = NtGdiDeleteObjectApp(hbmp); - TEST(ret == 1); + ASSERT(IsHandleValid(hbmp) == 1); + TEST(NtGdiDeleteObjectApp(hbmp) == 1); TEST(GetLastError() == 0); TEST(IsHandleValid(hbmp) == 0); @@ -65,23 +55,19 @@ /* Try to delete a brush that is selected into a DC */ SetLastError(0); hbrush = CreateSolidBrush(0x123456); - ASSERT(hbrush); - TEST(IsHandleValid(hbrush) == 1); + ASSERT(IsHandleValid(hbrush) == 1); TEST(NtGdiSelectBrush(hdc, hbrush)); - ret = NtGdiDeleteObjectApp(hbrush); - TEST(ret == 1); + TEST(NtGdiDeleteObjectApp(hbrush) == 1); TEST(GetLastError() == 0); TEST(IsHandleValid(hbrush) == 1); /* Try to delete a bitmap that is selected into a DC */ SetLastError(0); hbmp = CreateBitmap(10, 10, 1, 1, NULL); - ASSERT(hbmp); - TEST(IsHandleValid(hbmp) == 1); + ASSERT(IsHandleValid(hbmp) == 1); TEST(NtGdiSelectBitmap(hdc, hbmp)); - ret = NtGdiDeleteObjectApp(hbmp); - TEST(ret == 1); + TEST(NtGdiDeleteObjectApp(hbmp) == 1); TEST(GetLastError() == 0); TEST(IsHandleValid(hbmp) == 1); @@ -89,11 +75,19 @@ NtGdiSelectBitmap(hdc, GetStockObject(DEFAULT_BITMAP)); TEST(IsHandleValid(hbmp) == 0); - ret = NtGdiDeleteObjectApp(hbmp); - TEST(ret == 1); + TEST(NtGdiDeleteObjectApp(hbmp) == 1); TEST(GetLastError() == 0); TEST(IsHandleValid(hbmp) == 0); + /* Try to delete a brush that is selected into a DC */ + SetLastError(0); + hbrush = CreateSolidBrush(123); + ASSERT(IsHandleValid(hbrush) == 1); + TEST(NtGdiSelectBrush(hdc, hbrush)); + + TEST(NtGdiDeleteObjectApp(hbrush) == 1); + TEST(GetLastError() == 0); + TEST(IsHandleValid(hbrush) == 1); return APISTATUS_NORMAL; }

1 0

[tkreuzer] 40388: revert miniport.h changes for now
by tkreuzer＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: tkreuzer Date: Mon Apr 6 06:28:53 2009 New Revision: 40388 URL: http://svn.reactos.org/svn/reactos?rev=40388&view=rev Log: revert miniport.h changes for now Modified: trunk/reactos/include/ddk/miniport.h Modified: trunk/reactos/include/ddk/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/miniport.h?rev… ============================================================================== --- trunk/reactos/include/ddk/miniport.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/miniport.h [iso-8859-1] Mon Apr 6 06:28:53 2009 @@ -23,45 +23,9 @@ #ifndef _MINIPORT_ #define _MINIPORT_ -#include <ntdef.h> -#include <stddef.h> -#include <basetsd.h> -#include <sdkddkver.h> -#include <guiddef.h> - - #ifdef __cplusplus extern "C" { #endif - -typedef enum _INTERFACE_TYPE -{ - InterfaceTypeUndefined = -1, - Internal, - Isa, - Eisa, - MicroChannel, - TurboChannel, - PCIBus, - VMEBus, - NuBus, - PCMCIABus, - CBus, - MPIBus, - MPSABus, - ProcessorInternal, - InternalPowerBus, - PNPISABus, - PNPBus, - Vmcs, - MaximumInterfaceType -} INTERFACE_TYPE, *PINTERFACE_TYPE; - -typedef enum _KINTERRUPT_MODE -{ - LevelSensitive, - Latched -} KINTERRUPT_MODE, *PKINTERRUPT_MODE; #define EMULATOR_READ_ACCESS 0x01 #define EMULATOR_WRITE_ACCESS 0x02 @@ -71,6 +35,7 @@ Ushort, Ulong } EMULATOR_PORT_ACCESS_TYPE, *PEMULATOR_PORT_ACCESS_TYPE; + typedef struct _EMULATOR_ACCESS_ENTRY { ULONG BasePort; @@ -93,170 +58,6 @@ } VIDEO_ACCESS_RANGE, *PVIDEO_ACCESS_RANGE; #endif -typedef VOID (*PINTERFACE_REFERENCE)(PVOID Context); -typedef VOID (*PINTERFACE_DEREFERENCE)(PVOID Context); - -typedef struct _INTERFACE -{ - USHORT Size; - USHORT Version; - PVOID Context; - PINTERFACE_REFERENCE InterfaceReference; - PINTERFACE_DEREFERENCE InterfaceDereference; -} INTERFACE, *PINTERFACE; - -typedef enum _IRQ_DEVICE_POLICY -{ - IrqPolicyMachineDefault = 0, - IrqPolicyAllCloseProcessors, - IrqPolicyOneCloseProcessor, - IrqPolicyAllProcessorsInMachine, - IrqPolicySpecifiedProcessors, - IrqPolicySpreadMessagesAcrossAllProcessors -} IRQ_DEVICE_POLICY, *PIRQ_DEVICE_POLICY; - -typedef enum _IRQ_PRIORITY -{ - IrqPriorityUndefined = 0, - IrqPriorityLow, - IrqPriorityNormal, - IrqPriorityHigh -} IRQ_PRIORITY, *PIRQ_PRIORITY; - -typedef enum _DMA_WIDTH -{ - Width8Bits, - Width16Bits, - Width32Bits, - MaximumDmaWidth -} DMA_WIDTH, *PDMA_WIDTH; - -typedef enum _DMA_SPEED -{ - Compatible, - TypeA, - TypeB, - TypeC, - TypeF, - MaximumDmaSpeed -} DMA_SPEED, *PDMA_SPEED; - -#pragma pack(push,4) -typedef enum _BUS_DATA_TYPE -{ - ConfigurationSpaceUndefined = -1, - Cmos, - EisaConfiguration, - Pos, - CbusConfiguration, - PCIConfiguration, - VMEConfiguration, - NuBusConfiguration, - PCMCIAConfiguration, - MPIConfiguration, - MPSAConfiguration, - PNPISAConfiguration, - SgiInternalConfiguration, - MaximumBusDataType -} BUS_DATA_TYPE, *PBUS_DATA_TYPE; -#pragma pack(pop) - -typedef struct _IO_RESOURCE_DESCRIPTOR -{ - UCHAR Option; - UCHAR Type; - UCHAR ShareDisposition; - UCHAR Spare1; - USHORT Flags; - USHORT Spare2; - - union - { - struct - { - ULONG Length; - ULONG Alignment; - PHYSICAL_ADDRESS MinimumAddress; - PHYSICAL_ADDRESS MaximumAddress; - } Port; - - struct - { - ULONG Length; - ULONG Alignment; - PHYSICAL_ADDRESS MinimumAddress; - PHYSICAL_ADDRESS MaximumAddress; - } Memory; - - struct - { - ULONG MinimumVector; - ULONG MaximumVector; - IRQ_DEVICE_POLICY AffinityPolicy; - IRQ_PRIORITY PriorityPolicy; - KAFFINITY TargetedProcessors; - } Interrupt; - - struct - { - ULONG MinimumChannel; - ULONG MaximumChannel; - } Dma; - - struct - { - ULONG Length; - ULONG Alignment; - PHYSICAL_ADDRESS MinimumAddress; - PHYSICAL_ADDRESS MaximumAddress; - } Generic; - - struct - { - ULONG Data[3]; - } DevicePrivate; - - struct - { - ULONG Length; - ULONG MinBusNumber; - ULONG MaxBusNumber; - ULONG Reserved; - } BusNumber; - - struct - { - ULONG Priority; - ULONG Reserved1; - ULONG Reserved2; - } ConfigData; - - struct - { - ULONG Length40; - ULONG Alignment40; - PHYSICAL_ADDRESS MinimumAddress; - PHYSICAL_ADDRESS MaximumAddress; - } Memory40; - - struct - { - ULONG Length48; - ULONG Alignment48; - PHYSICAL_ADDRESS MinimumAddress; - PHYSICAL_ADDRESS MaximumAddress; - } Memory48; - - struct - { - ULONG Length64; - ULONG Alignment64; - PHYSICAL_ADDRESS MinimumAddress; - PHYSICAL_ADDRESS MaximumAddress; - } Memory64; - } u; -} IO_RESOURCE_DESCRIPTOR, *PIO_RESOURCE_DESCRIPTOR; - typedef VOID DDKAPI (*PBANKED_SECTION_ROUTINE)( IN ULONG ReadBank,

1 0

[cgutman] 40387: - Drivers must use DelayedWorkQueue (part 2)
by cgutman＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: cgutman Date: Mon Apr 6 06:15:43 2009 New Revision: 40387 URL: http://svn.reactos.org/svn/reactos?rev=40387&view=rev Log: - Drivers must use DelayedWorkQueue (part 2) Modified: trunk/reactos/lib/drivers/chew/workqueue.c Modified: trunk/reactos/lib/drivers/chew/workqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/chew/workqueue… ============================================================================== --- trunk/reactos/lib/drivers/chew/workqueue.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/chew/workqueue.c [iso-8859-1] Mon Apr 6 06:15:43 2009 @@ -87,7 +87,7 @@ ExInterlockedInsertTailList ( &WorkQueue, &Item->Entry, &WorkQueueLock ); IoQueueWorkItem - ( Item->WorkItem, ChewWorkItem, CriticalWorkQueue, Item ); + ( Item->WorkItem, ChewWorkItem, DelayedWorkQueue, Item ); if( ItemPtr ) *ItemPtr = Item;

1 0

[tkreuzer] 40386: fix include guard, use winddi types instead of ros specific function pointer types, add a bunch of static asserts to make sure the DRIVRE_FUNCTIONS structure matches the array.
by tkreuzer＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: tkreuzer Date: Mon Apr 6 06:13:44 2009 New Revision: 40386 URL: http://svn.reactos.org/svn/reactos?rev=40386&view=rev Log: fix include guard, use winddi types instead of ros specific function pointer types, add a bunch of static asserts to make sure the DRIVRE_FUNCTIONS structure matches the array. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/driver.h trunk/reactos/subsystems/win32/win32k/misc/driver.c trunk/reactos/subsystems/win32/win32k/objects/device.c Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] Mon Apr 6 06:13:44 2009 @@ -216,7 +216,7 @@ typedef PVOID KERNEL_PVOID; typedef PVOID PUMDHPDEV; typedef D3DNTHAL_CONTEXTCREATEDATA D3DNTHAL_CONTEXTCREATEI; -#if !defined(__WINDDI_H) +#if !defined(_WINDDI_) typedef LONG FIX; #endif @@ -534,77 +534,10 @@ } GDIBSOBJECT, *PGDIBSOBJECT; // -// Driver Functions -// -typedef BOOL (NTAPI *PGD_ENABLEDRIVER)(ULONG, ULONG, PDRVENABLEDATA); -typedef DHPDEV (NTAPI *PGD_ENABLEPDEV)(DEVMODEW *, LPWSTR, ULONG, HSURF *, ULONG, ULONG *, ULONG, DEVINFO *, LPWSTR, LPWSTR, HANDLE); -typedef VOID (NTAPI *PGD_COMPLETEPDEV)(DHPDEV, HDEV); -typedef VOID (NTAPI *PGD_DISABLEPDEV)(DHPDEV); -typedef HSURF (NTAPI *PGD_ENABLESURFACE)(DHPDEV); -typedef VOID (NTAPI *PGD_DISABLESURFACE)(DHPDEV); -typedef BOOL (NTAPI *PGD_ASSERTMODE)(DHPDEV, BOOL); -typedef BOOL (NTAPI *PGD_OFFSET)(SURFOBJ*, LONG, LONG, FLONG); -typedef BOOL (NTAPI *PGD_RESETPDEV)(DHPDEV, DHPDEV); -typedef VOID (NTAPI *PGD_DISABLEDRIVER)(VOID); -typedef HBITMAP (NTAPI *PGD_CREATEDEVICEBITMAP)(DHPDEV, SIZEL, ULONG); -typedef VOID (NTAPI *PGD_DELETEDEVICEBITMAP)(DHSURF); -typedef BOOL (NTAPI *PGD_ALPHABLEND)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, RECTL*, BLENDOBJ*); -typedef BOOL (NTAPI *PGD_REALIZEBRUSH)(BRUSHOBJ*, SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, ULONG); -typedef ULONG (NTAPI *PGD_DITHERCOLOR)(DHPDEV, ULONG, ULONG, PULONG); -typedef BOOL (NTAPI *PGD_STROKEPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, BRUSHOBJ*, POINTL*, PLINEATTRS, MIX); -typedef BOOL (NTAPI *PGD_FILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MIX, ULONG); -typedef BOOL (NTAPI *PGD_STROKEANDFILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, BRUSHOBJ*, PLINEATTRS, BRUSHOBJ*, POINTL*, MIX, ULONG); -typedef BOOL (NTAPI *PGD_PAINT)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MIX); -typedef BOOL (NTAPI *PGD_BITBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, POINTL*, POINTL*, BRUSHOBJ*, POINTL*, ROP4); -typedef BOOL (NTAPI *PGD_TRANSPARENTBLT)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, RECTL*, ULONG, ULONG); -typedef BOOL (NTAPI *PGD_COPYBITS)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, POINTL*); -typedef BOOL (NTAPI *PGD_STRETCHBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG); -typedef BOOL (NTAPI *PGD_STRETCHBLTROP)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG, BRUSHOBJ*, DWORD); -typedef BOOL (NTAPI *PGD_SETPALETTE)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG); -typedef BOOL (NTAPI *PGD_TEXTOUT)(SURFOBJ*, STROBJ*, FONTOBJ*, CLIPOBJ*, RECTL*, RECTL*, BRUSHOBJ*, BRUSHOBJ*, POINTL*, MIX); -typedef ULONG (NTAPI *PGD_ESCAPE)(SURFOBJ*, ULONG, ULONG, PVOID *, ULONG, PVOID *); -typedef ULONG (NTAPI *PGD_DRAWESCAPE)(SURFOBJ*, ULONG, CLIPOBJ*, RECTL*, ULONG, PVOID *); -typedef PIFIMETRICS (NTAPI *PGD_QUERYFONT)(DHPDEV, ULONG, ULONG, PULONG); -typedef PVOID (NTAPI *PGD_QUERYFONTTREE)(DHPDEV, ULONG, ULONG, ULONG, PULONG); -typedef LONG (NTAPI *PGD_QUERYFONTDATA)(DHPDEV, FONTOBJ*, ULONG, HGLYPH, GLYPHDATA*, PVOID, ULONG); -typedef ULONG (NTAPI *PGD_SETPOINTERSHAPE)(SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, LONG, LONG, LONG, LONG, RECTL*, ULONG); -typedef VOID (NTAPI *PGD_MOVEPOINTER)(SURFOBJ*, LONG, LONG, RECTL*); -typedef BOOL (NTAPI *PGD_LINETO)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, LONG, LONG, LONG, LONG, RECTL*, MIX); -typedef BOOL (NTAPI *PGD_SENDPAGE)(SURFOBJ*); -typedef BOOL (NTAPI *PGD_STARTPAGE)(SURFOBJ*); -typedef BOOL (NTAPI *PGD_ENDDOC)(SURFOBJ*, ULONG); -typedef BOOL (NTAPI *PGD_STARTDOC)(SURFOBJ*, PWSTR, DWORD); -typedef ULONG (NTAPI *PGD_GETGLYPHMODE)(DHPDEV, FONTOBJ*); -typedef VOID (NTAPI *PGD_SYNCHRONIZE)(DHPDEV, RECTL*); -typedef ULONG (NTAPI *PGD_SAVESCREENBITS)(SURFOBJ*, ULONG, ULONG, RECTL*); -typedef ULONG (NTAPI *PGD_GETMODES)(HANDLE, ULONG, PDEVMODEW); -typedef VOID (NTAPI *PGD_FREE)(PVOID, ULONG); -typedef VOID (NTAPI *PGD_DESTROYFONT)(FONTOBJ*); -typedef LONG (NTAPI *PGD_QUERYFONTCAPS)(ULONG, PULONG); -typedef ULONG (NTAPI *PGD_LOADFONTFILE)(ULONG, PVOID, ULONG, ULONG); -typedef BOOL (NTAPI *PGD_UNLOADFONTFILE)(ULONG); -typedef ULONG (NTAPI *PGD_FONTMANAGEMENT)(SURFOBJ*, FONTOBJ*, ULONG, ULONG, PVOID, ULONG, PVOID); -typedef LONG (NTAPI *PGD_QUERYTRUETYPETABLE)(ULONG, ULONG, ULONG, PTRDIFF, ULONG, PBYTE); -typedef LONG (NTAPI *PGD_QUERYTRUETYPEOUTLINE)(DHPDEV, FONTOBJ*, HGLYPH, BOOL, GLYPHDATA*, ULONG, TTPOLYGONHEADER*); -typedef PVOID (NTAPI *PGD_GETTRUETYPEFILE)(ULONG, PULONG); -typedef LONG (NTAPI *PGD_QUERYFONTFILE)(ULONG, ULONG, ULONG, PULONG); -typedef BOOL (NTAPI *PGD_QUERYADVANCEWIDTHS)(DHPDEV, FONTOBJ*, ULONG, HGLYPH *, PVOID *, ULONG); -typedef BOOL (NTAPI *PGD_SETPIXELFORMAT)(SURFOBJ*, LONG, ULONG); -typedef LONG (NTAPI *PGD_DESCRIBEPIXELFORMAT)(DHPDEV, LONG, ULONG, PPIXELFORMATDESCRIPTOR); -typedef BOOL (NTAPI *PGD_SWAPBUFFERS)(SURFOBJ*, PWNDOBJ); -typedef BOOL (NTAPI *PGD_STARTBANDING)(SURFOBJ*, POINTL*); -typedef BOOL (NTAPI *PGD_NEXTBAND)(SURFOBJ*, POINTL*); -typedef BOOL (NTAPI *PGD_GETDIRECTDRAWINFO)(DHPDEV, PDD_HALINFO, PDWORD, VIDEOMEMORY*, PDWORD, PDWORD); -typedef BOOL (NTAPI *PGD_ENABLEDIRECTDRAW)(DHPDEV, PDD_CALLBACKS, PDD_SURFACECALLBACKS, PDD_PALETTECALLBACKS); -typedef VOID (NTAPI *PGD_DISABLEDIRECTDRAW)(DHPDEV); -typedef LONG (NTAPI *PGD_QUERYSPOOLTYPE)(DHPDEV, LPWSTR); -typedef BOOL (NTAPI *PGD_GRADIENTFILL)(SURFOBJ*, CLIPOBJ*, XLATEOBJ*, TRIVERTEX*, ULONG, PVOID, ULONG, RECTL*, POINTL*, ULONG); -typedef VOID (NTAPI *PGD_SYNCHRONIZESURFACE)(SURFOBJ*, RECTL *, FLONG); - -// // Declarations missing in ddk/winddi.h // typedef VOID (APIENTRY *PFN_DrvMovePanning)(LONG, LONG, FLONG); +//typedef BOOL (APIENTRY *PFN_DrvOffset)(SURFOBJ*, LONG, LONG, FLONG); // @@ -612,81 +545,81 @@ // typedef struct _DRIVER_FUNCTIONS { - PGD_ENABLEPDEV EnablePDEV; - PGD_COMPLETEPDEV CompletePDEV; - PGD_DISABLEPDEV DisablePDEV; - PGD_ENABLESURFACE EnableSurface; - PGD_DISABLESURFACE DisableSurface; - PGD_ASSERTMODE AssertMode; - PGD_OFFSET Offset; - PGD_RESETPDEV ResetPDEV; - PGD_DISABLEDRIVER DisableDriver; + PFN_DrvEnablePDEV EnablePDEV; + PFN_DrvCompletePDEV CompletePDEV; + PFN_DrvDisablePDEV DisablePDEV; + PFN_DrvEnableSurface EnableSurface; + PFN_DrvDisableSurface DisableSurface; + PFN_DrvAssertMode AssertMode; + PFN_DrvOffset Offset; + PFN_DrvResetDevice ResetPDEV; + PFN_DrvDisableDriver DisableDriver; PVOID Unknown1; - PGD_CREATEDEVICEBITMAP CreateDeviceBitmap; - PGD_DELETEDEVICEBITMAP DeleteDeviceBitmap; - PGD_REALIZEBRUSH RealizeBrush; - PGD_DITHERCOLOR DitherColor; - PGD_STROKEPATH StrokePath; - PGD_FILLPATH FillPath; - PGD_STROKEANDFILLPATH StrokeAndFillPath; - PGD_PAINT Paint; - PGD_BITBLT BitBlt; - PGD_COPYBITS CopyBits; - PGD_STRETCHBLT StretchBlt; + PFN_DrvCreateDeviceBitmap CreateDeviceBitmap; + PFN_DrvDeleteDeviceBitmap DeleteDeviceBitmap; + PFN_DrvRealizeBrush RealizeBrush; + PFN_DrvDitherColor DitherColor; + PFN_DrvStrokePath StrokePath; + PFN_DrvFillPath FillPath; + PFN_DrvStrokeAndFillPath StrokeAndFillPath; + PFN_DrvPaint Paint; + PFN_DrvBitBlt BitBlt; + PFN_DrvCopyBits CopyBits; + PFN_DrvStretchBlt StretchBlt; PVOID Unknown2; - PGD_SETPALETTE SetPalette; - PGD_TEXTOUT TextOut; - PGD_ESCAPE Escape; - PGD_DRAWESCAPE DrawEscape; - PGD_QUERYFONT QueryFont; - PGD_QUERYFONTTREE QueryFontTree; - PGD_QUERYFONTDATA QueryFontData; - PGD_SETPOINTERSHAPE SetPointerShape; - PGD_MOVEPOINTER MovePointer; - PGD_LINETO LineTo; - PGD_SENDPAGE SendPage; - PGD_STARTPAGE StartPage; - PGD_ENDDOC EndDoc; - PGD_STARTDOC StartDoc; + PFN_DrvSetPalette SetPalette; + PFN_DrvTextOut TextOut; + PFN_DrvEscape Escape; + PFN_DrvDrawEscape DrawEscape; + PFN_DrvQueryFont QueryFont; + PFN_DrvQueryFontTree QueryFontTree; + PFN_DrvQueryFontData QueryFontData; + PFN_DrvSetPointerShape SetPointerShape; + PFN_DrvMovePointer MovePointer; + PFN_DrvLineTo LineTo; + PFN_DrvSendPage SendPage; + PFN_DrvStartPage StartPage; + PFN_DrvEndDoc EndDoc; + PFN_DrvStartDoc StartDoc; PVOID Unknown3; - PGD_GETGLYPHMODE GetGlyphMode; - PGD_SYNCHRONIZE Synchronize; + PFN_DrvGetGlyphMode GetGlyphMode; + PFN_DrvSynchronize Synchronize; PVOID Unknown4; - PGD_SAVESCREENBITS SaveScreenBits; - PGD_GETMODES GetModes; - PGD_FREE Free; - PGD_DESTROYFONT DestroyFont; - PGD_QUERYFONTCAPS QueryFontCaps; - PGD_LOADFONTFILE LoadFontFile; - PGD_UNLOADFONTFILE UnloadFontFile; - PGD_FONTMANAGEMENT FontManagement; - PGD_QUERYTRUETYPETABLE QueryTrueTypeTable; - PGD_QUERYTRUETYPEOUTLINE QueryTrueTypeOutline; - PGD_GETTRUETYPEFILE GetTrueTypeFile; - PGD_QUERYFONTFILE QueryFontFile; + PFN_DrvSaveScreenBits SaveScreenBits; + PFN_DrvGetModes GetModes; + PFN_DrvFree Free; + PFN_DrvDestroyFont DestroyFont; + PFN_DrvQueryFontCaps QueryFontCaps; + PFN_DrvLoadFontFile LoadFontFile; + PFN_DrvUnloadFontFile UnloadFontFile; + PFN_DrvFontManagement FontManagement; + PFN_DrvQueryTrueTypeTable QueryTrueTypeTable; + PFN_DrvQueryTrueTypeOutline QueryTrueTypeOutline; + PFN_DrvGetTrueTypeFile GetTrueTypeFile; + PFN_DrvQueryFontFile QueryFontFile; PFN_DrvMovePanning MovePanning; - PGD_QUERYADVANCEWIDTHS QueryAdvanceWidths; - PGD_SETPIXELFORMAT SetPixelFormat; - PGD_DESCRIBEPIXELFORMAT DescribePixelFormat; - PGD_SWAPBUFFERS SwapBuffers; - PGD_STARTBANDING StartBanding; - PGD_NEXTBAND NextBand; - PGD_GETDIRECTDRAWINFO GetDirectDrawInfo; - PGD_ENABLEDIRECTDRAW EnableDirectDraw; - PGD_DISABLEDIRECTDRAW DisableDirectDraw; - PGD_QUERYSPOOLTYPE QuerySpoolType; + PFN_DrvQueryAdvanceWidths QueryAdvanceWidths; + PFN_DrvSetPixelFormat SetPixelFormat; + PFN_DrvDescribePixelFormat DescribePixelFormat; + PFN_DrvSwapBuffers SwapBuffers; + PFN_DrvStartBanding StartBanding; + PFN_DrvNextBand NextBand; + PFN_DrvGetDirectDrawInfo GetDirectDrawInfo; + PFN_DrvEnableDirectDraw EnableDirectDraw; + PFN_DrvDisableDirectDraw DisableDirectDraw; + PFN_DrvQuerySpoolType QuerySpoolType; PVOID Unknown5; PFN_DrvIcmCreateColorTransform IcmCreateColorTransform; PFN_DrvIcmDeleteColorTransform IcmDeleteColorTransform; PFN_DrvIcmCheckBitmapBits IcmCheckBitmapBits; PFN_DrvIcmSetDeviceGammaRamp IcmSetDeviceGammaRamp; - PGD_GRADIENTFILL GradientFill; - PGD_STRETCHBLTROP StretchBltROP; + PFN_DrvGradientFill GradientFill; + PFN_DrvStretchBltROP StretchBltROP; PFN_DrvPlgBlt PlgBlt; - PGD_ALPHABLEND AlphaBlend; + PFN_DrvAlphaBlend AlphaBlend; PVOID SynthesizeFont; PVOID GetSynthesizedFontFiles; - PGD_TRANSPARENTBLT TransparentBlt; + PFN_DrvTransparentBlt TransparentBlt; PFN_DrvQueryPerBandInfo QueryPerBandInfo; PFN_DrvQueryDeviceSupport QueryDeviceSupport; PVOID Reserved1; @@ -700,14 +633,102 @@ PFN_DrvDeriveSurface DeriveSurface; PFN_DrvQueryGlyphAttrs QueryGlyphAttrs; PFN_DrvNotify Notify; - PGD_SYNCHRONIZESURFACE SynchronizeSurface; + PFN_DrvSynchronizeSurface SynchronizeSurface; PFN_DrvResetDevice ResetDevice; PVOID Reserved9; PVOID Reserved10; PVOID Reserved11; /* 92 */ /* ReactOS specify */ - PGD_ENABLEDRIVER EnableDriver; //ReactOS Extra + PFN_DrvEnableDriver EnableDriver; //ReactOS Extra } DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS; +#define ASSERT_PFN(pfn) \ + C_ASSERT(FIELD_OFFSET(DRIVER_FUNCTIONS, pfn) == sizeof(PVOID) * INDEX_Drv##pfn) + +ASSERT_PFN(EnablePDEV); +ASSERT_PFN(CompletePDEV); +ASSERT_PFN(DisablePDEV); +ASSERT_PFN(EnableSurface); +ASSERT_PFN(DisableSurface); +ASSERT_PFN(AssertMode); +ASSERT_PFN(Offset); +ASSERT_PFN(ResetPDEV); +ASSERT_PFN(DisableDriver); +ASSERT_PFN(CreateDeviceBitmap); +ASSERT_PFN(DeleteDeviceBitmap); +ASSERT_PFN(RealizeBrush); +ASSERT_PFN(DitherColor); +ASSERT_PFN(StrokePath); +ASSERT_PFN(FillPath); +ASSERT_PFN(StrokeAndFillPath); +ASSERT_PFN(Paint); +ASSERT_PFN(BitBlt); +ASSERT_PFN(CopyBits); +ASSERT_PFN(StretchBlt); +ASSERT_PFN(SetPalette); +ASSERT_PFN(TextOut); +ASSERT_PFN(Escape); +ASSERT_PFN(DrawEscape); +ASSERT_PFN(QueryFont); +ASSERT_PFN(QueryFontTree); +ASSERT_PFN(QueryFontData); +ASSERT_PFN(SetPointerShape); +ASSERT_PFN(MovePointer); +ASSERT_PFN(LineTo); +ASSERT_PFN(SendPage); +ASSERT_PFN(StartPage); +ASSERT_PFN(EndDoc); +ASSERT_PFN(StartDoc); +ASSERT_PFN(GetGlyphMode); +ASSERT_PFN(Synchronize); +ASSERT_PFN(SaveScreenBits); +ASSERT_PFN(GetModes); +ASSERT_PFN(Free); +ASSERT_PFN(DestroyFont); +ASSERT_PFN(QueryFontCaps); +ASSERT_PFN(LoadFontFile); +ASSERT_PFN(UnloadFontFile); +ASSERT_PFN(FontManagement); +ASSERT_PFN(QueryTrueTypeTable); +ASSERT_PFN(QueryTrueTypeOutline); +ASSERT_PFN(GetTrueTypeFile); +ASSERT_PFN(QueryFontFile); +ASSERT_PFN(MovePanning); +ASSERT_PFN(QueryAdvanceWidths); +ASSERT_PFN(SetPixelFormat); +ASSERT_PFN(DescribePixelFormat); +ASSERT_PFN(SwapBuffers); +ASSERT_PFN(StartBanding); +ASSERT_PFN(NextBand); +ASSERT_PFN(GetDirectDrawInfo); +ASSERT_PFN(EnableDirectDraw); +ASSERT_PFN(DisableDirectDraw); +ASSERT_PFN(QuerySpoolType); +ASSERT_PFN(IcmCreateColorTransform); +ASSERT_PFN(IcmDeleteColorTransform); +ASSERT_PFN(IcmCheckBitmapBits); +ASSERT_PFN(IcmSetDeviceGammaRamp); +ASSERT_PFN(GradientFill); +ASSERT_PFN(StretchBltROP); +ASSERT_PFN(PlgBlt); +ASSERT_PFN(AlphaBlend); +ASSERT_PFN(SynthesizeFont); +ASSERT_PFN(GetSynthesizedFontFiles); +ASSERT_PFN(TransparentBlt); +ASSERT_PFN(QueryPerBandInfo); +ASSERT_PFN(QueryDeviceSupport); +ASSERT_PFN(Reserved1); +ASSERT_PFN(Reserved2); +ASSERT_PFN(Reserved3); +ASSERT_PFN(Reserved4); +ASSERT_PFN(Reserved5); +ASSERT_PFN(Reserved6); +ASSERT_PFN(Reserved7); +ASSERT_PFN(Reserved8); +ASSERT_PFN(DeriveSurface); +ASSERT_PFN(QueryGlyphAttrs); +ASSERT_PFN(Notify); +ASSERT_PFN(SynchronizeSurface); + #endif Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Mon Apr 6 06:13:44 2009 @@ -44,7 +44,7 @@ /* public pointer information */ RECTL Exclude; /* required publicly for SPS_ACCEPT_EXCLUDE */ - PGD_MOVEPOINTER MovePointer; + PFN_DrvMovePointer MovePointer; ULONG Status; } GDIPOINTER, *PGDIPOINTER; Modified: trunk/reactos/subsystems/win32/win32k/include/driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/driver.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/driver.h [iso-8859-1] Mon Apr 6 06:13:44 2009 @@ -10,9 +10,9 @@ -BOOL DRIVER_RegisterDriver(LPCWSTR Name, PGD_ENABLEDRIVER EnableDriver); -PGD_ENABLEDRIVER DRIVER_FindExistingDDIDriver(LPCWSTR Name); -PGD_ENABLEDRIVER DRIVER_FindDDIDriver(LPCWSTR Name); +BOOL DRIVER_RegisterDriver(LPCWSTR Name, PFN_DrvEnableDriver EnableDriver); +PFN_DrvEnableDriver DRIVER_FindExistingDDIDriver(LPCWSTR Name); +PFN_DrvEnableDriver DRIVER_FindDDIDriver(LPCWSTR Name); PFILE_OBJECT DRIVER_FindMPDriver(ULONG DisplayNumber); BOOL DRIVER_BuildDDIFunctions(PDRVENABLEDATA DED, PDRIVER_FUNCTIONS DF); Modified: trunk/reactos/subsystems/win32/win32k/misc/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/driver.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/misc/driver.c [iso-8859-1] Mon Apr 6 06:13:44 2009 @@ -35,7 +35,7 @@ typedef struct _GRAPHICS_DRIVER { PWSTR Name; - PGD_ENABLEDRIVER EnableDriver; + PFN_DrvEnableDriver EnableDriver; int ReferenceCount; struct _GRAPHICS_DRIVER *Next; } GRAPHICS_DRIVER, *PGRAPHICS_DRIVER; @@ -43,7 +43,7 @@ static PGRAPHICS_DRIVER DriverList; static PGRAPHICS_DRIVER GenericDriver = NULL; -BOOL DRIVER_RegisterDriver(LPCWSTR Name, PGD_ENABLEDRIVER EnableDriver) +BOOL DRIVER_RegisterDriver(LPCWSTR Name, PFN_DrvEnableDriver EnableDriver) { PGRAPHICS_DRIVER Driver; @@ -79,7 +79,7 @@ return TRUE; } -PGD_ENABLEDRIVER DRIVER_FindExistingDDIDriver(LPCWSTR Name) +PFN_DrvEnableDriver DRIVER_FindExistingDDIDriver(LPCWSTR Name) { GRAPHICS_DRIVER *Driver = DriverList; while (Driver && Name) @@ -94,11 +94,11 @@ return NULL; } -PGD_ENABLEDRIVER DRIVER_FindDDIDriver(LPCWSTR Name) +PFN_DrvEnableDriver DRIVER_FindDDIDriver(LPCWSTR Name) { static WCHAR DefaultPath[] = L"\\SystemRoot\\System32\\"; static WCHAR DefaultExtension[] = L".DLL"; - PGD_ENABLEDRIVER ExistingDriver; + PFN_DrvEnableDriver ExistingDriver; SYSTEM_GDI_DRIVER_INFORMATION GdiDriverInfo; NTSTATUS Status; LPWSTR FullName; @@ -174,7 +174,7 @@ DRIVER_RegisterDriver( L"DISPLAY", GdiDriverInfo.EntryPoint); DRIVER_RegisterDriver( FullName, GdiDriverInfo.EntryPoint); ExFreePoolWithTag(FullName, TAG_DRIVER); - return (PGD_ENABLEDRIVER)GdiDriverInfo.EntryPoint; + return (PFN_DrvEnableDriver)GdiDriverInfo.EntryPoint; } #define BEGIN_FUNCTION_MAP() \ Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] Mon Apr 6 06:13:44 2009 @@ -204,7 +204,7 @@ static BOOL FASTCALL IntPrepareDriver() { - PGD_ENABLEDRIVER GDEnableDriver; + PFN_DrvEnableDriver GDEnableDriver; DRVENABLEDATA DED; UNICODE_STRING DriverFileNames; PWSTR CurrentName; @@ -326,7 +326,7 @@ HS_DDI_MAX, PrimarySurface.FillPatterns, sizeof(PrimarySurface.GDIInfo), - (ULONG *) &PrimarySurface.GDIInfo, + &PrimarySurface.GDIInfo, sizeof(PrimarySurface.DevInfo), &PrimarySurface.DevInfo, NULL, @@ -353,7 +353,7 @@ HS_DDI_MAX, PrimarySurface.FillPatterns, sizeof(PrimarySurface.GDIInfo), - (ULONG *) &PrimarySurface.GDIInfo, + &PrimarySurface.GDIInfo, sizeof(PrimarySurface.DevInfo), &PrimarySurface.DevInfo, NULL, @@ -1552,8 +1552,8 @@ CurrentName += wcslen(CurrentName) + 1) { INT i; - PGD_ENABLEDRIVER GDEnableDriver; - PGD_GETMODES GetModes = NULL; + PFN_DrvEnableDriver GDEnableDriver; + PFN_DrvGetModes GetModes = NULL; INT SizeNeeded, SizeUsed; /* Get the DDI driver's entry point */ @@ -1583,7 +1583,7 @@ if (DrvFn->iFunc == INDEX_DrvGetModes) { - GetModes = (PGD_GETMODES)DrvFn->pfn; + GetModes = (PFN_DrvGetModes)DrvFn->pfn; break; } }

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