Ros-diffs June 2015

ros-diffs@reactos.org

13 participants
343 discussions

[ekohl] 68257: [USETUP] - ReAllocateLayoutBuffer: Write all new partition table entries to the disk. - UpdateDiskLayout: - Create link entries for logical partitions. - Wipe unused logical partiton...

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Jun 24 20:06:33 2015 New Revision: 68257 URL: http://svn.reactos.org/svn/reactos?rev=68257&view=rev Log: [USETUP] - ReAllocateLayoutBuffer: Write all new partition table entries to the disk. - UpdateDiskLayout: - Create link entries for logical partitions. - Wipe unused logical partiton table entries. Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Wed Jun 24 20:06:33 2015 @@ -2192,7 +2192,6 @@ } -#if 0 static BOOLEAN IsEmptyLayoutEntry( @@ -2200,12 +2199,10 @@ { if (PartitionInfo->StartingOffset.QuadPart == 0 && PartitionInfo->PartitionLength.QuadPart == 0) -// PartitionInfo->PartitionType == 0) return TRUE; return FALSE; } -#endif static @@ -2280,6 +2277,7 @@ ULONG NewPartitionCount; ULONG CurrentPartitionCount = 0; ULONG LayoutBufferSize; + ULONG i; DPRINT1("ReAllocateLayoutBuffer()\n"); @@ -2306,6 +2304,13 @@ return FALSE; } + /* If the layout buffer grows, make sure the new (empty) entries are written to the disk */ + if (NewPartitionCount > CurrentPartitionCount) + { + for (i = CurrentPartitionCount; i < NewPartitionCount; i++) + NewLayoutBuffer->PartitionEntry[i].RewritePartition = TRUE; + } + DiskEntry->LayoutBuffer = NewLayoutBuffer; DiskEntry->LayoutBuffer->PartitionCount = NewPartitionCount; @@ -2319,6 +2324,7 @@ IN PDISKENTRY DiskEntry) { PPARTITION_INFORMATION PartitionInfo; + PPARTITION_INFORMATION LinkInfo = NULL; PLIST_ENTRY ListEntry; PPARTENTRY PartEntry; ULONG Index; @@ -2350,7 +2356,7 @@ PartitionInfo->StartingOffset.QuadPart = PartEntry->StartSector.QuadPart * DiskEntry->BytesPerSector; PartitionInfo->PartitionLength.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; - PartitionInfo->HiddenSectors = PartEntry->StartSector.LowPart; + PartitionInfo->HiddenSectors = (ULONG)PartEntry->StartSector.QuadPart; PartitionInfo->PartitionNumber = (!IsContainerPartition(PartEntry->PartitionType)) ? PartitionNumber : 0; PartitionInfo->PartitionType = PartEntry->PartitionType; PartitionInfo->BootIndicator = PartEntry->BootIndicator; @@ -2395,6 +2401,22 @@ PartEntry->PartitionNumber = PartitionNumber; PartEntry->PartitionIndex = Index; + /* Fill the link entry of the previous partition table */ + if (LinkInfo != NULL) + { + LinkInfo->StartingOffset.QuadPart = (PartEntry->StartSector.QuadPart - DiskEntry->SectorAlignment) * DiskEntry->BytesPerSector; + LinkInfo->PartitionLength.QuadPart = (PartEntry->StartSector.QuadPart + DiskEntry->SectorAlignment) * DiskEntry->BytesPerSector; + LinkInfo->HiddenSectors = (ULONG)(PartEntry->StartSector.QuadPart - DiskEntry->SectorAlignment - DiskEntry->ExtendedPartition->StartSector.QuadPart); + LinkInfo->PartitionNumber = 0; + LinkInfo->PartitionType = PARTITION_EXTENDED; + LinkInfo->BootIndicator = FALSE; + LinkInfo->RecognizedPartition = FALSE; + LinkInfo->RewritePartition = TRUE; + } + + /* Save a pointer to the link entry of the current partition table */ + LinkInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index + 1]; + PartitionNumber++; Index += 4; } @@ -2402,26 +2424,52 @@ ListEntry = ListEntry->Flink; } -#if 0 - for (;Index < 4; Index++) - { + /* Wipe unused primary partition table entries */ + for (Index = GetPrimaryPartitionCount(DiskEntry); Index < 4; Index++) + { + DPRINT1("Primary partition entry %lu\n", Index); + PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index]; if (!IsEmptyLayoutEntry(PartitionInfo)) { - DPRINT1("Wiping partition entry %lu\n", Index); + DPRINT1("Wiping primary partition entry %lu\n", Index); PartitionInfo->StartingOffset.QuadPart = 0; PartitionInfo->PartitionLength.QuadPart = 0; PartitionInfo->HiddenSectors = 0; PartitionInfo->PartitionNumber = 0; - PartitionInfo->PartitionType = 0; + PartitionInfo->PartitionType = PARTITION_ENTRY_UNUSED; PartitionInfo->BootIndicator = FALSE; PartitionInfo->RecognizedPartition = FALSE; PartitionInfo->RewritePartition = TRUE; } } -#endif + + /* Wipe unused logical partition table entries */ + for (Index = 4; Index < DiskEntry->LayoutBuffer->PartitionCount; Index++) + { + if (Index % 4 >= 2) + { + DPRINT1("Logical partition entry %lu\n", Index); + + PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[Index]; + + if (!IsEmptyLayoutEntry(PartitionInfo)) + { + DPRINT1("Wiping partition entry %lu\n", Index); + + PartitionInfo->StartingOffset.QuadPart = 0; + PartitionInfo->PartitionLength.QuadPart = 0; + PartitionInfo->HiddenSectors = 0; + PartitionInfo->PartitionNumber = 0; + PartitionInfo->PartitionType = PARTITION_ENTRY_UNUSED; + PartitionInfo->BootIndicator = FALSE; + PartitionInfo->RecognizedPartition = FALSE; + PartitionInfo->RewritePartition = TRUE; + } + } + } #ifdef DUMP_PARTITION_TABLE DumpPartitionTable(DiskEntry);

9 years, 6 months

[hbelusca] 68256: [GRMBL]: Fix build on *niks.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jun 24 20:00:23 2015 New Revision: 68256 URL: http://svn.reactos.org/svn/reactos?rev=68256&view=rev Log: [GRMBL]: Fix build on *niks. Modified: trunk/reactos/tools/bin2c.c Modified: trunk/reactos/tools/bin2c.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2c.c?rev=68256&r1… ============================================================================== --- trunk/reactos/tools/bin2c.c [iso-8859-1] (original) +++ trunk/reactos/tools/bin2c.c [iso-8859-1] Wed Jun 24 20:00:23 2015 @@ -7,6 +7,13 @@ */ #include <stdio.h> + +#ifdef _WIN32 +#include <string.h> // Required for _stricmp() +#else +#include <strings.h> // Required for strcasecmp() +#define _stricmp strcasecmp +#endif static size_t dumpHex(FILE* inFile, FILE* outCFile, char nullTerminate) {

9 years, 6 months

[hbelusca] 68255: [TOOLS_BIN2C] - Fix a GCC warning (error on Macs) concerning the printf "%Iu" specifier. - To make sure data included by bin2c, that need to be interpreted as a (long) string, is ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jun 24 19:54:19 2015 New Revision: 68255 URL: http://svn.reactos.org/svn/reactos?rev=68255&view=rev Log: [TOOLS_BIN2C] - Fix a GCC warning (error on Macs) concerning the printf "%Iu" specifier. - To make sure data included by bin2c, that need to be interpreted as a (long) string, is correctly NULL-terminated, introduce an output format called "STR": this creates a long character array using the "\xXX" format. - To circumvent a silly limitation of MSVC (all versions?) about the maximum length (65535 bytes) of a char string (aka. char MyArray[] = "...my_long_string...";), introduced yet another output format called "BINSTR" which creates an array of bytes that is NULL-terminated (aka. char MyArray[] = {0xde, 0xad, 0xbe, 0xef, 0x00};). - Finally, the output format "BIN" is the regular bin2c format (simple array of bytes). [HAL_PCIDATA][FREELDR_INSTALL] Use the above-described functionality (for HAL_PCIDATA, use BINSTR format because the PciVendors data is otherwise too large to be stored in "char_string" format). Modified: trunk/reactos/boot/freeldr/install/CMakeLists.txt trunk/reactos/boot/freeldr/install/install.c trunk/reactos/hal/halx86/pcidata.cmake trunk/reactos/tools/bin2c.c Modified: trunk/reactos/boot/freeldr/install/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/install/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/install/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/install/CMakeLists.txt [iso-8859-1] Wed Jun 24 19:54:19 2015 @@ -4,12 +4,12 @@ # add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/fat.c ${CMAKE_CURRENT_BINARY_DIR}/fat.h - COMMAND native-bin2c ${CMAKE_CURRENT_BINARY_DIR}/../bootsect/fat.bin ${CMAKE_CURRENT_BINARY_DIR}/fat.c ${CMAKE_CURRENT_BINARY_DIR}/fat.h fat_data + COMMAND native-bin2c ${CMAKE_CURRENT_BINARY_DIR}/../bootsect/fat.bin ${CMAKE_CURRENT_BINARY_DIR}/fat.c ${CMAKE_CURRENT_BINARY_DIR}/fat.h BIN fat_data DEPENDS native-bin2c fat) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/fat32.c ${CMAKE_CURRENT_BINARY_DIR}/fat32.h - COMMAND native-bin2c ${CMAKE_CURRENT_BINARY_DIR}/../bootsect/fat32.bin ${CMAKE_CURRENT_BINARY_DIR}/fat32.c ${CMAKE_CURRENT_BINARY_DIR}/fat32.h fat32_data + COMMAND native-bin2c ${CMAKE_CURRENT_BINARY_DIR}/../bootsect/fat32.bin ${CMAKE_CURRENT_BINARY_DIR}/fat32.c ${CMAKE_CURRENT_BINARY_DIR}/fat32.h BIN fat32_data DEPENDS native-bin2c fat32) ##################################### Modified: trunk/reactos/boot/freeldr/install/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/install/insta… ============================================================================== --- trunk/reactos/boot/freeldr/install/install.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/install/install.c [iso-8859-1] Wed Jun 24 19:54:19 2015 @@ -36,7 +36,6 @@ int main(int argc, char *argv[]) { - if (argc < 3) { _tprintf(_T("syntax: install x: [fs_type]\nwhere fs_type is fat or fat32\n")); Modified: trunk/reactos/hal/halx86/pcidata.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/pcidata.cmake?r… ============================================================================== --- trunk/reactos/hal/halx86/pcidata.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/pcidata.cmake [iso-8859-1] Wed Jun 24 19:54:19 2015 @@ -3,11 +3,11 @@ # add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.c ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.h - COMMAND native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_classes.ids ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.c ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.h ClassTable INIT_FUNCTION ${CMAKE_CURRENT_SOURCE_DIR}/include/hal.h + COMMAND native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_classes.ids ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.c ${CMAKE_CURRENT_BINARY_DIR}/pci_classes.h BINSTR ClassTable INIT_FUNCTION ${CMAKE_CURRENT_SOURCE_DIR}/include/hal.h DEPENDS native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_classes.ids) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.c ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.h - COMMAND native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_vendors.ids ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.c ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.h VendorTable INIT_FUNCTION ${CMAKE_CURRENT_SOURCE_DIR}/include/hal.h + COMMAND native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_vendors.ids ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.c ${CMAKE_CURRENT_BINARY_DIR}/pci_vendors.h BINSTR VendorTable INIT_FUNCTION ${CMAKE_CURRENT_SOURCE_DIR}/include/hal.h DEPENDS native-bin2c ${CMAKE_CURRENT_SOURCE_DIR}/legacy/bus/pci_vendors.ids) ##################################### Modified: trunk/reactos/tools/bin2c.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2c.c?rev=68255&r1… ============================================================================== --- trunk/reactos/tools/bin2c.c [iso-8859-1] (original) +++ trunk/reactos/tools/bin2c.c [iso-8859-1] Wed Jun 24 19:54:19 2015 @@ -8,18 +8,102 @@ #include <stdio.h> -int main(int argc, char *argv[]) +static size_t dumpHex(FILE* inFile, FILE* outCFile, char nullTerminate) +{ + size_t bufLen = 0; + unsigned char ch; + + fprintf(outCFile, "\n{"); + do + { + /* Read the next byte */ + ch = fgetc(inFile); + + if (feof(inFile) && nullTerminate) + ch = 0x00; + + if (!feof(inFile) || nullTerminate) + { + /* Start a new line if needed */ + if ((bufLen % 16) == 0) + fprintf(outCFile, "\n "); + + /* Write the byte or the optional NULL terminator */ + fprintf(outCFile, " 0x%02x,", (unsigned int)ch); + + ++bufLen; + } + } while (!feof(inFile)); + fprintf(outCFile, "\n}"); + + return bufLen; +} + +static size_t dumpStr(FILE* inFile, FILE* outCFile) +{ + size_t bufLen = 0; + unsigned char ch; + + /* Always start the first line */ + fprintf(outCFile, "\n \""); + do + { + /* Read the next byte */ + ch = fgetc(inFile); + + /* If a byte is available... */ + if (!feof(inFile)) + { + /* ... do we need to start a new line? */ + if ((bufLen != 0) && (bufLen % 16) == 0) + { + /* Yes, end the current line and start a new one */ + fprintf(outCFile, "\""); + fprintf(outCFile, "\n \""); + } + + /* Now write the byte */ + fprintf(outCFile, "\\x%02x", (unsigned int)ch); + } + /* ... otherwise, end the current line... */ + else + { + fprintf(outCFile, "\""); + /* We break just after */ + } + + ++bufLen; // This takes also the final NULL terminator into account. + + } while (!feof(inFile)); + + return bufLen; +} + +static void usage(char* name) +{ + fprintf(stdout, "Usage: %s infile.bin outfile.c outfile.h [BIN|BINSTR|STR] array_name [array_attribute [header_for_attribute]]\n", name); +} + +int main(int argc, char* argv[]) { FILE* inFile; FILE* outCFile; FILE* outHFile; size_t bufLen; - unsigned char ch; /* Validate the arguments */ - if (argc < 5) + if (argc < 6) { - fprintf(stdout, "Usage: bin2c infile.bin outfile.c outfile.h array_name [array_attribute [header_for_attribute]]\n"); + usage(argv[0]); + return -1; + } + + /* Verify the output format */ + if (_stricmp(argv[4], "BIN" ) != 0 && + _stricmp(argv[4], "BINSTR") != 0 && + _stricmp(argv[4], "STR" ) != 0) + { + usage(argv[0]); return -1; } @@ -48,41 +132,36 @@ /* Generate the source file and close it */ fprintf(outCFile, "/* This file is autogenerated, do not edit. */\n\n"); - if (argc >= 7) + if (argc >= 8) { /* Include needed header for defining the array attribute */ - fprintf(outCFile, "#include \"%s\"\n", argv[6]); + fprintf(outCFile, "#include \"%s\"\n", argv[7]); } fprintf(outCFile, "#include \"%s\"\n\n", argv[3]); /* Generate the data array */ - if (argc >= 6) + if (argc >= 7) { /* Add the array attribute */ - fprintf(outCFile, "%s ", argv[5]); + fprintf(outCFile, "%s ", argv[6]); } - fprintf(outCFile, "unsigned char %s[] =\n{", argv[4]); + fprintf(outCFile, "unsigned char %s[] =", argv[5]); - bufLen = 0; - ch = fgetc(inFile); - while (!feof(inFile)) - { - if ((bufLen % 16) == 0) - fprintf(outCFile, "\n "); + /* Output the bytes in the chosen format */ + if (_stricmp(argv[4], "BIN") == 0) + bufLen = dumpHex(inFile, outCFile, 0); + else if (_stricmp(argv[4], "BINSTR") == 0) + bufLen = dumpHex(inFile, outCFile, 1); + else // (_stricmp(argv[4], "STR") == 0) + bufLen = dumpStr(inFile, outCFile); - fprintf(outCFile, " 0x%02x,", (unsigned int)ch); - ++bufLen; - ch = fgetc(inFile); - } - /* Put a final NULL terminator */ - fprintf(outCFile, "\n 0x00"); ++bufLen; - fprintf(outCFile, "\n};\n"); + fprintf(outCFile, ";\n"); fclose(outCFile); /* Generate the header file and close it */ fprintf(outHFile, "/* This file is autogenerated, do not edit. */\n\n"); - fprintf(outHFile, "#define %s_SIZE %Iu\n" , argv[4], bufLen); - fprintf(outHFile, "extern unsigned char %s[%Iu];\n", argv[4], bufLen); + fprintf(outHFile, "#define %s_SIZE %lu\n" , argv[5], bufLen); + fprintf(outHFile, "extern unsigned char %s[%lu];\n", argv[5], bufLen); fclose(outHFile); /* Close the input file */

9 years, 6 months

[pschweitzer] 68254: [NTFS] - Bail out if no subnode is available - It's unimplemented if subnodes are available

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Jun 24 19:21:04 2015 New Revision: 68254 URL: http://svn.reactos.org/svn/reactos?rev=68254&view=rev Log: [NTFS] - Bail out if no subnode is available - It's unimplemented if subnodes are available Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Wed Jun 24 19:21:04 2015 @@ -535,9 +535,12 @@ IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)IndexEntry + IndexEntry->Length); } - if (IndexEntry->Flags & NTFS_INDEX_ENTRY_NODE) - DPRINT1("Sub-node available\n"); - + if (!(IndexEntry->Flags & NTFS_INDEX_ENTRY_NODE)) + { + return STATUS_OBJECT_PATH_NOT_FOUND; + } + + UNIMPLEMENTED; return STATUS_OBJECT_PATH_NOT_FOUND; }

9 years, 6 months

[cfinck] 68253: [SPOOLSS] Halfplement and document the undocumented but exported MarshallDownStructure API. Information about this API was exclusively gained by writing a custom XML file for rohita...

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jun 24 16:26:33 2015 New Revision: 68253 URL: http://svn.reactos.org/svn/reactos?rev=68253&view=rev Log: [SPOOLSS] Halfplement and document the undocumented but exported MarshallDownStructure API. Information about this API was exclusively gained by writing a custom XML file for rohitab.com's API Monitor and monitoring calls under Windows. I could figure out the parameters passed to the function, but don't really know what most of them are for. For me, the function does what it should and what I will soon need it for, but without making use of cbSize, cbPerElementSize, cbStructureSize and bSomeBoolean. A Code Review and additional hints are highly appreciated! My XML file for the API Monitor is available on request. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/tools.c branches/colins-printing-for-freedom/reactos/win32ss/printing/include/spoolss.h Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec [iso-8859-1] Wed Jun 24 16:26:33 2015 @@ -96,7 +96,7 @@ @ stub LoadDriverFiletoConvertDevmode @ stub LoadDriverWithVersion @ stub LogWmiTraceEvent -@ stub MarshallDownStructure +@ stdcall MarshallDownStructure(ptr ptr long long) @ stub MarshallDownStructuresArray @ stub MarshallUpStructure @ stub MarshallUpStructuresArray Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/tools.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/tools.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/tools.c [iso-8859-1] Wed Jun 24 16:26:33 2015 @@ -7,6 +7,56 @@ #include "precomp.h" + +/** + * @name MarshallDownStructure + * + * Prepare a structure for marshalling/serialization by replacing absolute pointer addresses in its fields by relative offsets. + * + * @param pStructure + * Pointer to the structure to operate on. + * + * @param pParameters + * Array of MARSHALL_DOWN_INFO elements containing information about the fields of the structure as well as how to modify them. + * See the documentation on MARSHALL_DOWN_INFO for more information. + * You have to indicate the end of the array by setting the dwOffset field to MAXDWORD. + * + * @param cbStructureSize + * Apparently, this is the size in bytes of the structure given through pStructure under Windows. + * This parameter is unused in my implementation. + * + * @param bSomeBoolean + * Unknown boolean value + * + * @return + * TRUE if the structure was successfully adjusted, FALSE otherwise. + */ +BOOL WINAPI +MarshallDownStructure(PVOID pStructure, PMARSHALL_DOWN_INFO pParameters, DWORD cbStructureSize, BOOL bSomeBoolean) +{ + // Sanity checks + if (!pStructure || !pParameters) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + // Loop until we reach an element with offset set to MAXDWORD. + while (pParameters->dwOffset != MAXDWORD) + { + if (pParameters->bAdjustAddress) + { + // Apply the byte offset on pStructure. There must be a pointer at this position, whose address we're adjusting + // by subtracting the address of pStructure from it. + *((PULONG_PTR)((PBYTE)pStructure + pParameters->dwOffset)) -= (ULONG_PTR)pStructure; + } + + // Advance to the next element description. + pParameters++; + } + + return TRUE; +} /** * @name PackStrings Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/include/spoolss.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/include/spoolss.h [iso-8859-1] Wed Jun 24 16:26:33 2015 @@ -8,10 +8,22 @@ #ifndef _REACTOS_SPOOLSS_H #define _REACTOS_SPOOLSS_H +typedef struct _MARSHALL_DOWN_INFO +{ + DWORD dwOffset; /** Byte offset of this element within the structure or MAXDWORD to indicate the end of the array */ + DWORD cbSize; /** Total size of this element in bytes under Windows. Unused here, I don't know what we need this number for. */ + DWORD cbPerElementSize; /** If this element is a structure itself, this field gives the size in bytes of each element of the structure. + Otherwise, this is the same as cbTotalSize. E.g. for SYSTEMTIME, cbSize would be 16 and cbPerElementSize would be 2. + Unused here, I don't know what we need this number for. */ + BOOL bAdjustAddress; /** TRUE if MarshallDownStructure shall adjust the address of this element, FALSE if it shall leave this element untouched. */ +} +MARSHALL_DOWN_INFO, *PMARSHALL_DOWN_INFO; + PWSTR WINAPI AllocSplStr(PCWSTR pwszInput); PVOID WINAPI DllAllocSplMem(DWORD dwBytes); BOOL WINAPI DllFreeSplMem(PVOID pMem); BOOL WINAPI DllFreeSplStr(PWSTR pwszString); +BOOL WINAPI MarshallDownStructure(PVOID pStructure, PMARSHALL_DOWN_INFO pParameters, DWORD cbStructureSize, BOOL bSomeBoolean); PBYTE WINAPI PackStrings(PCWSTR* pSource, PBYTE pDest, PDWORD DestOffsets, PBYTE pEnd); PVOID WINAPI ReallocSplMem(PVOID pOldMem, DWORD cbOld, DWORD cbNew); BOOL WINAPI ReallocSplStr(PWSTR* ppwszString, PCWSTR pwszInput);

9 years, 6 months

[cfinck] 68252: Addendum to r68248

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jun 24 16:20:13 2015 New Revision: 68252 URL: http://svn.reactos.org/svn/reactos?rev=68252&view=rev Log: Addendum to r68248 Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/main.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/precomp.h Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/main.c [iso-8859-1] Wed Jun 24 16:20:13 2015 @@ -59,7 +59,7 @@ _UpdateServiceStatus(SERVICE_START_PENDING, 0); // Create a thread for serving RPC requests - hThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)RpcThreadProc, NULL, 0, NULL); + hThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)LrpcThreadProc, NULL, 0, NULL); if (!hThread) { ERR("CreateThread failed with error %u!\n", GetLastError()); Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/precomp.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/precomp.h [iso-8859-1] Wed Jun 24 16:20:13 2015 @@ -22,7 +22,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(spoolsv); // rpcserver.c -DWORD WINAPI RpcThreadProc(LPVOID lpParameter); +DWORD WINAPI LrpcThreadProc(LPVOID lpParameter); // Undocumented spoolss BOOL WINAPI InitializeRouter(HANDLE SpoolerStatusHandle);

9 years, 6 months

[cwittich] 68251: [HIDCLASS] fix a "formatting bug"

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Jun 24 10:58:39 2015 New Revision: 68251 URL: http://svn.reactos.org/svn/reactos?rev=68251&view=rev Log: [HIDCLASS] fix a "formatting bug" Modified: trunk/reactos/drivers/hid/hidclass/pdo.c Modified: trunk/reactos/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/pdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/pdo.c [iso-8859-1] Wed Jun 24 10:58:39 2015 @@ -671,9 +671,9 @@ // let's create a PDO for top level collection // Index = 0; - while (Index < FDODeviceExtension->Common.DeviceDescription.CollectionDescLength) - { - // + while (Index < FDODeviceExtension->Common.DeviceDescription.CollectionDescLength) + { + // // let's create the device object // Status = IoCreateDevice(FDODeviceExtension->Common.DriverExtension->DriverObject,

9 years, 6 months

[tfaber] 68250: [USBCCGP] - Reset FunctionDescriptorCount to zero in USBCCGP_LegacyEnum since the function can be called multiple times CORE-9226

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Jun 24 10:31:50 2015 New Revision: 68250 URL: http://svn.reactos.org/svn/reactos?rev=68250&view=rev Log: [USBCCGP] - Reset FunctionDescriptorCount to zero in USBCCGP_LegacyEnum since the function can be called multiple times CORE-9226 Modified: trunk/reactos/drivers/usb/usbccgp/function.c Modified: trunk/reactos/drivers/usb/usbccgp/function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/functi… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/function.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/function.c [iso-8859-1] Wed Jun 24 10:31:50 2015 @@ -639,11 +639,7 @@ // // init function descriptors // - if (FDODeviceExtension->FunctionDescriptorCount != 0) - { - DPRINT1("USBCCGP_LegacyEnum called with FunctionDescriptorCount=%lu. Adding another %lu descriptors will probably overflow\n", FDODeviceExtension->FunctionDescriptorCount, FDODeviceExtension->ConfigurationDescriptor->bNumInterfaces); - ASSERT(FDODeviceExtension->FunctionDescriptorCount == 0); - } + FDODeviceExtension->FunctionDescriptorCount = 0; for (Index = 0; Index < FDODeviceExtension->ConfigurationDescriptor->bNumInterfaces; Index++) { // get interface descriptor

9 years, 6 months

[janderwald] 68249: [HIDCLASS] - fix a bug

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Jun 24 10:13:15 2015 New Revision: 68249 URL: http://svn.reactos.org/svn/reactos?rev=68249&view=rev Log: [HIDCLASS] - fix a bug Modified: trunk/reactos/drivers/hid/hidclass/pdo.c Modified: trunk/reactos/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/pdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/pdo.c [iso-8859-1] Wed Jun 24 10:13:15 2015 @@ -636,7 +636,7 @@ OUT PDEVICE_RELATIONS *OutDeviceRelations) { PHIDCLASS_FDO_EXTENSION FDODeviceExtension; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PDEVICE_OBJECT PDODeviceObject; PHIDCLASS_PDO_DEVICE_EXTENSION PDODeviceExtension; ULONG Index; @@ -671,9 +671,9 @@ // let's create a PDO for top level collection // Index = 0; - do - { - // + while (Index < FDODeviceExtension->Common.DeviceDescription.CollectionDescLength) + { + // // let's create the device object // Status = IoCreateDevice(FDODeviceExtension->Common.DriverExtension->DriverObject, @@ -742,7 +742,7 @@ // Index++; - } while(Index < FDODeviceExtension->Common.DeviceDescription.CollectionDescLength); + } //

9 years, 6 months

[cfinck] 68248: [SPOOLSV, WINSPOOL] Local Communication between winspool.drv and spoolsv.exe happens using the ncalrpc protocol. The ncacn_np endpoint is only available when sharing a printer. It's...

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jun 24 09:51:29 2015 New Revision: 68248 URL: http://svn.reactos.org/svn/reactos?rev=68248&view=rev Log: [SPOOLSV, WINSPOOL] Local Communication between winspool.drv and spoolsv.exe happens using the ncalrpc protocol. The ncacn_np endpoint is only available when sharing a printer. It's then used for receiving a remote call from win32spl.dll. Reference: http://www.hsc.fr/ressources/articles/win_net_srv/msrpc_spoolss.html This fixes e.g. testing a _RpcOpenPrinter call from our winspool.drv to a local printer under Windows. Modified: branches/colins-printing-for-freedom/reactos/include/reactos/idl/winspool.idl branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcserver.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c Modified: branches/colins-printing-for-freedom/reactos/include/reactos/idl/winspool.idl URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/include/reactos/idl/winspool.idl [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/include/reactos/idl/winspool.idl [iso-8859-1] Wed Jun 24 09:51:29 2015 @@ -841,7 +841,7 @@ [ uuid(12345678-1234-ABCD-EF00-0123456789AB), version(1.0), - endpoint("ncacn_np:[\\pipe\\spoolss]"), + endpoint("ncalrpc:[spoolss]", "ncacn_np:[\\pipe\\spoolss]"), pointer_default(unique) ] Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcserver.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/rpcserver.c [iso-8859-1] Wed Jun 24 09:51:29 2015 @@ -8,11 +8,11 @@ #include "precomp.h" DWORD WINAPI -RpcThreadProc(LPVOID lpParameter) +LrpcThreadProc(LPVOID lpParameter) { RPC_STATUS Status; - Status = RpcServerUseProtseqEpW(L"ncacn_np", 20, L"\\pipe\\spoolss", NULL); + Status = RpcServerUseProtseqEpW(L"ncalrpc", 20, L"spoolss", NULL); if (Status != RPC_S_OK) { ERR("RpcServerUseProtseqEpW failed with status %ld!\n", Status); Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c [iso-8859-1] Wed Jun 24 09:51:29 2015 @@ -15,7 +15,7 @@ RPC_STATUS Status; // Get us a string binding handle from the supplied connection information - Status = RpcStringBindingComposeW(NULL, L"ncacn_np", wszName, L"\\pipe\\spoolss", NULL, &wszStringBinding); + Status = RpcStringBindingComposeW(NULL, L"ncalrpc", wszName, L"spoolss", NULL, &wszStringBinding); if (Status != RPC_S_OK) { ERR("RpcStringBindingComposeW failed with status %ld!\n", Status);

9 years, 6 months

← Newer
1
...
5
6
7
8
9
10
11
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2015