Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sedwards] 17447: use instead of g++
by sedwards＠svn.reactos.com 19 Aug '05

19 Aug '05

use instead of g++ Modified: trunk/irc/ArchBlackmann/makefile _____ Modified: trunk/irc/ArchBlackmann/makefile --- trunk/irc/ArchBlackmann/makefile 2005-08-19 21:54:59 UTC (rev 17446) +++ trunk/irc/ArchBlackmann/makefile 2005-08-19 21:56:14 UTC (rev 17447) @@ -4,6 +4,7 @@ all: $(TARGET) +CPP=mingw32-g++ CFLAGS := -DWIN32 -D_DEBUG -D_CONSOLE -D_MBCS LFLAGS := LIBS := -lstdc++ -lws2_32 @@ -26,7 +27,7 @@ OBJS := $(SRCS:.cpp=.o) $(TARGET): $(OBJS) - g++ $(LFLAGS) -o $@ $(OBJS) $(LIBS) + $(CPP) $(LFLAGS) -o $@ $(OBJS) $(LIBS) .cpp.o: $< - g++ $(CFLAGS) -c $< -o $@ + $(CPP) $(CFLAGS) -c $< -o $@

1 0

[royce] 17446: spelling/grammar
by royce＠svn.reactos.com 19 Aug '05

19 Aug '05

spelling/grammar Modified: trunk/irc/ArchBlackmann/readme.txt _____ Modified: trunk/irc/ArchBlackmann/readme.txt --- trunk/irc/ArchBlackmann/readme.txt 2005-08-19 21:53:40 UTC (rev 17445) +++ trunk/irc/ArchBlackmann/readme.txt 2005-08-19 21:54:59 UTC (rev 17446) @@ -21,10 +21,10 @@ List that are used directly to create responses are: - - tech - here are the sentces ArchBlackmann sais when he finds his name + - tech - here are the sentences ArchBlackmann says when he finds his name - curse - this are the curses he looks for - cursecop - this the responces to them - - grovel - this is said when a op does the grovel command + - grovel - this is said when an op does the grovel command - nogrovel - this when someone else does it The remaining lists are not used directly, but by the other lists.

1 0

[royce] 17445: mingw makefile + more mingw compatibility fixes
by royce＠svn.reactos.com 19 Aug '05

19 Aug '05

mingw makefile + more mingw compatibility fixes Modified: trunk/irc/ArchBlackmann/ArchBlackmann.cpp Added: trunk/irc/ArchBlackmann/makefile _____ Modified: trunk/irc/ArchBlackmann/ArchBlackmann.cpp --- trunk/irc/ArchBlackmann/ArchBlackmann.cpp 2005-08-19 21:21:58 UTC (rev 17444) +++ trunk/irc/ArchBlackmann/ArchBlackmann.cpp 2005-08-19 21:53:40 UTC (rev 17445) @@ -203,12 +203,13 @@ } bool OnPart ( const std::string& user, const std::string& channel ) { - for ( int i = 0; i < ops.size(); i++ ) + std::vector<std::string>::iterator it = ops.begin(); + for ( ; it != ops.end(); it++ ) { - if ( ops[i] == user ) + if ( *it == user ) { printf ( "remove '%s' to ops list\n", user.c_str() ); - ops.erase ( &ops[i] ); + ops.erase ( it ); } } return true; @@ -394,15 +395,17 @@ return PrivMsg ( channel, ssprintf("%s: Couldn't add, unmatched quotes",from.c_str()) ); s = string ( p, p2-p ); } - for ( i = 0; i < list.list.size(); i++ ) + std::vector<std::string>::iterator it = list.list.begin(); + for ( ; it != list.list.end(); it++ ) { - if ( list.list[i] == s ) + if ( *it == s ) { - list.list.erase ( &list.list[i] ); + list.list.erase ( it ); { - File f ( ssprintf("%s.txt",list.name.c_str()), "w" ); - for ( i = 0; i < list.list.size(); i++ ) - f.printf ( "%s\n", list.list[i].c_str() ); + File f ( ssprintf("%s.txt",list.name.c_str()), "w" ); + it = list.list.begin(); + for ( ; it < list.list.end(); it++ ) + f.printf ( "%s\n", it->c_str() ); } return PrivMsg ( channel, ssprintf("%s: entry removed from list '%s'",from.c_str(),listname.c_str()) ); } @@ -480,12 +483,13 @@ { if ( *p == 'o' ) { - for ( int i = 0; i < ops.size(); i++ ) + std::vector<std::string>::iterator it = ops.begin(); + for ( ; it != ops.end(); it++ ) { - if ( ops[i] == target ) + if ( *it == target ) { printf ( "remove '%s' to ops list\n", target.c_str() ); - ops.erase ( &ops[i] ); + ops.erase ( it ); } } break; _____ Added: trunk/irc/ArchBlackmann/makefile --- trunk/irc/ArchBlackmann/makefile 2005-08-19 21:21:58 UTC (rev 17444) +++ trunk/irc/ArchBlackmann/makefile 2005-08-19 21:53:40 UTC (rev 17445) @@ -0,0 +1,32 @@ +TARGET := ArchBlackmann.exe + +.PHONY: all + +all: $(TARGET) + +CFLAGS := -DWIN32 -D_DEBUG -D_CONSOLE -D_MBCS +LFLAGS := +LIBS := -lstdc++ -lws2_32 + +SRCS := ArchBlackmann.cpp \ + base64.cpp \ + chomp.cpp \ + cram_md5.cpp \ + File.cpp \ + IRCClient.cpp \ + MD5.cpp \ + panic.cpp \ + ReliMT.cpp \ + SockUtils.cpp \ + SplitJoin.cpp \ + ssprintf.cpp \ + ThreadPool.cpp \ + trim.cpp + +OBJS := $(SRCS:.cpp=.o) + +$(TARGET): $(OBJS) + g++ $(LFLAGS) -o $@ $(OBJS) $(LIBS) + +.cpp.o: $< + g++ $(CFLAGS) -c $< -o $@

1 0

[sedwards] 17444: ditto
by sedwards＠svn.reactos.com 19 Aug '05

19 Aug '05

ditto Modified: trunk/irc/ArchBlackmann/IRCClient.cpp _____ Modified: trunk/irc/ArchBlackmann/IRCClient.cpp --- trunk/irc/ArchBlackmann/IRCClient.cpp 2005-08-19 21:21:05 UTC (rev 17443) +++ trunk/irc/ArchBlackmann/IRCClient.cpp 2005-08-19 21:21:58 UTC (rev 17444) @@ -10,7 +10,7 @@ #include <sstream> #include "IRCClient.h" -#include "md5.h" +#include "MD5.h" #include "cram_md5.h" #include "trim.h" #include "chomp.h"

1 0

[royce] 17443: mingw compatibility fixes
by royce＠svn.reactos.com 19 Aug '05

19 Aug '05

mingw compatibility fixes Modified: trunk/irc/ArchBlackmann/File.cpp Modified: trunk/irc/ArchBlackmann/File.h Modified: trunk/irc/ArchBlackmann/auto_vector.h Modified: trunk/irc/ArchBlackmann/ssprintf.cpp _____ Modified: trunk/irc/ArchBlackmann/File.cpp --- trunk/irc/ArchBlackmann/File.cpp 2005-08-19 21:21:04 UTC (rev 17442) +++ trunk/irc/ArchBlackmann/File.cpp 2005-08-19 21:21:05 UTC (rev 17443) @@ -14,8 +14,8 @@ #define nelem(x) ( sizeof(x) / sizeof(x[0]) ) #endif//nelem -using File::filesize_t; -using File::fileoff_t; +typedef File::filesize_t filesize_t; +typedef File::fileoff_t fileoff_t; fileoff_t File::seek ( fileoff_t offset ) _____ Modified: trunk/irc/ArchBlackmann/File.h --- trunk/irc/ArchBlackmann/File.h 2005-08-19 21:21:04 UTC (rev 17442) +++ trunk/irc/ArchBlackmann/File.h 2005-08-19 21:21:05 UTC (rev 17443) @@ -18,7 +18,7 @@ class File { public: -#ifdef _MSC_VER +#ifdef WIN32 typedef __int64 fileoff_t; typedef unsigned __int64 filesize_t; #else//_MSC_VER _____ Modified: trunk/irc/ArchBlackmann/auto_vector.h --- trunk/irc/ArchBlackmann/auto_vector.h 2005-08-19 21:21:04 UTC (rev 17442) +++ trunk/irc/ArchBlackmann/auto_vector.h 2005-08-19 21:21:05 UTC (rev 17443) @@ -53,7 +53,7 @@ { ASSERT ( i < _end ); reserve ( i + 1 ); - _arr[i].reset ( ptr ); + _arr[i].reset ( p ); } void push_back ( auto_ptr<T>& p ) _____ Modified: trunk/irc/ArchBlackmann/ssprintf.cpp --- trunk/irc/ArchBlackmann/ssprintf.cpp 2005-08-19 21:21:04 UTC (rev 17442) +++ trunk/irc/ArchBlackmann/ssprintf.cpp 2005-08-19 21:21:05 UTC (rev 17443) @@ -551,7 +551,7 @@ return true; } -static int string(std::string& f, const char* s, int len, int field_width, int precision, int flags) +static int stringa(std::string& f, const char* s, int len, int field_width, int precision, int flags) { int i, done = 0; if (s == NULL) @@ -654,7 +654,7 @@ long double _ldouble; double _double; const char *s; - const unsigned short* sw; + const wchar_t* sw; int result; std::string f; @@ -793,12 +793,12 @@ case 's': if (qualifier == 'l' || qualifier == 'w') { /* print unicode string */ - sw = va_arg(args, wchar_t *); + sw = (const wchar_t*)va_arg(args, wchar_t *); result = stringw(f, sw, -1, field_width, precision, flags); } else { /* print ascii string */ s = va_arg(args, char *); - result = string(f, s, -1, field_width, precision, flags); + result = stringa(f, s, -1, field_width, precision, flags); } if (result < 0) { @@ -811,10 +811,10 @@ if (qualifier == 'h') { /* print ascii string */ s = va_arg(args, char *); - result = string(f, s, -1, field_width, precision, flags); + result = stringa(f, s, -1, field_width, precision, flags); } else { /* print unicode string */ - sw = va_arg(args, wchar_t *); + sw = (const wchar_t*)va_arg(args, wchar_t *); result = stringw(f, sw, -1, field_width, precision, flags); } if (result < 0) @@ -846,7 +846,7 @@ s = pas->Buffer; len = pas->Length; } - result = string(f, s, -1, field_width, precision, flags); + result = stringa(f, s, -1, field_width, precision, flags); } if (result < 0) return -1;

1 0

[sedwards] 17442: mixed case sucks
by sedwards＠svn.reactos.com 19 Aug '05

19 Aug '05

mixed case sucks Modified: trunk/irc/ArchBlackmann/cram_md5.cpp _____ Modified: trunk/irc/ArchBlackmann/cram_md5.cpp --- trunk/irc/ArchBlackmann/cram_md5.cpp 2005-08-19 20:56:01 UTC (rev 17441) +++ trunk/irc/ArchBlackmann/cram_md5.cpp 2005-08-19 21:21:04 UTC (rev 17442) @@ -2,7 +2,7 @@ // This file is (C) 2004 Royce Mitchell III // and released under the BSD & LGPL licenses -#include "md5.h" +#include "MD5.h" #include "cram_md5.h" #include "base64.h"

1 0

[gvg] 17441: Add generation of 8bpp DIB code
by gvg＠svn.reactos.com 19 Aug '05

19 Aug '05

Add generation of 8bpp DIB code Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c Modified: trunk/reactos/subsys/win32k/win32k.xml Modified: trunk/reactos/tools/gendib/gendib.c Modified: trunk/reactos/tools/gendib/gendib.mak _____ Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c --- trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-08-19 19:05:59 UTC (rev 17440) +++ trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-08-19 20:56:01 UTC (rev 17441) @@ -252,114 +252,17 @@ return TRUE; } -BOOLEAN -DIB_8BPP_BitBlt(PBLTINFO BltInfo) -{ - ULONG DestX, DestY; - ULONG SourceX, SourceY; - ULONG PatternY = 0; - ULONG Dest, Source = 0, Pattern = 0; - BOOL UsesSource; - BOOL UsesPattern; - PULONG DestBits; - LONG RoundedRight; - - UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4); - UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4); - - SourceY = BltInfo->SourcePoint.y; - RoundedRight = BltInfo->DestRect.right - - ((BltInfo->DestRect.right - BltInfo->DestRect.left) & 0x7); - - if (UsesPattern) - { - if (BltInfo->PatternSurface) - { - PatternY = (BltInfo->DestRect.top + BltInfo->BrushOrigin.y) % - BltInfo->PatternSurface->sizlBitmap.cy; - } - else - { - Pattern = BltInfo->Brush->iSolidColor | - (BltInfo->Brush->iSolidColor << 8) | - (BltInfo->Brush->iSolidColor << 16) | - (BltInfo->Brush->iSolidColor << 24); - } - } - - for (DestY = BltInfo->DestRect.top; DestY < BltInfo->DestRect.bottom; DestY++) - { - SourceX = BltInfo->SourcePoint.x; - DestBits = (PULONG)( - (PBYTE)BltInfo->DestSurface->pvScan0 + - BltInfo->DestRect.left + - DestY * BltInfo->DestSurface->lDelta); - - for (DestX = BltInfo->DestRect.left; DestX < RoundedRight; DestX += 4, DestBits++) - { - Dest = *DestBits; - - if (UsesSource) - { - Source = DIB_GetSource(BltInfo->SourceSurface, SourceX + (DestX - BltInfo->DestRect.left), SourceY, BltInfo->XlateSourceToDest); - Source |= DIB_GetSource(BltInfo->SourceSurface, SourceX + (DestX - BltInfo->DestRect.left) + 1, SourceY, BltInfo->XlateSourceToDest) << 8; - Source |= DIB_GetSource(BltInfo->SourceSurface, SourceX + (DestX - BltInfo->DestRect.left) + 2, SourceY, BltInfo->XlateSourceToDest) << 16; - Source |= DIB_GetSource(BltInfo->SourceSurface, SourceX + (DestX - BltInfo->DestRect.left) + 3, SourceY, BltInfo->XlateSourceToDest) << 24; - } - - 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) << 8; - Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 2) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 16; - Pattern |= DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x + 3) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest) << 24; - } - - *DestBits = DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern); - } - - if (DestX < BltInfo->DestRect.right) - { - for (; DestX < BltInfo->DestRect.right; DestX++) - { - Dest = DIB_8BPP_GetPixel(BltInfo->DestSurface, DestX, DestY); - - if (UsesSource) - { - Source = DIB_GetSource(BltInfo->SourceSurface, SourceX + (DestX - BltInfo->DestRect.left), SourceY, BltInfo->XlateSourceToDest); - } - - if (BltInfo->PatternSurface) - { - Pattern = DIB_GetSource(BltInfo->PatternSurface, (DestX + BltInfo->BrushOrigin.x) % BltInfo->PatternSurface->sizlBitmap.cx, PatternY, BltInfo->XlatePatternToDest); - } - - DIB_8BPP_PutPixel(BltInfo->DestSurface, DestX, DestY, DIB_DoRop(BltInfo->Rop4, Dest, Source, Pattern) & 0xFFFF); - } - } - - SourceY++; - if (BltInfo->PatternSurface) - { - PatternY++; - PatternY %= BltInfo->PatternSurface->sizlBitmap.cy; - } - } - - return TRUE; -} - /* BitBlt Optimize */ BOOLEAN DIB_8BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color) { ULONG DestY; - for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++) - { - DIB_8BPP_HLine (DestSurface, DestRect->left, DestRect->right, DestY, color); - } + for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++) + { + DIB_8BPP_HLine(DestSurface, DestRect->left, DestRect->right, DestY, color); + } - return TRUE; + return TRUE; } /* ======================================= _____ Modified: trunk/reactos/subsys/win32k/win32k.xml --- trunk/reactos/subsys/win32k/win32k.xml 2005-08-19 19:05:59 UTC (rev 17440) +++ trunk/reactos/subsys/win32k/win32k.xml 2005-08-19 20:56:01 UTC (rev 17441) @@ -14,6 +14,7 @@ <file>dib1bpp.c</file> <file>dib4bpp.c</file> <file>dib8bpp.c</file> + <file>dib8gen.c</file> <file>dib16bpp.c</file> <file>dib16gen.c</file> <file>dib24bpp.c</file> _____ Modified: trunk/reactos/tools/gendib/gendib.c --- trunk/reactos/tools/gendib/gendib.c 2005-08-19 19:05:59 UTC (rev 17440) +++ trunk/reactos/tools/gendib/gendib.c 2005-08-19 20:56:01 UTC (rev 17441) @@ -263,11 +263,16 @@ Cast = ""; Dest = "*DestPtr"; } - else + else if (16 == Bpp) { Cast = "(USHORT) "; Dest = "*((PUSHORT) DestPtr)"; } + else + { + Cast = "(UCHAR) "; + Dest = "*((PUCHAR) DestPtr)"; + } Output(Out, "%s = ", Dest); if (ROPCODE_GENERIC == RopInfo->RopCode) { @@ -448,11 +453,24 @@ MARK(Out); if (32 != Bpp) { - Output(Out, "LeftCount = ((ULONG_PTR) DestBase >> 1) & 0x01;\n"); + if (8 < Bpp) + { + Output(Out, "LeftCount = ((ULONG_PTR) DestBase >> 1) & 0x01;\n"); + } + else + { + Output(Out, "LeftCount = (ULONG_PTR) DestBase & 0x03;\n"); + Output(Out, "if (BltInfo->DestRect.right - BltInfo->DestRect.left < " + "LeftCount)\n"); + Output(Out, "{\n"); + Output(Out, "LeftCount = BltInfo->DestRect.right - " + "BltInfo->DestRect.left;\n"); + Output(Out, "}\n"); + } Output(Out, "CenterCount = (BltInfo->DestRect.right - BltInfo->DestRect.left -\n"); - Output(Out, " LeftCount) / 2;\n"); + Output(Out, " LeftCount) / %u;\n", 32 / Bpp); Output(Out, "RightCount = (BltInfo->DestRect.right - BltInfo->DestRect.left -\n"); - Output(Out, " LeftCount - 2 * CenterCount);\n"); + Output(Out, " LeftCount - %u * CenterCount);\n", 32 / Bpp); } else { @@ -461,6 +479,36 @@ } static void +CreateSetSinglePixel(FILE *Out, unsigned Bpp, PROPINFO RopInfo, int Flags, + unsigned SourceBpp) +{ + 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"); + 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 + %u);\n", Bpp / 8); +} + +static void CreateBitCase(FILE *Out, unsigned Bpp, PROPINFO RopInfo, int Flags, unsigned SourceBpp) { @@ -536,33 +584,19 @@ Output(Out, "\n"); if (32 != Bpp) { - Output(Out, "if (0 != LeftCount)\n"); - Output(Out, "{\n"); - if (RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) + if (16 == Bpp) { - CreateGetSource(Out, Bpp, RopInfo, Flags | FLAG_FORCERAWSOURCEAVAIL, - SourceBpp, 0); - MARK(Out); + Output(Out, "if (0 != LeftCount)\n"); } - if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) + else { - 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, "for (i = 0; i < LeftCount; i++)\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"); + Output(Out, "{\n"); + CreateSetSinglePixel(Out, Bpp, RopInfo, + (16 == Bpp ? Flags | FLAG_FORCERAWSOURCEAVAIL : + Flags), SourceBpp); MARK(Out); - Output(Out, "\n"); - Output(Out, "DestPtr = (PULONG)((char *) DestPtr + 2);\n"); Output(Out, "}\n"); Output(Out, "\n"); } @@ -606,24 +640,16 @@ Output(Out, "\n"); if (32 != Bpp) { - Output(Out, "if (0 != RightCount)\n"); - Output(Out, "{\n"); - if (RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) + if (16 == Bpp) { - CreateGetSource(Out, Bpp, RopInfo, Flags, SourceBpp, 0); - MARK(Out); + Output(Out, "if (0 != RightCount)\n"); } - if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) + else { - Output(Out, "Pattern = DIB_GetSource(BltInfo->PatternSurface, PatternX, PatternY, BltInfo->XlatePatternToDest);\n"); + Output(Out, "for (i = 0; i < RightCount; i++)\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"); + Output(Out, "{\n"); + CreateSetSinglePixel(Out, Bpp, RopInfo, Flags, SourceBpp); MARK(Out); Output(Out, "}\n"); Output(Out, "\n"); @@ -998,7 +1024,7 @@ { unsigned Index; static unsigned DestBpp[] = - { 16, 32 }; + { 8, 16, 32 }; for (Index = 0; Index < sizeof(DestBpp) / sizeof(DestBpp[0]); Index++) { _____ Modified: trunk/reactos/tools/gendib/gendib.mak --- trunk/reactos/tools/gendib/gendib.mak 2005-08-19 19:05:59 UTC (rev 17440) +++ trunk/reactos/tools/gendib/gendib.mak 2005-08-19 20:56:01 UTC (rev 17441) @@ -44,8 +44,9 @@ GENDIB_DIB_DIR = subsys$(SEP)win32k$(SEP)dib GENDIB_DIB_FILES = \ + $(GENDIB_DIB_DIR)$(SEP)dib32gen.c \ $(GENDIB_DIB_DIR)$(SEP)dib16gen.c \ - $(GENDIB_DIB_DIR)$(SEP)dib32gen.c + $(GENDIB_DIB_DIR)$(SEP)dib8gen.c $(GENDIB_DIB_FILES): $(GENDIB_TARGET) $(ECHO_GENDIB)

1 0

[sedwards] 17440: Added support for MOVEFILE_DELAY_UNTIL_REBOOT, based on Wine code by Gerhard W. Gruber and others. Still requires smss to check the key.
by sedwards＠svn.reactos.com 19 Aug '05

19 Aug '05

Added support for MOVEFILE_DELAY_UNTIL_REBOOT, based on Wine code by Gerhard W. Gruber and others. Still requires smss to check the key. Modified: trunk/reactos/lib/kernel32/file/move.c _____ Modified: trunk/reactos/lib/kernel32/file/move.c --- trunk/reactos/lib/kernel32/file/move.c 2005-08-19 17:13:37 UTC (rev 17439) +++ trunk/reactos/lib/kernel32/file/move.c 2005-08-19 19:05:59 UTC (rev 17440) @@ -5,6 +5,7 @@ * FILE: lib/kernel32/file/file.c * PURPOSE: Directory functions * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) + * Gerhard W. Gruber (sparhawk_at_gmx.at) * UPDATE HISTORY: * Created 01/11/98 */ @@ -147,7 +148,153 @@ return Result; } +/********************************************************************** * + * add_boot_rename_entry + * + * Adds an entry to the registry that is loaded when windows boots and + * checks if there are some files to be removed or renamed/moved. + * <fn1> has to be valid and <fn2> may be NULL. If both pointers are + * non-NULL then the file is moved, otherwise it is deleted. The + * entry of the registrykey is always appended with two zero + * terminated strings. If <fn2> is NULL then the second entry is + * simply a single 0-byte. Otherwise the second filename goes + * there. The entries are prepended with \??\ before the path and the + * second filename gets also a '!' as the first character if + * MOVEFILE_REPLACE_EXISTING is set. After the final string another + * 0-byte follows to indicate the end of the strings. + * i.e.: + * \??\D:\test\file1[0] + * !\??\D:\test\file1_renamed[0] + * \??\D:\Test|delete[0] + * [0] <- file is to be deleted, second string empty + * \??\D:\test\file2[0] + * !\??\D:\test\file2_renamed[0] + * [0] <- indicates end of strings + * + * or: + * \??\D:\test\file1[0] + * !\??\D:\test\file1_renamed[0] + * \??\D:\Test|delete[0] + * [0] <- file is to be deleted, second string empty + * [0] <- indicates end of strings + * + */ +static BOOL add_boot_rename_entry( LPCWSTR source, LPCWSTR dest, DWORD flags ) +{ + static const WCHAR ValueName[] = {'P','e','n','d','i','n','g', + 'F','i','l','e','R','e','n','a','m','e', + 'O','p','e','r','a','t','i','o','n','s',0}; + static const WCHAR SessionW[] = {'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\' , + 'C','o','n','t','r','o','l','\\', + 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r',0}; + static const int info_size = FIELD_OFFSET( KEY_VALUE_PARTIAL_INFORMATION, Data ); + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW, source_name, dest_name; + KEY_VALUE_PARTIAL_INFORMATION *info; + BOOL rc = FALSE; + HANDLE Reboot = 0; + DWORD len1, len2; + DWORD DataSize = 0; + BYTE *Buffer = NULL; + WCHAR *p; + + DPRINT("Add support to smss for keys created by MOVEFILE_DELAY_UNTIL_REBOOT\n"); + + if (!RtlDosPathNameToNtPathName_U( (LPWSTR)source, &source_name, NULL, NULL )) + { + SetLastError( ERROR_PATH_NOT_FOUND ); + return FALSE; + } + dest_name.Buffer = NULL; + if (dest && !RtlDosPathNameToNtPathName_U( (LPWSTR)dest, &dest_name, NULL, NULL )) + { + RtlFreeUnicodeString( &source_name ); + SetLastError( ERROR_PATH_NOT_FOUND ); + return FALSE; + } + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, SessionW ); + + if (NtCreateKey( &Reboot, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) != STATUS_SUCCESS) + { + DPRINT1("Error creating key for reboot managment [%s]\n", + "SYSTEM\\CurrentControlSet\\Control\\Session Manager"); + RtlFreeUnicodeString( &source_name ); + RtlFreeUnicodeString( &dest_name ); + return FALSE; + } + + len1 = source_name.Length + sizeof(WCHAR); + if (dest) + { + len2 = dest_name.Length + sizeof(WCHAR); + if (flags & MOVEFILE_REPLACE_EXISTING) + len2 += sizeof(WCHAR); /* Plus 1 because of the leading '!' */ + } + else len2 = sizeof(WCHAR); /* minimum is the 0 characters for the empty second string */ + + RtlInitUnicodeString( &nameW, ValueName ); + + /* First we check if the key exists and if so how many bytes it already contains. */ + if (NtQueryValueKey( Reboot, &nameW, KeyValuePartialInformation, + NULL, 0, &DataSize ) == STATUS_BUFFER_OVERFLOW) + { + if (!(Buffer = HeapAlloc( GetProcessHeap(), 0, DataSize + len1 + len2 + sizeof(WCHAR) ))) + goto Quit; + if (NtQueryValueKey( Reboot, &nameW, KeyValuePartialInformation, + Buffer, DataSize, &DataSize )) goto Quit; + info = (KEY_VALUE_PARTIAL_INFORMATION *)Buffer; + if (info->Type != REG_MULTI_SZ) goto Quit; + if (DataSize > sizeof(info)) DataSize -= sizeof(WCHAR); /* remove terminating null (will be added back later) */ + } + else + { + DataSize = info_size; + if (!(Buffer = HeapAlloc( GetProcessHeap(), 0, DataSize + len1 + len2 + sizeof(WCHAR) ))) + goto Quit; + } + + memcpy( Buffer + DataSize, source_name.Buffer, len1 ); + DataSize += len1; + p = (WCHAR *)(Buffer + DataSize); + if (dest) + { + if (flags & MOVEFILE_REPLACE_EXISTING) + *p++ = '!'; + memcpy( p, dest_name.Buffer, len2 ); + DataSize += len2; + } + else + { + *p = 0; + DataSize += sizeof(WCHAR); + } + + /* add final null */ + p = (WCHAR *)(Buffer + DataSize); + *p = 0; + DataSize += sizeof(WCHAR); + + rc = !NtSetValueKey(Reboot, &nameW, 0, REG_MULTI_SZ, Buffer + info_size, DataSize - info_size); + + Quit: + RtlFreeUnicodeString( &source_name ); + RtlFreeUnicodeString( &dest_name ); + if (Reboot) NtClose(Reboot); + HeapFree( GetProcessHeap(), 0, Buffer ); + return(rc); +} + + /* * @implemented */ @@ -170,6 +317,9 @@ DPRINT("MoveFileWithProgressW()\n"); + if (dwFlags & MOVEFILE_DELAY_UNTIL_REBOOT) + return add_boot_rename_entry( lpExistingFileName, lpNewFileName, dwFlags ); + hFile = CreateFileW (lpExistingFileName, GENERIC_ALL, FILE_SHARE_WRITE|FILE_SHARE_READ,

1 0

[amunger] 17439: Merge TimeOut fix from trunk.
by amunger＠svn.reactos.com 19 Aug '05

19 Aug '05

Merge TimeOut fix from trunk. Modified: branches/ros-branch-0_2_7/reactos/subsys/system/usetup/bootsup.c _____ Modified: branches/ros-branch-0_2_7/reactos/subsys/system/usetup/bootsup.c --- branches/ros-branch-0_2_7/reactos/subsys/system/usetup/bootsup.c 2005-08-19 15:28:41 UTC (rev 17438) +++ branches/ros-branch-0_2_7/reactos/subsys/system/usetup/bootsup.c 2005-08-19 17:13:37 UTC (rev 17439) @@ -50,14 +50,12 @@ L"DefaultOS", L"ReactOS"); -#if 0 /* Timeout=10 */ IniCacheInsertKey(IniSection, NULL, INSERT_LAST, L"TimeOut", L"10"); -#endif /* Create "Display" section */ IniSection = IniCacheAppendSection(IniCache, @@ -167,13 +165,6 @@ INSERT_LAST, L"SelectedColor", L"Gray"); - - /* TimeOut=5 */ - IniCacheInsertKey(IniSection, - NULL, - INSERT_LAST, - L"TimeOut", - L"5"); }

1 0

[ea] 17438: XML chunks are required to contain a single node.
by ea＠svn.reactos.com 19 Aug '05

19 Aug '05

XML chunks are required to contain a single node. Modified: trunk/reactos/include/idl/idl.xml _____ Modified: trunk/reactos/include/idl/idl.xml --- trunk/reactos/include/idl/idl.xml 2005-08-19 15:27:39 UTC (rev 17437) +++ trunk/reactos/include/idl/idl.xml 2005-08-19 15:28:41 UTC (rev 17438) @@ -1,3 +1,4 @@ +<group> <module name="pnp_server" type="rpcserver"> <include base="ReactOS">.</include> <include base="ReactOS">w32api/include</include> @@ -22,3 +23,4 @@ <define name="_X86_" /> <file switches="-o">svcctl.idl</file> </module> +</group>

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