Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 44336: - Merge 44301 (network revert).
by fireball＠svn.reactos.org 30 Nov '09

30 Nov '09

Author: fireball Date: Mon Nov 30 22:52:07 2009 New Revision: 44336 URL: http://svn.reactos.org/svn/reactos?rev=44336&view=rev Log: - Merge 44301 (network revert). Added: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/irp.h - copied unchanged from r44301, trunk/reactos/drivers/network/tcpip/include/irp.h branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/memtrack.h - copied unchanged from r44301, trunk/reactos/drivers/network/tcpip/include/memtrack.h branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/recmutex/ (props changed) - copied from r44301, trunk/reactos/drivers/network/tcpip/recmutex/ branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/irp.c - copied unchanged from r44301, trunk/reactos/drivers/network/tcpip/tcpip/irp.c branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/memtrack.c - copied unchanged from r44301, trunk/reactos/lib/drivers/ip/network/memtrack.c branches/ros-branch-0_3_11/reactos/lib/drivers/oskittcp/include/memtrack.h - copied unchanged from r44301, trunk/reactos/lib/drivers/oskittcp/include/memtrack.h Removed: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/tags.h Modified: branches/ros-branch-0_3_11/reactos/ (props changed) branches/ros-branch-0_3_11/reactos/dll/directx/d3d8/d3d8.spec (props changed) branches/ros-branch-0_3_11/reactos/dll/directx/dsound_new/ (props changed) branches/ros-branch-0_3_11/reactos/dll/directx/dsound_new/classfactory.c (props changed) branches/ros-branch-0_3_11/reactos/dll/directx/dsound_new/dsound.spec (props changed) branches/ros-branch-0_3_11/reactos/dll/directx/dsound_new/regsvr.c (props changed) branches/ros-branch-0_3_11/reactos/dll/shellext/devcpux/devcpux.spec (props changed) branches/ros-branch-0_3_11/reactos/dll/shellext/slayer/slayer.spec (props changed) branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/datalink/lan.c branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/address.h branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/datagram.h branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/debug.h branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/dispatch.h branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/fileobjs.h branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/ip.h branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/lock.h branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/neighbor.h branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/precomp.h branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/routines.h branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/tcp.h branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/titypes.h branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip.rbuild branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/ainfo.c branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/buffer.c branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/dispatch.c branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/fileobjs.c branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/iinfo.c branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/lock.c branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/main.c branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/mocklock.c branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/ninfo.c branches/ros-branch-0_3_11/reactos/include/ndk/amd64/ (props changed) branches/ros-branch-0_3_11/reactos/include/ndk/amd64/asmmacro.S (props changed) branches/ros-branch-0_3_11/reactos/lib/drivers/ip/ip.rbuild branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/address.c branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/ip.c branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/neighbor.c branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/ports.c branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/receive.c branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/router.c branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/routines.c branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/transmit.c branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/datagram/datagram.c branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/rawip/rawip.c branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/tcp/accept.c branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/tcp/event.c branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/tcp/if.c branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/tcp/tcp.c branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/udp/udp.c branches/ros-branch-0_3_11/reactos/lib/drivers/oskittcp/include/oskittcp.h branches/ros-branch-0_3_11/reactos/lib/drivers/oskittcp/oskittcp/interface.c branches/ros-branch-0_3_11/reactos/lib/sdk/crt/time/ (props changed) branches/ros-branch-0_3_11/reactos/subsystems/win32/win32k/include/engobjects.h (props changed) branches/ros-branch-0_3_11/reactos/tools/rsym/log2lines.c (props changed) branches/ros-branch-0_3_11/reactos/tools/rsym/log2lines.mak (props changed) branches/ros-branch-0_3_11/reactos/tools/rsym/rsym.c (props changed) branches/ros-branch-0_3_11/reactos/tools/rsym/rsym.h (props changed) branches/ros-branch-0_3_11/reactos/tools/rsym/rsym.mak (props changed) branches/ros-branch-0_3_11/reactos/tools/rsym/rsym_common.c (props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/address.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/datagram.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/debug.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/dispatch.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/fileobjs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/ip.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/lock.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/neighbor.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/routines.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Removed: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/tags.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/tcp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/include/titypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/ainfo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/buffer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/iinfo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/lock.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/mocklock.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/drivers/network/tcpip/tcpip/ninfo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/ip.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/d… Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/address.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/d… Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/d… Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/d… Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/ports.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/d… Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/receive.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/d… Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/router.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/d… Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/routines.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/d… Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/network/transmit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/d… Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/datagram/datagram.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/d… Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/d… Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/d… Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/d… Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/tcp/if.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/d… Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/d… Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/d… Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/oskittcp/include/oskittcp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/d… Modified: branches/ros-branch-0_3_11/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/lib/d…

1 0

[dgorbachev] 44335: Update log2lines to version 1.4. Jan Roeloffzen, bug #4342.
by dgorbachev＠svn.reactos.org 30 Nov '09

30 Nov '09

Author: dgorbachev Date: Mon Nov 30 22:49:18 2009 New Revision: 44335 URL: http://svn.reactos.org/svn/reactos?rev=44335&view=rev Log: Update log2lines to version 1.4. Jan Roeloffzen, bug #4342. Modified: trunk/reactos/tools/rsym/log2lines.c Modified: trunk/reactos/tools/rsym/log2lines.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/log2lines.c?rev… ============================================================================== --- trunk/reactos/tools/rsym/log2lines.c [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/log2lines.c [iso-8859-1] Mon Nov 30 22:49:18 2009 @@ -1,14 +1,6 @@ /* - * Usage: log2lines [-cd:fFhmrv] [<exefile> <offset>] - * Try log2lines -h - * - * This is a tool and is compiled using the host compiler, - * i.e. on Linux gcc and not mingw-gcc (cross-compiler). - * Therefore we can't include SDK headers and we have to - * duplicate some definitions here. - * Also note that the internal functions are "old C-style", - * returning an int, where a return of 0 means success and - * non-zero is failure. + * ReactOS log2lines + * Written by Jan Roeloffzen */ #include <stdio.h> @@ -18,7 +10,7 @@ #include "rsym.h" -#define LOG2LINES_VERSION "1.1" +#define LOG2LINES_VERSION "1.4" #define INVALID_BASE 0xFFFFFFFFL @@ -34,7 +26,7 @@ #define CP_CMD "copy /Y " #define DIR_FMT "dir /a:-d /s /b %s > %s" -#else /* not defined (__DJGPP__) || defined (__WIN32__) */ +#else /* not defined (__DJGPP__) || defined (__WIN32__) */ #include <errno.h> #include <limits.h> @@ -48,16 +40,25 @@ #define CP_CMD "cp -f " #define DIR_FMT "find %s -type f > %s" -#endif /* not defined (__DJGPP__) || defined (__WIN32__) */ +#endif /* not defined (__DJGPP__) || defined (__WIN32__) */ #define CP_FMT CP_CMD "%s %s > " DEV_NULL #define CMD_7Z "7z" +//#define UNZIP_FMT_7Z "%s e -y %s -o%s > " DEV_NULL +#define UNZIP_FMT_7Z "%s e -y %s -o%s" #define UNZIP_FMT "%s x -y -r %s -o%s > " DEV_NULL #define UNZIP_FMT_CAB \ "%s x -y -r %s" PATH_STR "reactos" PATH_STR "reactos.cab -o%s" PATH_STR "reactos" PATH_STR "reactos > " DEV_NULL #define LINESIZE 1024 + +#define log(outFile, fmt, ...) \ + { \ + fprintf(outFile, fmt, ##__VA_ARGS__); \ + if (logFile) \ + fprintf(logFile, fmt, ##__VA_ARGS__); \ + } struct entry_struct { @@ -79,20 +80,21 @@ struct summ_struct { - int translated; - int undo; - int redo; - int skipped; - int diff; - int offset_errors; - int total; + int translated; + int undo; + int redo; + int skipped; + int diff; + int majordiff; + int offset_errors; + int total; }; typedef struct cache_struct CACHE; -typedef struct summ_struct SUMM; - -static CACHE cache; -static SUMM summ; +typedef struct summ_struct SUMM; + +static CACHE cache; +static SUMM summ; static char *optchars = "bcd:fFhl:mMrstTuUvz:"; static int opt_buffered= 0; // -b @@ -112,7 +114,7 @@ static char opt_dir[MAX_PATH]; // -d static char opt_logFile[MAX_PATH]; // -l static char opt_7z[MAX_PATH]; // -z -static char opt_scanned[LINESIZE]; // all scanned options +static char opt_scanned[LINESIZE]; // all scanned options static FILE *logFile = NULL; static char *cache_name; @@ -152,11 +154,11 @@ } static PROSSYM_ENTRY -find_offset(void *data, size_t offset, char *toString) -{ - PSYMBOLFILE_HEADER RosSymHeader = (PSYMBOLFILE_HEADER) data; - PROSSYM_ENTRY Entries = (PROSSYM_ENTRY) ((char *)data + RosSymHeader->SymbolsOffset); - size_t symbols = RosSymHeader->SymbolsLength / sizeof (ROSSYM_ENTRY); +find_offset(void *data, size_t offset) +{ + PSYMBOLFILE_HEADER RosSymHeader = (PSYMBOLFILE_HEADER)data; + PROSSYM_ENTRY Entries = (PROSSYM_ENTRY)((char *)data + RosSymHeader->SymbolsOffset); + size_t symbols = RosSymHeader->SymbolsLength / sizeof(ROSSYM_ENTRY); size_t i; for (i = 0; i < symbols; i++) @@ -177,80 +179,108 @@ static int print_offset(void *data, size_t offset, char *toString) { - PSYMBOLFILE_HEADER RosSymHeader = (PSYMBOLFILE_HEADER) data; + PSYMBOLFILE_HEADER RosSymHeader = (PSYMBOLFILE_HEADER)data; PROSSYM_ENTRY e = NULL; PROSSYM_ENTRY e2 = NULL; + int bFileOffsetChanged = 0; + char fmt[LINESIZE]; char *Strings = (char *)data + RosSymHeader->StringsOffset; - - e = find_offset(data, offset, toString); + fmt[0] = '\0'; + e = find_offset(data, offset); if (opt_twice) { - e2 = find_offset(data, offset-1, toString); - - if ( e == e2 ) + e2 = find_offset(data, offset - 1); + + if (e == e2) e2 = NULL; - - if ( opt_Twice && e2 ) + else + summ.diff++; + + if (opt_Twice && e2) { e = e2; e2 = NULL; - /* replaced (transparantly), but update stats: */ - summ.diff ++; - } - } - if ( e || e2 ) - { - if (toString) - { // put in toString if provided - if ( e2 ) - { - snprintf(toString, LINESIZE, "%s:%u (%s) [%s:%u (%s)]", + /* replaced (transparantly), but updated stats */ + } + } + if (e || e2) + { + if (e2) + { + bFileOffsetChanged = e->FileOffset != e2->FileOffset; + if (e->FileOffset != e2->FileOffset || e->FunctionOffset != e2->FunctionOffset) + summ.majordiff++; + + /* + * - "%.0s" displays nothing, but processes argument + * - bFileOffsetChanged implies always display 2nd SourceLine even if the same + * - also for FunctionOffset + */ + strcat(fmt, "%s"); + if (bFileOffsetChanged) + strcat(fmt, "[%s]"); + else + strcat(fmt, "%.0s"); + + strcat(fmt, ":%u"); + if (e->SourceLine != e2->SourceLine || bFileOffsetChanged) + strcat(fmt, "[%u]"); + else + strcat(fmt, "%.0u"); + + strcat(fmt, " (%s"); + if (e->FunctionOffset != e2->FunctionOffset || bFileOffsetChanged) + strcat(fmt, "[%s])"); + else + strcat(fmt, "%.0s)"); + + if (toString) + { // put in toString if provided + snprintf(toString, LINESIZE, fmt, &Strings[e->FileOffset], + &Strings[e2->FileOffset], (unsigned int)e->SourceLine, + (unsigned int)e2->SourceLine, &Strings[e->FunctionOffset], - &Strings[e2->FileOffset], - (unsigned int)e2->SourceLine, &Strings[e2->FunctionOffset]); - summ.diff ++; } else { + strcat(fmt, "\n"); + printf(fmt, + &Strings[e->FileOffset], + &Strings[e2->FileOffset], + (unsigned int)e->SourceLine, + (unsigned int)e2->SourceLine, + &Strings[e->FunctionOffset], + &Strings[e2->FunctionOffset]); + } + } + else + { + if (toString) + { // put in toString if provided snprintf(toString, LINESIZE, "%s:%u (%s)", &Strings[e->FileOffset], (unsigned int)e->SourceLine, &Strings[e->FunctionOffset]); } - return 0; - } - else - { // to stdout - if ( e2 ) - { - printf("%s:%u (%s) [%s:%u (%s)]\n", + else + { + printf("%s:%u (%s)\n", &Strings[e->FileOffset], (unsigned int)e->SourceLine, - &Strings[e->FunctionOffset], - &Strings[e2->FileOffset], - (unsigned int)e2->SourceLine, - &Strings[e2->FunctionOffset]); - summ.diff ++; - } - else - { - printf("%s:%u (%s)\n", - &Strings[e->FileOffset], - (unsigned int)e->SourceLine, &Strings[e->FunctionOffset]); } - return 0; - } + } + return 0; } return 1; } static int -process_data(const void *FileData, size_t FileSize, size_t offset, char *toString) +process_data(const void *FileData, size_t offset, char *toString) { PIMAGE_DOS_HEADER PEDosHeader; PIMAGE_FILE_HEADER PEFileHeader; @@ -261,24 +291,24 @@ int res; /* Check if MZ header exists */ - PEDosHeader = (PIMAGE_DOS_HEADER) FileData; + PEDosHeader = (PIMAGE_DOS_HEADER)FileData; if (PEDosHeader->e_magic != IMAGE_DOS_MAGIC || PEDosHeader->e_lfanew == 0L) { fprintf(stderr, "Input file is not a PE image.\n"); - summ.offset_errors ++; + summ.offset_errors++; return 1; } /* Locate PE file header */ /* sizeof(ULONG) = sizeof(MAGIC) */ - PEFileHeader = (PIMAGE_FILE_HEADER) ((char *)FileData + PEDosHeader->e_lfanew + sizeof (ULONG)); + PEFileHeader = (PIMAGE_FILE_HEADER)((char *)FileData + PEDosHeader->e_lfanew + sizeof(ULONG)); /* Locate optional header */ - PEOptHeader = (PIMAGE_OPTIONAL_HEADER) (PEFileHeader + 1); + PEOptHeader = (PIMAGE_OPTIONAL_HEADER)(PEFileHeader + 1); ImageBase = PEOptHeader->ImageBase; /* Locate PE section headers */ - PESectionHeaders = (PIMAGE_SECTION_HEADER) ((char *)PEOptHeader + PEFileHeader->SizeOfOptionalHeader); + PESectionHeaders = (PIMAGE_SECTION_HEADER)((char *)PEOptHeader + PEFileHeader->SizeOfOptionalHeader); /* make sure offset is what we want */ offset = fixup_offset(ImageBase, offset); @@ -288,7 +318,7 @@ if (!PERosSymSectionHeader) { fprintf(stderr, "Couldn't find rossym section in executable\n"); - summ.offset_errors ++; + summ.offset_errors++; return 1; } res = print_offset((char *)FileData + PERosSymSectionHeader->PointerToRawData, offset, toString); @@ -303,16 +333,15 @@ printf("??:0\n"); } fprintf(stderr, "Offset not found.\n"); - summ.offset_errors ++; + summ.offset_errors++; } return res; } -static long -my_atoi(const char *a) -{ - int i = 0; +static const char * +getFmt(const char *a) +{ const char *fmt = "%x"; if (*a == '0') @@ -332,8 +361,24 @@ break; } } - sscanf(a, fmt, &i); + return fmt; +} + +static long +my_atoi(const char *a) +{ + int i = 0; + sscanf(a, getFmt(a), &i); return i; +} + +static int +isOffset(const char *a) +{ + int i = 0; + if (strchr(a, '.')) + return 0; + return sscanf(a, getFmt(a), &i); } static int @@ -387,7 +432,7 @@ } else { - res = process_data(FileData, FileSize, offset, toString); + res = process_data(FileData, offset, toString); free(FileData); } return res; @@ -408,12 +453,12 @@ fr = fopen(fname, "rb"); if (!fr) { - if (opt_verbose) + if (opt_verbose > 2) fprintf(stderr, "get_ImageBase, cannot open '%s' (%s)\n", fname, strerror(errno)); return 1; } - readLen = fread(&PEDosHeader, sizeof (IMAGE_DOS_HEADER), 1, fr); + readLen = fread(&PEDosHeader, sizeof(IMAGE_DOS_HEADER), 1, fr); if (1 != readLen) { if (opt_verbose) @@ -432,8 +477,8 @@ } /* Locate PE file header */ - res = fseek(fr, PEDosHeader.e_lfanew + sizeof (ULONG), SEEK_SET); - readLen = fread(&PEFileHeader, sizeof (IMAGE_FILE_HEADER), 1, fr); + res = fseek(fr, PEDosHeader.e_lfanew + sizeof(ULONG), SEEK_SET); + readLen = fread(&PEFileHeader, sizeof(IMAGE_FILE_HEADER), 1, fr); if (1 != readLen) { if (opt_verbose) @@ -443,7 +488,7 @@ } /* Locate optional header */ - readLen = fread(&PEOptHeader, sizeof (IMAGE_OPTIONAL_HEADER), 1, fr); + readLen = fread(&PEOptHeader, sizeof(IMAGE_OPTIONAL_HEADER), 1, fr); if (1 != readLen) { if (opt_verbose) @@ -453,8 +498,8 @@ } /* Check if it's really an IMAGE_OPTIONAL_HEADER we are interested in */ - if ((PEOptHeader.Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC) && - (PEOptHeader.Magic != IMAGE_NT_OPTIONAL_HDR64_MAGIC)) + if (PEOptHeader.Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC && + PEOptHeader.Magic != IMAGE_NT_OPTIONAL_HDR64_MAGIC) { if (opt_verbose > 1) fprintf(stderr, "get_ImageBase %s, not an IMAGE_NT_OPTIONAL_HDR<32|64>\n", fname); @@ -500,7 +545,7 @@ if (!Line) return NULL; - pentry = malloc(sizeof (CACHE_ENTRY)); + pentry = malloc(sizeof(CACHE_ENTRY)); if (!pentry) return NULL; @@ -557,7 +602,7 @@ if (PATHCMP(name, pnext->name) == 0) { if (pprev) - { // move to head for faster lookup next time + { // move to head for faster lookup next time pprev->pnext = pnext->pnext; pnext->pnext = cache.phead; cache.phead = pnext; @@ -680,7 +725,7 @@ if (*Fname == '\n') *Fname = '\0'; - while ((Fname > Line) && (*Fname != PATH_CHAR)) + while (Fname > Line && *Fname != PATH_CHAR) Fname--; if (*Fname == PATH_CHAR) Fname++; @@ -770,9 +815,9 @@ static char * remove_mark(char *Line) { - if( Line[1] == ' ' && Line[2] == '<' ) - if ( Line[0] == '*' || Line[0] == '?' ) - return Line+2; + if (Line[1] == ' ' && Line[2] == '<') + if (Line[0] == '*' || Line[0] == '?') + return Line + 2; return Line; } @@ -799,33 +844,29 @@ if (cnt == 3 && ch == ' ') { tail = strchr(s, '>'); - tail = tail ? tail-1 : tail; - if (tail && (tail[0] == ')') && (tail[1] == '>') ) + tail = tail ? tail - 1 : tail; + if (tail && tail[0] == ')' && tail[1] == '>') { res = 0; tail += 2; mark = opt_mark ? "* " : ""; if (opt_redo && !(res = translate_file(path, offset, LineOut))) { - fprintf(outFile, "%s<%s:%x (%s)>%s", mark, path, offset, LineOut, tail); - if (logFile) - fprintf(logFile, "%s<%s:%x (%s)>%s", mark, path, offset, LineOut, tail); - summ.redo ++; + log(outFile, "%s<%s:%x (%s)>%s", mark, path, offset, LineOut, tail); + summ.redo++; } else { - fprintf(outFile, "%s<%s:%x>%s", mark, path, offset, tail); - if (logFile) - fprintf(logFile, "%s<%s:%x>%s", mark, path, offset, tail); - summ.undo ++; + log(outFile, "%s<%s:%x>%s", mark, path, offset, tail); + summ.undo++; } } else { mark = opt_Mark ? "? " : ""; - summ.skipped ++; + summ.skipped++; } - summ.total ++; + summ.total++; } } @@ -837,17 +878,15 @@ if (!(res = translate_file(path, offset, LineOut))) { mark = opt_mark ? "* " : ""; - fprintf(outFile, "%s<%s:%x (%s)>%s", mark, path, offset, LineOut, tail); - if (logFile) - fprintf(logFile, "%s<%s:%x (%s)>%s", mark, path, offset, LineOut, tail); - summ.translated ++; + log(outFile, "%s<%s:%x (%s)>%s", mark, path, offset, LineOut, tail); + summ.translated++; } else { mark = opt_Mark ? "? " : ""; - summ.skipped ++; + summ.skipped++; } - summ.total ++; + summ.total++; } } } @@ -855,36 +894,35 @@ { if (sep) *sep = ':'; // restore because not translated - fprintf(outFile, "%s%s", mark, s); // just copy - if (logFile) - fprintf(logFile, "%s%s", mark, s); // just copy + log(outFile, "%s%s", mark, s); } memset(Line, '\0', LINESIZE); // flushed } static void -print_summary(FILE * outFile) +print_summary(FILE *outFile) { if (outFile) { fprintf(outFile, "\n*** LOG2LINES SUMMARY ***\n"); - fprintf(outFile, "Translated: %d\n", summ.translated); - fprintf(outFile, "Reverted: %d\n", summ.undo); - fprintf(outFile, "Retranslated: %d\n", summ.redo); - fprintf(outFile, "Skipped: %d\n", summ.skipped); - fprintf(outFile, "Differ: %d\n", summ.diff); - fprintf(outFile, "Offset error: %d\n", summ.offset_errors); - fprintf(outFile, "Total: %d\n", summ.total); + fprintf(outFile, "Translated: %d\n", summ.translated); + fprintf(outFile, "Reverted: %d\n", summ.undo); + fprintf(outFile, "Retranslated: %d\n", summ.redo); + fprintf(outFile, "Skipped: %d\n", summ.skipped); + fprintf(outFile, "Differ: %d\n", summ.diff); + fprintf(outFile, "Differ (function/source): %d\n", summ.majordiff); + fprintf(outFile, "Offset error: %d\n", summ.offset_errors); + fprintf(outFile, "Total: %d\n", summ.total); fprintf(outFile, "-------------------------------\n"); fprintf(outFile, "Log2lines version: " LOG2LINES_VERSION "\n"); - fprintf(outFile, "Directory: %s\n",opt_dir); - fprintf(outFile, "Passed options: %s\n",opt_scanned); + fprintf(outFile, "Directory: %s\n", opt_dir); + fprintf(outFile, "Passed options: %s\n", opt_scanned); fprintf(outFile, "-------------------------------\n"); } } static int -translate_files(FILE * inFile, FILE * outFile) +translate_files(FILE *inFile, FILE *outFile) { char *Line = malloc(LINESIZE + 1); char *path = malloc(LINESIZE + 1); @@ -927,7 +965,6 @@ translate_line(outFile, Line, path, LineOut); translate_char(c, outFile); } - i = 0; } else { @@ -962,7 +999,7 @@ } } else - { // Line by line, slightly faster but less interactive + { // Line by line, slightly faster but less interactive while (fgets(Line, LINESIZE, inFile) != NULL) { if (!opt_raw) @@ -971,9 +1008,7 @@ } else { - fprintf(outFile, "%s", Line); // just copy - if (logFile) - fprintf(logFile, "%s", Line); // just copy + log(outFile, "%s", Line); } } } @@ -993,9 +1028,12 @@ static char *verboseUsage = "\n" "Description:\n" -" When <exefile> <offset> are given, log2lines works just like raddr2line\n" +" When <exefile> <offset> are given, log2lines works like raddr2line:\n" +" - The <exefile> <offset> combination can be repeated\n" +" - Also, <offset> can be repeated for each <exefile>\n" +" - NOTE: some of the options below will have no effect in this form.\n" " Otherwise it reads stdin and tries to translate lines of the form:\n" -" <IMAGENAME:ADDRESS>\n\n" +" <IMAGENAME:ADDRESS>\n\n" " The result is written to stdout.\n" " log2lines uses a cache in order to avoid a directory scan at each\n" " image lookup, greatly increasing performance. Only image path and its\n" @@ -1008,7 +1046,9 @@ " -d <directory>|<ISO image>\n" " Directory to scan for images. (Do not append a '" PATH_STR "')\n" " This option also takes an ISO image as argument:\n" -" - The image is recognized by the '.iso' extension.\n" +" - The image is recognized by the '.iso' or '.7z' extension.\n" +" - NOTE: The '.7z' and extracted '.iso' basenames must be identical,\n" +" which is normally true for Reactos trunk builds.\n" " - The image will be unpacked to a directory with the same name.\n" " - The embedded reactos.cab file will also be unpacked.\n" " - Combined with -f the file will be re-unpacked.\n" @@ -1026,17 +1066,20 @@ " -r Raw output without translation.\n\n" " -s Statistics. A summary with the following info is printed after EOF:\n" " *** LOG2LINES SUMMARY ***\n" -" - Translated: Translated lines.\n" -" - Reverted: Lines translated back. See -u option\n" -" - Retranslated: Lines retranslated. See -U option\n" -" - Skipped: Lines not translated.\n" -" - Differ: Lines where (addr-1) info differs. See -tT options\n" -" - Offset error: Image exists, but error retrieving offset info.\n" -" - Total: Total number of lines attempted to translate.\n" +" - Translated: Translated lines.\n" +" - Reverted: Lines translated back. See -u option\n" +" - Retranslated: Lines retranslated. See -U option\n" +" - Skipped: Lines not translated.\n" +" - Differ: Lines where (addr-1) info differs. See -tT options\n" +" - Differ(func/src):Lines where also function or source info differ.\n" +" - Offset error: Image exists, but error retrieving offset info.\n" +" - Total: Total number of lines attempted to translate.\n" " Also some version info is displayed.\n\n" " -t Translate twice. The address itself and for (address - 1)\n" -" Display extra filename and linenumber between [..] if they differ\n\n" -" -T As -t, but the original filename+linenumber gets replaced\n\n" +" Show extra filename, func and linenumber between [..] if they differ\n" +" So if only the linenumbers differ, then only show the extra\n" +" linenumber.\n\n" +" -T As -t, but the original filename+func+linenumber gets replaced\n\n" " -u Undo translations.\n" " Lines are translated back (reverted) to the form <IMAGENAME:ADDRESS>\n" " Overrides console mode -c.\n\n" @@ -1053,7 +1096,7 @@ "Examples:\n" " Setup is a VMware machine with its serial port set to: '\\\\.\\pipe\\kdbg'.\n\n" " Just recreate cache after a svn update or a new module has been added:\n" -" log2lines -F\n\n" +" log2lines -F\n\n" " Use kdbg debugger via console (interactive):\n" " log2lines -c < \\\\.\\pipe\\kdbg\n\n" " Use kdbg debugger via console, and append copy to logFile:\n" @@ -1061,14 +1104,22 @@ " Use kdbg debugger to send output to logfile:\n" " log2lines < \\\\.\\pipe\\kdbg > dbg.log\n\n" " Re-translate a debug log:\n" -" log2lines -d bootcd-38701-dbg.iso < bugxxxx.log\n\n" +" log2lines -U -d bootcd-38701-dbg.iso < bugxxxx.log\n\n" +" Re-translate a debug log. Specify a 7z file, which wil be decompressed.\n" +" Also check for (address) - (address - 1) differences:\n" +" log2lines -U -t -d bootcd-38701-dbg.7z < bugxxxx.log\n" +" This would generate loglines like:\n" +" '<ntdll.dll:60f1 (dll/ntdll/ldr/utils.c:337[331] (LdrPEStartup))>'\n\n" +" The following command line invocations are equivalent:\n" +" log2lines msi.dll 2e35d msi.dll 2235 msiexec.exe 30a8 msiexec.exe 2e89\n" +" log2lines msi.dll 2e35d 2235 msiexec.exe 30a8 2e89\n\n" "\n"; static void usage(int verbose) { fprintf(stderr, "log2lines " LOG2LINES_VERSION "\n\n"); - fprintf(stderr, "Usage: log2lines [-%s] [<exefile> <offset>]\n", optchars); + fprintf(stderr, "Usage: log2lines -%s {<exefile> <offset> {<offset>}}\n", optchars); if (verbose) { fprintf(stderr, "%s", verboseUsage); @@ -1085,7 +1136,7 @@ char Line[LINESIZE]; int res = 0; char iso_tmp[MAX_PATH]; - int iso_copied = 0; + int iso_copied = 0; FILE *fiso; strcpy(iso_tmp, iso); @@ -1094,8 +1145,8 @@ if (opt_verbose) fprintf(stderr, "Open of %s failed (locked for writing?), trying to copy first\n", iso); - strcat(iso_tmp,"~"); - if (copy_file(iso,iso_tmp)) + strcat(iso_tmp, "~"); + if (copy_file(iso, iso_tmp)) return 3; iso_copied = 1; } @@ -1135,10 +1186,51 @@ static int check_directory(int force) { + char Line[LINESIZE]; char freeldr_path[MAX_PATH]; char iso_path[MAX_PATH]; - - char *check_iso = strrchr(opt_dir, '.'); + char compressed_7z_path[MAX_PATH]; + char *check_iso; + char *check_dir; + + check_iso = strrchr(opt_dir, '.'); + if (check_iso && PATHCMP(check_iso, ".7z") == 0) + { + if (opt_verbose) + fprintf(stderr, "Uncompressing 7z image: %s\n", opt_dir); + + // First attempt to decompress to a .iso image + strcpy(compressed_7z_path, opt_dir); + if ((check_dir = strrchr(compressed_7z_path, PATH_CHAR))) + { + *check_dir = '\0'; + } + else + strcpy(compressed_7z_path, "."); // default to current dir + + sprintf(Line, UNZIP_FMT_7Z, opt_7z, opt_dir, compressed_7z_path); + + /* This of course only works if the .7z and .iso basenames are identical + * which is normally true for our trunk builds: + */ + strcpy(check_iso, ".iso"); + if (!file_exists(opt_dir) || force) + { + if (system(Line) < 0) + { + fprintf(stderr, "\nCannot decompress to iso image %s\n", opt_dir); + if (opt_verbose) + fprintf(stderr, "Failed to execute: '%s'\n", Line); + return 2; + } + } + else + { + if (opt_verbose > 1) + fprintf(stderr, "%s already decompressed\n", opt_dir); + } + } + if (check_iso && PATHCMP(check_iso, ".iso") == 0) { if (opt_verbose) @@ -1187,7 +1279,7 @@ int i; strcpy(opt_scanned, ""); - for (i=1; i<argc; i++) + for (i = 1; i < argc; i++) { strcat(opt_scanned, argv[i]); strcat(opt_scanned, " "); @@ -1218,7 +1310,7 @@ case 'h': opt_help++; usage(1); - exit(0); + return 0; break; case 'F': opt_exit++; @@ -1263,7 +1355,7 @@ break; default: usage(0); - exit(2); + return 2; break; } optCount++; @@ -1272,18 +1364,12 @@ opt_console = 0; argc -= optCount; - if (argc != 1 && argc != 3) - { - usage(0); - exit(1); - } - if (check_directory(opt_force)) - exit(3); + return 3; create_cache(opt_force, 0); if (opt_exit) - exit(0); + return 0; read_cache(); @@ -1297,7 +1383,7 @@ { if (opt_verbose) fprintf(stderr, "Disabling log buffering on %s\n", opt_logFile); - setbuf(logFile,NULL); + setbuf(logFile, NULL); } else { @@ -1308,20 +1394,47 @@ else { fprintf(stderr, "Could not open logfile %s (%s)\n", opt_logFile, strerror(errno)); - exit(2); - - } - } - if (argc == 3) - { // translate <exefile> <offset> - translate_file(argv[optCount + 1], my_atoi(argv[optCount + 2]), NULL); + return 2; + } + } + + if (argc > 1) + { // translate {<exefile> <offset>} + int i = 1; + const char *base = NULL; + const char *offset = NULL; + while (i < argc) + { + offset = argv[optCount + i++]; + if (isOffset(offset)) + { + if (base) + { + if (opt_verbose > 1) + fprintf(stderr, "translating %s %s\n", base, offset); + translate_file(base, my_atoi(offset), NULL); + } + else + { + fprintf(stderr, "<exefile> expected\n"); + res = 3; + break; + } + } + else + { + // Must be exefile + base = offset; + } + } } else - { // translate logging from stdin + { // translate logging from stdin translate_files(stdin, stdout); } if (logFile) fclose(logFile); + return res; }

1 0

[jimtabor] 44334: - [Win32k] Test thread death before posting to queue.
by jimtabor＠svn.reactos.org 30 Nov '09

30 Nov '09

Author: jimtabor Date: Mon Nov 30 21:13:05 2009 New Revision: 44334 URL: http://svn.reactos.org/svn/reactos?rev=44334&view=rev Log: - [Win32k] Test thread death before posting to queue. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Mon Nov 30 21:13:05 2009 @@ -1324,7 +1324,7 @@ if( Status == STATUS_SUCCESS ) { pThread = (PTHREADINFO)peThread->Tcb.Win32Thread; - if( !pThread || !pThread->MessageQueue ) + if( !pThread || !pThread->MessageQueue || (pThread->TIF_flags & TIF_INCLEANUP)) { ObDereferenceObject( peThread ); return FALSE;

1 0

[jimtabor] 44333: - [Win32k] Remove debug prints from classes.
by jimtabor＠svn.reactos.org 30 Nov '09

30 Nov '09

Author: jimtabor Date: Mon Nov 30 20:24:23 2009 New Revision: 44333 URL: http://svn.reactos.org/svn/reactos?rev=44333&view=rev Log: - [Win32k] Remove debug prints from classes. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Mon Nov 30 20:24:23 2009 @@ -628,7 +628,7 @@ { ASSERT(Class->pclsBase == Class); - DPRINT1("IntDereferenceClass 0x%x\n", Class); + DPRINT("IntDereferenceClass 0x%x\n", Class); /* check if there are clones of the class on other desktops, link the first clone in if possible. If there are no clones then leave the class on the desktop heap. It will get moved @@ -666,7 +666,7 @@ } else { - DPRINT1("IntDereferenceClass1 0x%x\n", Class); + DPRINT("IntDereferenceClass1 0x%x\n", Class); /* locate the cloned class and unlink it */ PrevLink = &BaseClass->pclsClone; @@ -1154,7 +1154,7 @@ &pi->pclsPrivateList, Link); if (Class != NULL) - { DPRINT1("Step 1: 0x%x\n",Class ); + { DPRINT("Step 1: 0x%x\n",Class ); goto FoundClass; } @@ -1165,7 +1165,7 @@ &pi->pclsPublicList, Link); if (Class != NULL) - { DPRINT1("Step 2: 0x%x 0x%x\n",Class, Class->hModule); + { DPRINT("Step 2: 0x%x 0x%x\n",Class, Class->hModule); goto FoundClass; } @@ -1175,7 +1175,7 @@ &pi->pclsPrivateList, Link); if (Class != NULL) - { DPRINT1("Step 3: 0x%x\n",Class ); + { DPRINT("Step 3: 0x%x\n",Class ); goto FoundClass; } @@ -1188,7 +1188,7 @@ { SetLastWin32Error(ERROR_CLASS_DOES_NOT_EXIST); return (RTL_ATOM)0; - }else{DPRINT1("Step 4: 0x%x\n",Class );} + }else{DPRINT("Step 4: 0x%x\n",Class );} FoundClass: *BaseClass = Class; @@ -1294,7 +1294,7 @@ pi = GetW32ProcessInfo(); - DPRINT1("UserUnregisterClass(%wZ, 0x%x)\n", ClassName, hInstance); + DPRINT("UserUnregisterClass(%wZ, 0x%x)\n", ClassName, hInstance); /* NOTE: Accessing the buffer in ClassName may raise an exception! */ ClassAtom = IntGetClassAtom(ClassName, @@ -1326,8 +1326,8 @@ if (NT_SUCCESS(IntDeregisterClassAtom(Class->atomClassName))) { - DPRINT1("Class 0x%x\n", Class); - DPRINT1("UserUnregisterClass: Good Exit!\n"); + DPRINT("Class 0x%x\n", Class); + DPRINT("UserUnregisterClass: Good Exit!\n"); /* finally free the resources */ IntDestroyClass(Class); return TRUE; @@ -2402,7 +2402,7 @@ if (Ret) { - DPRINT1("GetClassInfo(%wZ, 0x%x)\n", ClassName, hInstance); + DPRINT("GetClassInfo(%wZ, 0x%x)\n", ClassName, hInstance); ClassAtom = IntGetClassAtom( &SafeClassName, hInstance, ppi,

1 0

[jimtabor] 44332: - [Win32k] Use PostMessage to send broadcast messages to the queues. co_IntPostOrSendMessage does not support it.
by jimtabor＠svn.reactos.org 30 Nov '09

30 Nov '09

Author: jimtabor Date: Mon Nov 30 20:21:27 2009 New Revision: 44332 URL: http://svn.reactos.org/svn/reactos?rev=44332&view=rev Log: - [Win32k] Use PostMessage to send broadcast messages to the queues. co_IntPostOrSendMessage does not support it. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Mon Nov 30 20:21:27 2009 @@ -628,7 +628,7 @@ { ASSERT(Class->pclsBase == Class); - DPRINT("IntDereferenceClass 0x%x\n", Class); + DPRINT1("IntDereferenceClass 0x%x\n", Class); /* check if there are clones of the class on other desktops, link the first clone in if possible. If there are no clones then leave the class on the desktop heap. It will get moved @@ -666,7 +666,7 @@ } else { - DPRINT("IntDereferenceClass1 0x%x\n", Class); + DPRINT1("IntDereferenceClass1 0x%x\n", Class); /* locate the cloned class and unlink it */ PrevLink = &BaseClass->pclsClone; @@ -1154,7 +1154,7 @@ &pi->pclsPrivateList, Link); if (Class != NULL) - { + { DPRINT1("Step 1: 0x%x\n",Class ); goto FoundClass; } @@ -1165,7 +1165,7 @@ &pi->pclsPublicList, Link); if (Class != NULL) - { + { DPRINT1("Step 2: 0x%x 0x%x\n",Class, Class->hModule); goto FoundClass; } @@ -1175,7 +1175,7 @@ &pi->pclsPrivateList, Link); if (Class != NULL) - { + { DPRINT1("Step 3: 0x%x\n",Class ); goto FoundClass; } @@ -1188,7 +1188,7 @@ { SetLastWin32Error(ERROR_CLASS_DOES_NOT_EXIST); return (RTL_ATOM)0; - } + }else{DPRINT1("Step 4: 0x%x\n",Class );} FoundClass: *BaseClass = Class; @@ -1294,7 +1294,7 @@ pi = GetW32ProcessInfo(); - DPRINT("UserUnregisterClass(%wZ, 0x%x)\n", ClassName, hInstance); + DPRINT1("UserUnregisterClass(%wZ, 0x%x)\n", ClassName, hInstance); /* NOTE: Accessing the buffer in ClassName may raise an exception! */ ClassAtom = IntGetClassAtom(ClassName, @@ -1326,8 +1326,8 @@ if (NT_SUCCESS(IntDeregisterClassAtom(Class->atomClassName))) { - DPRINT("Class 0x%x\n", Class); - DPRINT("UserUnregisterClass: Good Exit!\n"); + DPRINT1("Class 0x%x\n", Class); + DPRINT1("UserUnregisterClass: Good Exit!\n"); /* finally free the resources */ IntDestroyClass(Class); return TRUE; @@ -2402,6 +2402,7 @@ if (Ret) { + DPRINT1("GetClassInfo(%wZ, 0x%x)\n", ClassName, hInstance); ClassAtom = IntGetClassAtom( &SafeClassName, hInstance, ppi, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Mon Nov 30 20:21:27 2009 @@ -77,8 +77,10 @@ /* Send palette messages */ if (co_IntPostOrSendMessage(hWnd, WM_QUERYNEWPALETTE, 0, 0)) { - co_IntPostOrSendMessage(HWND_BROADCAST, WM_PALETTEISCHANGING, - (WPARAM)hWnd, 0); + UserPostMessage( HWND_BROADCAST, + WM_PALETTEISCHANGING, + (WPARAM)hWnd, + 0); } if (UserGetWindow(hWnd, GW_HWNDPREV) != NULL)

1 0

[janderwald] 44331: - First version of ReactOS Sound Record Application by Marco Pagliaricci (IRC: rendar)
by janderwald＠svn.reactos.org 30 Nov '09

30 Nov '09

Author: janderwald Date: Mon Nov 30 19:54:41 2009 New Revision: 44331 URL: http://svn.reactos.org/svn/reactos?rev=44331&view=rev Log: - First version of ReactOS Sound Record Application by Marco Pagliaricci (IRC: rendar) Added: trunk/reactos/base/applications/sndrec32/ (with props) trunk/reactos/base/applications/sndrec32/audio_def.hpp (with props) trunk/reactos/base/applications/sndrec32/audio_format.cpp (with props) trunk/reactos/base/applications/sndrec32/audio_format.hpp (with props) trunk/reactos/base/applications/sndrec32/audio_membuffer.cpp (with props) trunk/reactos/base/applications/sndrec32/audio_membuffer.hpp (with props) trunk/reactos/base/applications/sndrec32/audio_producer.cpp (with props) trunk/reactos/base/applications/sndrec32/audio_producer.hpp (with props) trunk/reactos/base/applications/sndrec32/audio_receiver.cpp (with props) trunk/reactos/base/applications/sndrec32/audio_receiver.hpp (with props) trunk/reactos/base/applications/sndrec32/audio_resampler_acm.cpp (with props) trunk/reactos/base/applications/sndrec32/audio_resampler_acm.hpp (with props) trunk/reactos/base/applications/sndrec32/audio_wavein.cpp (with props) trunk/reactos/base/applications/sndrec32/audio_wavein.hpp (with props) trunk/reactos/base/applications/sndrec32/audio_waveout.cpp (with props) trunk/reactos/base/applications/sndrec32/audio_waveout.hpp (with props) trunk/reactos/base/applications/sndrec32/bitmap1.bmp trunk/reactos/base/applications/sndrec32/but_end.bmp (with props) trunk/reactos/base/applications/sndrec32/but_play.bmp (with props) trunk/reactos/base/applications/sndrec32/but_rec.bmp (with props) trunk/reactos/base/applications/sndrec32/but_start.bmp (with props) trunk/reactos/base/applications/sndrec32/but_stop.bmp (with props) trunk/reactos/base/applications/sndrec32/kkaudio.hpp (with props) trunk/reactos/base/applications/sndrec32/reactOS_sndrec32.ico (with props) trunk/reactos/base/applications/sndrec32/resource.h (with props) trunk/reactos/base/applications/sndrec32/small.ico (with props) trunk/reactos/base/applications/sndrec32/sndrec32.cpp (with props) trunk/reactos/base/applications/sndrec32/sndrec32.h (with props) trunk/reactos/base/applications/sndrec32/sndrec32.rbuild (with props) trunk/reactos/base/applications/sndrec32/sndrec32.rc (with props) trunk/reactos/base/applications/sndrec32/stdafx.h (with props) trunk/reactos/base/applications/sndrec32/targetver.h (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/base/applications/sndrec32/audio_def.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/audio_format.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/audio_format.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/audio_membuffer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/audio_membuffer.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/audio_producer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/audio_producer.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/audio_receiver.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/audio_receiver.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/audio_resampler_acm.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/audio_resampler_acm.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/audio_wavein.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/audio_wavein.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/audio_waveout.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/audio_waveout.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/bitmap1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/but_end.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/but_play.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/but_rec.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/but_start.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/but_stop.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/kkaudio.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/reactOS_sndrec32.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/small.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/sndrec32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/sndrec32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/sndrec32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/sndrec32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Added: trunk/reactos/base/applications/sndrec32/targetver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32…

1 0

[dgorbachev] 44330: Apply font changes from r44305 to mainline.
by dgorbachev＠svn.reactos.org 30 Nov '09

30 Nov '09

Author: dgorbachev Date: Mon Nov 30 18:00:12 2009 New Revision: 44330 URL: http://svn.reactos.org/svn/reactos?rev=44330&view=rev Log: Apply font changes from r44305 to mainline. Modified: trunk/reactos/base/setup/usetup/muifonts.h trunk/reactos/base/setup/usetup/muilanguages.h trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/media/inf/font.inf Modified: trunk/reactos/base/setup/usetup/muifonts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muifonts… ============================================================================== --- trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] Mon Nov 30 18:00:12 2009 @@ -59,18 +59,18 @@ { NULL, NULL } }; -MUI_SUBFONT JapaneseFonts[] = +MUI_SUBFONT CJKFonts[] = { { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, { L"Times New Roman", L"Liberation Serif" }, - { L"Tahoma", L"Systema" }, + { L"Tahoma", L"Droid Sans Fallback" }, { L"MS Sans Serif", L"Tahoma" }, - { L"MS Shell Dlg", L"Systema" }, - { L"MS Shell Dlg 2", L"Systema" }, - { L"MS UI Gothic", L"Systema" }, - { L"MS UI Gothic 2", L"Systema" }, + { L"MS Shell Dlg", L"Droid Sans Fallback" }, + { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, + { L"MS UI Gothic", L"Droid Sans Fallback" }, + { L"MS UI Gothic 2", L"Droid Sans Fallback" }, { L"Helv", L"Tahoma" }, { NULL, NULL } }; Modified: trunk/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu… ============================================================================== --- trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Mon Nov 30 18:00:12 2009 @@ -165,11 +165,11 @@ {L"00000402", L"1251", L"866", L"10007", L"Bulgarian", L"359", bgBGPages, bgBGErrorEntries, bgBGStrings, CyrillicFonts, bgBGLayouts }, {L"00000455", L"0", L"1", L"2", L"Burmese", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, myMMLayouts }, {L"00000403", L"1252", L"850", L"10000", L"Catalan", L"1", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, caESLayouts }, - {L"00000404", L"950", L"950", L"10008", L"Chinese (Taiwan)", L"886", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhTWLayouts }, - {L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", L"86", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhCNLayouts }, - {L"00000C04", L"950", L"950", L"10008", L"Chinese (Hong Kong S.A.R.)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhHKLayouts }, - {L"00001004", L"936", L"936", L"10008", L"Chinese (Singapore)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhSGLayouts }, - {L"00001404", L"950", L"950", L"10002", L"Chinese (Macau S.A.R.)", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, zhMOLayouts }, + {L"00000404", L"950", L"950", L"10008", L"Chinese (Taiwan)", L"886", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhTWLayouts }, + {L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", L"86", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhCNLayouts }, + {L"00000C04", L"950", L"950", L"10008", L"Chinese (Hong Kong S.A.R.)", L"1", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhHKLayouts }, + {L"00001004", L"936", L"936", L"10008", L"Chinese (Singapore)", L"1", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhSGLayouts }, + {L"00001404", L"950", L"950", L"10002", L"Chinese (Macau S.A.R.)", L"1", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, zhMOLayouts }, {L"0000041A", L"1250", L"852", L"10029", L"Croatian", L"385", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, hrHRLayouts }, {L"00000405", L"1250", L"852", L"10029", L"Czech", L"420", csCZPages, csCZErrorEntries, csCZStrings, LatinFonts, csCZLayouts }, {L"00000406", L"1252", L"850", L"10000", L"Danish", L"45", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, daDKLayouts }, @@ -216,11 +216,11 @@ {L"00000421", L"1252", L"850", L"10079", L"Indonesian", L"62", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, idIDLayouts }, {L"00000410", L"1252", L"850", L"10000", L"Italian (Italy)", L"39", itITPages, itITErrorEntries, itITStrings, LatinFonts, itITLayouts }, {L"00000810", L"1252", L"850", L"10000", L"Italian (Switzerland)", L"41", itITPages, itITErrorEntries, itITStrings, LatinFonts, itCHLayouts }, - {L"00000411", L"932", L"932", L"10001", L"Japanese", L"81", jaJPPages, jaJPErrorEntries, jaJPStrings, JapaneseFonts, jaJPLayouts }, + {L"00000411", L"932", L"932", L"10001", L"Japanese", L"81", jaJPPages, jaJPErrorEntries, jaJPStrings, CJKFonts, jaJPLayouts }, {L"0000044B", L"1252", L"437", L"10079", L"Kannada (India)", L"91", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, knINLayouts }, {L"0000043F", L"1251", L"866", L"10007", L"Kazakh", L"705", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, kkKZLayouts }, {L"00000457", L"0", L"437", L"2", L"Konkani", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, kokINLayouts}, - {L"00000412", L"949", L"949", L"10003", L"Korean", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, koKRLayouts }, + {L"00000412", L"949", L"949", L"10003", L"Korean", L"1", enUSPages, enUSErrorEntries, enUSStrings, CJKFonts, koKRLayouts }, {L"00000440", L"1251", L"866", L"10007", L"Kyrgyz (Kyrgyzstan)", L"1", enUSPages, enUSErrorEntries, enUSStrings, CyrillicFonts, kyKGLayouts }, {L"00000426", L"1257", L"775", L"10029", L"Latvian", L"371", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, lvLVLayouts }, {L"00000427", L"1257", L"775", L"10029", L"Lithuanian", L"370", ltLTPages, ltLTErrorEntries, ltLTStrings, LatinFonts, ltLTLayouts }, Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Nov 30 18:00:12 2009 @@ -667,6 +667,8 @@ subsystems\win32\win32k\win32k.sys 1 ; Optional/proprietary files +modules\optional\DroidSansFallback.ttf 3 optional +modules\optional\NOTICE_for_Droid_Font.txt 4 optional modules\optional\netkvm2k.inf 6 optional modules\optional\netkvm2k.cat 6 optional modules\optional\netkvm.sys 2 optional @@ -681,7 +683,6 @@ modules\optional\msvcirt.dll 1 optional modules\optional\msvcp71.dll 1 optional modules\optional\msvcr71.dll 1 optional -modules\optional\Systema.ttf 3 optional modules\optional\vmx_fb.dll 1 optional modules\optional\vmx_mode.dll 1 optional modules\optional\vmx_svga.inf 6 optional Modified: trunk/reactos/media/inf/font.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/font.inf?rev=443… ============================================================================== Binary files - no diff available.

1 0

[janderwald] 44329: Fix build breakage
by janderwald＠svn.reactos.org 30 Nov '09

30 Nov '09

Author: janderwald Date: Mon Nov 30 15:55:20 2009 New Revision: 44329 URL: http://svn.reactos.org/svn/reactos?rev=44329&view=rev Log: Fix build breakage Modified: trunk/reactos/include/reactos/libs/sound/mmebuddy.h Modified: trunk/reactos/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sound… ============================================================================== --- trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Mon Nov 30 15:55:20 2009 @@ -249,6 +249,10 @@ IN DWORD InterfaceLength, OUT DWORD * InterfaceSize); +typedef MMRESULT(*MMRESETSTREAM_FUNC)( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN MMDEVICE_TYPE DeviceType, + IN BOOLEAN bStartReset); typedef struct _MMFUNCTION_TABLE { @@ -274,6 +278,7 @@ MMGETPOS_FUNC GetPos; MMSETSTATE_FUNC SetState; MMQUERYDEVICEINTERFACESTRING_FUNC GetDeviceInterfaceString; + MMRESETSTREAM_FUNC ResetStream; // Redundant //MMWAVEHEADER_FUNC PrepareWaveHeader;

1 0

[dreimer] 44328: Updated the rapps Software list. AbiWord from 2.6.4 to 2.6.8 MinGW from 5.1.4 to 5.1.6 MirandaIM from 0.8.9 to 0.8.10 Opera from 9.6.4 to 10.10 (YES, this works!) SDL Mixer from 1.2.9 to 1.2.11 SeaMonkey from 1.1.18 to 2.0 (YES, that too!) UltraVNC from 1.0.6.5 to 1.0.8.0 uTorrent from 1.8.4 to 1.8.5 vlc from 1.0.2 to 1.0.3
by dreimer＠svn.reactos.org 30 Nov '09

30 Nov '09

Author: dreimer Date: Mon Nov 30 02:50:47 2009 New Revision: 44328 URL: http://svn.reactos.org/svn/reactos?rev=44328&view=rev Log: Updated the rapps Software list. AbiWord from 2.6.4 to 2.6.8 MinGW from 5.1.4 to 5.1.6 MirandaIM from 0.8.9 to 0.8.10 Opera from 9.6.4 to 10.10 (YES, this works!) SDL Mixer from 1.2.9 to 1.2.11 SeaMonkey from 1.1.18 to 2.0 (YES, that too!) UltraVNC from 1.0.6.5 to 1.0.8.0 uTorrent from 1.8.4 to 1.8.5 vlc from 1.0.2 to 1.0.3 Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt trunk/reactos/base/applications/rapps/rapps/mingw.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/opera.txt trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/ultravnc.txt trunk/reactos/base/applications/rapps/rapps/utorrent.txt trunk/reactos/base/applications/rapps/rapps/vlc.txt Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abiword.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abiword.txt [iso-8859-1] Mon Nov 30 02:50:47 2009 @@ -2,13 +2,13 @@ [Section] Name = AbiWord -Version = 2.6.4 +Version = 2.6.8 Licence = GPL Description = Word processor. -Size = 5.9MB +Size = 5.6MB Category = 6 URLSite = http://www.abisource.com/ -URLDownload = http://www.abisource.com/downloads/abiword/2.6.4/Windows/abiword-setup-2.6.… +URLDownload = http://www.abisource.com/downloads/abiword/2.6.8/Windows/abiword-setup-2.6.… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mingw.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mingw.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mingw.txt [iso-8859-1] Mon Nov 30 02:50:47 2009 @@ -2,13 +2,13 @@ [Section] Name = MinGW -Version = 5.1.4 +Version = 5.1.6 Licence = Public domain/GPL Description = A Port of the GNU toolchain with GCC, GDB, GNU make, etc. -Size = 136kb +Size = 155kb Category = 7 URLSite = http://mingw.org/ -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.4.exe +URLDownload = http://ovh.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.6.exe CDPath = none Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] Mon Nov 30 02:50:47 2009 @@ -1,14 +1,14 @@ -; UTF-8 +ï»¿; UTF-8 [Section] Name = Miranda IM -Version = 0.8.9 +Version = 0.8.10 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. Size = 1.6MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.8.9-unicode.exe +URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.8.10-unicode.exe CDPath = none Modified: trunk/reactos/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] Mon Nov 30 02:50:47 2009 @@ -2,13 +2,13 @@ [Section] Name = Opera -Version = 9.64 +Version = 10.10 Licence = Freeware Description = The popular Opera Browser with many advanced features and including a Mail and BitTorrent client. -Size = 7.1M +Size = 11.0M Category = 5 URLSite = http://www.opera.com/ -URLDownload = http://ftp.opera.com/pub/opera/win/964/int/Opera_964_int_Setup.exe +URLDownload = http://ftp.opera.com/pub/opera/win/1010/int/Opera_1010_in_Setup.exe CDPath = none [Section.0419] Modified: trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt [iso-8859-1] Mon Nov 30 02:50:47 2009 @@ -1,14 +1,14 @@ -; UTF-8 +ï»¿; UTF-8 [Section] Name = Simple Direct Media Layer (SDL) Mixer -Version = 1.2.9 +Version = 1.2.11 Licence = LGPL Description = Needed for some Open Source Games to run. You need 7-Zip or a similar Utility to extract it. Size = 307kB Category = 14 URLSite = http://www.libsdl.org/projects/SDL_mixer/ -URLDownload = http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.9-win32.zip +URLDownload = http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.11-win32.zip CDPath = none Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Mon Nov 30 02:50:47 2009 @@ -2,26 +2,26 @@ [Section] Name = Mozilla SeaMonkey -Version = 1.1.18 +Version = 2.0 Licence = MPL/GPL/LGPL Description = Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need. -Size = 12.4MB +Size = 10.0MB Category = 5 URLSite = http://www.seamonkey-project.org/ -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.18/seamonkey-1.1.18.en-… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.0/win32/en-US/SeaMonkey%2… CDPath = none [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. -Size = 9.0MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.18/contr… +Size = 10.4MB +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.0/win32/ru/SeaMonkey%20Se… [Section.0407] -Description = Mozilla Suite ist lebendig. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. -Size = 9.0MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.18/contrib-localized/se… +Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. +Size = 10.0MB +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.0/win32/de/SeaMonkey%20Se… [Section.0415] Description = Pakiet Mozilla Å¼yje. W zestawie: przeglÄdarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. -Size = 12.4MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.18/contr… +Size = 10.8MB +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.0/win32/pl/SeaMonkey%20Se… Modified: trunk/reactos/base/applications/rapps/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ultravnc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ultravnc.txt [iso-8859-1] Mon Nov 30 02:50:47 2009 @@ -2,11 +2,11 @@ [Section] Name = UltraVNC -Version = 1.0.6.5 +Version = 1.0.8.0 Licence = GPL Description = Open-source VNC client/server Size = 1.9MB Category = 5 URLSite = http://www.uvnc.com -URLDownload = http://support1.uvnc.com/download/1065/UltraVNC_1.0.6.5_Setup.exe +URLDownload = http://support1.uvnc.com/download/1080/UltraVNC_1.0.8.0_Setup.exe CDPath = none Modified: trunk/reactos/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] Mon Nov 30 02:50:47 2009 @@ -2,13 +2,13 @@ [Section] Name = ÂµTorrent -Version = 1.8.4 +Version = 1.8.5 Licence = Freeware for non-commercial uses Description = Small and fast BitTorrent Client. Size = 282K Category = 5 URLSite = http://www.utorrent.com/ -URLDownload = http://download.utorrent.com/1.8.3/utorrent.exe +URLDownload = http://download.utorrent.com/1.8.5/utorrent.exe CDPath = none [Section.0419] Modified: trunk/reactos/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] Mon Nov 30 02:50:47 2009 @@ -2,11 +2,11 @@ [Section] Name = VLC media player -Version = 1.0.2 +Version = 1.0.3 Licence = GPL Description = A media player. -Size = 18MB +Size = 17.2MB Category = 1 URLSite = http://www.videolan.org/vlc/ -URLDownload = http://mirror.services.wisc.edu/mirrors/videolan/vlc/1.0.2/win32/vlc-1.0.2-… +URLDownload = http://mirror.services.wisc.edu/mirrors/videolan/vlc/1.0.3/win32/vlc-1.0.3-… CDPath = none

1 0

[tkreuzer] 44327: [MM] Rewrite the broken MmFindGap* functions. They were first searching for a gap between the already allocated memory areas and only after that trying to find a gap below or above these areas. This bug helped with 2 things. 1. Not overwriting the kernel mapping, because no memory area was defined for it and 2. allow csrss to map video memory at virtual adress 0x000a0000. The former is fixed by adding the appropriate memory area, the latter is hacked away, by making the address
by tkreuzer＠svn.reactos.org 30 Nov '09

30 Nov '09

Author: tkreuzer Date: Mon Nov 30 01:24:55 2009 New Revision: 44327 URL: http://svn.reactos.org/svn/reactos?rev=44327&view=rev Log: [MM] Rewrite the broken MmFindGap* functions. They were first searching for a gap between the already allocated memory areas and only after that trying to find a gap below or above these areas. This bug helped with 2 things. 1. Not overwriting the kernel mapping, because no memory area was defined for it and 2. allow csrss to map video memory at virtual adress 0x000a0000. The former is fixed by adding the appropriate memory area, the latter is hacked away, by making the addressing range start at 0x00100000. Also use MmHighestUserAddress instead of MmSystemRangestart - 1. Simplyfy overcomplicated code. Fix a DPRINT Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Mon Nov 30 01:24:55 2009 @@ -469,13 +469,12 @@ ULONG_PTR Length, ULONG_PTR Granularity) { - PVOID LowestAddress = MmGetAddressSpaceOwner(AddressSpace) ? MM_LOWEST_USER_ADDRESS : MmSystemRangeStart; + // HACK: csrss really wants to map video memory at 0x000a0000 - 0x00100000, so keep that free + PVOID LowestAddress = MmGetAddressSpaceOwner(AddressSpace) ? (PVOID)0x00100000 : MmSystemRangeStart; PVOID HighestAddress = MmGetAddressSpaceOwner(AddressSpace) ? - (PVOID)((ULONG_PTR)MmSystemRangeStart - 1) : (PVOID)MAXULONG_PTR; + MmHighestUserAddress : (PVOID)MAXULONG_PTR; PVOID AlignedAddress; - PMEMORY_AREA Node; - PMEMORY_AREA FirstNode; - PMEMORY_AREA PreviousNode; + PMEMORY_AREA Root, Node; MmVerifyMemoryAreas(AddressSpace); @@ -484,53 +483,30 @@ AlignedAddress = MM_ROUND_UP(LowestAddress, Granularity); - /* Special case for empty tree. */ - if (AddressSpace->WorkingSetExpansionLinks.Flink == NULL) - { - if ((ULONG_PTR)HighestAddress - (ULONG_PTR)AlignedAddress >= Length) + Root = (PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink; + + /* Go to the node with lowest address in the tree. */ + if (Root) + Node = MmIterateFirstNode(Root); + else + Node = NULL; + + while (Node) + { + if (Node->StartingAddress > AlignedAddress && + (ULONG_PTR)Node->StartingAddress >= (ULONG_PTR)AlignedAddress + Length) { DPRINT("MmFindGapBottomUp: %p\n", AlignedAddress); return AlignedAddress; } - DPRINT("MmFindGapBottomUp: 0\n"); - return 0; - } - - /* Go to the node with lowest address in the tree. */ - FirstNode = Node = MmIterateFirstNode((PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink); - - /* Traverse the tree from left to right. */ - PreviousNode = Node; - for (;;) - { + + AlignedAddress = MM_ROUND_UP(Node->EndingAddress, Granularity); Node = MmIterateNextNode(Node); - if (Node == NULL) - break; - - AlignedAddress = MM_ROUND_UP(PreviousNode->EndingAddress, Granularity); - if (Node->StartingAddress > AlignedAddress && - (ULONG_PTR)Node->StartingAddress - (ULONG_PTR)AlignedAddress >= Length) - { - DPRINT("MmFindGapBottomUp: %p\n", AlignedAddress); - return AlignedAddress; - } - - PreviousNode = Node; } /* Check if there is enough space after the last memory area. */ - AlignedAddress = MM_ROUND_UP(PreviousNode->EndingAddress, Granularity); if ((ULONG_PTR)HighestAddress > (ULONG_PTR)AlignedAddress && (ULONG_PTR)HighestAddress - (ULONG_PTR)AlignedAddress >= Length) - { - DPRINT("MmFindGapBottomUp: %p\n", AlignedAddress); - return AlignedAddress; - } - - /* Check if there is enough space before the first memory area. */ - AlignedAddress = MM_ROUND_UP(LowestAddress, Granularity); - if (FirstNode->StartingAddress > AlignedAddress && - (ULONG_PTR)FirstNode->StartingAddress - (ULONG_PTR)AlignedAddress >= Length) { DPRINT("MmFindGapBottomUp: %p\n", AlignedAddress); return AlignedAddress; @@ -549,72 +525,46 @@ { PVOID LowestAddress = MmGetAddressSpaceOwner(AddressSpace) ? MM_LOWEST_USER_ADDRESS : MmSystemRangeStart; PVOID HighestAddress = MmGetAddressSpaceOwner(AddressSpace) ? - (PVOID)((ULONG_PTR)MmSystemRangeStart - 1) : (PVOID)MAXULONG_PTR; + MmHighestUserAddress : (PVOID)MAXULONG_PTR; PVOID AlignedAddress; - PMEMORY_AREA Node; - PMEMORY_AREA PreviousNode; + PMEMORY_AREA Root, Node; MmVerifyMemoryAreas(AddressSpace); DPRINT("LowestAddress: %p HighestAddress: %p\n", LowestAddress, HighestAddress); - AlignedAddress = MM_ROUND_DOWN((ULONG_PTR)HighestAddress - Length + 1, Granularity); + AlignedAddress = MM_ROUND_DOWN((ULONG_PTR)HighestAddress - Length, Granularity); /* Check for overflow. */ if (AlignedAddress > HighestAddress) return NULL; - /* Special case for empty tree. */ - if (AddressSpace->WorkingSetExpansionLinks.Flink == NULL) - { - if (AlignedAddress >= LowestAddress) + Root = (PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink; + + /* Go to the node with highest address in the tree. */ + if (Root) + Node = MmIterateLastNode(Root); + else + Node = NULL; + + /* Traverse the tree from left to right. */ + while (Node) + { + if (Node->EndingAddress <= AlignedAddress) { DPRINT("MmFindGapTopDown: %p\n", AlignedAddress); return AlignedAddress; } - DPRINT("MmFindGapTopDown: 0\n"); - return 0; - } - - /* Go to the node with highest address in the tree. */ - Node = MmIterateLastNode((PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink); - - /* Check if there is enough space after the last memory area. */ - if (Node->EndingAddress <= AlignedAddress) - { - DPRINT("MmFindGapTopDown: %p\n", AlignedAddress); - return AlignedAddress; - } - - /* Traverse the tree from left to right. */ - PreviousNode = Node; - for (;;) - { + + AlignedAddress = MM_ROUND_DOWN((ULONG_PTR)Node->StartingAddress - Length, Granularity); + + /* Check for overflow. */ + if (AlignedAddress > Node->StartingAddress) + return NULL; + Node = MmIteratePrevNode(Node); - if (Node == NULL) - break; - - AlignedAddress = MM_ROUND_DOWN((ULONG_PTR)PreviousNode->StartingAddress - Length + 1, Granularity); - - /* Check for overflow. */ - if (AlignedAddress > PreviousNode->StartingAddress) - return NULL; - - if (Node->EndingAddress <= AlignedAddress) - { - DPRINT("MmFindGapTopDown: %p\n", AlignedAddress); - return AlignedAddress; - } - - PreviousNode = Node; - } - - AlignedAddress = MM_ROUND_DOWN((ULONG_PTR)PreviousNode->StartingAddress - Length + 1, Granularity); - - /* Check for overflow. */ - if (AlignedAddress > PreviousNode->StartingAddress) - return NULL; + } if (AlignedAddress >= LowestAddress) { @@ -944,6 +894,7 @@ if ((*BaseAddress) == 0 && !FixedAddress) { tmpLength = PAGE_ROUND_UP(Length); + __debugbreak(); *BaseAddress = MmFindGap(AddressSpace, tmpLength, Granularity, Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Mon Nov 30 01:24:55 2009 @@ -1,4 +1,4 @@ -/* +ï»¿/* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/mm/mminit.c @@ -78,6 +78,21 @@ BoundaryAddressMultiple.QuadPart = 0; // + // Create the memory area to define the loader mappings + // + BaseAddress = (PVOID)KSEG0_BASE; + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, + &BaseAddress, + MmBootImageSize, + PAGE_EXECUTE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); + + // // Create the memory area to define the PTE base // BaseAddress = (PVOID)PTE_BASE; @@ -284,8 +299,8 @@ // Print the memory layout // DPRINT1(" 0x%p - 0x%p\t%s\n", - MmSystemRangeStart, - (ULONG_PTR)MmSystemRangeStart + MmBootImageSize, + KSEG0_BASE, + (ULONG_PTR)KSEG0_BASE + MmBootImageSize, "Boot Loaded Image"); DPRINT1(" 0x%p - 0x%p\t%s\n", MmPagedPoolBase,

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