Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[gvg] 16431: Prevent warning in optimized builds

by gvg＠svn.reactos.com

Prevent warning in optimized builds Modified: trunk/reactos/lib/gdi32/objects/dc.c _____ Modified: trunk/reactos/lib/gdi32/objects/dc.c --- trunk/reactos/lib/gdi32/objects/dc.c 2005-07-05 17:08:58 UTC (rev 16430) +++ trunk/reactos/lib/gdi32/objects/dc.c 2005-07-05 17:10:19 UTC (rev 16431) @@ -147,7 +147,7 @@ NTSTATUS Status; LPWSTR lpszDriverW, lpszDeviceW, lpszOutputW; UNICODE_STRING Driver, Device, Output; - LPDEVMODEW dvmInitW; + LPDEVMODEW dvmInitW = NULL; HDC rc = 0; Status = HEAP_strdupA2W ( &lpszDriverW, lpszDriver );

19 years, 6 months

[gvg] 16430: Code generator for 16bpp DIB Blt operations

by gvg＠svn.reactos.com

Code generator for 16bpp DIB Blt operations Modified: trunk/reactos/Makefile Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsys/win32k/include/inteng.h Modified: trunk/reactos/subsys/win32k/win32k.xml Added: trunk/reactos/tools/gendib/ Added: trunk/reactos/tools/gendib/gendib.c Added: trunk/reactos/tools/gendib/gendib.mak Modified: trunk/reactos/tools/tools.mak _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-07-05 17:08:48 UTC (rev 16429) +++ trunk/reactos/Makefile 2005-07-05 17:08:58 UTC (rev 16430) @@ -169,6 +169,7 @@ ECHO_MKHIVE =@echo $(QUOTE)[MKHIVE] $@$(QUOTE) ECHO_REGTESTS=@echo $(QUOTE)[REGTESTS] $@$(QUOTE) ECHO_TEST =@echo $(QUOTE)[TEST] $@$(QUOTE) + ECHO_GENDIB =@echo $(QUOTE)[GENDIB] $@$(QUOTE) else ECHO_CP = ECHO_MKDIR = @@ -196,6 +197,7 @@ ECHO_MKHIVE = ECHO_REGTESTS= ECHO_TEST = + ECHO_GENDIB = endif @@ -297,7 +299,8 @@ $(BUGCODES_RC) \ $(ERRCODES_H) \ $(ERRCODES_RC) \ - $(NCI_SERVICE_FILES) + $(NCI_SERVICE_FILES) \ + $(GENDIB_DIB_FILES) makefile.auto: $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) $(ECHO_RBUILD) Property changes on: trunk/reactos/subsys/win32k/dib ___________________________________________________________________ Name: svn:ignore - *.d *.o *.sym + *.d *.o *.sym dib16gen.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-07-05 17:08:48 UTC (rev 16429) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-07-05 17:08:58 UTC (rev 16430) @@ -16,7 +16,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ */ #include <w32k.h> @@ -337,99 +336,6 @@ return TRUE; } -BOOLEAN -DIB_16BPP_BitBlt(PBLTINFO BltInfo) -{ - ULONG DestX, DestY; - ULONG SourceX, SourceY; - ULONG PatternY = 0; - ULONG Dest, Source = 0, Pattern = 0; - BOOL UsesSource; - BOOL UsesPattern; - PULONG DestBits; - ULONG RoundedRight; - - UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); - UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); - - RoundedRight = BltInfo->DestRect.right - - ((BltInfo->DestRect.right - BltInfo->DestRect.left) & 0x1); - SourceY = BltInfo->SourcePoint.y; - DestBits = (PULONG)( - (PBYTE)BltInfo->DestSurface->pvScan0 + - (BltInfo->DestRect.left << 1) + - BltInfo->DestRect.top * BltInfo->DestSurface->lDelta); - - if (UsesPattern) - { - if (BltInfo->PatternSurface) - { - PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % - BltInfo->PatternSurface->sizlBitmap.cy; - } - else - { - Pattern = BltInfo->Brush->iSolidColor | - (BltInfo->Brush->iSolidColor << 16); - } - } - - for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++) - { - SourceX = BltInfo->SourcePoint.x; - - for (DestX = BltInfo->DestRect.left; DestX < RoundedRight; DestX += 2, DestBits++, SourceX += 2) - { - Dest = *DestBits; - - if (UsesSource) - { - Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest); - Source |= DIB_GetSource(BltInfo->SourceSurface, SourceX + 1, SourceY, BltInfo->XlateSourceToDest) << 16; - } - - if (BltInfo->PatternSurface) - { - Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest); - Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 1) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 16; - } - - *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern); - } - - if (DestX < BltInfo->DestRect.right) - { - Dest = *((PUSHORT)DestBits); - - if (UsesSource) - { - Source = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest); - } - - if (BltInfo->PatternSurface) - { - Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest); - } - - DIB_16BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xFFFF); - DestBits = (PULONG)((ULONG_PTR)DestBits + 2); - } - - SourceY++; - if (BltInfo->PatternSurface) - { - PatternY++; - PatternY %= BltInfo->PatternSurface->sizlBitmap.cy; - } - DestBits = (PULONG)( - (ULONG_PTR)DestBits - - ((BltInfo->DestRect.right - BltInfo->DestRect.left) << 1) + - BltInfo->DestSurface->lDelta); - } - - return TRUE; -} - /* Optimize for bitBlt */ BOOLEAN DIB_16BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color) _____ Modified: trunk/reactos/subsys/win32k/include/inteng.h --- trunk/reactos/subsys/win32k/include/inteng.h 2005-07-05 17:08:48 UTC (rev 16429) +++ trunk/reactos/subsys/win32k/include/inteng.h 2005-07-05 17:08:58 UTC (rev 16430) @@ -24,6 +24,8 @@ #define R4_MASK ((R3_OPINDEX_NOOP << 8) | R3_OPINDEX_SRCCOPY) #define ROP2_TO_MIX(Rop2) (((Rop2) << 8) | (Rop2)) +#define ROP3_USES_DEST(Rop3) ((((Rop3) & 0xAA0000) >> 1) != ((Rop3) & 0x550000)) +#define ROP4_USES_DEST(Rop4) (((((Rop4) & 0xAA) >> 1) != ((Rop4) & 0x55)) || ((((Rop4) & 0xAA00) >> 1) != ((Rop4) & 0x5500))) #define ROP3_USES_SOURCE(Rop3) ((((Rop3) & 0xCC0000) >> 2) != ((Rop3) & 0x330000)) #define ROP4_USES_SOURCE(Rop4) (((((Rop4) & 0xCC) >> 2) != ((Rop4) & 0x33)) || ((((Rop4) & 0xCC00) >> 2) != ((Rop4) & 0x3300))) #define ROP3_USES_PATTERN(Rop3) ((((Rop3) & 0xF00000) >> 4) != ((Rop3) & 0x0F0000)) _____ Modified: trunk/reactos/subsys/win32k/win32k.xml --- trunk/reactos/subsys/win32k/win32k.xml 2005-07-05 17:08:48 UTC (rev 16429) +++ trunk/reactos/subsys/win32k/win32k.xml 2005-07-05 17:08:58 UTC (rev 16430) @@ -15,6 +15,7 @@ <file>dib4bpp.c</file> <file>dib8bpp.c</file> <file>dib16bpp.c</file> + <file>dib16gen.c</file> <file>dib24bpp.c</file> <file>dib32bpp.c</file> <file>dib.c</file> Property changes on: trunk/reactos/tools/gendib ___________________________________________________________________ Name: svn:ignore + gendib *.exe *.sym *.map _____ Added: trunk/reactos/tools/gendib/gendib.c --- trunk/reactos/tools/gendib/gendib.c 2005-07-05 17:08:48 UTC (rev 16429) +++ trunk/reactos/tools/gendib/gendib.c 2005-07-05 17:08:58 UTC (rev 16430) @@ -0,0 +1,926 @@ +/* + * Copyright 2005 Ge van Geldorp (gvg(a)reactos.com). + * + * 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. + */ +/* + * This is a code generator. It outputs C code which can be compiled using the + * standard build tools. It is used to generate code for the DIB Blt routines. + * There are a lot of possible Blt routines (256 rop codes, for 6 different + * bit depths). It is possible to use a generic Blt routine which handles all + * rop codes and all depths. The drawback is that it will be relatively slow. + * The other extreme is to write (generate) a separate Blt routine for each + * rop code/depth combination. This will result in a extremely large amount + * of code. So, we opt for something in between: named rops get their own + * routine, unnamed rops are handled by a generic routine. + * Basically, what happens is that generic code which looks like: + * + * for (...) + * { + * if (CondA) + * { + * doSomethingA; + * } + * for (...) + * { + * if (CondB) + * { + * doSomethingB; + * } + * else + * { + * doSomethingElseB; + * } + * } + * } + * + * is specialized for named rops to look like: + * + * if (condC) + * { + * if (condD) + * { + * for (...) + * { + * for (...) + * { + * pumpSomeBytes; + * } + * } + * } + * else + * { + * for (...) + * { + * for (...) + * { + * pumpSomeBytesSlightlyDifferentE; + * } + * } + * } + * } + * + * i.e. we make the inner loops as tight as possible. + * Another optimization is to try to load/store 32 alligned bits at a time from + * video memory. Accessing video memory from the CPU is slooooooow, so let's + * try to do this as little as possible, even if that means we have to do some + * extra operations using main memory. + */ + +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#define NDEBUG + +#define USES_DEST(RopCode) ((((RopCode) & 0xaa) >> 1) != ((RopCode) & 0x55)) +#define USES_SOURCE(RopCode) ((((RopCode) & 0xcc) >> 2) != ((RopCode) & 0x33)) +#define USES_PATTERN(RopCode) ((((RopCode) & 0xf0) >> 4) != ((RopCode) & 0x0f)) + +#ifdef NDEBUG +#define MARK(Out) +#else +#define MARK(Out) Output((Out), "/* Generated by %s line %d*/\n", \ + __FUNCTION__, __LINE__); +#endif + +#define ROPCODE_BLACKNESS 0x00 +#define ROPCODE_NOTSRCERASE 0x11 +#define ROPCODE_NOTSRCCOPY 0x33 +#define ROPCODE_SRCERASE 0x44 +#define ROPCODE_DSTINVERT 0x55 +#define ROPCODE_PATINVERT 0x5a +#define ROPCODE_SRCINVERT 0x66 +#define ROPCODE_SRCAND 0x88 +#define ROPCODE_NOOP 0xaa +#define ROPCODE_MERGEPAINT 0xbb +#define ROPCODE_MERGECOPY 0xc0 +#define ROPCODE_SRCCOPY 0xcc +#define ROPCODE_SRCPAINT 0xee +#define ROPCODE_PATCOPY 0xf0 +#define ROPCODE_PATPAINT 0xfb +#define ROPCODE_WHITENESS 0xff + +#define ROPCODE_GENERIC 256 /* Special case */ + +typedef struct _ROPINFO + { + unsigned RopCode; + char *Name; + char *Operation; + int UsesDest; + int UsesSource; + int UsesPattern; + } +ROPINFO, *PROPINFO; + +#define FLAG_PATTERNSURFACE 0x01 +#define FLAG_TRIVIALXLATE 0x02 +#define FLAG_BOTTOMUP 0x04 +#define FLAG_FORCENOUSESSOURCE 0x08 +#define FLAG_FORCERAWSOURCEAVAIL 0x10 + +static PROPINFO +FindRopInfo(unsigned RopCode) +{ + static ROPINFO KnownCodes[] = + { + { ROPCODE_BLACKNESS, "BLACKNESS", "0", 0, 0, 0 }, + { ROPCODE_NOTSRCERASE, "NOTSRCERASE","~(D | S)", 1, 1, 0 }, + { ROPCODE_NOTSRCCOPY, "NOTSRCCOPY", "~S", 0, 1, 0 }, + { ROPCODE_SRCERASE, "SRCERASE", "(~D) & S", 1, 1, 0 }, + { ROPCODE_DSTINVERT, "DSTINVERT", "~D", 1, 0, 0 }, + { ROPCODE_PATINVERT, "PATINVERT", "D ^ P", 1, 0, 1 }, + { ROPCODE_SRCINVERT, "SRCINVERT", "D ^ S", 1, 1, 0 }, + { ROPCODE_SRCAND, "SRCAND", "D & S", 1, 1, 0 }, + { ROPCODE_NOOP, "NOOP", "D", 1, 0, 0 }, + { ROPCODE_MERGEPAINT, "MERGEPAINT", "D & (~S)", 1, 1, 0 }, + { ROPCODE_MERGECOPY, "MERGECOPY", "S & P", 0, 1, 1 }, + { ROPCODE_SRCCOPY, "SRCCOPY", "S", 0, 1, 0 }, + { ROPCODE_SRCPAINT, "SRCPAINT", "D | S", 1, 1, 0 }, + { ROPCODE_PATCOPY, "PATCOPY", "P", 0, 0, 1 }, + { ROPCODE_PATPAINT, "PATPAINT", "D | (~S) | P", 1, 1, 1 }, + { ROPCODE_WHITENESS, "WHITENESS", "0xffffffff", 0, 0, 0 }, + { ROPCODE_GENERIC, NULL, NULL, 1, 1, 1 } + }; + unsigned Index; + + for (Index = 0; Index < sizeof(KnownCodes) / sizeof(KnownCodes[0]); Index++) + { + if (RopCode == KnownCodes[Index].RopCode) + { + return KnownCodes + Index; + } + } + + return NULL; +} + +static void +Output(FILE *Out, char *Fmt, ...) +{ + static unsigned Indent = 0; + static int AtBOL = 1; + unsigned n; + va_list Args; + + if (NULL != strchr(Fmt, '{') && 0 != Indent) + { + Indent += 2; + } + else if (NULL != strchr(Fmt, '}')) + { + Indent -= 2; + } + if (AtBOL) + { + for (n = 0; n < Indent; n++) + { + putc(' ', Out); + } + AtBOL = 0; + } + + va_start(Args, Fmt); + vfprintf(Out, Fmt, Args); + va_end(Args); + + if (NULL != strchr(Fmt, '{')) + { + Indent += 2; + } + else if (NULL != strchr(Fmt, '}') && 0 != Indent) + { + Indent -= 2; + } + AtBOL = '\n' == Fmt[strlen(Fmt) - 1]; +} + +static void +PrintRoutineName(FILE *Out, unsigned Bpp, PROPINFO RopInfo) +{ + if (NULL != RopInfo && ROPCODE_GENERIC != RopInfo->RopCode) + { + Output(Out, "DIB_%uBPP_BitBlt_%s", Bpp, RopInfo->Name); + } + else + { + Output(Out, "DIB_%uBPP_BitBlt_Generic", Bpp); + } +} + +static void +CreateShiftTables(FILE *Out) +{ + Output(Out, "\n"); + Output(Out, "static unsigned Shift1Bpp[] =\n"); + Output(Out, "{\n"); + Output(Out, "0,\n"); + Output(Out, "24, 25, 26, 27, 28, 29, 30, 31, 16, 17, 18, 19, 20, 21, 22, 23,\n"); + Output(Out, "8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7\n"); + Output(Out, "};\n"); + Output(Out, "static unsigned Shift4Bpp[] =\n"); + Output(Out, "{\n"); + Output(Out, "0,\n"); + Output(Out, "24, 28, 16, 20, 8, 12, 0, 4\n"); + Output(Out, "};\n"); + Output(Out, "static unsigned Shift8Bpp[] =\n"); + Output(Out, "{\n"); + Output(Out, "0,\n"); + Output(Out, "24, 16, 8, 0\n"); + Output(Out, "};\n"); + Output(Out, "static unsigned Shift16Bpp[] =\n"); + Output(Out, "{\n"); + Output(Out, "0,\n"); + Output(Out, "16, 0\n"); + Output(Out, "};\n"); +} + +static void +CreateOperation(FILE *Out, unsigned Bpp, PROPINFO RopInfo, unsigned SourceBpp, + unsigned Bits) +{ + char *Cast; + char *Dest; + char *Template; + + MARK(Out); + if (32 == Bits) + { + Cast = ""; + Dest = "*DestPtr"; + } + else + { + Cast = "(USHORT) "; + Dest = "*((PUSHORT) DestPtr)"; + } + Output(Out, "%s = ", Dest); + if (ROPCODE_GENERIC == RopInfo->RopCode) + { + Output(Out, "%sDIB_DoRop(BltInfo->Rop4, %s, Source, Pattern)", + Cast, Dest); + } + else + { + Template = RopInfo->Operation; + while ('\0' != *Template) + { + switch(*Template) + { + case 'S': + Output(Out, "%sSource", Cast); + break; + case 'P': + Output(Out, "%sPattern", Cast); + break; + case 'D': + Output(Out, "%s", Dest); + break; + default: + Output(Out, "%c", *Template); + break; + } + Template++; + } + } +} + +static void +CreateBase(FILE *Out, int Source, int Flags, unsigned Bpp) +{ + char *What = (Source ? "Source" : "Dest"); + + MARK(Out); + Output(Out, "%sBase = (char *) BltInfo->%sSurface->pvScan0 +\n", What, What); + if (0 == (Flags & FLAG_BOTTOMUP)) + { + if (Source) + { + Output(Out, " BltInfo->SourcePoint.y *\n"); + } + else + { + Output(Out, " BltInfo->DestRect.top *\n"); + } + } + else + { + if (Source) + { + Output(Out, " (BltInfo->SourcePoint.y +\n"); + Output(Out, " BltInfo->DestRect.bottom -\n"); + Output(Out, " BltInfo->DestRect.top - 1) *\n"); + } + else + { + Output(Out, " (BltInfo->DestRect.bottom - 1) *\n"); + } + } + Output(Out, " %sBltInfo->%sSurface->lDelta +\n", + Source ? " " : "", What); + if (Source) + { + Output(Out, " %sBltInfo->SourcePoint.x", + 16 < Bpp ? "" : "(("); + } + else + { + Output(Out, " BltInfo->DestRect.left"); + } + if (Bpp < 8) + { + Output(Out, " / %u", 8 / Bpp); + } + else if (8 < Bpp) + { + Output(Out, " * %u", Bpp / 8); + } + if (Source && Bpp <= 16) + { + Output(Out, ") & ~ 0x3)"); + } + Output(Out, ";\n", Bpp / 8); + if (Source && Bpp <= 16) + { + Output(Out, "BaseSourcePixels = %u - (BltInfo->SourcePoint.x & 0x%x);\n", + 32 / Bpp, 32 / Bpp - 1); + } +} + +static void +CreateGetSource(FILE *Out, unsigned Bpp, PROPINFO RopInfo, int Flags, + unsigned SourceBpp, unsigned Shift) +{ + char *AssignOp; + char *Before; + char After[8]; + + MARK(Out); + if (0 == Shift) + { + AssignOp = "="; + Before = ""; + After[0] = '\0'; + } + else + { + AssignOp = "|="; + Before = "("; + sprintf(After, ") << %u", Shift); + } + + if (ROPCODE_SRCCOPY != RopInfo->RopCode || + 0 == (Flags & FLAG_TRIVIALXLATE) || Bpp != SourceBpp) + { + if (0 == (Flags & FLAG_FORCERAWSOURCEAVAIL) && SourceBpp <= 16) + { + Output(Out, "if (0 == SourcePixels)\n"); + Output(Out, "{\n"); + Output(Out, "RawSource = *SourcePtr++;\n"); + Output(Out, "SourcePixels = %u;\n", 32 / SourceBpp); + Output(Out, "}\n"); + } + Output(Out, "Source %s (%s", AssignOp, Before); + if (0 == (Flags & FLAG_TRIVIALXLATE)) + { + Output(Out, "XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, %s", + 16 < SourceBpp ? "" : "("); + } + if (32 == SourceBpp) + { + Output(Out, "*SourcePtr++"); + } + else if (24 == SourceBpp) + { + Output(Out, "*(PUSHORT) SourcePtr + (*((PBYTE) SourcePtr + 2) << 16)"); + } + else + { + Output(Out, "RawSource >> Shift%uBpp[SourcePixels]", SourceBpp); + } + if (0 == (Flags & FLAG_TRIVIALXLATE)) + { + if (16 < SourceBpp) + { + Output(Out, ")"); + } + else + { + Output(Out, ") & 0x%x)", (1 << SourceBpp) - 1); + } + } + Output(Out, " & 0xffff)%s;\n", After); + if (SourceBpp <= 16) + { + Output(Out, "SourcePixels--;\n"); + } + else if (24 == SourceBpp) + { + Output(Out, "SourcePtr = (PULONG)((char *) SourcePtr + 3);\n"); + } + } +} + +static void +CreateCounts(FILE *Out) +{ + MARK(Out); + Output(Out, "LeftCount = ((ULONG_PTR) DestBase >> 1) & 0x01;\n"); + Output(Out, "CenterCount = (BltInfo->DestRect.right - BltInfo->DestRect.left -\n"); + Output(Out, " LeftCount) / 2;\n"); + Output(Out, "RightCount = (BltInfo->DestRect.right - BltInfo->DestRect.left -\n"); + Output(Out, " LeftCount - 2 * CenterCount);\n"); +} + +static void +CreateBitCase(FILE *Out, unsigned Bpp, PROPINFO RopInfo, int Flags, + unsigned SourceBpp) +{ + MARK(Out); + if (RopInfo->UsesSource) + { + if (0 == (Flags & FLAG_FORCENOUSESSOURCE)) + { + CreateBase(Out, 1, Flags, SourceBpp); + } + CreateBase(Out, 0, Flags, Bpp); + CreateCounts(Out); + MARK(Out); + } + if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) + { + if (0 == (Flags & FLAG_BOTTOMUP)) + { + Output(Out, "PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) %%\n"); + Output(Out, " BltInfo->PatternSurface->sizlBitmap.cy;\n"); + } + else + { + Output(Out, "PatternY = (BltInfo->DestRect.bottom - 1 +\n"); + Output(Out, " BltInfo->BrushOrigin.y) %%\n"); + Output(Out, " BltInfo->PatternSurface->sizlBitmap.cy;\n"); + } + } + if (ROPCODE_SRCCOPY == RopInfo->RopCode && + 0 != (Flags & FLAG_TRIVIALXLATE) && Bpp == SourceBpp) + { + Output(Out, "CenterCount = 2 * (BltInfo->DestRect.right -\n"); + Output(Out, " BltInfo->DestRect.left);\n"); + } + Output(Out, "for (LineIndex = 0; LineIndex < LineCount; LineIndex++)\n"); + Output(Out, "{\n"); + if (ROPCODE_SRCCOPY != RopInfo->RopCode || + 0 == (Flags & FLAG_TRIVIALXLATE) || Bpp != SourceBpp) + { + if (RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) + { + Output(Out, "SourcePtr = (PULONG) SourceBase;\n"); + if (SourceBpp <= 16) + { + Output(Out, "RawSource = *SourcePtr++;\n"); + Output(Out, "SourcePixels = BaseSourcePixels;\n"); + } + } + Output(Out, "DestPtr = (PULONG) DestBase;\n"); + } + if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) + { + Output(Out, "PatternX = (BltInfo->DestRect.left + BltInfo->BrushOrigin.x) %%\n"); + Output(Out, " BltInfo->PatternSurface->sizlBitmap.cx;\n"); + } + if (ROPCODE_SRCCOPY == RopInfo->RopCode && + 0 != (Flags & FLAG_TRIVIALXLATE) && Bpp == SourceBpp) + { + Output(Out, "RtlMoveMemory(DestBase, SourceBase, CenterCount);\n"); + Output(Out, "\n"); + } + else + { + Output(Out, "\n"); + Output(Out, "if (0 != LeftCount)\n"); + Output(Out, "{\n"); + if (RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) + { + CreateGetSource(Out, Bpp, RopInfo, Flags | FLAG_FORCERAWSOURCEAVAIL, + SourceBpp, 0); + MARK(Out); + } + if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) + { + Output(Out, "Pattern = DIB_GetSource(BltInfo->PatternSurface, PatternX, PatternY, BltInfo->XlatePatternToDest);\n"); + Output(Out, "if (BltInfo->PatternSurface->sizlBitmap.cx <= ++PatternX)\n"); + Output(Out, "{\n"); + Output(Out, "PatternX -= BltInfo->PatternSurface->sizlBitmap.cx;\n"); + Output(Out, "}\n"); + } + if ((RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE) && + Bpp != SourceBpp) || + (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE))) + { + Output(Out, "\n"); + } + CreateOperation(Out, Bpp, RopInfo, SourceBpp, 16); + Output(Out, ";\n"); + MARK(Out); + Output(Out, "\n"); + Output(Out, "DestPtr = (PULONG)((char *) DestPtr + 2);\n"); + Output(Out, "}\n"); + Output(Out, "\n"); + Output(Out, "for (i = 0; i < CenterCount; i++)\n"); + Output(Out, "{\n"); + if (RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) + { + CreateGetSource(Out, Bpp, RopInfo, Flags, SourceBpp, 0); + CreateGetSource(Out, Bpp, RopInfo, Flags, SourceBpp, 16); + MARK(Out); + Output(Out, "\n"); + } + if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) + { + Output(Out, "Pattern = DIB_GetSource(BltInfo->PatternSurface, PatternX, PatternY, BltInfo->XlatePatternToDest);\n"); + Output(Out, "if (BltInfo->PatternSurface->sizlBitmap.cx <= ++PatternX)\n"); + Output(Out, "{\n"); + Output(Out, "PatternX -= BltInfo->PatternSurface->sizlBitmap.cx;\n"); + Output(Out, "}\n"); + Output(Out, "Pattern |= DIB_GetSource(BltInfo->PatternSurface, PatternX, PatternY, BltInfo->XlatePatternToDest) << 16;\n"); + Output(Out, "if (BltInfo->PatternSurface->sizlBitmap.cx <= ++PatternX)\n"); + Output(Out, "{\n"); + Output(Out, "PatternX -= BltInfo->PatternSurface->sizlBitmap.cx;\n"); + Output(Out, "}\n"); + Output(Out, "\n"); + } + CreateOperation(Out, Bpp, RopInfo, SourceBpp, 32); + Output(Out, ";\n"); + MARK(Out); + Output(Out, "\n"); + Output(Out, "DestPtr++;\n"); + Output(Out, "}\n"); + Output(Out, "\n"); + Output(Out, "if (0 != RightCount)\n"); + Output(Out, "{\n"); + if (RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) + { + CreateGetSource(Out, Bpp, RopInfo, Flags, SourceBpp, 0); + MARK(Out); + } + if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) + { + Output(Out, "Pattern = DIB_GetSource(BltInfo->PatternSurface, PatternX, PatternY, BltInfo->XlatePatternToDest);\n"); + } + if ((RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) || + (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE))) + { + Output(Out, "\n"); + } + CreateOperation(Out, Bpp, RopInfo, SourceBpp, 16); + Output(Out, ";\n"); + MARK(Out); + Output(Out, "}\n"); + Output(Out, "\n"); + if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) + { + if (0 == (Flags & FLAG_BOTTOMUP)) + { + Output(Out, "if (BltInfo->PatternSurface->sizlBitmap.cy <= ++PatternY)\n"); + Output(Out, "{\n"); + Output(Out, "PatternY -= BltInfo->PatternSurface->sizlBitmap.cy;\n"); + Output(Out, "}\n"); + } + else + { + Output(Out, "if (0 == PatternY--)\n"); + Output(Out, "{\n"); + Output(Out, "PatternY = BltInfo->PatternSurface->sizlBitmap.cy - 1;\n"); + Output(Out, "}\n"); + } + } + } + if (RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) + { + Output(Out, "SourceBase %c= BltInfo->SourceSurface->lDelta;\n", + 0 == (Flags & FLAG_BOTTOMUP) ? '+' : '-'); + } + Output(Out, "DestBase %c= BltInfo->DestSurface->lDelta;\n", + 0 == (Flags & FLAG_BOTTOMUP) ? '+' : '-'); + Output(Out, "}\n"); +} + +static void +CreateActionBlock(FILE *Out, unsigned Bpp, PROPINFO RopInfo, + int Flags) +{ + static unsigned SourceBpp[ ] = + { 1, 4, 8, 16, 24, 32 }; + unsigned BppIndex; + + MARK(Out); + if (RopInfo->UsesSource) + { + if (ROPCODE_GENERIC == RopInfo->RopCode) + { + Output(Out, "if (UsesSource)\n"); + Output(Out, "{\n"); + } + Output(Out, "switch (BltInfo->SourceSurface->iBitmapFormat)\n"); + Output(Out, "{\n"); + for (BppIndex = 0; + BppIndex < sizeof(SourceBpp) / sizeof(unsigned); + BppIndex++) + { + Output(Out, "case BMF_%uBPP:\n", SourceBpp[BppIndex]); + Output(Out, "{\n"); + if (Bpp == SourceBpp[BppIndex]) + { + Output(Out, "if (NULL == BltInfo->XlateSourceToDest ||\n"); + Output(Out, " 0 != (BltInfo->XlateSourceToDest->flXlate & XO_TRIVIAL))\n"); + Output(Out, "{\n"); + Output(Out, "if (BltInfo->DestRect.top < BltInfo->SourcePoint.y)\n"); + Output(Out, "{\n"); + CreateBitCase(Out, Bpp, RopInfo, + Flags | FLAG_TRIVIALXLATE, + SourceBpp[BppIndex]); + MARK(Out); + Output(Out, "}\n"); + Output(Out, "else\n"); + Output(Out, "{\n"); + CreateBitCase(Out, Bpp, RopInfo, + Flags | FLAG_BOTTOMUP | FLAG_TRIVIALXLATE, + SourceBpp[BppIndex]); + MARK(Out); + Output(Out, "}\n"); + Output(Out, "}\n"); + Output(Out, "else\n"); + Output(Out, "{\n"); + Output(Out, "if (BltInfo->DestRect.top < BltInfo->SourcePoint.y)\n"); + Output(Out, "{\n"); + CreateBitCase(Out, Bpp, RopInfo, Flags, SourceBpp[BppIndex]); + MARK(Out); + Output(Out, "}\n"); + Output(Out, "else\n"); + Output(Out, "{\n"); + CreateBitCase(Out, Bpp, RopInfo, + Flags | FLAG_BOTTOMUP, + SourceBpp[BppIndex]); + MARK(Out); + Output(Out, "}\n"); + Output(Out, "}\n"); + } + else + { + CreateBitCase(Out, Bpp, RopInfo, Flags, + SourceBpp[BppIndex]); + MARK(Out); + } + Output(Out, "break;\n"); + Output(Out, "}\n"); + } + Output(Out, "}\n"); + if (ROPCODE_GENERIC == RopInfo->RopCode) + { + Output(Out, "}\n"); + Output(Out, "else\n"); + Output(Out, "{\n"); + CreateBitCase(Out, Bpp, RopInfo, Flags | FLAG_FORCENOUSESSOURCE, 0); + MARK(Out); + Output(Out, "}\n"); + } + } + else + { + CreateBitCase(Out, Bpp, RopInfo, Flags, 0); + } +} + +static void +CreatePrimitive(FILE *Out, unsigned Bpp, PROPINFO RopInfo) +{ + int First; + + MARK(Out); + Output(Out, "\n"); + Output(Out, "static void\n"); + PrintRoutineName(Out, Bpp, RopInfo); + Output(Out, "(PBLTINFO BltInfo)\n"); + Output(Out, "{\n"); + if (ROPCODE_BLACKNESS == RopInfo->RopCode) + { + Output(Out, "DIB_%uBPP_ColorFill(BltInfo->DestSurface, " + "&BltInfo->DestRect, 0x0);\n", Bpp); + } + else if (ROPCODE_WHITENESS == RopInfo->RopCode) + { + Output(Out, "DIB_%uBPP_ColorFill(BltInfo->DestSurface, " + "&BltInfo->DestRect, ~0);\n", Bpp); + } + else if (ROPCODE_NOOP == RopInfo->RopCode) + { + Output(Out, "return;\n"); + } + else + { + Output(Out, "ULONG LineIndex, LineCount;\n"); + Output(Out, "ULONG i;\n"); +#ifdef TODO + if (RopInfo->UsesSource) + { + Output(Out, "ULONG SourceX, SourceY;\n"); + } +#endif + if (RopInfo->UsesPattern) + { + Output(Out, "ULONG PatternX, PatternY = 0;\n"); + } + First = 1; + if (RopInfo->UsesSource) + { + Output(Out, "ULONG Source = 0"); + First = 0; + } + if (RopInfo->UsesPattern) + { + Output(Out, "%s Pattern = 0", First ? "ULONG" : ","); + First = 0; + } + if (! First) + { + Output(Out, ";\n"); + } + Output(Out, "char *DestBase;\n"); + Output(Out, "PULONG DestPtr;\n"); + if (RopInfo->UsesSource) + { + Output(Out, "char *SourceBase;\n"); + Output(Out, "PULONG SourcePtr;\n"); + Output(Out, "ULONG RawSource;\n"); + Output(Out, "unsigned SourcePixels, BaseSourcePixels;\n"); + } + Output(Out, "ULONG LeftCount, CenterCount, RightCount;\n"); + if (ROPCODE_GENERIC == RopInfo->RopCode) + { + Output(Out, "BOOLEAN UsesDest, UsesSource, UsesPattern;\n"); + Output(Out, "\n"); + Output(Out, "UsesDest = ROP4_USES_DEST(BltInfo->Rop4);\n"); + Output(Out, "UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4);\n"); + Output(Out, "UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4);\n"); + } + Output(Out, "\n"); + if (! RopInfo->UsesSource) + { + CreateBase(Out, 0, 0, Bpp); + CreateCounts(Out); + MARK(Out); + } + Output(Out, "LineCount = BltInfo->DestRect.bottom - BltInfo->DestRect.top;\n"); + + Output(Out, "\n"); + if (RopInfo->UsesPattern) + { + if (ROPCODE_GENERIC == RopInfo->RopCode) + { + Output(Out, "if (UsesPattern && NULL != BltInfo->PatternSurface)\n"); + } + else + { + Output(Out, "if (NULL != BltInfo->PatternSurface)\n"); + } + Output(Out, "{\n"); + CreateActionBlock(Out, Bpp, RopInfo, FLAG_PATTERNSURFACE); + MARK(Out); + Output(Out, "}\n"); + Output(Out, "else\n"); + Output(Out, "{\n"); + if (ROPCODE_GENERIC == RopInfo->RopCode) + { + Output(Out, "if (UsesPattern)\n"); + Output(Out, "{\n"); + } + Output(Out, "Pattern = BltInfo->Brush->iSolidColor |\n"); [truncated at 1000 lines; 191 more skipped]

19 years, 6 months

[navaraf] 16429: Get rid of the (incorrect) __attribute__((packed)) usage.

by navaraf＠svn.reactos.com

Get rid of the (incorrect) __attribute__((packed)) usage. Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c --- trunk/reactos/ntoskrnl/kdbg/kdb.c 2005-07-05 16:40:01 UTC (rev 16428) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c 2005-07-05 17:08:48 UTC (rev 16429) @@ -320,10 +320,7 @@ BOOLEAN KdbpStepIntoInstruction(ULONG_PTR Eip) { - struct __attribute__((packed)) { - USHORT Limit; - ULONG Base; - } Idtr; + KDESCRIPTOR Idtr; UCHAR Mem[2]; INT IntVect; ULONG IntDesc[2]; @@ -353,7 +350,7 @@ } /* Read the interrupt descriptor table register */ - asm volatile("sidt %0" : : "m"(Idtr)); + asm volatile("sidt %0" : : "m"(Idtr.Limit)); if (IntVect >= (Idtr.Limit + 1) / 8) { /*KdbpPrint("IDT does not contain interrupt vector %d\n.", IntVect);*/ _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-07-05 16:40:01 UTC (rev 16428) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-07-05 17:08:48 UTC (rev 16429) @@ -411,10 +411,7 @@ else if (Argv[0][0] == 'c') /* cregs */ { ULONG Cr0, Cr2, Cr3, Cr4; - struct __attribute__((packed)) { - USHORT Limit; - ULONG Base; - } Gdtr, Ldtr, Idtr; + KDESCRIPTOR Gdtr, Ldtr, Idtr; ULONG Tr; STATIC CONST PCHAR Cr0Bits[32] = { " PE", " MP", " EM", " TS", " ET", " NE", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -431,9 +428,9 @@ Cr4 = KdbCurrentTrapFrame->Cr4; /* Get descriptor table regs */ - asm volatile("sgdt %0" : : "m"(Gdtr)); - asm volatile("sldt %0" : : "m"(Ldtr)); - asm volatile("sidt %0" : : "m"(Idtr)); + asm volatile("sgdt %0" : : "m"(Gdtr.Limit)); + asm volatile("sldt %0" : : "m"(Ldtr.Limit)); + asm volatile("sidt %0" : : "m"(Idtr.Limit)); /* Get the task register */ asm volatile("str %0" : "=g"(Tr));

19 years, 6 months

[navaraf] 16428: - Convert pure inline assembler .c files to .S files.

by navaraf＠svn.reactos.com

- Convert pure inline assembler .c files to .S files. - Move SMP IRQ handlers to irqhand.s (at the same place where the UP ones are). Added: trunk/reactos/ntoskrnl/ex/i386/interlck.S Deleted: trunk/reactos/ntoskrnl/ex/i386/interlck.c Added: trunk/reactos/ntoskrnl/ke/i386/brkpoint.S Deleted: trunk/reactos/ntoskrnl/ke/i386/brkpoint.c Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c Modified: trunk/reactos/ntoskrnl/ke/i386/irqhand.s Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml _____ Added: trunk/reactos/ntoskrnl/ex/i386/interlck.S --- trunk/reactos/ntoskrnl/ex/i386/interlck.S 2005-07-05 14:00:33 UTC (rev 16427) +++ trunk/reactos/ntoskrnl/ex/i386/interlck.S 2005-07-05 16:40:01 UTC (rev 16428) @@ -0,0 +1,143 @@ +/* $Id: interlck.c 15557 2005-05-28 07:26:38Z hbirr $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/ex/i386/interlck.c + * PURPOSE: No purpose listed. + * + * PROGRAMMERS: No programmer listed. + */ + +#ifdef CONFIG_SMP +#define LOCK lock +#else +#define LOCK +#endif + +.global @Exfi386InterlockedIncrementLong@4 +@Exfi386InterlockedIncrementLong@4: + LOCK + addl $1,(%ecx) + lahf + andl $0xC000, %eax + ret + +.global @Exfi386InterlockedDecrementLong@4 +@Exfi386InterlockedDecrementLong@4: + LOCK + subl $1,(%ecx) + lahf + andl $0xC000, %eax + ret + +.global @Exfi386InterlockedExchangeUlong@8 +@Exfi386InterlockedExchangeUlong@8: + LOCK + xchgl %edx,(%ecx) + movl %edx,%eax + ret + +.global _Exi386InterlockedIncrementLong@4 +_Exi386InterlockedIncrementLong@4: + movl 4(%esp),%eax + LOCK + addl $1,(%eax) + lahf + andl $0xC000, %eax + ret $4 + +.global _Exi386InterlockedDecrementLong@4 +_Exi386InterlockedDecrementLong@4: + movl 4(%esp),%eax + LOCK + subl $1,(%eax) + lahf + andl $0xC000, %eax + ret $4 + +.global _Exi386InterlockedExchangeUlong@8 +_Exi386InterlockedExchangeUlong@8: + movl 4(%esp),%edx + movl 8(%esp),%eax + LOCK + xchgl %eax,(%edx) + ret $8 + +.global @InterlockedIncrement@4 +@InterlockedIncrement@4: + movl $1,%eax + LOCK + xaddl %eax,(%ecx) + incl %eax + ret + +.global @InterlockedDecrement@4 +@InterlockedDecrement@4: + movl $-1,%eax + LOCK + xaddl %eax,(%ecx) + decl %eax + ret + +.global @InterlockedExchange@8 +@InterlockedExchange@8: + LOCK + xchgl %edx,(%ecx) + movl %edx,%eax + ret + +.global @InterlockedExchangeAdd@8 +@InterlockedExchangeAdd@8: + LOCK + xaddl %edx,(%ecx) + movl %edx,%eax + ret + +.global @InterlockedClearBit@8 +@InterlockedClearBit@8: + LOCK + btr %edx,(%ecx) + setc %al + ret + +.global @InterlockedCompareExchange@12 +@InterlockedCompareExchange@12: + movl 4(%esp),%eax + LOCK + cmpxchg %edx,(%ecx) + ret $4 + +.global @ExfpInterlockedExchange64@8 +@ExfpInterlockedExchange64@8: + pushl %ebx + pushl %esi + movl %ecx,%esi + movl (%edx),%ebx + movl 4(%edx),%ecx +1: + movl (%esi),%eax + movl 4(%esi),%edx + LOCK + cmpxchg8b (%esi) + jnz 1b + popl %esi + popl %ebx + ret + +.global @ExfInterlockedCompareExchange64@12 +@ExfInterlockedCompareExchange64@12: + pushl %ebx + pushl %esi + movl %ecx,%esi + movl (%edx),%ebx + movl 4(%edx),%ecx + movl 12(%esp),%edx + movl (%edx),%eax + movl 4(%edx),%edx + LOCK + cmpxchg8b (%esi) + popl %esi + popl %ebx + ret $4 + +/* EOF */ _____ Deleted: trunk/reactos/ntoskrnl/ex/i386/interlck.c --- trunk/reactos/ntoskrnl/ex/i386/interlck.c 2005-07-05 14:00:33 UTC (rev 16427) +++ trunk/reactos/ntoskrnl/ex/i386/interlck.c 2005-07-05 16:40:01 UTC (rev 16428) @@ -1,536 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ex/i386/interlck.c - * PURPOSE: No purpose listed. - * - * PROGRAMMERS: No programmer listed. - */ - -#include <ntoskrnl.h> - -#ifdef LOCK -#undef LOCK -#endif - -#if defined(__GNUC__) - -/* - * Do not declare any variable after this point!! - */ -__asm__("\n\t.text\n\t"); - -#ifdef CONFIG_SMP -#define LOCK "lock ; " -#else -#define LOCK "" -#endif - -#elif defined(_MSC_VER) - -#ifdef CONFIG_SMP -#define LOCK lock -#else -#define LOCK -#endif - -#endif - -#if defined(__GNUC__) - -/* - * @implemented - */ -INTERLOCKED_RESULT FASTCALL -Exfi386InterlockedIncrementLong(IN PLONG Addend); - -__asm__("\n\t.global @Exfi386InterlockedIncrementLong@4\n\t" - "@Exfi386InterlockedIncrementLong@4:\n\t" - LOCK - "addl $1,(%ecx)\n\t" - "lahf\n\t" - "andl $0xC000, %eax\n\t" - "ret\n\t"); - -#elif defined(_MSC_VER) - -/* - * @implemented - */ -__declspec(naked) -INTERLOCKED_RESULT FASTCALL -Exfi386InterlockedIncrementLong(IN PLONG Addend) -{ - __asm LOCK add dword ptr [ecx], 1 - __asm lahf - __asm and eax, 0xC000 - __asm ret -} - -#else -#error Unknown compiler for inline assembler -#endif - - -#if defined(__GNUC__) - -/* - * @implemented - */ -INTERLOCKED_RESULT FASTCALL -Exfi386InterlockedDecrementLong(IN PLONG Addend); - -__asm__("\n\t.global @Exfi386InterlockedDecrementLong@4\n\t" - "@Exfi386InterlockedDecrementLong@4:\n\t" - LOCK - "subl $1,(%ecx)\n\t" - "lahf\n\t" - "andl $0xC000, %eax\n\t" - "ret\n\t"); - -#elif defined(_MSC_VER) - -/* - * @implemented - */ -__declspec(naked) -INTERLOCKED_RESULT FASTCALL -Exfi386InterlockedDecrementLong(IN PLONG Addend) -{ - __asm LOCK sub dword ptr [ecx], 1 - __asm lahf - __asm and eax, 0xC000 - __asm ret -} - -#else -#error Unknown compiler for inline assembler -#endif - - -#if defined(__GNUC__) - -/* - * @implemented - */ -ULONG FASTCALL -Exfi386InterlockedExchangeUlong(IN PULONG Target, - IN ULONG Value); - -__asm__("\n\t.global @Exfi386InterlockedExchangeUlong@8\n\t" - "@Exfi386InterlockedExchangeUlong@8:\n\t" - LOCK - "xchgl %edx,(%ecx)\n\t" - "movl %edx,%eax\n\t" - "ret\n\t"); - -#elif defined(_MSC_VER) - -/* - * @implemented - */ -__declspec(naked) -ULONG FASTCALL -Exfi386InterlockedExchangeUlong(IN PULONG Target, - IN ULONG Value) -{ - __asm LOCK xchg [ecx], edx - __asm mov eax, edx - __asm ret -} - -#else -#error Unknown compiler for inline assembler -#endif - - -#if defined(__GNUC__) - -INTERLOCKED_RESULT STDCALL -Exi386InterlockedIncrementLong(IN PLONG Addend); - -__asm__("\n\t.global _Exi386InterlockedIncrementLong@4\n\t" - "_Exi386InterlockedIncrementLong@4:\n\t" - "movl 4(%esp),%eax\n\t" - LOCK - "addl $1,(%eax)\n\t" - "lahf\n\t" - "andl $0xC000, %eax\n\t" - "ret $4\n\t"); - -#elif defined(_MSC_VER) - -__declspec(naked) -INTERLOCKED_RESULT STDCALL -Exi386InterlockedIncrementLong(IN PLONG Addend) -{ - __asm mov eax, Addend - __asm LOCK add dword ptr [eax], 1 - __asm lahf - __asm and eax, 0xC000 - __asm ret 4 -} - -#else -#error Unknown compiler for inline assembler -#endif - - -#if defined(__GNUC__) - -INTERLOCKED_RESULT STDCALL -Exi386InterlockedDecrementLong(IN PLONG Addend); - -__asm__("\n\t.global _Exi386InterlockedDecrementLong@4\n\t" - "_Exi386InterlockedDecrementLong@4:\n\t" - "movl 4(%esp),%eax\n\t" - LOCK - "subl $1,(%eax)\n\t" - "lahf\n\t" - "andl $0xC000, %eax\n\t" - "ret $4\n\t"); - -#elif defined(_MSC_VER) - -__declspec(naked) -INTERLOCKED_RESULT STDCALL -Exi386InterlockedDecrementLong(IN PLONG Addend) -{ - __asm mov eax, Addend - __asm LOCK sub dword ptr [eax], 1 - __asm lahf - __asm and eax, 0xC000 - __asm ret 4 -} - -#else -#error Unknown compiler for inline assembler -#endif - - -#if defined(__GNUC__) - -ULONG STDCALL -Exi386InterlockedExchangeUlong(IN PULONG Target, - IN ULONG Value); - -__asm__("\n\t.global _Exi386InterlockedExchangeUlong@8\n\t" - "_Exi386InterlockedExchangeUlong@8:\n\t" - "movl 4(%esp),%edx\n\t" - "movl 8(%esp),%eax\n\t" - LOCK - "xchgl %eax,(%edx)\n\t" - "ret $8\n\t"); - -#elif defined(_MSC_VER) - -__declspec(naked) -ULONG STDCALL -Exi386InterlockedExchangeUlong(IN PULONG Target, - IN ULONG Value) -{ - __asm mov edx, Value - __asm mov eax, Target - __asm LOCK xchg [edx], eax - __asm ret 8 -} - -#else -#error Unknown compiler for inline assembler -#endif - - - -/********************************************************************** - * FASTCALL: @InterlockedIncrement@4 - * STDCALL : _InterlockedIncrement@4 - */ -#if defined(__GNUC__) -/* - * @implemented - */ -LONG FASTCALL -InterlockedIncrement(PLONG Addend); -/* - * FUNCTION: Increments a caller supplied variable of type LONG as an - * atomic operation - * ARGUMENTS: - * Addend = Points to a variable whose value is to be increment - * RETURNS: The incremented value - */ - -__asm__("\n\t.global @InterlockedIncrement@4\n\t" - "@InterlockedIncrement@4:\n\t" - "movl $1,%eax\n\t" - LOCK - "xaddl %eax,(%ecx)\n\t" - "incl %eax\n\t" - "ret\n\t"); - -#elif defined(_MSC_VER) -/* - * @implemented - */ -__declspec(naked) -LONG FASTCALL -InterlockedIncrement(PLONG Addend) -{ - __asm mov eax, 1 - __asm LOCK xadd [ecx], eax - __asm inc eax - __asm ret -} - -#else -#error Unknown compiler for inline assembler -#endif - - -/********************************************************************** - * FASTCALL: @InterlockedDecrement@4 - * STDCALL : _InterlockedDecrement@4 - */ -#if defined(__GNUC__) -/* - * @implemented - */ -LONG FASTCALL -InterlockedDecrement(PLONG Addend); - -__asm__("\n\t.global @InterlockedDecrement@4\n\t" - "@InterlockedDecrement@4:\n\t" - "movl $-1,%eax\n\t" - LOCK - "xaddl %eax,(%ecx)\n\t" - "decl %eax\n\t" - "ret\n\t"); - -#elif defined(_MSC_VER) - -/* - * @implemented - */ -__declspec(naked) -LONG FASTCALL -InterlockedDecrement(PLONG Addend) -{ - __asm mov eax, -1 - __asm LOCK xadd [ecx], eax - __asm dec eax - __asm ret -} - -#else -#error Unknown compiler for inline assembler -#endif - - -/********************************************************************** - * FASTCALL: @InterlockedExchange@8 - * STDCALL : _InterlockedExchange@8 - */ - -#if defined(__GNUC__) -/* - * @implemented - */ -LONG FASTCALL -InterlockedExchange(PLONG Target, - LONG Value); - -__asm__("\n\t.global @InterlockedExchange@8\n\t" - "@InterlockedExchange@8:\n\t" - LOCK - "xchgl %edx,(%ecx)\n\t" - "movl %edx,%eax\n\t" - "ret\n\t"); - -#elif defined(_MSC_VER) -/* - * @implemented - */ -__declspec(naked) -LONG FASTCALL -InterlockedExchange(PLONG Target, - LONG Value) -{ - __asm LOCK xchg [ecx], edx - __asm mov eax, edx - __asm ret -} - -#else -#error Unknown compiler for inline assembler -#endif - -/********************************************************************** - * FASTCALL: @InterlockedExchangeAdd@8 - * STDCALL: _InterlockedExchangeAdd@8 - */ -#if defined(__GNUC__) -/* - * @implemented - */ -LONG FASTCALL -InterlockedExchangeAdd(PLONG Addend, - LONG Value); - -__asm__("\n\t.global @InterlockedExchangeAdd@8\n\t" - "@InterlockedExchangeAdd@8:\n\t" - LOCK - "xaddl %edx,(%ecx)\n\t" - "movl %edx,%eax\n\t" - "ret\n\t"); - -#elif defined(_MSC_VER) -/* - * @implemented - */ -__declspec(naked) -LONG FASTCALL -InterlockedExchangeAdd(PLONG Addend, - LONG Value) -{ - __asm LOCK xadd [ecx], edx - __asm mov eax, edx - __asm ret -} - -#else -#error Unknown compiler for inline assembler -#endif - -/********************************************************************** - * FASTCALL: @InterlockedClearBit@8 - * STDCALL: _InterlockedClearBit@8 - */ -#if defined(__GNUC__) -/* - * @implemented - */ -UCHAR -FASTCALL -InterlockedClearBit(PLONG Destination, - LONG Bit); - -__asm__("\n\t.global @InterlockedClearBit@8\n\t" - "@InterlockedClearBit@8:\n\t" - LOCK - "btr %edx,(%ecx)\n\t" - "setc %al\n\t" - "ret\n\t"); - -#elif defined(_MSC_VER) -/* - * @implemented - */ -__declspec(naked) -UCHAR -FASTCALL -InterlockedClearBit(PUCHAR Destination, - UCHAR Bit) -{ - __asm LOCK btr [ecx], edx - __asm setc al - __asm ret -} - -#else -#error Unknown compiler for inline assembler -#endif - -/********************************************************************** - * FASTCALL: @InterlockedCompareExchange@12 - * STDCALL: _InterlockedCompareExchange@12 - */ -#if defined(__GNUC__) - -LONG FASTCALL -InterlockedCompareExchange(PLONG Destination, - LONG Exchange, - LONG Comperand); - -__asm__("\n\t.global @InterlockedCompareExchange@12\n\t" - "@InterlockedCompareExchange@12:\n\t" - "movl 4(%esp),%eax\n\t" - LOCK - "cmpxchg %edx,(%ecx)\n\t" - "ret $4\n\t"); - -#elif defined(_MSC_VER) - -__declspec(naked) -LONG FASTCALL -InterlockedCompareExchange(PLONG Destination, - LONG Exchange, - LONG Comperand) -{ - __asm mov eax, Comperand - __asm LOCK cmpxchg [ecx], edx - __asm ret 4 -} - -#else -#error Unknown compiler for inline assembler -#endif - -/********************************************************************** - * FASTCALL: @InterlockedCompareExchange64@8 - */ -#if defined(__GNUC__) -LONGLONG FASTCALL -ExfpInterlockedExchange64(LONGLONG volatile * Destination, - PLONGLONG Exchange); - -__asm__("\n\t.global @ExfpInterlockedExchange64@8\n\t" - "@ExfpInterlockedExchange64@8:\n\t" - "pushl %ebx\n\t" - "pushl %esi\n\t" - "movl %ecx,%esi\n\t" - "movl (%edx),%ebx\n\t" - "movl 4(%edx),%ecx\n\t" - "\n1:\t" - "movl (%esi),%eax\n\t" - "movl 4(%esi),%edx\n\t" - LOCK - "cmpxchg8b (%esi)\n\t" - "jnz 1b\n\t" - "popl %esi\n\t" - "popl %ebx\n\t" - "ret\n\t"); - -#else -#error Unknown compiler for inline assembler -#endif - -/********************************************************************** - * FASTCALL: @ExfInterlockedCompareExchange@12 - */ -#if defined(__GNUC__) -LONGLONG FASTCALL -ExfInterlockedCompareExchange64(LONGLONG volatile * Destination, - PLONGLONG Exchange, - PLONGLONG Comperand); - -__asm__("\n\t.global @ExfInterlockedCompareExchange64@12\n\t" - "@ExfInterlockedCompareExchange64@12:\n\t" - "pushl %ebx\n\t" - "pushl %esi\n\t" - "movl %ecx,%esi\n\t" - "movl (%edx),%ebx\n\t" - "movl 4(%edx),%ecx\n\t" - "movl 12(%esp),%edx\n\t" - "movl (%edx),%eax\n\t" - "movl 4(%edx),%edx\n\t" - LOCK - "cmpxchg8b (%esi)\n\t" - "popl %esi\n\t" - "popl %ebx\n\t" - "ret $4\n\t"); - -#else -#error Unknown compiler for inline assembler -#endif - -/* EOF */ _____ Added: trunk/reactos/ntoskrnl/ke/i386/brkpoint.S --- trunk/reactos/ntoskrnl/ke/i386/brkpoint.S 2005-07-05 14:00:33 UTC (rev 16427) +++ trunk/reactos/ntoskrnl/ke/i386/brkpoint.S 2005-07-05 16:40:01 UTC (rev 16428) @@ -0,0 +1,22 @@ +/* $Id: brkpoint.c 15164 2005-05-09 01:38:29Z sedwards $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/ke/i386/brkpoint.c + * PURPOSE: Handles breakpoints + * + * PROGRAMMERS: No programmer listed. + */ + +.global _DbgBreakPoint@0 +_DbgBreakPoint@0: +.global _DbgBreakPointNoBugCheck@0 +_DbgBreakPointNoBugCheck@0: + int $3 + ret + +.global _DbgBreakPointWithStatus@4 +_DbgBreakPointWithStatus@4: + mov 0x4(%esp), %eax + int $3 + ret $4 _____ Deleted: trunk/reactos/ntoskrnl/ke/i386/brkpoint.c --- trunk/reactos/ntoskrnl/ke/i386/brkpoint.c 2005-07-05 14:00:33 UTC (rev 16427) +++ trunk/reactos/ntoskrnl/ke/i386/brkpoint.c 2005-07-05 16:40:01 UTC (rev 16428) @@ -1,59 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ke/i386/brkpoint.c - * PURPOSE: Handles breakpoints - * - * PROGRAMMERS: No programmer listed. - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#include <internal/debug.h> - -/* FUNCTIONS *****************************************************************/ - -/* - * @implemented - */ -VOID STDCALL -DbgBreakPoint(VOID) -{ -#if defined(__GNUC__) - __asm__("int $3\n\t"); -#elif defined(_MSC_VER) - __asm int 3; -#else -#error Unknown compiler for inline assembler -#endif -} - -/* - * @implemented - */ -#if defined(__GNUC__) - __asm__(".globl _DbgBreakPointNoBugCheck@0\n\t" - "_DbgBreakPointNoBugCheck@0:\n\t" - "int $3\n\t" - "ret\n\t"); -#endif - -/* - * @implemented - */ -VOID STDCALL -DbgBreakPointWithStatus(ULONG Status) -{ -#if defined(__GNUC__) - __asm__("mov %0, %%eax\n\t" - "int $3\n\t" - ::"m"(Status)); -#elif defined(_MSC_VER) - __asm mov eax, Status - __asm int 3; -#else -#error Unknown compiler for inline assembler -#endif -} _____ Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c --- trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-07-05 14:00:33 UTC (rev 16427) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-07-05 16:40:01 UTC (rev 16428) @@ -26,74 +26,29 @@ /* GLOBALS *****************************************************************/ +/* Interrupt handler list */ + #ifdef CONFIG_SMP -#define __STR(x) #x -#define STR(x) __STR(x) - -#define INT_NAME(intnum) _KiUnexpectedInterrupt##intnum #define INT_NAME2(intnum) KiUnexpectedInterrupt##intnum -#define BUILD_COMMON_INTERRUPT_HANDLER() \ -__asm__( \ - "_KiCommonInterrupt:\n\t" \ - "cld\n\t" \ - "pushl %ds\n\t" \ - "pushl %es\n\t" \ - "pushl %fs\n\t" \ - "pushl %gs\n\t" \ - "movl $0xceafbeef,%eax\n\t" \ - "pushl %eax\n\t" \ - "movl $" STR(KERNEL_DS) ",%eax\n\t" \ - "movl %eax,%ds\n\t" \ - "movl %eax,%es\n\t" \ - "movl %eax,%gs\n\t" \ - "movl $" STR(PCR_SELECTOR) ",%eax\n\t" \ - "movl %eax,%fs\n\t" \ - "pushl %esp\n\t" \ - "pushl %ebx\n\t" \ - "call _KiInterruptDispatch\n\t" \ - "addl $0xC, %esp\n\t" \ - "popl %gs\n\t" \ - "popl %fs\n\t" \ - "popl %es\n\t" \ - "popl %ds\n\t" \ - "popa\n\t" \ - "iret\n\t"); - #define BUILD_INTERRUPT_HANDLER(intnum) \ -VOID INT_NAME2(intnum)(VOID); \ -__asm__( \ - STR(INT_NAME(intnum)) ":\n\t" \ - "pusha\n\t" \ - "movl $0x" STR(intnum) ",%ebx\n\t" \ - "jmp _KiCommonInterrupt"); +VOID INT_NAME2(intnum)(VOID); - -/* Interrupt handlers and declarations */ - -#define B(x,y) \ +#define D(x,y) \ BUILD_INTERRUPT_HANDLER(x##y) -#define B16(x) \ - B(x,0) B(x,1) B(x,2) B(x,3) \ - B(x,4) B(x,5) B(x,6) B(x,7) \ - B(x,8) B(x,9) B(x,A) B(x,B) \ - B(x,C) B(x,D) B(x,E) B(x,F) +#define D16(x) \ + D(x,0) D(x,1) D(x,2) D(x,3) \ + D(x,4) D(x,5) D(x,6) D(x,7) \ + D(x,8) D(x,9) D(x,A) D(x,B) \ + D(x,C) D(x,D) D(x,E) D(x,F) +D16(3) D16(4) D16(5) D16(6) +D16(7) D16(8) D16(9) D16(A) +D16(B) D16(C) D16(D) D16(E) +D16(F) -BUILD_COMMON_INTERRUPT_HANDLER() -B16(3) B16(4) B16(5) B16(6) -B16(7) B16(8) B16(9) B16(A) -B16(B) B16(C) B16(D) B16(E) -B16(F) - -#undef B -#undef B16 - - -/* Interrupt handler list */ - #define L(x,y) \ (ULONG)& INT_NAME2(x##y) @@ -111,45 +66,47 @@ #undef L #undef L16 +#undef D +#undef D16 #else /* CONFIG_SMP */ - void irq_handler_0(void); - void irq_handler_1(void); - void irq_handler_2(void); - void irq_handler_3(void); - void irq_handler_4(void); - void irq_handler_5(void); - void irq_handler_6(void); - void irq_handler_7(void); - void irq_handler_8(void); - void irq_handler_9(void); - void irq_handler_10(void); - void irq_handler_11(void); - void irq_handler_12(void); - void irq_handler_13(void); - void irq_handler_14(void); - void irq_handler_15(void); +void irq_handler_0(void); +void irq_handler_1(void); +void irq_handler_2(void); +void irq_handler_3(void); +void irq_handler_4(void); +void irq_handler_5(void); +void irq_handler_6(void); +void irq_handler_7(void); +void irq_handler_8(void); +void irq_handler_9(void); +void irq_handler_10(void); +void irq_handler_11(void); +void irq_handler_12(void); +void irq_handler_13(void); +void irq_handler_14(void); +void irq_handler_15(void); static unsigned int irq_handler[NR_IRQS]= - { - (int)&irq_handler_0, - (int)&irq_handler_1, - (int)&irq_handler_2, - (int)&irq_handler_3, - (int)&irq_handler_4, - (int)&irq_handler_5, - (int)&irq_handler_6, - (int)&irq_handler_7, - (int)&irq_handler_8, - (int)&irq_handler_9, - (int)&irq_handler_10, - (int)&irq_handler_11, - (int)&irq_handler_12, - (int)&irq_handler_13, - (int)&irq_handler_14, - (int)&irq_handler_15, - }; +{ + (int)&irq_handler_0, + (int)&irq_handler_1, + (int)&irq_handler_2, + (int)&irq_handler_3, + (int)&irq_handler_4, + (int)&irq_handler_5, + (int)&irq_handler_6, + (int)&irq_handler_7, + (int)&irq_handler_8, + (int)&irq_handler_9, + (int)&irq_handler_10, + (int)&irq_handler_11, + (int)&irq_handler_12, + (int)&irq_handler_13, + (int)&irq_handler_14, + (int)&irq_handler_15, +}; #endif /* CONFIG_SMP */ _____ Modified: trunk/reactos/ntoskrnl/ke/i386/irqhand.s --- trunk/reactos/ntoskrnl/ke/i386/irqhand.s 2005-07-05 14:00:33 UTC (rev 16427) +++ trunk/reactos/ntoskrnl/ke/i386/irqhand.s 2005-07-05 16:40:01 UTC (rev 16428) @@ -1,6 +1,61 @@ #include <ndk/i386/segment.h> #include <../hal/halx86/include/halirq.h> +#ifdef CONFIG_SMP + +#define BUILD_INTERRUPT_HANDLER(intnum) \ + .global _KiUnexpectedInterrupt##intnum; \ + _KiUnexpectedInterrupt##intnum:; \ + pusha; \ + movl $0x##intnum, %ebx; \ + jmp _KiCommonInterrupt; + +/* Interrupt handlers and declarations */ + +#define B(x,y) \ + BUILD_INTERRUPT_HANDLER(x##y) + +#define B16(x) \ + B(x,0) B(x,1) B(x,2) B(x,3) \ + B(x,4) B(x,5) B(x,6) B(x,7) \ + B(x,8) B(x,9) B(x,A) B(x,B) \ + B(x,C) B(x,D) B(x,E) B(x,F) + +_KiCommonInterrupt: + cld + pushl %ds + pushl %es + pushl %fs + pushl %gs + movl $0xceafbeef,%eax + pushl %eax + movl $KERNEL_DS,%eax + movl %eax,%ds + movl %eax,%es + movl %eax,%gs + movl $PCR_SELECTOR,%eax + movl %eax,%fs + pushl %esp + pushl %ebx + call _KiInterruptDispatch + addl $0xC, %esp [truncated at 1000 lines; 741 more skipped]

19 years, 6 months

[hpoussin] 16427: Fix compilation due to revision 16425.

by hpoussin＠svn.reactos.com

Fix compilation due to revision 16425. I forgot a parameter in SetupDiGetClassDevsExA/W ... Modified: trunk/reactos/include/wine/setupapi.h Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/stubs.c _____ Modified: trunk/reactos/include/wine/setupapi.h --- trunk/reactos/include/wine/setupapi.h 2005-07-05 13:15:10 UTC (rev 16426) +++ trunk/reactos/include/wine/setupapi.h 2005-07-05 14:00:33 UTC (rev 16427) @@ -741,8 +741,8 @@ HDEVINFO WINAPI SetupDiGetClassDevsA(CONST GUID *,LPCSTR,HWND,DWORD); HDEVINFO WINAPI SetupDiGetClassDevsW(CONST GUID *,LPCWSTR,HWND,DWORD); #define SetupDiGetClassDevs WINELIB_NAME_AW(SetupDiGetClassDevs) -HDEVINFO WINAPI SetupDiGetClassDevsExA(CONST GUID *,LPCSTR,HWND,DWORD,LPCSTR,PVOID); -HDEVINFO WINAPI SetupDiGetClassDevsExW(CONST GUID *,LPCWSTR,HWND,DWORD,LPCWSTR,PVOID); +HDEVINFO WINAPI SetupDiGetClassDevsExA(CONST GUID *,LPCSTR,HWND,DWORD,HDEVINFO,LPCSTR,PVOID); +HDEVINFO WINAPI SetupDiGetClassDevsExW(CONST GUID *,LPCWSTR,HWND,DWORD,HDEVINFO,LPCWSTR,PVOID); #define SetupDiGetClassDevsEx WINELIB_NAME_AW(SetupDiGetClassDevsEx) BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_A, DWORD, PDWORD, PSP_DEVINFO_DATA); _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-07-05 13:15:10 UTC (rev 16426) +++ trunk/reactos/lib/setupapi/devinst.c 2005-07-05 14:00:33 UTC (rev 16427) @@ -990,7 +990,7 @@ DWORD flags) { return SetupDiGetClassDevsExA(class, enumstr, parent, - flags, NULL, NULL); + flags, NULL, NULL, NULL); } /*********************************************************************** @@ -1003,7 +1003,7 @@ DWORD flags) { return SetupDiGetClassDevsExW(class, enumstr, parent, - flags, NULL, NULL); + flags, NULL, NULL, NULL); } /*********************************************************************** @@ -1014,6 +1014,7 @@ LPCSTR enumstr, HWND parent, DWORD flags, + HDEVINFO deviceset, LPCSTR machine, PVOID reserved) { @@ -1043,7 +1044,7 @@ } MultiByteToWideChar(CP_ACP, 0, machine, -1, machineW, len); } - ret = SetupDiGetClassDevsExW(class, enumstrW, parent, flags, machineW, reserved); + ret = SetupDiGetClassDevsExW(class, enumstrW, parent, flags, deviceset, machineW, reserved); end: HeapFree(GetProcessHeap(), 0, enumstrW); @@ -1195,18 +1196,21 @@ LPCWSTR enumstr, HWND parent, DWORD flags, + HDEVINFO deviceset, LPCWSTR machine, PVOID reserved) { HDEVINFO ret = (HDEVINFO)INVALID_HANDLE_VALUE; - TRACE("%s %s %p 0x%08lx\n", debugstr_guid(class), debugstr_w(enumstr), - parent, flags); + TRACE("%s %s %p 0x%08lx %p %s %p\n", debugstr_guid(class), debugstr_w(enumstr), + parent, flags, deviceset, debugstr_w(machine), reserved); if (flags & DIGCF_PRESENT) FIXME(": flag DIGCF_PRESENT ignored\n"); if (flags & DIGCF_PROFILE) FIXME(": flag DIGCF_PROFILE ignored\n"); + if (deviceset) + FIXME(": deviceset ignored\n"); if (enumstr) FIXME(": unimplemented for enumerator strings (%s)\n", _____ Modified: trunk/reactos/lib/setupapi/stubs.c --- trunk/reactos/lib/setupapi/stubs.c 2005-07-05 13:15:10 UTC (rev 16426) +++ trunk/reactos/lib/setupapi/stubs.c 2005-07-05 14:00:33 UTC (rev 16427) @@ -69,29 +69,6 @@ } /*********************************************************************** - * (SETUPAPI.@) - * - * NO WINAPI in description given - */ -HDEVINFO WINAPI SetupDiGetClassDevsExA(const GUID *class, PCSTR filter, HWND parent, DWORD flags, HDEVINFO deviceset, PCSTR machine, PVOID reserved) -{ - FIXME("filter %s machine %s\n",debugstr_a(filter),debugstr_a(machine)); - return FALSE; -} - -/********************************************************************** * - * (SETUPAPI.@) - * - * NO WINAPI in description given - */ -HDEVINFO WINAPI SetupDiGetClassDevsExW(const GUID *class, PCWSTR filter, HWND parent, DWORD flags, HDEVINFO deviceset, PCWSTR machine, PVOID reserved) -{ - FIXME("\n"); - return FALSE; -} - - -/********************************************************************** * * SetupCopyOEMInfA (SETUPAPI.@) */ BOOL WINAPI SetupCopyOEMInfA(PCSTR sourceinffile, PCSTR sourcemedialoc,

19 years, 6 months

[hpoussin] 16426: Implement SetupDiGetClassDescriptionExA, by calling SetupDiGetClassDescriptionExW

by hpoussin＠svn.reactos.com

Implement SetupDiGetClassDescriptionExA, by calling SetupDiGetClassDescriptionExW Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-07-05 12:59:14 UTC (rev 16425) +++ trunk/reactos/lib/setupapi/devinst.c 2005-07-05 13:15:10 UTC (rev 16426) @@ -877,8 +877,48 @@ PCSTR MachineName, PVOID Reserved) { - FIXME("\n"); - return FALSE; + PWCHAR ClassDescriptionW; + LPWSTR MachineNameW = NULL; + BOOL ret; + + TRACE("\n"); + if (ClassDescriptionSize > 0) + { + ClassDescriptionW = HeapAlloc(GetProcessHeap(), 0, ClassDescriptionSize * sizeof(WCHAR)); + if (!ClassDescriptionW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ret = FALSE; + goto end; + } + } + + if (MachineName) + { + MachineNameW = MultiByteToUnicode(MachineName, CP_ACP); + if (!MachineNameW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ret = FALSE; + goto end; + } + } + + ret = SetupDiGetClassDescriptionExW(ClassGuid, ClassDescriptionW, ClassDescriptionSize * sizeof(WCHAR), + NULL, MachineNameW, Reserved); + if (ret) + { + int len = WideCharToMultiByte(CP_ACP, 0, ClassDescriptionW, -1, ClassDescription, + ClassDescriptionSize, NULL, NULL); + + if (!ClassDescriptionSize && RequiredSize) + *RequiredSize = len; + } + +end: + HeapFree(GetProcessHeap(), 0, ClassDescriptionW); + MyFree(MachineNameW); + return ret; } /***********************************************************************

19 years, 6 months

[hpoussin] 16425: Implement SetupDiGetClassDevs(Ex)A/W

by hpoussin＠svn.reactos.com

Implement SetupDiGetClassDevs(Ex)A/W Modified: trunk/reactos/include/wine/setupapi.h Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/include/wine/setupapi.h --- trunk/reactos/include/wine/setupapi.h 2005-07-05 12:06:27 UTC (rev 16424) +++ trunk/reactos/include/wine/setupapi.h 2005-07-05 12:59:14 UTC (rev 16425) @@ -613,7 +613,7 @@ #define ERROR_NO_SUCH_INTERFACE_DEVICE ERROR_NO_SUCH_DEVICE_INTERFACE #define ERROR_NOT_INSTALLED (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x1000) -/* flags for SetupDiGetClassDevs */ +/* flags for SetupDiGetClassDevs(Ex) */ #define DIGCF_DEFAULT 0x00000001 #define DIGCF_PRESENT 0x00000002 #define DIGCF_ALLCLASSES 0x00000004 @@ -741,6 +741,9 @@ HDEVINFO WINAPI SetupDiGetClassDevsA(CONST GUID *,LPCSTR,HWND,DWORD); HDEVINFO WINAPI SetupDiGetClassDevsW(CONST GUID *,LPCWSTR,HWND,DWORD); #define SetupDiGetClassDevs WINELIB_NAME_AW(SetupDiGetClassDevs) +HDEVINFO WINAPI SetupDiGetClassDevsExA(CONST GUID *,LPCSTR,HWND,DWORD,LPCSTR,PVOID); +HDEVINFO WINAPI SetupDiGetClassDevsExW(CONST GUID *,LPCWSTR,HWND,DWORD,LPCWSTR,PVOID); +#define SetupDiGetClassDevsEx WINELIB_NAME_AW(SetupDiGetClassDevsEx) BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_A, DWORD, PDWORD, PSP_DEVINFO_DATA); BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_W, _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-07-05 12:06:27 UTC (rev 16424) +++ trunk/reactos/lib/setupapi/devinst.c 2005-07-05 12:59:14 UTC (rev 16425) @@ -949,8 +949,37 @@ HWND parent, DWORD flags) { + return SetupDiGetClassDevsExA(class, enumstr, parent, + flags, NULL, NULL); +} + +/********************************************************************** * + * SetupDiGetClassDevsW (SETUPAPI.@) + */ +HDEVINFO WINAPI SetupDiGetClassDevsW( + CONST GUID *class, + LPCWSTR enumstr, + HWND parent, + DWORD flags) +{ + return SetupDiGetClassDevsExW(class, enumstr, parent, + flags, NULL, NULL); +} + +/********************************************************************** * + * SetupDiGetClassDevsExA (SETUPAPI.@) + */ +HDEVINFO WINAPI SetupDiGetClassDevsExA( + CONST GUID *class, + LPCSTR enumstr, + HWND parent, + DWORD flags, + LPCSTR machine, + PVOID reserved) +{ HDEVINFO ret; LPWSTR enumstrW = NULL; + LPWSTR machineW = NULL; if (enumstr) { @@ -963,10 +992,22 @@ } MultiByteToWideChar(CP_ACP, 0, enumstr, -1, enumstrW, len); } - ret = SetupDiGetClassDevsW(class, enumstrW, parent, flags); - HeapFree(GetProcessHeap(), 0, enumstrW); + if (machine) + { + int len = MultiByteToWideChar(CP_ACP, 0, machine, -1, NULL, 0); + machineW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!machineW) + { + ret = (HDEVINFO)INVALID_HANDLE_VALUE; + goto end; + } + MultiByteToWideChar(CP_ACP, 0, machine, -1, machineW, len); + } + ret = SetupDiGetClassDevsExW(class, enumstrW, parent, flags, machineW, reserved); end: + HeapFree(GetProcessHeap(), 0, enumstrW); + HeapFree(GetProcessHeap(), 0, machineW); return ret; } @@ -1079,7 +1120,6 @@ return INVALID_HANDLE_VALUE; } - FIXME("subKeys %ld, maxSubKey %ld\n", subKeys, maxSubKey); for (i = 0; i < subKeys; i++) { deviceInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(DeviceInfo) + maxSubKey * sizeof(WCHAR)); @@ -1108,13 +1148,15 @@ } /*********************************************************************** - * SetupDiGetClassDevsW (SETUPAPI.@) + * SetupDiGetClassDevsExW (SETUPAPI.@) */ -HDEVINFO WINAPI SetupDiGetClassDevsW( +HDEVINFO WINAPI SetupDiGetClassDevsExW( CONST GUID *class, LPCWSTR enumstr, HWND parent, - DWORD flags) + DWORD flags, + LPCWSTR machine, + PVOID reserved) { HDEVINFO ret = (HDEVINFO)INVALID_HANDLE_VALUE; @@ -1141,7 +1183,7 @@ else #else { - ret = SETUP_CreateDevListFromClass(NULL, (LPGUID)class); + ret = SETUP_CreateDevListFromClass(machine, (LPGUID)class); } #endif }

19 years, 6 months

[greatlrd] 16424: Brandon Turner turnerb7@msu.edu. Bug fix color now it working as ms cmd color. Please everyone that have done translate of cmd, update the language's file. some text have been modify and add in cmd en.rc

by greatlrd＠svn.reactos.com

Brandon Turner turnerb7(a)msu.edu. Bug fix color now it working as ms cmd color. Please everyone that have done translate of cmd, update the language's file. some text have been modify and add in cmd en.rc Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/color.c _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-07-05 08:48:43 UTC (rev 16423) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-07-05 12:06:27 UTC (rev 16424) @@ -89,9 +89,9 @@ /T:bf Sets the background/foreground color (see COLOR command)." STRING_COLOR_HELP1, "Sets the default foreground and background colors.\n\n\ -COLOR [attr [/F]] \n\n\ +COLOR [attr [/-F]] \n\n\ attr Specifies color attribute of console output\n\ - /F fill the console with color attribute\n\n\ + /-F Does not fill the console blank space with color attribute\n\n\ There are three ways to specify the colors:\n\ 1) [bright] name on [bright] name (only the first three letters are required)\n\ 2) decimal on decimal\n\ _____ Modified: trunk/reactos/subsys/system/cmd/color.c --- trunk/reactos/subsys/system/cmd/color.c 2005-07-05 08:48:43 UTC (rev 16423) +++ trunk/reactos/subsys/system/cmd/color.c 2005-07-05 12:06:27 UTC (rev 16424) @@ -32,7 +32,7 @@ } -VOID SetScreenColor (WORD wColor, BOOL bFill) +VOID SetScreenColor (WORD wColor, BOOL bNoFill) { DWORD dwWritten; CONSOLE_SCREEN_BUFFER_INFO csbi; @@ -45,7 +45,7 @@ } else { - if (bFill == TRUE) + if (bNoFill != TRUE) { GetConsoleScreenBufferInfo (hConsole, &csbi); @@ -81,7 +81,7 @@ { /* set default color */ wColor = wDefColor; - SetScreenColor (wColor, TRUE); + SetScreenColor (wColor, FALSE); return 0; } @@ -125,7 +125,7 @@ /* set color */ SetScreenColor(wColor, - (_tcsstr (rest,_T("/F")) || _tcsstr (rest,_T("/f")))); + (_tcsstr (rest,_T("/-F")) || _tcsstr (rest,_T("/-f")))); return 0; }

19 years, 6 months

[hpoussin] 16423: - Implement SetupDiCreateDeviceInfoListExW

by hpoussin＠svn.reactos.com

- Implement SetupDiCreateDeviceInfoListExW - Do according changes in SetupDiDestroyDeviceInfoList - Implement SetupDiEnumDeviceInfo - Don't open registry with full rights in SetupDiClassGuidsFromNameExW - Set last error in SetupDiClassNameFromGuidExW in case of problem - Do W->A conversion for InfSectionWithExt string in SetupDiGetActualSectionToInstallA Following changes break serial port devices enumeration on Wine. I'll work on this problem later. - Implement SetupDiGetClassDevsW - Disable some code in SetupDiEnumDeviceInterfaces and SetupDiGetDeviceInterfaceDetailA Now, you should be able to list devices classes, and enumerate devices related to each class Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-07-05 01:18:07 UTC (rev 16422) +++ trunk/reactos/lib/setupapi/devinst.c 2005-07-05 08:48:43 UTC (rev 16423) @@ -68,6 +68,34 @@ 'C','o','n','t','r','o','l','\\', 'D','e','v','i','c','e','C','l','a','s','s','e','s',0}; + +typedef struct _DeviceInfo +{ + LIST_ENTRY ItemEntry; +#ifdef __WINE__ + PWSTR InterfaceName; /* "COMx:" */ + LPGUID InterfaceGuid; /* GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR */ +#else + WCHAR DeviceInstance[0]; +#endif +} DeviceInfo; + +#define SETUP_DEV_INFO_LIST_MAGIC 0xd00ff056 + +typedef struct _DeviceInfoList +{ + DWORD magic; + GUID ClassGuid; + HWND hWnd; + HKEY HKLM; /* Local or distant HKEY_LOCAL_MACHINE registry key */ + DWORD numberOfEntries; + LIST_ENTRY ListHead; +} DeviceInfoList; + +/* FIXME: header mess */ +DEFINE_GUID(GUID_NULL, + 0x00000000L, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); + /*********************************************************************** * SetupDiBuildClassInfoList (SETUPAPI.@) */ @@ -344,7 +372,7 @@ *RequiredSize = 0; hClassesKey = SetupDiOpenClassRegKeyExW(NULL, - KEY_ALL_ACCESS, + KEY_ENUMERATE_SUB_KEYS, DIOCR_INSTALLER, MachineName, Reserved); @@ -372,7 +400,7 @@ if (RegOpenKeyExW(hClassesKey, szKeyName, 0, - KEY_ALL_ACCESS, + KEY_QUERY_VALUE, &hClassKey)) { RegCloseKey(hClassesKey); @@ -503,9 +531,10 @@ { HKEY hKey; DWORD dwLength; + LONG rc; hKey = SetupDiOpenClassRegKeyExW(ClassGuid, - KEY_ALL_ACCESS, + KEY_QUERY_VALUE, DIOCR_INSTALLER, MachineName, Reserved); @@ -517,13 +546,15 @@ if (RequiredSize != NULL) { dwLength = 0; - if (RegQueryValueExW(hKey, + rc = RegQueryValueExW(hKey, Class, NULL, NULL, NULL, - &dwLength)) + &dwLength); + if (rc != ERROR_SUCCESS) { + SetLastError(rc); RegCloseKey(hKey); return FALSE; } @@ -532,13 +563,15 @@ } dwLength = ClassNameSize * sizeof(WCHAR); - if (RegQueryValueExW(hKey, + rc = RegQueryValueExW(hKey, Class, NULL, NULL, (LPBYTE)ClassName, - &dwLength)) + &dwLength); + if (rc != ERROR_SUCCESS) { + SetLastError(rc); RegCloseKey(hKey); return FALSE; } @@ -597,26 +630,81 @@ PCWSTR MachineName, PVOID Reserved) { - FIXME("\n"); - return (HDEVINFO)INVALID_HANDLE_VALUE; + DeviceInfoList* list; + + TRACE("%p %p %p %p\n", ClassGuid, hwndParent, MachineName, Reserved); + + list = HeapAlloc(GetProcessHeap(), 0, sizeof(DeviceInfoList)); + if (!list) + return (HDEVINFO)INVALID_HANDLE_VALUE; + + list->magic = SETUP_DEV_INFO_LIST_MAGIC; + list->hWnd = hwndParent; + list->numberOfEntries = 0; + /* FIXME: open distant registry */ + //if (RegConnectRegistryW(MachineName, HKEY_LOCAL_MACHINE, &list->HKLM) != ERROR_SUCCESS) + if (RegOpenKey(HKEY_LOCAL_MACHINE, NULL, &list->HKLM) != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, list); + return (HDEVINFO)INVALID_HANDLE_VALUE; + } + memcpy( + &list->ClassGuid, + ClassGuid ? ClassGuid : &GUID_NULL, + sizeof(list->ClassGuid)); + InitializeListHead(&list->ListHead); + return (HDEVINFO)list; } /*********************************************************************** * SetupDiEnumDeviceInfo (SETUPAPI.@) */ BOOL WINAPI SetupDiEnumDeviceInfo( - HDEVINFO devinfo, - DWORD index, - PSP_DEVINFO_DATA info) + HDEVINFO DeviceInfoSet, + DWORD MemberIndex, + PSP_DEVINFO_DATA DeviceInfoData) { - FIXME("%p %ld %p\n", devinfo, index, info); + BOOL ret = FALSE; - if(info==NULL) - return FALSE; - if(info->cbSize < sizeof(*info)) - return FALSE; - - return FALSE; + TRACE("%p, 0x%08lx, %p\n", DeviceInfoSet, MemberIndex, DeviceInfoData); + if (!DeviceInfoData) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoSet && DeviceInfoSet != (HDEVINFO)INVALID_HANDLE_VALUE) + { + DeviceInfoList *list = (DeviceInfoList *)DeviceInfoSet; + + if (list->magic != SETUP_DEV_INFO_LIST_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_PARAMETER); + else if (MemberIndex >= list->numberOfEntries) + SetLastError(ERROR_NO_MORE_ITEMS); + else + { + PLIST_ENTRY ItemList = list->ListHead.Flink; + DeviceInfo* DevInfo; + while (MemberIndex-- > 0) + ItemList = ItemList->Flink; + DevInfo = (DeviceInfo *)ItemList; +#ifdef __WINE__ + memcpy(&DeviceInfoData->ClassGuid, + DevInfo->InterfaceGuid, + sizeof(GUID)); + DeviceInfoData->DevInst = 0; /* FIXME */ + DeviceInfoData->Reserved = 0; +#else + memcpy(&DeviceInfoData->ClassGuid, + &list->ClassGuid, /* FIXME */ + sizeof(GUID)); + DeviceInfoData->DevInst = 0; /* FIXME */ + DeviceInfoData->Reserved = 0; +#endif + ret = TRUE; + } + } + else + SetLastError(ERROR_INVALID_HANDLE); + return ret; } /*********************************************************************** @@ -653,10 +741,12 @@ InfSectionWithExtSize, RequiredSize, Extension ? &ExtensionW : NULL); - if (InfSectionWithExt) + if (bResult && InfSectionWithExt) { + bResult = WideCharToMultiByte(CP_ACP, 0, InfSectionWithExtW, -1, InfSectionWithExt, + InfSectionWithExtSize, NULL, NULL) != 0; } - if (Extension) + if (bResult && Extension) { if (ExtensionW == NULL) *Extension = NULL; @@ -880,20 +970,7 @@ return ret; } -#define SETUP_SERIAL_PORT_MAGIC 0xd00ff055 - -typedef struct _SerialPortName -{ - WCHAR name[5]; -} SerialPortName; - -typedef struct _SerialPortList -{ - DWORD magic; - UINT numPorts; - SerialPortName names[1]; -} SerialPortList; - +#ifdef __WINE__ static HDEVINFO SETUP_CreateSerialDeviceList(void) { static const size_t initialSize = 100; @@ -964,7 +1041,72 @@ TRACE("returning %p\n", ret); return ret; } +#endif /* __WINE__ */ +static HDEVINFO SETUP_CreateDevListFromClass( + PCWSTR MachineName, + LPGUID class) +{ + HDEVINFO hDeviceInfo; + HKEY KeyClass; + LONG rc; + DWORD subKeys = 0, maxSubKey; + DeviceInfo* deviceInfo; + DWORD i; + + hDeviceInfo = SetupDiCreateDeviceInfoListExW(class, NULL, MachineName, NULL); + if (hDeviceInfo == INVALID_HANDLE_VALUE) + return INVALID_HANDLE_VALUE; + + KeyClass = SetupDiOpenClassRegKeyExW(class, KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, DIOCR_INSTALLER, MachineName, NULL); + if (KeyClass == INVALID_HANDLE_VALUE) + { + SetupDiDestroyDeviceInfoList(hDeviceInfo); + return INVALID_HANDLE_VALUE; + } + + rc = RegQueryInfoKeyW( + KeyClass, + NULL, NULL, + NULL, + &subKeys, + &maxSubKey, + NULL, NULL, NULL, NULL, NULL, NULL); + if (rc != ERROR_SUCCESS) + { + RegCloseKey(KeyClass); + SetLastError(rc); + return INVALID_HANDLE_VALUE; + } + + FIXME("subKeys %ld, maxSubKey %ld\n", subKeys, maxSubKey); + for (i = 0; i < subKeys; i++) + { + deviceInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(DeviceInfo) + maxSubKey * sizeof(WCHAR)); + if (!deviceInfo) + { + SetupDiDestroyDeviceInfoList(hDeviceInfo); + SetLastError(ERROR_NO_SYSTEM_RESOURCES); + return INVALID_HANDLE_VALUE; + } + rc = RegEnumKeyW(KeyClass, i, &deviceInfo->DeviceInstance[0], maxSubKey); + if (rc == ERROR_NO_MORE_ITEMS) + break; + if (rc != ERROR_SUCCESS) + { + SetupDiDestroyDeviceInfoList(hDeviceInfo); + SetLastError(rc); + return INVALID_HANDLE_VALUE; + } + InsertTailList(&((DeviceInfoList*)hDeviceInfo)->ListHead, &deviceInfo->ItemEntry); + ((DeviceInfoList*)hDeviceInfo)->numberOfEntries++; + } + + RegCloseKey(KeyClass); + + return hDeviceInfo; +} + /*********************************************************************** * SetupDiGetClassDevsW (SETUPAPI.@) */ @@ -979,19 +1121,29 @@ TRACE("%s %s %p 0x%08lx\n", debugstr_guid(class), debugstr_w(enumstr), parent, flags); + if (flags & DIGCF_PRESENT) + FIXME(": flag DIGCF_PRESENT ignored\n"); + if (flags & DIGCF_PROFILE) + FIXME(": flag DIGCF_PROFILE ignored\n"); + if (enumstr) FIXME(": unimplemented for enumerator strings (%s)\n", debugstr_w(enumstr)); else if (flags & DIGCF_ALLCLASSES) FIXME(": unimplemented for DIGCF_ALLCLASSES\n"); + else if (flags & DIGCF_DEVICEINTERFACE) + FIXME(": unimplemented for DIGCF_DEVICEINTERFACE\n"); else { - if (IsEqualIID(class, &GUID_DEVINTERFACE_COMPORT)) +#ifdef __WINE__ + if (IsEqualIID(class, &GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR)) ret = SETUP_CreateSerialDeviceList(); - else if (IsEqualIID(class, &GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR)) - ret = SETUP_CreateSerialDeviceList(); else - FIXME("(%s): stub\n", debugstr_guid(class)); +#else + { + ret = SETUP_CreateDevListFromClass(NULL, (LPGUID)class); + } +#endif } return ret; } @@ -1016,20 +1168,27 @@ FIXME(": unimplemented with PSP_DEVINFO_DATA set\n"); else if (DeviceInfoSet && DeviceInfoSet != (HDEVINFO)INVALID_HANDLE_VALUE) { - /* FIXME: this assumes the only possible enumeration is of serial - * ports. - */ - SerialPortList *list = (SerialPortList *)DeviceInfoSet; + DeviceInfoList *list = (DeviceInfoList *)DeviceInfoSet; - if (list->magic == SETUP_SERIAL_PORT_MAGIC) + if (list->magic == SETUP_DEV_INFO_LIST_MAGIC) { - if (MemberIndex >= list->numPorts) + if (MemberIndex >= list->numberOfEntries) SetLastError(ERROR_NO_MORE_ITEMS); else { + PLIST_ENTRY ItemList = list->ListHead.Flink; + DeviceInfo* DevInfo; + while (MemberIndex-- > 0) + ItemList = ItemList->Flink; + DevInfo = (DeviceInfo *)ItemList; + DeviceInterfaceData->cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); +#ifdef __WINE__ + /* FIXME: this assumes the only possible enumeration is of serial + * ports. + */ memcpy(&DeviceInterfaceData->InterfaceClassGuid, - &GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR, + DevInfo->InterfaceGuid, sizeof(DeviceInterfaceData->InterfaceClassGuid)); DeviceInterfaceData->Flags = 0; /* Note: this appears to be dangerous, passing a private @@ -1037,8 +1196,10 @@ * expected lifetime of the device data is the same as the * HDEVINFO; once that is closed, the data are no longer valid. */ - DeviceInterfaceData->Reserved = - (ULONG_PTR)&list->names[MemberIndex].name; + DeviceInterfaceData->Reserved = (ULONG_PTR)DevInfo->InterfaceName; +#else + FIXME("implemented\n"); +#endif ret = TRUE; } } @@ -1060,13 +1221,17 @@ TRACE("%p\n", devinfo); if (devinfo && devinfo != (HDEVINFO)INVALID_HANDLE_VALUE) { - /* FIXME: this assumes the only possible enumeration is of serial - * ports. - */ - SerialPortList *list = (SerialPortList *)devinfo; + DeviceInfoList *list = (DeviceInfoList *)devinfo; - if (list->magic == SETUP_SERIAL_PORT_MAGIC) + if (list->magic == SETUP_DEV_INFO_LIST_MAGIC) { + PLIST_ENTRY ListEntry; + while (!IsListEmpty(&list->ListHead)) + { + ListEntry = RemoveHeadList(&list->ListHead); + HeapFree(GetProcessHeap(), 0, ListEntry); + } + RegCloseKey(list->HKLM); HeapFree(GetProcessHeap(), 0, list); ret = TRUE; } @@ -1101,13 +1266,14 @@ SetLastError(ERROR_INVALID_PARAMETER); else if (DeviceInfoSet && DeviceInfoSet != (HDEVINFO)INVALID_HANDLE_VALUE) { - /* FIXME: this assumes the only possible enumeration is of serial - * ports. - */ - SerialPortList *list = (SerialPortList *)DeviceInfoSet; + DeviceInfoList *list = (DeviceInfoList *)DeviceInfoSet; - if (list->magic == SETUP_SERIAL_PORT_MAGIC) + if (list->magic == SETUP_DEV_INFO_LIST_MAGIC) { +#ifdef __WINE__ + /* FIXME: this assumes the only possible enumeration is of serial + * ports. + */ LPCWSTR devName = (LPCWSTR)DeviceInterfaceData->Reserved; DWORD sizeRequired = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_A) + lstrlenW(devName); @@ -1142,6 +1308,10 @@ } ret = TRUE; } +#else /* __WINE__ */ + FIXME("unimplemented\n"); + ret = FALSE; +#endif /* __WINE__ */ } else SetLastError(ERROR_INVALID_HANDLE);

19 years, 6 months

[weiden] 16422: globally enable the -Wpointer-arith warning to prevent usage of GCC's pointer arithmetics extension

by weiden＠svn.reactos.com

globally enable the -Wpointer-arith warning to prevent usage of GCC's pointer arithmetics extension Modified: trunk/reactos/ReactOS.xml _____ Modified: trunk/reactos/ReactOS.xml --- trunk/reactos/ReactOS.xml 2005-07-05 00:57:47 UTC (rev 16421) +++ trunk/reactos/ReactOS.xml 2005-07-05 01:18:07 UTC (rev 16422) @@ -28,11 +28,12 @@ <define name="KDBG" value="1" /> <property name="DBG_OR_KDBG" value="true" /> </if> + <compilerflag>-Wpointer-arith</compilerflag> <include>include</include> - <include>include/reactos</include> + <include>include/reactos</include> <include>w32api/include</include> - <include>w32api/include/ddk</include> + <include>w32api/include/ddk</include> <directory name="apps"> <xi:include href="apps/directory.xml" />

19 years, 6 months

← Newer
1
...
47
48
49
50
51
52
53
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2005