Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sserapion] 44620: Revert unnecessary hack/fix.
by sserapion＠svn.reactos.org 16 Dec '09

16 Dec '09

Author: sserapion Date: Wed Dec 16 18:01:24 2009 New Revision: 44620 URL: http://svn.reactos.org/svn/reactos?rev=44620&view=rev Log: Revert unnecessary hack/fix. Modified: branches/ros-amd64-bringup/reactos/drivers/video/miniport/vbe/vbemp.c Modified: branches/ros-amd64-bringup/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] Wed Dec 16 18:01:24 2009 @@ -781,8 +781,6 @@ MapInformation->VideoRamBase = RequestedAddress->RequestedVirtualAddress; MapInformation->VideoRamLength = 0x10000; } -#else - FrameBuffer.QuadPart = 0; #endif VideoPortMapMemory(DeviceExtension, FrameBuffer,

1 0

[cgutman] 44619: [OSKITTCP] - Add ROS-specific MSS code - We don't mirror our route cache with oskittcp so we can't rely on routes to get the MTU
by cgutman＠svn.reactos.org 16 Dec '09

16 Dec '09

Author: cgutman Date: Wed Dec 16 05:45:43 2009 New Revision: 44619 URL: http://svn.reactos.org/svn/reactos?rev=44619&view=rev Log: [OSKITTCP] - Add ROS-specific MSS code - We don't mirror our route cache with oskittcp so we can't rely on routes to get the MTU Modified: branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/tcp_input.c Modified: branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/tcp_input.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/tcp_input.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/tcp_input.c [iso-8859-1] Wed Dec 16 05:45:43 2009 @@ -1961,7 +1961,14 @@ inp = tp->t_inpcb; if ((rt = tcp_rtlookup(inp)) == NULL) { +#ifndef __REACTOS__ tp->t_maxopd = tp->t_maxseg = tcp_mssdflt; +#else + if (offer < tcp_mssdflt) + tp->t_maxopd = tp->t_maxseg = tcp_mssdflt; + else + tp->t_maxopd = tp->t_maxseg = min(offer, tcp_mssopt(tp)); +#endif return; } #ifndef __REACTOS__ @@ -2116,15 +2123,20 @@ tcp_mssopt(tp) struct tcpcb *tp; { +#ifndef __REACTOS__ struct rtentry *rt; rt = tcp_rtlookup(tp->t_inpcb); if (rt == NULL) return tcp_mssdflt; -#ifndef __REACTOS__ + return rt->rt_ifp->if_mtu - sizeof(struct tcpiphdr); #else - return tcp_mssdflt; + struct ifaddr *ifa = ifa_ifwithnet((struct sockaddr *)&tp->t_inpcb->inp_faddr); + if (ifa == NULL) + return tcp_mssdflt; + + return ifa->ifa_mtu - sizeof(struct tcpiphdr); #endif } #endif /* TUBA_INCLUDE */

1 0

[cgutman] 44618: [OSKITTCP] - Fix broken MTU code (MTU was assumed to always be 1500)
by cgutman＠svn.reactos.org 16 Dec '09

16 Dec '09

Author: cgutman Date: Wed Dec 16 03:41:39 2009 New Revision: 44618 URL: http://svn.reactos.org/svn/reactos?rev=44618&view=rev Log: [OSKITTCP] - Fix broken MTU code (MTU was assumed to always be 1500) Modified: branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/ip_output.c Modified: branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/ip_output.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] Wed Dec 16 03:41:39 2009 @@ -160,6 +160,7 @@ */ #define ifatoia(ifa) ((struct in_ifaddr *)(ifa)) #define sintosa(sin) ((struct sockaddr *)(sin)) +#ifndef __REACTOS__ if (flags & IP_ROUTETOIF) { if ((ia = ifatoia(ifa_ifwithdstaddr(sintosa(dst)))) == 0 && (ia = ifatoia(ifa_ifwithnet(sintosa(dst)))) == 0) { @@ -167,9 +168,8 @@ error = ENETUNREACH; goto bad; } -#ifndef __REACTOS__ + ifp = ia->ia_ifp; -#endif ip->ip_ttl = 1; } else { /* @@ -181,7 +181,7 @@ * the link layer, as this is probably required in all cases * for correct operation (as it is for ARP). */ -#ifndef __REACTOS__ + if (ro->ro_rt == 0) rtalloc_ign(ro, RTF_PRCLONING); if (ro->ro_rt == 0) { @@ -195,8 +195,17 @@ ro->ro_rt->rt_use++; if (ro->ro_rt->rt_flags & RTF_GATEWAY) dst = (struct sockaddr_in *)ro->ro_rt->rt_gateway; -#endif - } + } + +#else + if ((ia = ifatoia(ifa_ifwithdstaddr(sintosa(dst)))) == 0 && + (ia = ifatoia(ifa_ifwithnet(sintosa(dst)))) == 0) { + ipstat.ips_noroute++; + error = ENETUNREACH; + goto bad; + } +#endif + #ifndef __REACTOS__ if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) { struct in_multi *inm; @@ -358,7 +367,9 @@ /* * If small enough for interface, can just send directly. */ - if ((u_short)ip->ip_len <= 1400 /* XXX Get MTU from Interface */) { + + /* FIXME: This was ROS-modified code. Where is the original? */ + if ((u_short)ip->ip_len <= ((struct ifaddr *)ia)->ifa_mtu) { ip->ip_len = htons((u_short)ip->ip_len); ip->ip_off = htons((u_short)ip->ip_off); ip->ip_sum = 0; @@ -421,8 +432,7 @@ goto bad; } #else - OS_DbgPrint(OSK_MID_TRACE,("Using default mtu of 1500\n")); - len = (1500 - hlen) & ~7; + len = (((struct ifaddr *)ia)->ifa_mtu - hlen) & ~7; #endif {

1 0

[tkreuzer] 44617: Copy from trunk
by tkreuzer＠svn.reactos.org 16 Dec '09

16 Dec '09

Author: tkreuzer Date: Wed Dec 16 02:06:10 2009 New Revision: 44617 URL: http://svn.reactos.org/svn/reactos?rev=44617&view=rev Log: Copy from trunk Modified: branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.c Modified: branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.c [iso-8859-1] Wed Dec 16 02:06:10 2009 @@ -27,7 +27,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> @@ -41,7 +41,7 @@ #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 @@ -82,14 +82,14 @@ struct summ_struct { - int translated; - int undo; - int redo; - int skipped; - int diff; + int translated; + int undo; + int redo; + int skipped; + int diff; int majordiff; - int offset_errors; - int total; + int offset_errors; + int total; }; struct lineinfo_struct @@ -104,11 +104,11 @@ }; typedef struct cache_struct CACHE; -typedef struct summ_struct SUMM; +typedef struct summ_struct SUMM; typedef struct lineinfo_struct LINEINFO; -static CACHE cache; -static SUMM summ; +static CACHE cache; +static SUMM summ; static LINEINFO lastLine; static char *optchars = "bcd:fFhl:mMrsS:tTuUvz:"; @@ -130,7 +130,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; @@ -229,9 +229,9 @@ static PROSSYM_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); + 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++) @@ -252,7 +252,7 @@ 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; @@ -264,20 +264,20 @@ if (opt_twice) { e2 = find_offset(data, offset - 1); - - if ( e == e2 ) + + if (e == e2) e2 = NULL; else summ.diff++; - if ( opt_Twice && e2 ) + if (opt_Twice && e2) { e = e2; e2 = NULL; /* replaced (transparantly), but updated stats */ } } - if ( e || e2 ) + if (e || e2) { strcpy(lastLine.file1, &Strings[e->FileOffset]); strcpy(lastLine.func1, &Strings[e->FunctionOffset]); @@ -315,47 +315,47 @@ else strcat(fmt, "%.0s)"); - if (toString) - { // put in toString if provided + if (toString) + { // put in toString if provided snprintf(toString, LINESIZE, fmt, - &Strings[e->FileOffset], + &Strings[e->FileOffset], &Strings[e2->FileOffset], - (unsigned int)e->SourceLine, + (unsigned int)e->SourceLine, (unsigned int)e2->SourceLine, - &Strings[e->FunctionOffset], - &Strings[e2->FunctionOffset]); + &Strings[e->FunctionOffset], + &Strings[e2->FunctionOffset]); } else { strcat(fmt, "\n"); printf(fmt, - &Strings[e->FileOffset], + &Strings[e->FileOffset], &Strings[e2->FileOffset], - (unsigned int)e->SourceLine, + (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->FileOffset], + (unsigned int)e->SourceLine, &Strings[e->FunctionOffset]); } else { printf("%s:%u (%s)\n", - &Strings[e->FileOffset], - (unsigned int)e->SourceLine, - &Strings[e->FunctionOffset]); - } - } - return 0; - } + &Strings[e->FileOffset], + (unsigned int)e->SourceLine, + &Strings[e->FunctionOffset]); + } + } + return 0; + } return 1; } @@ -371,24 +371,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); @@ -398,7 +398,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); @@ -413,7 +413,7 @@ printf("??:0\n"); } fprintf(stderr, "Offset not found.\n"); - summ.offset_errors ++; + summ.offset_errors++; } return res; @@ -538,7 +538,7 @@ 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) @@ -557,8 +557,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) @@ -568,7 +568,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) @@ -625,7 +625,7 @@ if (!Line) return NULL; - pentry = malloc(sizeof (CACHE_ENTRY)); + pentry = malloc(sizeof(CACHE_ENTRY)); if (!pentry) return NULL; @@ -682,7 +682,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; @@ -895,9 +895,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; } @@ -934,7 +934,7 @@ if (cnt == 3 && ch == ' ') { tail = strchr(s, '>'); - tail = tail ? tail-1 : tail; + tail = tail ? tail - 1 : tail; if (tail && tail[0] == ')' && tail[1] == '>') { res = 0; @@ -943,20 +943,20 @@ if (opt_redo && !(res = translate_file(path, offset, LineOut))) { log(outFile, "%s<%s:%x (%s)>%s", mark, path, offset, LineOut, tail); - summ.redo ++; + summ.redo++; } else { log(outFile, "%s<%s:%x>%s", mark, path, offset, tail); - summ.undo ++; + summ.undo++; } } else { mark = opt_Mark ? "? " : ""; - summ.skipped ++; + summ.skipped++; } - summ.total ++; + summ.total++; } } @@ -969,14 +969,14 @@ { mark = opt_mark ? "* " : ""; log(outFile, "%s<%s:%x (%s)>%s", mark, path, offset, LineOut, tail); - summ.translated ++; + summ.translated++; } else { mark = opt_Mark ? "? " : ""; - summ.skipped ++; + summ.skipped++; } - summ.total ++; + summ.total++; } } } @@ -990,29 +990,29 @@ } 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, "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, "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); @@ -1090,7 +1090,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) @@ -1125,7 +1125,7 @@ " - 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" @@ -1158,14 +1158,14 @@ " -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" +" - 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" +" - 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" " -S <context>\n" " Source lines. Display up to <context> lines until linenumber.\n" @@ -1195,7 +1195,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" @@ -1243,7 +1243,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); @@ -1252,8 +1252,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; } @@ -1394,7 +1394,7 @@ } strcpy(opt_scanned, ""); - for (i=1; i<argc; i++) + for (i = 1; i < argc; i++) { strcat(opt_scanned, argv[i]); strcat(opt_scanned, " "); @@ -1506,7 +1506,7 @@ { if (opt_verbose) fprintf(stderr, "Disabling log buffering on %s\n", opt_logFile); - setbuf(logFile,NULL); + setbuf(logFile, NULL); } else { @@ -1537,15 +1537,15 @@ fprintf(stderr, "translating %s %s\n", base, offset); translate_file(base, my_atoi(offset), NULL); reportSource(stdout); - } + } else { fprintf(stderr, "<exefile> expected\n"); res = 3; break; - } - } - else + } + } + else { // Must be exefile base = offset; @@ -1553,7 +1553,7 @@ } } else - { // translate logging from stdin + { // translate logging from stdin translate_files(stdin, stdout); }

1 0

[tkreuzer] 44616: Fix built a bit more.
by tkreuzer＠svn.reactos.org 15 Dec '09

15 Dec '09

Author: tkreuzer Date: Wed Dec 16 00:49:10 2009 New Revision: 44616 URL: http://svn.reactos.org/svn/reactos?rev=44616&view=rev Log: Fix built a bit more. Modified: trunk/reactos/base/applications/sndrec32/audio_membuffer.cpp Modified: trunk/reactos/base/applications/sndrec32/audio_membuffer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/audio_membuffer.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/audio_membuffer.cpp [iso-8859-1] Wed Dec 16 00:49:10 2009 @@ -7,7 +7,7 @@ -#include "StdAfx.h" +#include "stdafx.h" #include "audio_membuffer.hpp"

1 0

[janderwald] 44615: fix build
by janderwald＠svn.reactos.org 15 Dec '09

15 Dec '09

Author: janderwald Date: Wed Dec 16 00:28:54 2009 New Revision: 44615 URL: http://svn.reactos.org/svn/reactos?rev=44615&view=rev Log: fix build Modified: trunk/reactos/base/applications/sndrec32/audio_def.hpp Modified: trunk/reactos/base/applications/sndrec32/audio_def.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/audio_def.hpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/audio_def.hpp [iso-8859-1] Wed Dec 16 00:28:54 2009 @@ -51,7 +51,7 @@ #include <windows.h> #include <mmsystem.h> //Windows MultiMedia (WINMM) audio apis #include <mmreg.h> //codecs stuff -#include <Msacm.h> //codecs stuff +#include <msacm.h> //codecs stuff

1 0

[janderwald] 44613: * Added wavebar * Added format, duration, buffer, position labels - Now wave_in/out objects are opened only when pressed rec/play buttons. - The slider bar now real points to audio samples in the buffer - Some other little Gui changes - by Marco Pagliaricci (IRC: rendar)
by janderwald＠svn.reactos.org 15 Dec '09

15 Dec '09

Author: janderwald Date: Tue Dec 15 23:39:18 2009 New Revision: 44613 URL: http://svn.reactos.org/svn/reactos?rev=44613&view=rev Log: * Added wavebar * Added format, duration, buffer, position labels - Now wave_in/out objects are opened only when pressed rec/play buttons. - The slider bar now real points to audio samples in the buffer - Some other little Gui changes - by Marco Pagliaricci (IRC: rendar) Modified: trunk/reactos/base/applications/sndrec32/audio_def.hpp trunk/reactos/base/applications/sndrec32/audio_format.cpp trunk/reactos/base/applications/sndrec32/audio_format.hpp trunk/reactos/base/applications/sndrec32/audio_membuffer.cpp trunk/reactos/base/applications/sndrec32/audio_membuffer.hpp trunk/reactos/base/applications/sndrec32/audio_producer.cpp trunk/reactos/base/applications/sndrec32/audio_producer.hpp trunk/reactos/base/applications/sndrec32/audio_receiver.cpp trunk/reactos/base/applications/sndrec32/audio_receiver.hpp trunk/reactos/base/applications/sndrec32/audio_resampler_acm.cpp trunk/reactos/base/applications/sndrec32/audio_resampler_acm.hpp trunk/reactos/base/applications/sndrec32/audio_wavein.cpp trunk/reactos/base/applications/sndrec32/audio_wavein.hpp trunk/reactos/base/applications/sndrec32/audio_waveout.cpp trunk/reactos/base/applications/sndrec32/audio_waveout.hpp trunk/reactos/base/applications/sndrec32/lang/en-US.rc trunk/reactos/base/applications/sndrec32/lang/it-IT.rc trunk/reactos/base/applications/sndrec32/resource.h trunk/reactos/base/applications/sndrec32/sndrec32.cpp trunk/reactos/base/applications/sndrec32/sndrec32.h trunk/reactos/base/applications/sndrec32/sndrec32.rbuild trunk/reactos/base/applications/sndrec32/stdafx.h trunk/reactos/base/applications/sndrec32/targetver.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/sndrec32/audio_def.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/audio_format.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/audio_format.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/audio_membuffer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/audio_membuffer.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/audio_producer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/audio_producer.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/audio_receiver.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/audio_receiver.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/audio_resampler_acm.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/audio_resampler_acm.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/audio_wavein.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/audio_wavein.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/audio_waveout.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/audio_waveout.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/sndrec32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/sndrec32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/targetver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32…

1 0

[tkreuzer] 44612: remove old hacks
by tkreuzer＠svn.reactos.org 15 Dec '09

15 Dec '09

Author: tkreuzer Date: Tue Dec 15 23:08:38 2009 New Revision: 44612 URL: http://svn.reactos.org/svn/reactos?rev=44612&view=rev Log: remove old hacks Modified: branches/ros-amd64-bringup/reactos/include/psdk/msacm.h branches/ros-amd64-bringup/reactos/include/psdk/sqlext.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/msacm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/msacm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/msacm.h [iso-8859-1] Tue Dec 15 23:08:38 2009 @@ -21,9 +21,6 @@ #ifndef __WINE_MSACM_H #define __WINE_MSACM_H -/* HACK! This shouldn't be here, but wine code needs it. */ -#include <mmreg.h> - #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */ Modified: branches/ros-amd64-bringup/reactos/include/psdk/sqlext.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/sqlext.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/sqlext.h [iso-8859-1] Tue Dec 15 23:08:38 2009 @@ -1142,9 +1142,7 @@ #endif #define TRACE_VERSION 1000 -#ifndef __WINE_DEBUG_H // HACK!!! #define TRACE_ON 1 -#endif #ifndef RC_INVOKED #define SQL_ODBC_KEYWORDS \

1 0

[tkreuzer] 44611: shuffle headers, add #undef, helps with wine macros.
by tkreuzer＠svn.reactos.org 15 Dec '09

15 Dec '09

Author: tkreuzer Date: Tue Dec 15 22:53:29 2009 New Revision: 44611 URL: http://svn.reactos.org/svn/reactos?rev=44611&view=rev Log: shuffle headers, add #undef, helps with wine macros. Modified: branches/ros-amd64-bringup/reactos/dll/win32/odbc32/proxyodbc.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/odbc32/proxyodbc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/odbc32/proxyodbc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/odbc32/proxyodbc.c [iso-8859-1] Tue Dec 15 22:53:29 2009 @@ -37,13 +37,16 @@ #include "windef.h" #include "winbase.h" #include "winreg.h" + +#include "sql.h" +#include "sqltypes.h" +#include "sqlext.h" + +#undef TRACE_ON + #include "wine/debug.h" #include "wine/library.h" #include "wine/unicode.h" - -#include "sql.h" -#include "sqltypes.h" -#include "sqlext.h" #include "proxyodbc.h"

1 0

[spetreolle] 44610: -Add missing NTAPI in prototypes. -Fix PLONG casts. -Remove duplicate Ext2FastIoQueryNetworkOpenInfo declaration.
by spetreolle＠svn.reactos.org 15 Dec '09

15 Dec '09

Author: spetreolle Date: Tue Dec 15 22:50:33 2009 New Revision: 44610 URL: http://svn.reactos.org/svn/reactos?rev=44610&view=rev Log: -Add missing NTAPI in prototypes. -Fix PLONG casts. -Remove duplicate Ext2FastIoQueryNetworkOpenInfo declaration. Modified: branches/arty-newcc/drivers/filesystems/Ext3Fsd/cmcb.c branches/arty-newcc/drivers/filesystems/Ext3Fsd/fastio.c branches/arty-newcc/drivers/filesystems/Ext3Fsd/include/ext2fs.h Modified: branches/arty-newcc/drivers/filesystems/Ext3Fsd/cmcb.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/Ext3Fsd/cmcb.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/Ext3Fsd/cmcb.c [iso-8859-1] Tue Dec 15 22:50:33 2009 @@ -142,7 +142,7 @@ ExReleaseResourceLite(&Fcb->MainResource); } -BOOLEAN +BOOLEAN NTAPI Ext2NoOpAcquire ( IN PVOID Fcb, IN BOOLEAN Wait @@ -153,7 +153,7 @@ return TRUE; } -VOID +VOID NTAPI Ext2NoOpRelease ( IN PVOID Fcb ) @@ -196,7 +196,7 @@ } -NTSTATUS +NTSTATUS NTAPI Ext2AcquireFileForModWrite ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER EndingOffset, @@ -226,7 +226,7 @@ return (ResourceAcquired ? STATUS_SUCCESS : STATUS_CANT_WAIT); } -NTSTATUS +NTSTATUS NTAPI Ext2ReleaseFileForModWrite ( IN PFILE_OBJECT FileObject, IN PERESOURCE ResourceToRelease, @@ -248,7 +248,7 @@ return STATUS_SUCCESS; } -NTSTATUS +NTSTATUS NTAPI Ext2AcquireFileForCcFlush ( IN PFILE_OBJECT FileObject, IN PDEVICE_OBJECT DeviceObject @@ -265,7 +265,7 @@ return STATUS_SUCCESS; } -NTSTATUS +NTSTATUS NTAPI Ext2ReleaseFileForCcFlush ( IN PFILE_OBJECT FileObject, IN PDEVICE_OBJECT DeviceObject Modified: branches/arty-newcc/drivers/filesystems/Ext3Fsd/fastio.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/Ext3Fsd/fastio.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/Ext3Fsd/fastio.c [iso-8859-1] Tue Dec 15 22:50:33 2009 @@ -54,7 +54,7 @@ } -BOOLEAN +BOOLEAN NTAPI Ext2FastIoCheckIfPossible ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -156,6 +156,7 @@ #if EXT2_DEBUG BOOLEAN +NTAPI Ext2FastIoRead (IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -195,6 +196,7 @@ } BOOLEAN +NTAPI Ext2FastIoWrite ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -243,7 +245,7 @@ #endif /* EXT2_DEBUG */ -BOOLEAN +BOOLEAN NTAPI Ext2FastIoQueryBasicInfo ( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, @@ -358,7 +360,7 @@ return Status; } -BOOLEAN +BOOLEAN NTAPI Ext2FastIoQueryStandardInfo ( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, @@ -480,7 +482,7 @@ return Status; } -BOOLEAN +BOOLEAN NTAPI Ext2FastIoLock ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -588,7 +590,7 @@ return Status; } -BOOLEAN +BOOLEAN NTAPI Ext2FastIoUnlockSingle ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -691,7 +693,7 @@ return Status; } -BOOLEAN +BOOLEAN NTAPI Ext2FastIoUnlockAll ( IN PFILE_OBJECT FileObject, IN PEPROCESS Process, @@ -782,7 +784,7 @@ return Status; } -BOOLEAN +BOOLEAN NTAPI Ext2FastIoUnlockAllByKey ( IN PFILE_OBJECT FileObject, IN PEPROCESS Process, @@ -885,7 +887,7 @@ } -BOOLEAN +BOOLEAN NTAPI Ext2FastIoQueryNetworkOpenInfo ( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, Modified: branches/arty-newcc/drivers/filesystems/Ext3Fsd/include/ext2fs.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… ============================================================================== --- branches/arty-newcc/drivers/filesystems/Ext3Fsd/include/ext2fs.h [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/Ext3Fsd/include/ext2fs.h [iso-8859-1] Tue Dec 15 22:50:33 2009 @@ -870,7 +870,7 @@ static __inline ULONG DEC_OBJ_CNT(PULONG _C) { if (*_C > 0) { - return InterlockedDecrement(_C); + return InterlockedDecrement((PLONG)_C); } else { DbgBreak(); } @@ -1030,12 +1030,12 @@ Ext2TraceMemory(BOOLEAN _n, int _i, PVOID _p, LONG _s) { if (_n) { - InterlockedIncrement(&Ext2Global->PerfStat.Current.Slot[_i]); - InterlockedIncrement(&Ext2Global->PerfStat.Total.Slot[_i]); - InterlockedExchangeAdd(&Ext2Global->PerfStat.Size.Slot[_i], _s); + InterlockedIncrement((PLONG)&Ext2Global->PerfStat.Current.Slot[_i]); + InterlockedIncrement((PLONG)&Ext2Global->PerfStat.Total.Slot[_i]); + InterlockedExchangeAdd((PLONG)&Ext2Global->PerfStat.Size.Slot[_i], _s); } else { - InterlockedDecrement(&Ext2Global->PerfStat.Current.Slot[_i]); - InterlockedExchangeAdd(&Ext2Global->PerfStat.Size.Slot[_i], -1 * _s); + InterlockedDecrement((PLONG)&Ext2Global->PerfStat.Current.Slot[_i]); + InterlockedExchangeAdd((PLONG)&Ext2Global->PerfStat.Size.Slot[_i], -1 * _s); } } @@ -1046,11 +1046,11 @@ { if (_n) { INC_MEM_COUNT(PS_IRP_CONTEXT, IrpContext, sizeof(EXT2_IRP_CONTEXT)); - InterlockedIncrement(&(Ext2Global->PerfStat.Irps[IrpContext->MajorFunction].Current)); + InterlockedIncrement((PLONG)&(Ext2Global->PerfStat.Irps[IrpContext->MajorFunction].Current)); } else { DEC_MEM_COUNT(PS_IRP_CONTEXT, IrpContext, sizeof(EXT2_IRP_CONTEXT)); - InterlockedIncrement(&Ext2Global->PerfStat.Irps[IrpContext->MajorFunction].Processed); - InterlockedDecrement(&Ext2Global->PerfStat.Irps[IrpContext->MajorFunction].Current); + InterlockedIncrement((PLONG)&Ext2Global->PerfStat.Irps[IrpContext->MajorFunction].Processed); + InterlockedDecrement((PLONG)&Ext2Global->PerfStat.Irps[IrpContext->MajorFunction].Current); } } @@ -1160,12 +1160,12 @@ VOID Ext2ReleaseFromReadAhead (IN PVOID Context); -BOOLEAN +BOOLEAN NTAPI Ext2NoOpAcquire ( IN PVOID Fcb, IN BOOLEAN Wait ); -VOID +VOID NTAPI Ext2NoOpRelease (IN PVOID Fcb); VOID @@ -1178,7 +1178,7 @@ IN PFILE_OBJECT FileObject ); -NTSTATUS +NTSTATUS NTAPI Ext2AcquireFileForModWrite ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER EndingOffset, @@ -1186,20 +1186,20 @@ IN PDEVICE_OBJECT DeviceObject ); -NTSTATUS +NTSTATUS NTAPI Ext2ReleaseFileForModWrite ( IN PFILE_OBJECT FileObject, IN PERESOURCE ResourceToRelease, IN PDEVICE_OBJECT DeviceObject ); -NTSTATUS +NTSTATUS NTAPI Ext2AcquireFileForCcFlush ( IN PFILE_OBJECT FileObject, IN PDEVICE_OBJECT DeviceObject ); -NTSTATUS +NTSTATUS NTAPI Ext2ReleaseFileForCcFlush ( IN PFILE_OBJECT FileObject, IN PDEVICE_OBJECT DeviceObject @@ -1745,7 +1745,7 @@ IN PEXT2_FCB Fcb ); -BOOLEAN +BOOLEAN NTAPI Ext2FastIoCheckIfPossible ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -1759,6 +1759,7 @@ BOOLEAN +NTAPI Ext2FastIoRead (IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -1769,6 +1770,7 @@ IN PDEVICE_OBJECT DeviceObject); BOOLEAN +NTAPI Ext2FastIoWrite ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -1779,7 +1781,7 @@ OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject); -BOOLEAN +BOOLEAN NTAPI Ext2FastIoQueryBasicInfo ( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, @@ -1787,7 +1789,7 @@ OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject); -BOOLEAN +BOOLEAN NTAPI Ext2FastIoQueryStandardInfo ( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, @@ -1795,7 +1797,7 @@ OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject); -BOOLEAN +BOOLEAN NTAPI Ext2FastIoLock ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -1808,7 +1810,7 @@ IN PDEVICE_OBJECT DeviceObject ); -BOOLEAN +BOOLEAN NTAPI Ext2FastIoUnlockSingle ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -1819,7 +1821,7 @@ IN PDEVICE_OBJECT DeviceObject ); -BOOLEAN +BOOLEAN NTAPI Ext2FastIoUnlockAll ( IN PFILE_OBJECT FileObject, IN PEPROCESS Process, @@ -1827,7 +1829,7 @@ IN PDEVICE_OBJECT DeviceObject ); -BOOLEAN +BOOLEAN NTAPI Ext2FastIoUnlockAllByKey ( IN PFILE_OBJECT FileObject, IN PEPROCESS Process, @@ -1836,23 +1838,13 @@ IN PDEVICE_OBJECT DeviceObject ); - -BOOLEAN +BOOLEAN NTAPI Ext2FastIoQueryNetworkOpenInfo ( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, OUT PFILE_NETWORK_OPEN_INFORMATION Buffer, OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject ); - -BOOLEAN -Ext2FastIoQueryNetworkOpenInfo ( - IN PFILE_OBJECT FileObject, - IN BOOLEAN Wait, - OUT PFILE_NETWORK_OPEN_INFORMATION Buffer, - OUT PIO_STATUS_BLOCK IoStatus, - IN PDEVICE_OBJECT DeviceObject); - // // FileInfo.c

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