Ros-diffs October 2011

ros-diffs@reactos.org

18 participants
369 discussions

[akhaldi] 53950: [GDI32_WINETEST] * Sync with Wine 1.3.29.
by akhaldi＠svn.reactos.org 03 Oct '11

03 Oct '11

Author: akhaldi Date: Mon Oct 3 09:26:08 2011 New Revision: 53950 URL: http://svn.reactos.org/svn/reactos?rev=53950&view=rev Log: [GDI32_WINETEST] * Sync with Wine 1.3.29. Added: trunk/rostests/winetests/gdi32/dib.c (with props) trunk/rostests/winetests/gdi32/resource.rc (with props) trunk/rostests/winetests/gdi32/wine_test.sfd trunk/rostests/winetests/gdi32/wine_test.ttf (with props) Modified: trunk/rostests/winetests/gdi32/CMakeLists.txt trunk/rostests/winetests/gdi32/bitmap.c trunk/rostests/winetests/gdi32/clipping.c trunk/rostests/winetests/gdi32/dc.c trunk/rostests/winetests/gdi32/font.c trunk/rostests/winetests/gdi32/gdi32.rbuild trunk/rostests/winetests/gdi32/gdiobj.c trunk/rostests/winetests/gdi32/icm.c trunk/rostests/winetests/gdi32/mapping.c trunk/rostests/winetests/gdi32/metafile.c trunk/rostests/winetests/gdi32/palette.c trunk/rostests/winetests/gdi32/path.c trunk/rostests/winetests/gdi32/pen.c trunk/rostests/winetests/gdi32/testlist.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/CMakeList… Modified: trunk/rostests/winetests/gdi32/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/bitmap.c?… Modified: trunk/rostests/winetests/gdi32/clipping.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/clipping.… Modified: trunk/rostests/winetests/gdi32/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/dc.c?rev=… Added: trunk/rostests/winetests/gdi32/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/dib.c?rev… Modified: trunk/rostests/winetests/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re… Modified: trunk/rostests/winetests/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/gdi32.rbu… Modified: trunk/rostests/winetests/gdi32/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/gdiobj.c?… Modified: trunk/rostests/winetests/gdi32/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/icm.c?rev… Modified: trunk/rostests/winetests/gdi32/mapping.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/mapping.c… Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… Modified: trunk/rostests/winetests/gdi32/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/palette.c… Modified: trunk/rostests/winetests/gdi32/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/path.c?re… Modified: trunk/rostests/winetests/gdi32/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/pen.c?rev… Added: trunk/rostests/winetests/gdi32/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/resource.… Modified: trunk/rostests/winetests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/testlist.… Added: trunk/rostests/winetests/gdi32/wine_test.sfd URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/wine_test… Added: trunk/rostests/winetests/gdi32/wine_test.ttf URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/wine_test…

1 0

[akhaldi] 53949: [PSDK] * Add missing LAYOUT_LTR define.
by akhaldi＠svn.reactos.org 03 Oct '11

03 Oct '11

Author: akhaldi Date: Mon Oct 3 09:24:20 2011 New Revision: 53949 URL: http://svn.reactos.org/svn/reactos?rev=53949&view=rev Log: [PSDK] * Add missing LAYOUT_LTR define. Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Mon Oct 3 09:24:20 2011 @@ -1314,6 +1314,7 @@ #define WGL_SWAP_UNDERLAY14 0x20000000 #define WGL_SWAP_UNDERLAY15 0x40000000 #define AC_SRC_OVER 0 +#define LAYOUT_LTR 0 #define LAYOUT_RTL 1 // Right to left #define LAYOUT_BTT 2 // Bottom to top #define LAYOUT_VBH 4 // Vertical before horizontal

1 0

[tkreuzer] 53948: [FREELDR] - more changes LoaderBlock -> BootDriverListHead/LoadOrderListHead - make one more function static
by tkreuzer＠svn.reactos.org 03 Oct '11

03 Oct '11

Author: tkreuzer Date: Mon Oct 3 08:32:07 2011 New Revision: 53948 URL: http://svn.reactos.org/svn/reactos?rev=53948&view=rev Log: [FREELDR] - more changes LoaderBlock -> BootDriverListHead/LoadOrderListHead - make one more function static Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] Mon Oct 3 08:32:07 2011 @@ -36,7 +36,7 @@ // TODO: Move to .h VOID AllocateAndInitLPB(PLOADER_PARAMETER_BLOCK *OutLoaderBlock); -VOID +static VOID SetupLdrLoadNlsData(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR SearchPath) { INFCONTEXT InfContext; @@ -82,8 +82,8 @@ TRACE("NLS data loaded with status %d\n", Status); } -VOID -SetupLdrScanBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR SearchPath) +static VOID +SetupLdrScanBootDrivers(PLIST_ENTRY BootDriverListHead, HINF InfHandle, LPCSTR SearchPath) { INFCONTEXT InfContext, dirContext; BOOLEAN Status; @@ -118,7 +118,7 @@ ServiceName[wcslen(ServiceName) - 4] = 0; /* Add it to the list */ - Status = WinLdrAddDriverToList(&LoaderBlock->BootDriverListHead, + Status = WinLdrAddDriverToList(BootDriverListHead, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", ImagePathW, ServiceName); @@ -229,7 +229,7 @@ SetupLdrLoadNlsData(LoaderBlock, InfHandle, FileName); /* Get a list of boot drivers */ - SetupLdrScanBootDrivers(LoaderBlock, InfHandle, BootPath); + SetupLdrScanBootDrivers(&LoaderBlock->BootDriverListHead, InfHandle, BootPath); LoadAndBootWindowsCommon(_WIN32_WINNT_WS03, Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Mon Oct 3 08:32:07 2011 @@ -217,8 +217,8 @@ TRACE("WinLdrInitializePhase1() completed\n"); } -BOOLEAN -WinLdrLoadDeviceDriver(PLOADER_PARAMETER_BLOCK LoaderBlock, +static BOOLEAN +WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead, LPSTR BootPath, PUNICODE_STRING FilePath, ULONG Flags, @@ -249,11 +249,11 @@ DriverPath[0] = 0; } - TRACE("DriverPath: %s, DllName: %s, LPB %p\n", DriverPath, DllName, LoaderBlock); + TRACE("DriverPath: %s, DllName: %s, LPB\n", DriverPath, DllName); // Check if driver is already loaded - Status = WinLdrCheckForLoadedDll(&LoaderBlock->LoadOrderListHead, DllName, DriverDTE); + Status = WinLdrCheckForLoadedDll(LoadOrderListHead, DllName, DriverDTE); if (Status) { // We've got the pointer to its DTE, just return success @@ -267,7 +267,7 @@ return FALSE; // Allocate a DTE for it - Status = WinLdrAllocateDataTableEntry(&LoaderBlock->LoadOrderListHead, DllName, DllName, DriverBase, DriverDTE); + Status = WinLdrAllocateDataTableEntry(LoadOrderListHead, DllName, DllName, DriverBase, DriverDTE); if (!Status) { ERR("WinLdrAllocateDataTableEntry() failed\n"); @@ -279,7 +279,7 @@ // Look for any dependencies it may have, and load them too sprintf(FullPath,"%s%s", BootPath, DriverPath); - Status = WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, FullPath, *DriverDTE); + Status = WinLdrScanImportDescriptorTable(LoadOrderListHead, FullPath, *DriverDTE); if (!Status) { ERR("WinLdrScanImportDescriptorTable() failed for %s\n", FullPath); @@ -310,7 +310,7 @@ // Paths are relative (FIXME: Are they always relative?) // Load it - Status = WinLdrLoadDeviceDriver(LoaderBlock, BootPath, &BootDriver->FilePath, + Status = WinLdrLoadDeviceDriver(&LoaderBlock->LoadOrderListHead, BootPath, &BootDriver->FilePath, 0, &BootDriver->LdrEntry); // If loading failed - cry loudly

1 0

[tkreuzer] 53947: [FREELDR] - Pass the module list head to a number of pe loader functions instead of the loader block. - use static for some functions - remove unneeded prototypes
by tkreuzer＠svn.reactos.org 03 Oct '11

03 Oct '11

Author: tkreuzer Date: Mon Oct 3 08:14:00 2011 New Revision: 53947 URL: http://svn.reactos.org/svn/reactos?rev=53947&view=rev Log: [FREELDR] - Pass the module list head to a number of pe loader functions instead of the loader block. - use static for some functions - remove unneeded prototypes Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c trunk/reactos/boot/freeldr/freeldr/include/winldr.h trunk/reactos/boot/freeldr/freeldr/windows/peloader.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] Mon Oct 3 08:14:00 2011 @@ -1563,7 +1563,7 @@ LoadBootDeviceDriver(VOID) { PIMAGE_NT_HEADERS NtHeaders; - LOADER_PARAMETER_BLOCK LoaderBlock; + LIST_ENTRY ModuleListHead; PIMAGE_IMPORT_DESCRIPTOR ImportTable; ULONG ImportTableSize; PLDR_DATA_TABLE_ENTRY BootDdDTE, FreeldrDTE; @@ -1572,9 +1572,8 @@ ULONG (NTAPI *EntryPoint)(IN PVOID DriverObject, IN PVOID RegistryPath); BOOLEAN Status; - /* Some initialization of our temporary loader block */ - RtlZeroMemory(&LoaderBlock, sizeof(LOADER_PARAMETER_BLOCK)); - InitializeListHead(&LoaderBlock.LoadOrderListHead); + /* Initialize the loaded module list */ + InitializeListHead(&ModuleListHead); /* Create full ntbootdd.sys path */ MachDiskGetBootPath(NtBootDdPath, sizeof(NtBootDdPath)); @@ -1589,14 +1588,14 @@ } /* Allocate a DTE for ntbootdd */ - Status = WinLdrAllocateDataTableEntry(&LoaderBlock, "ntbootdd.sys", + Status = WinLdrAllocateDataTableEntry(&ModuleListHead, "ntbootdd.sys", "NTBOOTDD.SYS", ImageBase, &BootDdDTE); if (!Status) return EIO; /* Add the PE part of freeldr.sys to the list of loaded executables, it contains Scsiport* exports, imported by ntbootdd.sys */ - Status = WinLdrAllocateDataTableEntry(&LoaderBlock, "scsiport.sys", + Status = WinLdrAllocateDataTableEntry(&ModuleListHead, "scsiport.sys", "FREELDR.SYS", &__ImageBase, &FreeldrDTE); if (!Status) { @@ -1605,7 +1604,7 @@ } /* Fix imports */ - Status = WinLdrScanImportDescriptorTable(&LoaderBlock, "", BootDdDTE); + Status = WinLdrScanImportDescriptorTable(&ModuleListHead, "", BootDdDTE); /* Now unlinkt the DTEs, they won't be valid later */ RemoveEntryList(&BootDdDTE->InLoadOrderLinks); Modified: trunk/reactos/boot/freeldr/freeldr/include/winldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] Mon Oct 3 08:14:00 2011 @@ -107,14 +107,14 @@ BOOLEAN -WinLdrAllocateDataTableEntry(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, +WinLdrAllocateDataTableEntry(IN OUT PLIST_ENTRY ModuleListHead, IN PCCH BaseDllName, IN PCCH FullDllName, IN PVOID BasePA, OUT PLDR_DATA_TABLE_ENTRY *NewEntry); BOOLEAN -WinLdrScanImportDescriptorTable(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, +WinLdrScanImportDescriptorTable(IN OUT PLIST_ENTRY ModuleListHead, IN PCCH DirectoryPath, IN PLDR_DATA_TABLE_ENTRY ScanDTE); @@ -135,12 +135,9 @@ BOOLEAN -WinLdrCheckForLoadedDll(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, +WinLdrCheckForLoadedDll(IN OUT PLIST_ENTRY ModuleListHead, IN PCH DllName, OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry); - -BOOLEAN -WinLdrLoadBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, LPSTR BootPath); VOID WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] Mon Oct 3 08:14:00 2011 @@ -19,12 +19,12 @@ DBG_DEFAULT_CHANNEL(PELOADER); -BOOLEAN +static BOOLEAN WinLdrpCompareDllName(IN PCH DllName, IN PUNICODE_STRING UnicodeName); -BOOLEAN -WinLdrpBindImportName(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, +static BOOLEAN +WinLdrpBindImportName(IN OUT PLIST_ENTRY ModuleListHead, IN PVOID DllBase, IN PVOID ImageBase, IN PIMAGE_THUNK_DATA ThunkData, @@ -32,14 +32,14 @@ IN ULONG ExportSize, IN BOOLEAN ProcessForwards); -BOOLEAN -WinLdrpLoadAndScanReferencedDll(PLOADER_PARAMETER_BLOCK WinLdrBlock, +static BOOLEAN +WinLdrpLoadAndScanReferencedDll(PLIST_ENTRY ModuleListHead, PCCH DirectoryPath, PCH ImportName, PLDR_DATA_TABLE_ENTRY *DataTableEntry); -BOOLEAN -WinLdrpScanImportAddressTable(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, +static BOOLEAN +WinLdrpScanImportAddressTable(IN OUT PLIST_ENTRY ModuleListHead, IN PVOID DllBase, IN PVOID ImageBase, IN PIMAGE_THUNK_DATA ThunkData); @@ -50,7 +50,7 @@ /* Returns TRUE if DLL has already been loaded - looks in LoadOrderList in LPB */ BOOLEAN -WinLdrCheckForLoadedDll(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, +WinLdrCheckForLoadedDll(IN OUT PLIST_ENTRY ModuleListHead, IN PCH DllName, OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry) { @@ -62,16 +62,17 @@ /* Just go through each entry in the LoadOrderList and compare loaded module's name with a given name */ - ModuleEntry = WinLdrBlock->LoadOrderListHead.Flink; - while (ModuleEntry != &WinLdrBlock->LoadOrderListHead) + ModuleEntry = ModuleListHead->Flink; + while (ModuleEntry != ModuleListHead) { /* Get pointer to the current DTE */ DataTableEntry = CONTAINING_RECORD(ModuleEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - TRACE("WinLdrCheckForLoadedDll: DTE %p, EP %p\n", - DataTableEntry, DataTableEntry->EntryPoint); + TRACE("WinLdrCheckForLoadedDll: DTE %p, EP %p, base %p name '%ws'\n", + DataTableEntry, DataTableEntry->EntryPoint, DataTableEntry->DllBase, + VaToPa(DataTableEntry->BaseDllName.Buffer)); /* Compare names */ if (WinLdrpCompareDllName(DllName, &DataTableEntry->BaseDllName)) @@ -93,7 +94,7 @@ } BOOLEAN -WinLdrScanImportDescriptorTable(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, +WinLdrScanImportDescriptorTable(IN OUT PLIST_ENTRY ModuleListHead, IN PCCH DirectoryPath, IN PLDR_DATA_TABLE_ENTRY ScanDTE) { @@ -132,9 +133,9 @@ continue; /* Load the DLL if it is not already loaded */ - if (!WinLdrCheckForLoadedDll(WinLdrBlock, ImportName, &DataTableEntry)) - { - Status = WinLdrpLoadAndScanReferencedDll(WinLdrBlock, + if (!WinLdrCheckForLoadedDll(ModuleListHead, ImportName, &DataTableEntry)) + { + Status = WinLdrpLoadAndScanReferencedDll(ModuleListHead, DirectoryPath, ImportName, &DataTableEntry); @@ -148,7 +149,7 @@ /* Scan its import address table */ Status = WinLdrpScanImportAddressTable( - WinLdrBlock, + ModuleListHead, DataTableEntry->DllBase, ScanDTE->DllBase, (PIMAGE_THUNK_DATA)RVA(ScanDTE->DllBase, ImportTable->FirstThunk)); @@ -164,7 +165,7 @@ } BOOLEAN -WinLdrAllocateDataTableEntry(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, +WinLdrAllocateDataTableEntry(IN OUT PLIST_ENTRY ModuleListHead, IN PCCH BaseDllName, IN PCCH FullDllName, IN PVOID BasePA, @@ -175,6 +176,8 @@ PLDR_DATA_TABLE_ENTRY DataTableEntry; PIMAGE_NT_HEADERS NtHeaders; USHORT Length; + TRACE("WinLdrAllocateDataTableEntry(, '%s', '%s', %p)\n", + BaseDllName, FullDllName, BasePA); /* Allocate memory for a data table entry, zero-initialize it */ DataTableEntry = (PLDR_DATA_TABLE_ENTRY)MmHeapAlloc(sizeof(LDR_DATA_TABLE_ENTRY)); @@ -236,7 +239,9 @@ DataTableEntry->LoadCount = 1; /* Insert this DTE to a list in the LPB */ - InsertTailList(&WinLdrBlock->LoadOrderListHead, &DataTableEntry->InLoadOrderLinks); + InsertTailList(ModuleListHead, &DataTableEntry->InLoadOrderLinks); + TRACE("Inserting DTE %p, name='%S' DllBase=%p \n", DataTableEntry, + DataTableEntry->BaseDllName.Buffer, DataTableEntry->DllBase); /* Save pointer to a newly allocated and initialized entry */ *NewEntry = DataTableEntry; @@ -442,7 +447,7 @@ /* PRIVATE FUNCTIONS *******************************************************/ /* DllName - physical, UnicodeString->Buffer - virtual */ -BOOLEAN +static BOOLEAN WinLdrpCompareDllName(IN PCH DllName, IN PUNICODE_STRING UnicodeName) { @@ -488,8 +493,8 @@ return FALSE; } -BOOLEAN -WinLdrpBindImportName(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, +static BOOLEAN +WinLdrpBindImportName(IN OUT PLIST_ENTRY ModuleListHead, IN PVOID DllBase, IN PVOID ImageBase, IN PIMAGE_THUNK_DATA ThunkData, @@ -651,7 +656,7 @@ *strchr(ForwardDllName,'.') = '\0'; TRACE("WinLdrpBindImportName(): ForwardDllName %s\n", ForwardDllName); - if (!WinLdrCheckForLoadedDll(WinLdrBlock, ForwardDllName, &DataTableEntry)) + if (!WinLdrCheckForLoadedDll(ModuleListHead, ForwardDllName, &DataTableEntry)) { /* We can't continue if DLL couldn't be loaded, so bomb out with an error */ //Print(L"Error loading DLL!\n"); @@ -692,7 +697,7 @@ /* And recursively call ourselves */ Status = WinLdrpBindImportName( - WinLdrBlock, + ModuleListHead, DataTableEntry->DllBase, ImageBase, &RefThunkData, @@ -717,8 +722,8 @@ return TRUE; } -BOOLEAN -WinLdrpLoadAndScanReferencedDll(PLOADER_PARAMETER_BLOCK WinLdrBlock, +static BOOLEAN +WinLdrpLoadAndScanReferencedDll(PLIST_ENTRY ModuleListHead, PCCH DirectoryPath, PCH ImportName, PLDR_DATA_TABLE_ENTRY *DataTableEntry) @@ -744,7 +749,7 @@ } /* Allocate DTE for newly loaded DLL */ - Status = WinLdrAllocateDataTableEntry(WinLdrBlock, + Status = WinLdrAllocateDataTableEntry(ModuleListHead, ImportName, FullDllName, BasePA, @@ -759,7 +764,7 @@ /* Scan its dependencies too */ TRACE("WinLdrScanImportDescriptorTable() calling ourselves for %S\n", VaToPa((*DataTableEntry)->BaseDllName.Buffer)); - Status = WinLdrScanImportDescriptorTable(WinLdrBlock, DirectoryPath, *DataTableEntry); + Status = WinLdrScanImportDescriptorTable(ModuleListHead, DirectoryPath, *DataTableEntry); if (!Status) { @@ -770,8 +775,8 @@ return TRUE; } -BOOLEAN -WinLdrpScanImportAddressTable(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, +static BOOLEAN +WinLdrpScanImportAddressTable(IN OUT PLIST_ENTRY ModuleListHead, IN PVOID DllBase, IN PVOID ImageBase, IN PIMAGE_THUNK_DATA ThunkData) @@ -786,7 +791,7 @@ /* Obtain the export table from the DLL's base */ if (DllBase == NULL) { - //Print(L"Error, DllBase == NULL!\n"); + ERR("Error, DllBase == NULL!\n"); return FALSE; } else @@ -802,14 +807,17 @@ /* If pointer to Export Directory is */ if (ExportDirectory == NULL) - return FALSE; + { + ERR("DllBase=%p(%p)\n", DllBase, VaToPa(DllBase)); + return FALSE; + } /* Go through each entry in the thunk table and bind it */ while (((PIMAGE_THUNK_DATA)VaToPa(ThunkData))->u1.AddressOfData != 0) { /* Bind it */ Status = WinLdrpBindImportName( - WinLdrBlock, + ModuleListHead, DllBase, ImageBase, ThunkData, Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Mon Oct 3 08:14:00 2011 @@ -214,6 +214,7 @@ if (LoaderBlock->SetupLdrBlock) LoaderBlock->SetupLdrBlock = PaToVa(LoaderBlock->SetupLdrBlock); + TRACE("WinLdrInitializePhase1() completed\n"); } BOOLEAN @@ -252,7 +253,7 @@ // Check if driver is already loaded - Status = WinLdrCheckForLoadedDll(LoaderBlock, DllName, DriverDTE); + Status = WinLdrCheckForLoadedDll(&LoaderBlock->LoadOrderListHead, DllName, DriverDTE); if (Status) { // We've got the pointer to its DTE, just return success @@ -266,7 +267,7 @@ return FALSE; // Allocate a DTE for it - Status = WinLdrAllocateDataTableEntry(LoaderBlock, DllName, DllName, DriverBase, DriverDTE); + Status = WinLdrAllocateDataTableEntry(&LoaderBlock->LoadOrderListHead, DllName, DllName, DriverBase, DriverDTE); if (!Status) { ERR("WinLdrAllocateDataTableEntry() failed\n"); @@ -278,7 +279,7 @@ // Look for any dependencies it may have, and load them too sprintf(FullPath,"%s%s", BootPath, DriverPath); - Status = WinLdrScanImportDescriptorTable(LoaderBlock, FullPath, *DriverDTE); + Status = WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, FullPath, *DriverDTE); if (!Status) { ERR("WinLdrScanImportDescriptorTable() failed for %s\n", FullPath); @@ -439,7 +440,7 @@ strcpy(FullFileName, "WINDOWS\\SYSTEM32\\"); strcat(FullFileName, File); - WinLdrAllocateDataTableEntry(LoaderBlock, File, + WinLdrAllocateDataTableEntry(&LoaderBlock->LoadOrderListHead, File, FullFileName, BaseAdress, Dte); return BaseAdress; @@ -587,10 +588,10 @@ /* Load all referenced DLLs for kernel, HAL and kdcom.dll */ strcpy(FileName, BootPath); strcat(FileName, "system32\\"); - Status = WinLdrScanImportDescriptorTable(LoaderBlock, FileName, KernelDTE); - Status &= WinLdrScanImportDescriptorTable(LoaderBlock, FileName, HalDTE); + Status = WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, FileName, KernelDTE); + Status &= WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, FileName, HalDTE); if (KdComDTE) - Status &= WinLdrScanImportDescriptorTable(LoaderBlock, FileName, KdComDTE); + Status &= WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, FileName, KdComDTE); if (!Status) { Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] Mon Oct 3 08:14:00 2011 @@ -16,26 +16,15 @@ // The only global var here, used to mark mem pages as NLS in WinLdrSetupMemoryLayout() ULONG TotalNLSSize = 0; -BOOLEAN WinLdrGetNLSNames(LPSTR AnsiName, - LPSTR OemName, - LPSTR LangName); - -BOOLEAN -WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, - IN LPCSTR DirectoryPath, - IN LPCSTR AnsiFileName, - IN LPCSTR OemFileName, - IN LPCSTR LanguageFileName); - -VOID -WinLdrScanRegistry(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, +static BOOLEAN +WinLdrGetNLSNames(LPSTR AnsiName, + LPSTR OemName, + LPSTR LangName); + +static VOID +WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, IN LPCSTR DirectoryPath); -BOOLEAN -WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, - LPWSTR RegistryPath, - LPWSTR ImagePath, - LPWSTR ServiceName); /* FUNCTIONS **************************************************************/ @@ -173,7 +162,7 @@ BOOLEAN Status; // Scan registry and prepare boot drivers list - WinLdrScanRegistry(LoaderBlock, DirectoryPath); + WinLdrScanRegistry(&LoaderBlock->BootDriverListHead, DirectoryPath); // Get names of NLS files Status = WinLdrGetNLSNames(AnsiName, OemName, LangName); @@ -201,9 +190,10 @@ /* PRIVATE FUNCTIONS ******************************************************/ // Queries registry for those three file names -BOOLEAN WinLdrGetNLSNames(LPSTR AnsiName, - LPSTR OemName, - LPSTR LangName) +static BOOLEAN +WinLdrGetNLSNames(LPSTR AnsiName, + LPSTR OemName, + LPSTR LangName) { LONG rc = ERROR_SUCCESS; FRLDRHKEY hKey; @@ -459,8 +449,8 @@ return FALSE; } -VOID -WinLdrScanRegistry(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, +static VOID +WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, IN LPCSTR DirectoryPath) { LONG rc = 0; @@ -602,7 +592,7 @@ TRACE("Adding boot driver: '%s'\n", ImagePath); - Status = WinLdrAddDriverToList(&LoaderBlock->BootDriverListHead, + Status = WinLdrAddDriverToList(BootDriverListHead, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", TempImagePath, ServiceName); @@ -680,7 +670,7 @@ } TRACE(" Adding boot driver: '%s'\n", ImagePath); - Status = WinLdrAddDriverToList(&LoaderBlock->BootDriverListHead, + Status = WinLdrAddDriverToList(BootDriverListHead, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\", TempImagePath, ServiceName);

1 0

[gadamopoulos] 53946: [win32k] - Fix RECTL_bPointInRect to work like PtInRect - Use the fixed RECTL_bPointInRect in DIB_XXBPP_FloodFillSolid to fix a bugchek See issue #6437 for more details.
by gadamopoulos＠svn.reactos.org 02 Oct '11

02 Oct '11

Author: gadamopoulos Date: Sun Oct 2 23:09:03 2011 New Revision: 53946 URL: http://svn.reactos.org/svn/reactos?rev=53946&view=rev Log: [win32k] - Fix RECTL_bPointInRect to work like PtInRect - Use the fixed RECTL_bPointInRect in DIB_XXBPP_FloodFillSolid to fix a bugchek See issue #6437 for more details. Modified: trunk/reactos/subsystems/win32/win32k/dib/floodfill.c trunk/reactos/subsystems/win32/win32k/include/rect.h Modified: trunk/reactos/subsystems/win32/win32k/dib/floodfill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/floodfill.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/floodfill.c [iso-8859-1] Sun Oct 2 23:09:03 2011 @@ -59,8 +59,7 @@ ULONG Color, BOOL isSurf) { - if (x >= DstRect->left && x <= DstRect->right && - y >= DstRect->top && y <= DstRect->bottom) + if (RECTL_bPointInRect(DstRect,x,y)) { if (isSurf == TRUE && DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_GetPixel(DstSurf, x, y) != Color) Modified: trunk/reactos/subsystems/win32/win32k/include/rect.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/rect.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/rect.h [iso-8859-1] Sun Oct 2 23:09:03 2011 @@ -41,8 +41,8 @@ FORCEINLINE RECTL_bPointInRect(const RECTL *prcl, INT x, INT y) { - return (x >= prcl->left && x <= prcl->right && - y >= prcl->top && y <= prcl->bottom); + return (x >= prcl->left && x < prcl->right && + y >= prcl->top && y < prcl->bottom); } BOOL

1 0

[tfaber] 53945: [WINETESTS/CMAKE] - Disable those unhelpful format string warnings - Remove some unnecessary defines
by tfaber＠svn.reactos.org 02 Oct '11

02 Oct '11

Author: tfaber Date: Sun Oct 2 22:16:18 2011 New Revision: 53945 URL: http://svn.reactos.org/svn/reactos?rev=53945&view=rev Log: [WINETESTS/CMAKE] - Disable those unhelpful format string warnings - Remove some unnecessary defines Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt trunk/rostests/winetests/kernel32/CMakeLists.txt trunk/rostests/winetests/msvcrt/CMakeLists.txt trunk/rostests/winetests/rpcrt4/CMakeLists.txt trunk/rostests/winetests/setupapi/CMakeLists.txt trunk/rostests/winetests/user32/CMakeLists.txt trunk/rostests/winetests/winmm/CMakeLists.txt trunk/rostests/winetests/ws2_32/CMakeLists.txt Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/CMakeL… ============================================================================== --- trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] Sun Oct 2 22:16:18 2011 @@ -40,6 +40,7 @@ if(MSVC) target_link_libraries(comctl32_winetest uuid) else() + add_target_compile_flags(comctl32_winetest "-Wno-format") allow_warnings(comctl32_winetest) endif() Modified: trunk/rostests/winetests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/CMakeL… ============================================================================== --- trunk/rostests/winetests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/CMakeLists.txt [iso-8859-1] Sun Oct 2 22:16:18 2011 @@ -1,7 +1,6 @@ add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) + -D__ROS_LONG64__) remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) @@ -51,6 +50,7 @@ set_module_type(kernel32_winetest win32cui) add_importlibs(kernel32_winetest user32 advapi32 msvcrt kernel32 ntdll) if(NOT MSVC) + add_target_compile_flags(kernel32_winetest "-Wno-format") allow_warnings(kernel32_winetest) endif() Modified: trunk/rostests/winetests/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/CMakeLis… ============================================================================== --- trunk/rostests/winetests/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/CMakeLists.txt [iso-8859-1] Sun Oct 2 22:16:18 2011 @@ -25,7 +25,7 @@ if(MSVC) target_link_libraries(msvcrt_winetest oldnames) else() - allow_warnings(msvcrt_winetest) + add_target_compile_flags(msvcrt_winetest "-Wno-format") endif() set_module_type(msvcrt_winetest win32cui) Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeLis… ============================================================================== --- trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Sun Oct 2 22:16:18 2011 @@ -4,8 +4,7 @@ add_definitions(-D_WIN32_WINNT=0x500) add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) + -D__ROS_LONG64__) include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -47,5 +46,6 @@ add_cd_file(TARGET rpcrt4_winetest DESTINATION reactos/bin FOR all) if(NOT MSVC) + add_target_compile_flags(rpcrt4_winetest "-Wno-format") allow_warnings(rpcrt4_winetest) endif() Modified: trunk/rostests/winetests/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/CMakeL… ============================================================================== --- trunk/rostests/winetests/setupapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/CMakeLists.txt [iso-8859-1] Sun Oct 2 22:16:18 2011 @@ -1,7 +1,6 @@ add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) + -D__ROS_LONG64__) list(APPEND SOURCE devclass.c @@ -21,5 +20,5 @@ add_cd_file(TARGET setupapi_winetest DESTINATION reactos/bin FOR all) if(NOT MSVC) - allow_warnings(setupapi_winetest) + add_target_compile_flags(setupapi_winetest "-Wno-format") endif() Modified: trunk/rostests/winetests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/CMakeLis… ============================================================================== --- trunk/rostests/winetests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/CMakeLists.txt [iso-8859-1] Sun Oct 2 22:16:18 2011 @@ -1,7 +1,6 @@ add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) + -D__ROS_LONG64__) set_rc_compiler() @@ -40,5 +39,5 @@ add_cd_file(TARGET user32_winetest DESTINATION reactos/bin FOR all) if(NOT MSVC) - allow_warnings(user32_winetest) + add_target_compile_flags(user32_winetest "-Wno-format") endif() Modified: trunk/rostests/winetests/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/CMakeList… ============================================================================== --- trunk/rostests/winetests/winmm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/winmm/CMakeLists.txt [iso-8859-1] Sun Oct 2 22:16:18 2011 @@ -1,7 +1,6 @@ add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) + -D__ROS_LONG64__) list(APPEND SOURCE capture.c @@ -19,5 +18,5 @@ add_cd_file(TARGET winmm_winetest DESTINATION reactos/bin FOR all) if(NOT MSVC) - allow_warnings(winmm_winetest) + add_target_compile_flags(winmm_winetest "-Wno-format") endif() Modified: trunk/rostests/winetests/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/CMakeLis… ============================================================================== --- trunk/rostests/winetests/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/ws2_32/CMakeLists.txt [iso-8859-1] Sun Oct 2 22:16:18 2011 @@ -1,7 +1,6 @@ add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) + -D__ROS_LONG64__) add_executable(ws2_32_winetest protocol.c sock.c testlist.c) target_link_libraries(ws2_32_winetest wine) @@ -10,5 +9,6 @@ add_cd_file(TARGET ws2_32_winetest DESTINATION reactos/bin FOR all) if(NOT MSVC) + add_target_compile_flags(ws2_32_winetest "-Wno-format") allow_warnings(ws2_32_winetest) endif()

1 0

[akhaldi] 53944: [BROWSEUI] * Reduce the scope of a variable. * Comment out some unused code. * Initialize some member variables in the respective constructors.
by akhaldi＠svn.reactos.org 02 Oct '11

02 Oct '11

Author: akhaldi Date: Sun Oct 2 21:44:24 2011 New Revision: 53944 URL: http://svn.reactos.org/svn/reactos?rev=53944&view=rev Log: [BROWSEUI] * Reduce the scope of a variable. * Comment out some unused code. * Initialize some member variables in the respective constructors. Modified: trunk/reactos/dll/win32/browseui/bandsite.cpp trunk/reactos/dll/win32/browseui/basebar.cpp trunk/reactos/dll/win32/browseui/brandband.cpp trunk/reactos/dll/win32/browseui/internettoolbar.cpp Modified: trunk/reactos/dll/win32/browseui/bandsite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… ============================================================================== --- trunk/reactos/dll/win32/browseui/bandsite.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandsite.cpp [iso-8859-1] Sun Oct 2 21:44:24 2011 @@ -247,10 +247,9 @@ CBandSiteBase::~CBandSiteBase() { - int i; TRACE("destroying %p\n", this); - + if (fRebarWindow != NULL) { DestroyWindow(fRebarWindow); @@ -259,6 +258,7 @@ if (fBands != NULL) { + int i; for (i = 0; i < fBandsAllocated; i++) { if (fBands[i].DeskBand != NULL) Modified: trunk/reactos/dll/win32/browseui/basebar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/basebar… ============================================================================== --- trunk/reactos/dll/win32/browseui/basebar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/basebar.cpp [iso-8859-1] Sun Oct 2 21:44:24 2011 @@ -491,18 +491,19 @@ LRESULT CBaseBar::OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { POINT newLocation; - int delta; + //int delta; if (fTracking) { newLocation.x = (short)LOWORD(lParam); newLocation.y = (short)HIWORD(lParam); +#if 0 if (fVertical) delta = newLocation.x - fLastLocation.x; else delta = newLocation.y - fLastLocation.y; - +#endif fLastLocation = newLocation; } return 0; Modified: trunk/reactos/dll/win32/browseui/brandband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/brandba… ============================================================================== --- trunk/reactos/dll/win32/browseui/brandband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/brandband.cpp [iso-8859-1] Sun Oct 2 21:44:24 2011 @@ -66,6 +66,7 @@ fCurrentFrame = 0; fMaxFrameCount = 0; fImageBitmap = NULL; + fBitmapSize = 0; fAdviseCookie = 0; } Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Sun Oct 2 21:44:24 2011 @@ -135,6 +135,8 @@ fToolbar = NULL; fRebarWindow = NULL; fChildWindow = NULL; + fBandID = 0; + fFlags = 0; fInitialized = false; memset(&fDeskBandInfo, 0, sizeof(fDeskBandInfo)); } @@ -150,7 +152,6 @@ CComPtr<IDeskBand> deskBand; TCHAR textBuffer[40]; REBARBANDINFOW bandInfo; - int bandCount; HRESULT hResult; hResult = containedBand->QueryInterface(IID_IObjectWithSite, (void **)&site); @@ -180,7 +181,7 @@ bandInfo.cch = sizeof(textBuffer) / sizeof(TCHAR); hResult = GetRBBandInfo(bandInfo); - bandCount = (int)SendMessage(fRebarWindow, RB_GETBANDCOUNT, 0, 0); + SendMessage(fRebarWindow, RB_GETBANDCOUNT, 0, 0); SendMessage(fRebarWindow, RB_INSERTBANDW, -1, (LPARAM)&bandInfo); fInitialized = true; return S_OK;

1 0

[tfaber] 53943: [ADVAPI32_APITEST] - Test passing tag, but no group to CreateService [KMTESTS/MM] - MmSection: Wait for write completion to prevent a random test failure
by tfaber＠svn.reactos.org 02 Oct '11

02 Oct '11

Author: tfaber Date: Sun Oct 2 21:42:33 2011 New Revision: 53943 URL: http://svn.reactos.org/svn/reactos?rev=53943&view=rev Log: [ADVAPI32_APITEST] - Test passing tag, but no group to CreateService [KMTESTS/MM] - MmSection: Wait for write completion to prevent a random test failure Modified: trunk/rostests/apitests/advapi32/CreateService.c trunk/rostests/kmtests/ntos_mm/MmSection.c Modified: trunk/rostests/apitests/advapi32/CreateService.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/CreateS… ============================================================================== --- trunk/rostests/apitests/advapi32/CreateService.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/CreateService.c [iso-8859-1] Sun Oct 2 21:42:33 2011 @@ -66,12 +66,28 @@ return 0; } +static void DestroyService(SC_HANDLE hService) +{ + LONG ret; + + if (!hService) + return; + SetLastError(DNS_ERROR_RCODE_NXRRSET); + ret = DeleteService(hService); + ok(ret == TRUE, "DeleteService returned %ld, expected 1\n", ret); + ok(GetLastError() == DNS_ERROR_RCODE_NXRRSET /* win7 */ + || GetLastError() == ERROR_SUCCESS /* win2k3 */, "DeleteService GetLastError()=0x%08lx\n", GetLastError()); + + CloseServiceHandle(hService); +} + static void Test_CreateService(void) { SC_HANDLE hScm = NULL; SC_HANDLE hService1 = NULL, hService2 = NULL; - LONG ret; + SC_HANDLE hService3 = NULL; DWORD tag1 = 0, tag2 = 0; + DWORD tag3 = 785; SetLastError(DNS_ERROR_RCODE_NXRRSET); hScm = OpenSCManagerW(NULL, NULL, SC_MANAGER_CREATE_SERVICE); @@ -92,28 +108,49 @@ ok(tag1 != tag2, "tag1=%lu, tag2=%lu\n", tag1, tag2); + /* ask for a tag, but don't have a group */ + hService3 = CreateServiceW( + hScm, + L"advapi32_apitest_CreateService_Test_Service2", + NULL, + DELETE, + SERVICE_KERNEL_DRIVER, + SERVICE_BOOT_START, + SERVICE_ERROR_IGNORE, + L"%systemroot%\\drivers\\win32k.sys", + NULL, + &tag3, + NULL, + NULL, + NULL); + ok(hService3 == NULL, "hService3=%p\n", hService3); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "error=%lu\n", GetLastError()); + ok(tag3 == 785, "tag3=%lu\n", tag3); + DestroyService(hService3); + + hService3 = CreateServiceW( + hScm, + L"advapi32_apitest_CreateService_Test_Service2", + NULL, + DELETE, + SERVICE_KERNEL_DRIVER, + SERVICE_BOOT_START, + SERVICE_ERROR_IGNORE, + L"%systemroot%\\drivers\\win32k.sys", + L"", + &tag3, + NULL, + NULL, + NULL); + ok(hService3 == NULL, "hService3=%p\n", hService3); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "error=%lu\n", GetLastError()); + ok(tag3 == 785, "tag3=%lu\n", tag3); + DestroyService(hService3); + cleanup: - if (hService2) - { - SetLastError(DNS_ERROR_RCODE_NXRRSET); - ret = DeleteService(hService2); - ok(ret == TRUE, "DeleteService returned %ld, expected 1\n", ret); - ok(GetLastError() == DNS_ERROR_RCODE_NXRRSET /* win7 */ - || GetLastError() == ERROR_SUCCESS /* win2k3 */, "DeleteService (Error: %ld)\n", GetLastError()); - CloseServiceHandle(hService2); - } - - if (hService1) - { - SetLastError(DNS_ERROR_RCODE_NXRRSET); - ret = DeleteService(hService1); - ok(ret == TRUE, "DeleteService returned %ld, expected 1\n", ret); - ok(GetLastError() == DNS_ERROR_RCODE_NXRRSET /* win7 */ - || GetLastError() == ERROR_SUCCESS /* win2k3 */, "DeleteService (Error: %ld)\n", GetLastError()); - - CloseServiceHandle(hService1); - } + DestroyService(hService2); + DestroyService(hService1); if (hScm) CloseServiceHandle(hScm); Modified: trunk/rostests/kmtests/ntos_mm/MmSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmSection… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] Sun Oct 2 21:42:33 2011 @@ -27,7 +27,7 @@ NTSTATUS Status; \ if (skip(SectionObject != NULL && \ SectionObject != (PVOID)0x5555555555555555ULL, \ - "blah\n")) \ + "No section object\n")) \ break; \ Status = ObOpenObjectByPointer(SectionObject, OBJ_KERNEL_HANDLE, \ NULL, 0, MmSectionObjectType, \ @@ -401,7 +401,7 @@ ok(ExGetPreviousMode() == UserMode, "Previous mode is kernel mode\n"); /* create a one-byte file that we can use */ InitializeObjectAttributes(&ObjectAttributes, &FileName1, OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwCreateFile(&FileHandle1, GENERIC_ALL, &ObjectAttributes, &IoStatusBlock, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, FILE_SUPERSEDE, FILE_NON_DIRECTORY_FILE, NULL, 0); + Status = ZwCreateFile(&FileHandle1, GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, FILE_SUPERSEDE, FILE_NON_DIRECTORY_FILE, NULL, 0); ok_eq_hex(Status, STATUS_SUCCESS); ok_eq_ulongptr(IoStatusBlock.Information, FILE_CREATED); ok(FileHandle1 != NULL, "FileHandle1 is NULL\n"); @@ -409,6 +409,8 @@ { FileOffset.QuadPart = 0; Status = ZwWriteFile(FileHandle1, NULL, NULL, NULL, &IoStatusBlock, &FileData, sizeof FileData, &FileOffset, NULL); + ok(Status == STATUS_SUCCESS || Status == STATUS_PENDING, "Status = 0x%08lx\n", Status); + Status = ZwWaitForSingleObject(FileHandle1, FALSE, NULL); ok_eq_hex(Status, STATUS_SUCCESS); ok_eq_ulongptr(IoStatusBlock.Information, 1); Status = ZwClose(FileHandle1);

1 0

[tkreuzer] 53942: [NTSOKRNL] - use RtlStringCbPrintfA instead of manually calculating required length and checking if the buffer is large enough - Use %wZ as format specifier for a UNICODE_STRING, ...
by tkreuzer＠svn.reactos.org 02 Oct '11

02 Oct '11

Author: tkreuzer Date: Sun Oct 2 21:42:00 2011 New Revision: 53942 URL: http://svn.reactos.org/svn/reactos?rev=53942&view=rev Log: [NTSOKRNL] - use RtlStringCbPrintfA instead of manually calculating required length and checking if the buffer is large enough - Use %wZ as format specifier for a UNICODE_STRING, instead of using %S and making assumptions about zero termination. - Don't "while (TRUE);" on buffer overflow! Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=539… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sun Oct 2 21:42:00 2011 @@ -750,9 +750,9 @@ ULONG Count, Length; PWCHAR Name; PLDR_DATA_TABLE_ENTRY LdrEntry; - BOOLEAN OverFlow = FALSE; CHAR NameBuffer[256]; STRING SymbolString; + NTSTATUS Status; /* Loop the driver list */ NextEntry = LoaderBlock->LoadOrderListHead.Flink; @@ -775,7 +775,7 @@ if (sizeof(NameBuffer) < Length + sizeof(ANSI_NULL)) { /* It's too long */ - OverFlow = TRUE; + Status = STATUS_BUFFER_OVERFLOW; } else { @@ -789,33 +789,21 @@ /* Null-terminate */ NameBuffer[Count] = ANSI_NULL; + Status = STATUS_SUCCESS; } } else { - /* This should be a driver, check if it fits */ - if (sizeof(NameBuffer) < - (sizeof("\\System32\\Drivers\\") + - NtSystemRoot.Length / sizeof(WCHAR) - sizeof(UNICODE_NULL) + - LdrEntry->BaseDllName.Length / sizeof(WCHAR) + - sizeof(ANSI_NULL))) - { - /* Buffer too small */ - OverFlow = TRUE; - while (TRUE); - } - else - { - /* Otherwise build the name. HACKED for GCC :( */ - sprintf(NameBuffer, - "%S\\System32\\Drivers\\%S", - &SharedUserData->NtSystemRoot[2], - LdrEntry->BaseDllName.Buffer); - } + /* Safely print the string into our buffer */ + Status = RtlStringCbPrintfA(NameBuffer, + sizeof(NameBuffer), + "%S\\System32\\Drivers\\%wZ", + &SharedUserData->NtSystemRoot[2], + &LdrEntry->BaseDllName); } /* Check if the buffer was ok */ - if (!OverFlow) + if (NT_SUCCESS(Status)) { /* Initialize the STRING for the debugger */ RtlInitString(&SymbolString, NameBuffer);

1 0

[akhaldi] 53941: [RBUILD] * Plug a leak.
by akhaldi＠svn.reactos.org 02 Oct '11

02 Oct '11

Author: akhaldi Date: Sun Oct 2 20:59:15 2011 New Revision: 53941 URL: http://svn.reactos.org/svn/reactos?rev=53941&view=rev Log: [RBUILD] * Plug a leak. Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Oct 2 20:59:15 2011 @@ -364,6 +364,7 @@ dep += ssprintf ( " $(%s_HEADERS)", importedModule.name.c_str () ); else if ( GetExtension ( *objectFilename ) == ".rc" ) dep += ssprintf ( " $(%s_MCHEADERS)", importedModule.name.c_str () ); + delete objectFilename; } } else

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2011