Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 43351: - Map STATUS_NOT_FOUND to ERROR_NOT_FOUND
by janderwald＠svn.reactos.org 10 Oct '09

10 Oct '09

Author: janderwald Date: Sat Oct 10 05:45:57 2009 New Revision: 43351 URL: http://svn.reactos.org/svn/reactos?rev=43351&view=rev Log: - Map STATUS_NOT_FOUND to ERROR_NOT_FOUND Modified: trunk/reactos/lib/rtl/error.c Modified: trunk/reactos/lib/rtl/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/error.c?rev=43351&… ============================================================================== --- trunk/reactos/lib/rtl/error.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/error.c [iso-8859-1] Sat Oct 10 05:45:57 2009 @@ -594,7 +594,7 @@ ERROR_MR_MID_NOT_FOUND, /* c0000222 */ ERROR_MR_MID_NOT_FOUND, /* c0000223 */ ERROR_PASSWORD_MUST_CHANGE, /* c0000224 (STATUS_PASSWORD_MUST_CHANGE) */ - ERROR_MR_MID_NOT_FOUND, /* c0000225 */ + ERROR_NOT_FOUND, /* c0000225 (STATUS_NOT_FOUND)*/ ERROR_MR_MID_NOT_FOUND, /* c0000226 */ ERROR_MR_MID_NOT_FOUND, /* c0000227 */ ERROR_MR_MID_NOT_FOUND, /* c0000228 */

1 0

[cgutman] 43350: - Specify the interface index so the route won't get added to interface 0 (loopback) - Warn if something tries to add a route to the loopback adapter - Fixes routing issues some people were having
by cgutman＠svn.reactos.org 10 Oct '09

10 Oct '09

Author: cgutman Date: Sat Oct 10 04:04:13 2009 New Revision: 43350 URL: http://svn.reactos.org/svn/reactos?rev=43350&view=rev Log: - Specify the interface index so the route won't get added to interface 0 (loopback) - Warn if something tries to add a route to the loopback adapter - Fixes routing issues some people were having Modified: trunk/reactos/base/services/dhcp/adapter.c trunk/reactos/base/services/dhcp/dhclient.c trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c Modified: trunk/reactos/base/services/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/adapter… ============================================================================== --- trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] Sat Oct 10 04:04:13 2009 @@ -182,6 +182,7 @@ Adapter->RouterMib.dwForwardDest = 0; Adapter->RouterMib.dwForwardMask = 0; Adapter->RouterMib.dwForwardMetric1 = 1; + Adapter->RouterMib.dwForwardIfIndex = Adapter->IfMib.dwIndex; Adapter->RouterMib.dwForwardNextHop = inet_addr(DefaultGateway); Error = CreateIpForwardEntry( &Adapter->RouterMib ); if( Error ) Modified: trunk/reactos/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhclien… ============================================================================== --- trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] Sat Oct 10 04:04:13 2009 @@ -519,6 +519,7 @@ Adapter->RouterMib.dwForwardDest = 0; /* Default route */ Adapter->RouterMib.dwForwardMask = 0; Adapter->RouterMib.dwForwardMetric1 = 1; + Adapter->RouterMib.dwForwardIfIndex = Adapter->IfMib.dwIndex; if( Adapter->RouterMib.dwForwardNextHop ) { /* If we set a default route before, delete it before continuing */ Modified: trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c [iso-8859-1] Sat Oct 10 04:04:13 2009 @@ -181,6 +181,12 @@ AddrInitIPv4( &Netmask, Route->Mask ); AddrInitIPv4( &Router, Route->Gw ); + if (IF == Loopback) + { + DbgPrint("Failing attempt to add route to loopback adapter\n"); + return TDI_INVALID_PARAMETER; + } + if( Route->Type == IP_ROUTE_TYPE_ADD ) { /* Add the route */ TI_DbgPrint(DEBUG_INFO,("Adding route (%s)\n", A2S(&Address))); if (!RouterCreateRoute( &Address, &Netmask, &Router,

1 0

[mjmartin] 43349: - KeyboardThreadMain: Set RepeatRate to 1 vice 0. Fixes text input in OpenOffice Writer.
by mjmartin＠svn.reactos.org 10 Oct '09

10 Oct '09

Author: mjmartin Date: Sat Oct 10 03:13:17 2009 New Revision: 43349 URL: http://svn.reactos.org/svn/reactos?rev=43349&view=rev Log: - KeyboardThreadMain: Set RepeatRate to 1 vice 0. Fixes text input in OpenOffice Writer. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sat Oct 10 03:13:17 2009 @@ -764,7 +764,7 @@ } else { - RepeatCount = 0; + RepeatCount = 1; LastFlags = KeyInput.Flags & (KEY_E0 | KEY_E1); LastMakeCode = KeyInput.MakeCode; }

1 0

[tkreuzer] 43348: Fix SECURITY_DESCRIPTOR_RELATIVE that I broke, spotted by Stefan
by tkreuzer＠svn.reactos.org 09 Oct '09

09 Oct '09

Author: tkreuzer Date: Sat Oct 10 00:52:39 2009 New Revision: 43348 URL: http://svn.reactos.org/svn/reactos?rev=43348&view=rev Log: Fix SECURITY_DESCRIPTOR_RELATIVE that I broke, spotted by Stefan Modified: trunk/reactos/include/ddk/ntifs.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=43… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Sat Oct 10 00:52:39 2009 @@ -945,10 +945,10 @@ UCHAR Revision; UCHAR Sbz1; SECURITY_DESCRIPTOR_CONTROL Control; - DWORD_PTR Owner; - DWORD_PTR Group; - DWORD_PTR Sacl; - DWORD_PTR Dacl; + ULONG Owner; + ULONG Group; + ULONG Sacl; + ULONG Dacl; } SECURITY_DESCRIPTOR_RELATIVE, *PISECURITY_DESCRIPTOR_RELATIVE; typedef enum _TOKEN_INFORMATION_CLASS { TokenUser=1,TokenGroups,TokenPrivileges,TokenOwner,

1 0

[gschneider] 43347: - Various resource fixes (unclosed files, unchecked memory allocations, missing destructor, not freed memory) - Patch by Russell with some modifications by myself See issue #4662 for more details.
by gschneider＠svn.reactos.org 09 Oct '09

09 Oct '09

Author: gschneider Date: Fri Oct 9 23:02:44 2009 New Revision: 43347 URL: http://svn.reactos.org/svn/reactos?rev=43347&view=rev Log: - Various resource fixes (unclosed files, unchecked memory allocations, missing destructor, not freed memory) - Patch by Russell with some modifications by myself See issue #4662 for more details. Modified: trunk/reactos/base/applications/downloader/xml.c trunk/reactos/base/services/dhcp/memory.c trunk/reactos/boot/freeldr/tools/deptool.c trunk/reactos/tools/buildno/buildno.cpp trunk/reactos/tools/cdmake/cdmake.c trunk/reactos/tools/mkconfig.c trunk/reactos/tools/rbuild/rbuild.h trunk/reactos/tools/stubgen.c Modified: trunk/reactos/base/applications/downloader/xml.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/xml.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/downloader/xml.c [iso-8859-1] Fri Oct 9 23:02:44 2009 @@ -203,6 +203,7 @@ if(!XML_Parse(parser, buffer, len, done)) { MessageBoxW(0,Strings[IDS_XMLERROR_2],0,0); + fclose(file); return FALSE; } } Modified: trunk/reactos/base/services/dhcp/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/memory.… ============================================================================== --- trunk/reactos/base/services/dhcp/memory.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/memory.c [iso-8859-1] Fri Oct 9 23:02:44 2009 @@ -829,7 +829,11 @@ user_class_hash = new_hash (); if (!tname || !class || !vendor_class_hash || !user_class_hash) + { + if (tname != NULL) + free(tname); return (struct class *)0; + } memset (class, 0, sizeof *class); strcpy (tname, name); Modified: trunk/reactos/boot/freeldr/tools/deptool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/tools/deptool… ============================================================================== --- trunk/reactos/boot/freeldr/tools/deptool.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/tools/deptool.c [iso-8859-1] Fri Oct 9 23:02:44 2009 @@ -50,6 +50,10 @@ if (!DependFileData || !NewDependFileData) { printf("deptool: Out of memory!\n"); + if (DependFileData != NULL) + free(DependFileData); + if (NewDependFileData != NULL) + free(NewDependFileData); fclose(DependFile); return ERROR_OUTOFMEMORY; } @@ -61,6 +65,8 @@ if (ferror(DependFile)) { printf("deptool: Dependency file read error.\n"); + free(DependFileData); + free(NewDependFileData); fclose(DependFile); return ERROR_READERROR; } @@ -121,9 +127,13 @@ { printf("deptool: Dependency file write error.\n"); fclose(DependFile); + free(DependFileData); + free(NewDependFileData); return ERROR_WRITEERROR; } fclose(DependFile); + free(DependFileData); + free(NewDependFileData); return ERROR_SUCCESS; } Modified: trunk/reactos/tools/buildno/buildno.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/buildno/buildno.cpp?… ============================================================================== --- trunk/reactos/tools/buildno/buildno.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/buildno/buildno.cpp [iso-8859-1] Fri Oct 9 23:02:44 2009 @@ -236,14 +236,22 @@ char* orig; orig = (char *) malloc(length); + if (orig == NULL) + { + fclose(h); + free(s1); + return; + } fseek(h, 0, SEEK_SET); fread(orig, 1, length, h); if (memcmp(s1, orig, length) == 0) { fclose(h); free(s1); + free(orig); return; } + free(orig); } fclose(h); } @@ -259,7 +267,7 @@ return; } fwrite(s1, 1, strlen(s1), h); - fclose (h); + fclose(h); } void Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] Fri Oct 9 23:02:44 2009 @@ -1259,7 +1259,10 @@ size = ftell(file); fseek(file, 0, SEEK_SET); if (size == 0 || (size % 2048)) + { + fclose(file); error_exit("Invalid boot image size (%lu bytes)\n", size); + } boot_image_size = size / 512; while (size > 0) { Modified: trunk/reactos/tools/mkconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkconfig.c?rev=43347… ============================================================================== --- trunk/reactos/tools/mkconfig.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkconfig.c [iso-8859-1] Fri Oct 9 23:02:44 2009 @@ -44,15 +44,18 @@ { fprintf(stderr, "Failed to read data\n"); fclose(out); + free(cmpbuf); return(1); } if (end == strlen(outbuf) && memcmp(cmpbuf, outbuf, end) == 0) { fclose(out); + free(cmpbuf); return(0); } fclose(out); + free(cmpbuf); out = fopen(filename, "wb"); if (out == NULL) { Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] Fri Oct 9 23:02:44 2009 @@ -455,6 +455,7 @@ void ParseToolsets ( const Project& project, const XMLElement& node ); public: + virtual ~ToolsetDirective() { } bool IsEnabled () const; }; @@ -469,6 +470,7 @@ public: CompilerDirective (): enabled ( true ) { } + virtual ~CompilerDirective() { } void SetCompiler ( CompilerType compiler ); void UnsetCompiler ( CompilerType compiler ); void SetAllCompilers (); Modified: trunk/reactos/tools/stubgen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/stubgen.c?rev=43347&… ============================================================================== --- trunk/reactos/tools/stubgen.c [iso-8859-1] (original) +++ trunk/reactos/tools/stubgen.c [iso-8859-1] Fri Oct 9 23:02:44 2009 @@ -88,7 +88,13 @@ if( new_f ) continue; new_f = (stub *)malloc( sizeof(stub) ); - if( !new_f ) {fprintf( stderr, "Out of memory\n" ); return 1;} + if( !new_f ) + { + fprintf( stderr, "Out of memory\n" ); + fclose( out ); + pclose( make_f ); + return 1; + } new_f->name = strdup( line ); new_f->next = functions; @@ -129,7 +135,14 @@ if( new_f ) continue; new_f = (stub *)malloc( sizeof(stub) ); - if( !new_f ) {fprintf( stderr, "Out of memory\n" ); return 1;} + if( !new_f ) + { + fprintf( stderr, "Out of memory\n" ); + fclose( out ); + pclose( make_f ); + pclose( nm_f ); + return 1; + } new_f->name = strdup( import_sign + 1 ); new_f->origin = origin; @@ -137,7 +150,7 @@ imports = new_f; } - fclose( nm_f ); + pclose( nm_f ); } /* Now we have a list of unique functions and a list of imports, @@ -152,6 +165,6 @@ } fclose( out ); - + pclose( make_f ); return 0; }

1 0

[sginsberg] 43346: - Hey, you know what? Dbg/NtQueryDebugFilterState returns TRUE/FALSE after all.
by sginsberg＠svn.reactos.org 09 Oct '09

09 Oct '09

Author: sginsberg Date: Fri Oct 9 21:54:07 2009 New Revision: 43346 URL: http://svn.reactos.org/svn/reactos?rev=43346&view=rev Log: - Hey, you know what? Dbg/NtQueryDebugFilterState returns TRUE/FALSE after all. Modified: trunk/reactos/lib/drivers/ip/network/routines.c Modified: trunk/reactos/lib/drivers/ip/network/routines.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/rou… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/routines.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/routines.c [iso-8859-1] Fri Oct 9 21:54:07 2009 @@ -94,8 +94,8 @@ UINT Length; PCHAR Buffer; - if (!NT_SUCCESS(DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_PBUFFER | DPFLTR_MASK)) || - !NT_SUCCESS(DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_TCP | DPFLTR_MASK))) { + if (!(DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_PBUFFER | DPFLTR_MASK)) || + !(DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_TCP | DPFLTR_MASK))) { return; } @@ -139,8 +139,8 @@ PNDIS_BUFFER NextBuffer; PCHAR CharBuffer; - if (!NT_SUCCESS(DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_PBUFFER | DPFLTR_MASK)) || - !NT_SUCCESS(DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_IP | DPFLTR_MASK))) { + if (!(DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_PBUFFER | DPFLTR_MASK)) || + !(DbgQueryDebugFilterState(DPFLTR_TCPIP_ID, DEBUG_IP | DPFLTR_MASK))) { return; }

1 0

[gschneider] 43345: Correct MPEG1/2 video decoder filename, patch by Russell See issue #4878 for more details.
by gschneider＠svn.reactos.org 09 Oct '09

09 Oct '09

Author: gschneider Date: Fri Oct 9 20:45:24 2009 New Revision: 43345 URL: http://svn.reactos.org/svn/reactos?rev=43345&view=rev Log: Correct MPEG1/2 video decoder filename, patch by Russell See issue #4878 for more details. Modified: trunk/reactos/boot/bootdata/system.ini Modified: trunk/reactos/boot/bootdata/system.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/system.ini?r… ============================================================================== --- trunk/reactos/boot/bootdata/system.ini [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/system.ini [iso-8859-1] Fri Oct 9 20:45:24 2009 @@ -9,8 +9,8 @@ vidc.cvid=iccvid.dll [mci] -MPEGVideo=mciqtz.drv -MPEGVideo2=mciqtz.drv +MPEGVideo=mciqtz32.dll +MPEGVideo2=mciqtz32.dll AVIVideo=mciavi32.dll CDAudio=mcicda.dll Sequencer=mciseq.dll

1 0

[janderwald] 43344: [KS] - Fix a bug when canceling irps
by janderwald＠svn.reactos.org 09 Oct '09

09 Oct '09

Author: janderwald Date: Fri Oct 9 18:48:41 2009 New Revision: 43344 URL: http://svn.reactos.org/svn/reactos?rev=43344&view=rev Log: [KS] - Fix a bug when canceling irps Modified: trunk/reactos/drivers/ksfilter/ks/irp.c Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Fri Oct 9 18:48:41 2009 @@ -1690,7 +1690,7 @@ RemoveEntryList(&Irp->Tail.Overlay.ListEntry); /* release spinlock */ - KeReleaseSpinLockFromDpcLevel(SpinLock); + KeReleaseSpinLock(SpinLock, Irp->CancelIrql); /* has the irp already been canceled */ if (Irp->IoStatus.Status != STATUS_CANCELLED)

1 0

[fireball] 43343: [fastfat_new] - Add two names to an FCB - a short name, and a long name. - Start implementing FatSetFcbNames, currently deals with short names only. - Implement Fati8dot3ToString, with most of the code actually #if0ed, because FullFAT already does this conversion.
by fireball＠svn.reactos.org 09 Oct '09

09 Oct '09

Author: fireball Date: Fri Oct 9 16:20:33 2009 New Revision: 43343 URL: http://svn.reactos.org/svn/reactos?rev=43343&view=rev Log: [fastfat_new] - Add two names to an FCB - a short name, and a long name. - Start implementing FatSetFcbNames, currently deals with short names only. - Implement Fati8dot3ToString, with most of the code actually #if0ed, because FullFAT already does this conversion. Modified: trunk/reactos/drivers/filesystems/fastfat_new/dir.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h trunk/reactos/drivers/filesystems/fastfat_new/fcb.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] Fri Oct 9 16:20:33 2009 @@ -71,9 +71,9 @@ Dcb->FullFileName.Length = 1 * sizeof(WCHAR); Dcb->FullFileName.MaximumLength = 2 * sizeof(WCHAR); - Dcb->FileName.Name.Ansi.Buffer = "\\"; - Dcb->FileName.Name.Ansi.Length = 1; - Dcb->FileName.Name.Ansi.MaximumLength = 2 * sizeof(CHAR); + Dcb->ShortName.Name.Ansi.Buffer = "\\"; + Dcb->ShortName.Name.Ansi.Length = 1; + Dcb->ShortName.Name.Ansi.MaximumLength = 2 * sizeof(CHAR); /* Fill dirent attribute byte copy */ Dcb->DirentFatFlags = FILE_ATTRIBUTE_DIRECTORY; Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Fri Oct 9 16:20:33 2009 @@ -306,8 +306,14 @@ VOID NTAPI FatSetFcbNames(IN PFAT_IRP_CONTEXT IrpContext, + IN PUNICODE_STRING Lfn, IN PFCB Fcb); +VOID NTAPI +Fati8dot3ToString(IN PCHAR FileName, + IN BOOLEAN DownCase, + OUT POEM_STRING OutString); + /* ------------------------------------------------------------ rw.c */ NTSTATUS NTAPI Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Fri Oct 9 16:20:33 2009 @@ -269,10 +269,11 @@ /* Mcb mapping Vbo->Lbo */ LARGE_MCB Mcb; ULONG FirstCluster; - /* Links into FCB Trie */ - FCB_NAME_LINK FileName; + /* Links into FCB Tree */ + FCB_NAME_LINK ShortName; + FCB_NAME_LINK LongName; /* Buffer for the short name */ - WCHAR ShortNameBuffer[0xc]; + CHAR ShortNameBuffer[0xc]; /* Full file name */ UNICODE_STRING FullFileName; /* Long name with exact case */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] Fri Oct 9 16:20:33 2009 @@ -150,7 +150,7 @@ Fcb->FatHandle = FileHandle; /* Set names */ - FatSetFcbNames(IrpContext, Fcb); + FatSetFcbNames(IrpContext, NULL, Fcb); return Fcb; } @@ -247,10 +247,125 @@ VOID NTAPI FatSetFcbNames(IN PFAT_IRP_CONTEXT IrpContext, + IN PUNICODE_STRING Lfn, IN PFCB Fcb) { - // Set the short name first - UNIMPLEMENTED; -} + FF_DIRENT DirEnt; + FF_ERROR Err; + POEM_STRING ShortName; + + /* Get the dir entry */ + Err = FF_GetEntry(Fcb->Vcb->Ioman, + Fcb->FatHandle->DirEntry, + Fcb->FatHandle->DirCluster, + &DirEnt); + + if (Err != FF_ERR_NONE) + { + DPRINT1("Error %d getting dirent of a file\n", Err); + return; + } + + /* Initialize short name string */ + ShortName = &Fcb->ShortName.Name.Ansi; + ShortName->Buffer = Fcb->ShortNameBuffer; + ShortName->Length = 0; + ShortName->MaximumLength = sizeof(Fcb->ShortNameBuffer); + + /* Convert dirent to the proper string */ + Fati8dot3ToString(DirEnt.FileName, FALSE, ShortName); + + // Unicode name + + // Add names to the splay tree +} + +VOID +NTAPI +Fati8dot3ToString(IN PCHAR FileName, + IN BOOLEAN DownCase, + OUT POEM_STRING OutString) +{ +#if 0 + ULONG BaseLen, ExtLen; + CHAR *cString = OutString->Buffer; + ULONG i; + + /* Calc base and ext lens */ + for (BaseLen = 8; BaseLen > 0; BaseLen--) + { + if (FileName[BaseLen - 1] != ' ') break; + } + + for (ExtLen = 3; ExtLen > 0; ExtLen--) + { + if (FileName[8 + ExtLen - 1] != ' ') break; + } + + /* Process base name */ + if (BaseLen) + { + RtlCopyMemory(cString, FileName, BaseLen); + + /* Substitute the e5 thing */ + if (cString[0] == 0x05) cString[0] = 0xe5; + + /* Downcase if asked to */ + if (DownCase) + { + /* Do it manually */ + for (i = 0; i < BaseLen; i++) + { + if (cString[i] >= 'A' && + cString[i] <= 'Z') + { + /* Lowercase it */ + cString[i] += 'a' - 'A'; + } + + } + } + } + + /* Process extension */ + if (ExtLen) + { + /* Add the dot */ + cString[BaseLen] = '.'; + BaseLen++; + + /* Copy the extension */ + for (i = 0; i < ExtLen; i++) + { + cString[BaseLen + i] = FileName[8 + i]; + } + + /* Lowercase the extension if asked to */ + if (DownCase) + { + /* Do it manually */ + for (i = BaseLen; i < BaseLen + ExtLen; i++) + { + if (cString[i] >= 'A' && + cString[i] <= 'Z') + { + /* Lowercase it */ + cString[i] += 'a' - 'A'; + } + } + } + } + + /* Set the length */ + OutString->Length = BaseLen + ExtLen; +#else + RtlCopyMemory(OutString->Buffer, FileName, 11); + OutString->Length = strlen(FileName); + ASSERT(OutString->Length <= 12); +#endif + + DPRINT1("'%s', len %d\n", OutString->Buffer, OutString->Length); +} + /* EOF */

1 0

[janderwald] 43342: [PORTLCS] - KSCATEGORY_AUDIO should be the first device category so that wdmaud can correctly assign virtual device ids
by janderwald＠svn.reactos.org 09 Oct '09

09 Oct '09

Author: janderwald Date: Fri Oct 9 14:36:26 2009 New Revision: 43342 URL: http://svn.reactos.org/svn/reactos?rev=43342&view=rev Log: [PORTLCS] - KSCATEGORY_AUDIO should be the first device category so that wdmaud can correctly assign virtual device ids Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp [iso-8859-1] Fri Oct 9 14:36:26 2009 @@ -65,12 +65,12 @@ static GUID InterfaceGuids[2] = { { + /// KS_CATEGORY_AUDIO + 0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} + }, + { /// KS_CATEGORY_TOPOLOGY 0xDDA54A40, 0x1E4C, 0x11D1, {0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00} - }, - { - /// KS_CATEGORY_AUDIO - 0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} } }; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [iso-8859-1] Fri Oct 9 14:36:26 2009 @@ -60,16 +60,16 @@ static GUID InterfaceGuids[4] = { { + //KS_CATEGORY_AUDIO + 0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} + }, + { /// KSCATEGORY_RENDER 0x65E8773EL, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} }, { /// KSCATEGORY_CAPTURE 0x65E8773DL, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} - }, - { - //KS_CATEGORY_AUDIO - 0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} }, { ///KSCATEGORY_AUDIO_DEVICE Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp [iso-8859-1] Fri Oct 9 14:36:26 2009 @@ -65,16 +65,16 @@ static GUID InterfaceGuids[3] = { { + /// KS_CATEGORY_AUDIO + 0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} + }, + { /// KSCATEGORY_RENDER 0x65E8773EL, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} }, { /// KSCATEGORY_CAPTURE 0x65E8773DL, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} - }, - { - /// KS_CATEGORY_AUDIO - 0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} } }; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp [iso-8859-1] Fri Oct 9 14:36:26 2009 @@ -58,16 +58,16 @@ static GUID InterfaceGuids[3] = { { + /// KS_CATEGORY_AUDIO + 0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} + }, + { /// KSCATEGORY_RENDER 0x65E8773EL, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} }, { /// KSCATEGORY_CAPTURE 0x65E8773DL, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} - }, - { - /// KS_CATEGORY_AUDIO - 0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} } };

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