Ros-diffs October 2012

ros-diffs@reactos.org

14 participants
211 discussions

[tkreuzer] 57550: [NTDLL_APITEST} Add tests for LdrEnumResources

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 13 13:07:17 2012 New Revision: 57550 URL: http://svn.reactos.org/svn/reactos?rev=57550&view=rev Log: [NTDLL_APITEST} Add tests for LdrEnumResources Added: trunk/rostests/apitests/ntdll/LdrEnumResources.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sat Oct 13 13:07:17 2012 @@ -1,5 +1,6 @@ list(APPEND SOURCE + LdrEnumResources.c NtAllocateVirtualMemory.c NtFreeVirtualMemory.c NtQuerySystemEnvironmentValue.c Added: trunk/rostests/apitests/ntdll/LdrEnumResources.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/LdrEnumRes… ============================================================================== --- trunk/rostests/apitests/ntdll/LdrEnumResources.c (added) +++ trunk/rostests/apitests/ntdll/LdrEnumResources.c [iso-8859-1] Sat Oct 13 13:07:17 2012 @@ -1,0 +1,371 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for LdrEnumResources + * PROGRAMMER: Timo Kreuzer + */ + +#define WIN32_NO_STATUS +#define UNICODE +#include <stdio.h> +#include <wine/test.h> +#include <pseh/pseh2.h> +#include <ndk/ldrfuncs.h> + +typedef struct _TEST_RESOURCES +{ + IMAGE_RESOURCE_DIRECTORY TypeDirectory; + IMAGE_RESOURCE_DIRECTORY_ENTRY TypeEntries[2]; + IMAGE_RESOURCE_DIRECTORY Name1Directory; + IMAGE_RESOURCE_DIRECTORY_ENTRY Name1Entries[2]; + IMAGE_RESOURCE_DIRECTORY Name2Directory; + IMAGE_RESOURCE_DIRECTORY_ENTRY Name2Entries[2]; + IMAGE_RESOURCE_DIRECTORY Lang1Directory; + IMAGE_RESOURCE_DIRECTORY_ENTRY Lang1Entries[2]; + IMAGE_RESOURCE_DIRECTORY Lang2Directory; + IMAGE_RESOURCE_DIRECTORY_ENTRY Lang2Entries[2]; + IMAGE_RESOURCE_DIRECTORY Lang3Directory; + IMAGE_RESOURCE_DIRECTORY_ENTRY Lang3Entries[2]; + IMAGE_RESOURCE_DIRECTORY Lang4Directory; + IMAGE_RESOURCE_DIRECTORY_ENTRY Lang4Entries[2]; + IMAGE_RESOURCE_DATA_ENTRY DataEntries[8]; + IMAGE_RESOURCE_DIRECTORY_STRING Name1String; + ULONG StringIndex; + WCHAR StringBuffer[20]; +} TEST_RESOURCES, *PTEST_RESOURCES; + +typedef struct _TEST_IMAGE +{ + IMAGE_DOS_HEADER DosHeader; + IMAGE_NT_HEADERS NtHeaders; + IMAGE_SECTION_HEADER SectionHeaders[1]; + TEST_RESOURCES Resources; +} TEST_IMAGE, *PTEST_IMAGE; + +static +VOID +InitializeResourceDirectory( + PIMAGE_RESOURCE_DIRECTORY ResourceDirectory, + USHORT NumberOfNamedEntries, + USHORT NumberOfIdEntries) +{ + ResourceDirectory->Characteristics = 0; + ResourceDirectory->TimeDateStamp = 0; + ResourceDirectory->MajorVersion = 0; + ResourceDirectory->MinorVersion = 0; + ResourceDirectory->NumberOfNamedEntries = NumberOfNamedEntries; + ResourceDirectory->NumberOfIdEntries = NumberOfIdEntries; +} + +static +VOID +InitializeNamedEntry( + PTEST_RESOURCES Resource, + PIMAGE_RESOURCE_DIRECTORY_ENTRY DirEntry, + PWCHAR Name, + PVOID Data) +{ + DirEntry->Name = Resource->StringIndex * 2 + FIELD_OFFSET(TEST_RESOURCES, StringBuffer); + DirEntry->NameIsString = 1; + DirEntry->OffsetToData = (PUCHAR)Data - (PUCHAR)Resource; + if (DirEntry < Resource->Lang1Entries) + DirEntry->DataIsDirectory = 1; + Resource->StringBuffer[Resource->StringIndex] = wcslen(Name); + wcscpy(&Resource->StringBuffer[Resource->StringIndex + 1], Name); + Resource->StringIndex += Resource->StringBuffer[Resource->StringIndex] * 2 + 1; +} + +static +VOID +InitializeIdEntry( + PTEST_RESOURCES Resource, + PIMAGE_RESOURCE_DIRECTORY_ENTRY DirEntry, + USHORT Id, + PVOID Data) +{ + DirEntry->Name = Id; + DirEntry->NameIsString = 0; + DirEntry->OffsetToData = (PUCHAR)Data - (PUCHAR)Resource; + if (DirEntry < Resource->Lang1Entries) + DirEntry->DataIsDirectory = 1; +} + +static +VOID +InitializeDataEntry( + PVOID ImageBase, + PIMAGE_RESOURCE_DATA_ENTRY DataEntry, + PVOID Data, + ULONG Size) +{ + + DataEntry->OffsetToData = (PUCHAR)Data - (PUCHAR)ImageBase; + DataEntry->Size = Size; + DataEntry->CodePage = 0; + DataEntry->Reserved = 0; +} + +static +VOID +InitializeTestResource( + PVOID ImageBase, + PTEST_RESOURCES Resource) +{ + + memset(Resource->StringBuffer, 0, sizeof(Resource->StringBuffer)); + Resource->StringIndex = 0; + + InitializeResourceDirectory(&Resource->TypeDirectory, 0, 2); + InitializeIdEntry(Resource, &Resource->TypeEntries[0], 1, &Resource->Name1Directory); + InitializeIdEntry(Resource, &Resource->TypeEntries[1], 2, &Resource->Name2Directory); + + InitializeResourceDirectory(&Resource->Name1Directory, 1, 1); + InitializeNamedEntry(Resource, &Resource->Name1Entries[0], L"TEST", &Resource->Lang1Directory); + InitializeIdEntry(Resource, &Resource->Name1Entries[1], 7, &Resource->Lang2Directory); + + InitializeResourceDirectory(&Resource->Name2Directory, 2, 0); + InitializeNamedEntry(Resource, &Resource->Name2Entries[0], L"LOL", &Resource->Lang3Directory); + InitializeNamedEntry(Resource, &Resource->Name2Entries[1], L"xD", &Resource->Lang4Directory); + + InitializeResourceDirectory(&Resource->Lang1Directory, 0, 2); + InitializeIdEntry(Resource, &Resource->Lang1Entries[0], 0x409, &Resource->DataEntries[0]); + InitializeIdEntry(Resource, &Resource->Lang1Entries[1], 0x407, &Resource->DataEntries[1]); + + InitializeResourceDirectory(&Resource->Lang2Directory, 0, 2); + InitializeIdEntry(Resource, &Resource->Lang2Entries[0], 0x408, &Resource->DataEntries[2]); + InitializeIdEntry(Resource, &Resource->Lang2Entries[1], 0x406, &Resource->DataEntries[3]); + + InitializeResourceDirectory(&Resource->Lang3Directory, 0, 2); + InitializeIdEntry(Resource, &Resource->Lang3Entries[0], 0x405, &Resource->DataEntries[4]); + InitializeIdEntry(Resource, &Resource->Lang3Entries[1], 0x403, &Resource->DataEntries[5]); + + InitializeResourceDirectory(&Resource->Lang4Directory, 0, 2); + InitializeIdEntry(Resource, &Resource->Lang4Entries[0], 0x402, &Resource->DataEntries[6]); + InitializeIdEntry(Resource, &Resource->Lang4Entries[1], 0x404, &Resource->DataEntries[7]); + + InitializeDataEntry(ImageBase, &Resource->DataEntries[0], Resource->StringBuffer + 0, 2); + InitializeDataEntry(ImageBase, &Resource->DataEntries[1], Resource->StringBuffer + 2, 4); + InitializeDataEntry(ImageBase, &Resource->DataEntries[2], Resource->StringBuffer + 4, 6); + InitializeDataEntry(ImageBase, &Resource->DataEntries[3], Resource->StringBuffer + 6, 8); + InitializeDataEntry(ImageBase, &Resource->DataEntries[4], Resource->StringBuffer + 8, 10); + InitializeDataEntry(ImageBase, &Resource->DataEntries[5], Resource->StringBuffer + 10, 12); + InitializeDataEntry(ImageBase, &Resource->DataEntries[6], Resource->StringBuffer + 12, 14); + InitializeDataEntry(ImageBase, &Resource->DataEntries[7], Resource->StringBuffer + 14, 16); + +} + +VOID +InitializeTestImage( + PTEST_IMAGE TestImage) +{ + PIMAGE_DATA_DIRECTORY ResourceDirectory; + + TestImage->DosHeader.e_magic = IMAGE_DOS_SIGNATURE; + TestImage->DosHeader.e_lfanew = sizeof(IMAGE_DOS_HEADER); + + TestImage->NtHeaders.Signature = IMAGE_NT_SIGNATURE; + + TestImage->NtHeaders.FileHeader.Machine = IMAGE_FILE_MACHINE_I386; + TestImage->NtHeaders.FileHeader.NumberOfSections = 1; + TestImage->NtHeaders.FileHeader.TimeDateStamp = 0; + TestImage->NtHeaders.FileHeader.PointerToSymbolTable = 0; + TestImage->NtHeaders.FileHeader.NumberOfSymbols = 0; + TestImage->NtHeaders.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); + TestImage->NtHeaders.FileHeader.Characteristics = 0; + + TestImage->NtHeaders.OptionalHeader.Magic = IMAGE_NT_OPTIONAL_HDR32_MAGIC; + TestImage->NtHeaders.OptionalHeader.ImageBase = (DWORD)TestImage; + TestImage->NtHeaders.OptionalHeader.SizeOfImage = sizeof(TEST_IMAGE); + TestImage->NtHeaders.OptionalHeader.SizeOfHeaders = sizeof(IMAGE_DOS_HEADER) + sizeof(IMAGE_NT_HEADERS); + + ResourceDirectory = &TestImage->NtHeaders.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE]; + ResourceDirectory->VirtualAddress = FIELD_OFFSET(TEST_IMAGE, Resources); + ResourceDirectory->Size = sizeof(TEST_RESOURCES); + + strcpy(TestImage->SectionHeaders[0].Name, ".rsrc"); + TestImage->SectionHeaders[0].Misc.VirtualSize = sizeof(TEST_IMAGE); + TestImage->SectionHeaders[0].VirtualAddress = FIELD_OFFSET(TEST_IMAGE, Resources); + TestImage->SectionHeaders[0].SizeOfRawData = sizeof(TEST_IMAGE); + TestImage->SectionHeaders[0].PointerToRawData = FIELD_OFFSET(TEST_IMAGE, Resources); + TestImage->SectionHeaders[0].PointerToRelocations = 0; + TestImage->SectionHeaders[0].PointerToLinenumbers = 0; + TestImage->SectionHeaders[0].NumberOfRelocations = 0; + TestImage->SectionHeaders[0].NumberOfLinenumbers = 0; + TestImage->SectionHeaders[0].Characteristics = 0; + + InitializeTestResource(TestImage, &TestImage->Resources); +} + +#define ok_nwstr(str1, str2, count) \ + ok(wcsncmp((PWCHAR)str1, (PWCHAR)str2, count) == 0, \ + "string is wrong, expected: '%S', got '%S'\n", str1, str2); \ + +#define ok_enumres(_Res, _Type, _Name, _Lang, _Data, _Size) \ + ok_dec((_Res)->Type, _Type); \ + if ((ULONG_PTR)(_Name) > 0xFFFF) \ + { \ + ok_dec(*(WORD*)((_Res)->Name), wcslen((PWCHAR)(_Name))); \ + ok_nwstr((PWCHAR)((_Res)->Name + 2), (PWCHAR)_Name, *(WORD*)((_Res)->Name)); \ + } \ + else \ + { \ + ok_dec((_Res)->Name, (ULONG_PTR)_Name); \ + } \ + ok_hex((_Res)->Language, _Lang); \ + ok_ptr((PVOID)(_Res)->Data, _Data); \ + ok_dec((_Res)->Size, _Size); \ + ok_dec((_Res)->Reserved, 0); + +static +void +Test_Data(PTEST_IMAGE TestImage) +{ + LDR_RESOURCE_INFO ResourceInfo; + LDR_ENUM_RESOURCE_INFO EnumRes[8]; + ULONG ResourceCount; + NTSTATUS Status; + + InitializeTestImage(TestImage); + + memset(EnumRes, 0xcc, sizeof(EnumRes)); + + ResourceInfo.Type = 1; + ResourceInfo.Name = 1; + ResourceInfo.Language = 0x408; + ResourceCount = 8; + Status = LdrEnumResources(TestImage, &ResourceInfo, 0, &ResourceCount, EnumRes); + ok_hex(Status, STATUS_SUCCESS); + ok_dec(ResourceCount, 8); + + ok_ptr((PVOID)EnumRes[0].Data, TestImage->Resources.StringBuffer); + ok_dec(EnumRes[0].Size, 2); + + ok_enumres(&EnumRes[0], 1, L"TEST", 0x409, TestImage->Resources.StringBuffer, 2) + ok_enumres(&EnumRes[1], 1, L"TEST", 0x407, TestImage->Resources.StringBuffer + 2, 4) + ok_enumres(&EnumRes[2], 1, 7, 0x408, TestImage->Resources.StringBuffer + 4, 6) + ok_enumres(&EnumRes[3], 1, 7, 0x406, TestImage->Resources.StringBuffer + 6, 8) + ok_enumres(&EnumRes[4], 2, L"LOL", 0x405, TestImage->Resources.StringBuffer + 8, 10) + ok_enumres(&EnumRes[5], 2, L"LOL", 0x403, TestImage->Resources.StringBuffer + 10, 12) + ok_enumres(&EnumRes[6], 2, L"xD", 0x402, TestImage->Resources.StringBuffer + 12, 14) + ok_enumres(&EnumRes[7], 2, L"xD", 0x404, TestImage->Resources.StringBuffer + 14, 16) + + Status = LdrEnumResources(TestImage, &ResourceInfo, 1, &ResourceCount, EnumRes); + ok_hex(Status, STATUS_SUCCESS); + ok_dec(ResourceCount, 4); + +} + + +static +void +Test_Parameters(PTEST_IMAGE TestImage) +{ + LDR_RESOURCE_INFO ResourceInfo; + LDR_ENUM_RESOURCE_INFO Resources[8]; + ULONG ResourceCount; + NTSTATUS Status; + + InitializeTestImage(TestImage); + + ResourceInfo.Type = 6; + ResourceInfo.Name = 1; + ResourceInfo.Language = 0x409; + + ResourceCount = 8; + Status = LdrEnumResources(TestImage, &ResourceInfo, 3, &ResourceCount, Resources); + ok_hex(Status, STATUS_SUCCESS); + ok_dec(ResourceCount, 0); + + ResourceInfo.Type = 1; + ResourceInfo.Name = 7; + ResourceInfo.Language = 0x406; + ResourceCount = 8; + Status = LdrEnumResources(TestImage, &ResourceInfo, 0, &ResourceCount, Resources); + ok_hex(Status, STATUS_SUCCESS); + ok_dec(ResourceCount, 8); + + ResourceCount = 8; + Status = LdrEnumResources(TestImage, &ResourceInfo, 1, &ResourceCount, Resources); + ok_hex(Status, STATUS_SUCCESS); + ok_dec(ResourceCount, 4); + + ResourceCount = 8; + Status = LdrEnumResources(TestImage, &ResourceInfo, 2, &ResourceCount, Resources); + ok_hex(Status, STATUS_SUCCESS); + ok_dec(ResourceCount, 2); + + ResourceCount = 8; + Status = LdrEnumResources(TestImage, &ResourceInfo, 3, &ResourceCount, Resources); + ok_hex(Status, STATUS_SUCCESS); + ok_dec(ResourceCount, 1); + + ResourceCount = 8; + Status = LdrEnumResources(TestImage, &ResourceInfo, 99, &ResourceCount, Resources); + ok_hex(Status, STATUS_SUCCESS); + ok_dec(ResourceCount, 1); + + ResourceCount = 0; + Status = LdrEnumResources(TestImage, &ResourceInfo, 0, &ResourceCount, Resources); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + ok_dec(ResourceCount, 8); + + ResourceCount = 7; + Status = LdrEnumResources(TestImage, &ResourceInfo, 0, &ResourceCount, Resources); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + ok_dec(ResourceCount, 8); + + ResourceCount = 8; + Status = LdrEnumResources(NULL, &ResourceInfo, 1, &ResourceCount, Resources); + ok_hex(Status, STATUS_RESOURCE_DATA_NOT_FOUND); + ok_dec(ResourceCount, 0); + + ResourceCount = 8; + Status = LdrEnumResources(TestImage, &ResourceInfo, 1, &ResourceCount, NULL); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + ok_dec(ResourceCount, 4); + + ResourceCount = 8; + _SEH2_TRY + { + Status = LdrEnumResources(NULL, NULL, 0, NULL, NULL); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = 0xDeadC0de; + } + _SEH2_END + ok_hex(Status, 0xDeadC0de); + + ResourceCount = 42; + _SEH2_TRY + { + Status = LdrEnumResources(TestImage, &ResourceInfo, 1, NULL, Resources); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = 0xDeadC0de; + } + _SEH2_END + ok_hex(Status, 0xDeadC0de); + ok_dec(ResourceCount, 42); + + ResourceCount = 8; + Status = LdrEnumResources(TestImage + 2, &ResourceInfo, 1, &ResourceCount, NULL); + ok_hex(Status, STATUS_RESOURCE_DATA_NOT_FOUND); + ok_dec(ResourceCount, 0); + + TestImage->Resources.TypeEntries[0].DataIsDirectory = 0; + Status = LdrEnumResources(TestImage, &ResourceInfo, 1, &ResourceCount, NULL); + ok_hex(Status, STATUS_INVALID_IMAGE_FORMAT); + ok_dec(ResourceCount, 0); + +} + +START_TEST(LdrEnumResources) +{ + TEST_IMAGE TestImage; + + Test_Parameters(&TestImage); + Test_Data(&TestImage); + +} Propchange: trunk/rostests/apitests/ntdll/LdrEnumResources.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Sat Oct 13 13:07:17 2012 @@ -5,6 +5,7 @@ #define STANDALONE #include "wine/test.h" +extern void func_LdrEnumResources(void); extern void func_NtAllocateVirtualMemory(void); extern void func_NtFreeVirtualMemory(void); extern void func_NtQuerySystemEnvironmentValue(void); @@ -24,6 +25,7 @@ const struct test winetest_testlist[] = { + { "LdrEnumResources", func_LdrEnumResources }, { "NtAllocateVirtualMemory", func_NtAllocateVirtualMemory }, { "NtFreeVirtualMemory", func_NtFreeVirtualMemory }, { "NtQuerySystemEnvironmentValue", func_NtQuerySystemEnvironmentValue },

12 years, 2 months

[tkreuzer] 57549: [RTL] Fix RtlEnumResources prototype

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 13 13:02:16 2012 New Revision: 57549 URL: http://svn.reactos.org/svn/reactos?rev=57549&view=rev Log: [RTL] Fix RtlEnumResources prototype Modified: trunk/reactos/lib/rtl/res.c Modified: trunk/reactos/lib/rtl/res.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/res.c?rev=57549&r1… ============================================================================== --- trunk/reactos/lib/rtl/res.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/res.c [iso-8859-1] Sat Oct 13 13:02:16 2012 @@ -286,12 +286,14 @@ /* * @unimplemented */ -NTSTATUS NTAPI -LdrEnumResources(IN PVOID BaseAddress, - IN PLDR_RESOURCE_INFO ResourceInfo, - IN ULONG Level, - IN OUT PULONG ResourceCount, - OUT PVOID Resources OPTIONAL) +NTSTATUS +NTAPI +LdrEnumResources( + IN PVOID BaseAddress, + IN PLDR_RESOURCE_INFO ResourceInfo, + IN ULONG Level, + IN OUT PULONG ResourceCount, + OUT PLDR_ENUM_RESOURCE_INFO Resources OPTIONAL) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED;

12 years, 2 months

[tkreuzer] 57548: [NDK] Add LdrEnumResources() and _LDR_ENUM_RESOURCE_INFO, fix _LDR_RESOURCE_INFO

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 13 12:53:09 2012 New Revision: 57548 URL: http://svn.reactos.org/svn/reactos?rev=57548&view=rev Log: [NDK] Add LdrEnumResources() and _LDR_ENUM_RESOURCE_INFO, fix _LDR_RESOURCE_INFO Modified: trunk/reactos/include/ndk/ldrfuncs.h trunk/reactos/include/ndk/ldrtypes.h Modified: trunk/reactos/include/ndk/ldrfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrfuncs.h [iso-8859-1] Sat Oct 13 12:53:09 2012 @@ -48,6 +48,17 @@ IN ULONG Level, OUT PIMAGE_RESOURCE_DATA_ENTRY *ResourceDataEntry ); + +NTSTATUS +NTAPI +LdrEnumResources( + IN PVOID BaseAddress, + IN PLDR_RESOURCE_INFO ResourceInfo, + IN ULONG Level, + IN OUT ULONG *ResourceCount, + OUT PLDR_ENUM_RESOURCE_INFO Resources OPTIONAL +); + NTSTATUS NTAPI Modified: trunk/reactos/include/ndk/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrtypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] Sat Oct 13 12:53:09 2012 @@ -170,8 +170,18 @@ { ULONG_PTR Type; ULONG_PTR Name; - ULONG Language; + ULONG_PTR Language; } LDR_RESOURCE_INFO, *PLDR_RESOURCE_INFO; + +typedef struct _LDR_ENUM_RESOURCE_INFO +{ + ULONG_PTR Type; + ULONG_PTR Name; + ULONG_PTR Language; + PVOID Data; + SIZE_T Size; + ULONG_PTR Reserved; +} LDR_ENUM_RESOURCE_INFO, *PLDR_ENUM_RESOURCE_INFO; // // DLL Notifications

12 years, 2 months

[mnordell] 57547: [WINETEST:MSVCRT][LOCALE] Locale inherently broken. Not even worth to test currently (source: Amine). Disabled by ROSTESTS_91_IS_FIXED

by mnordell＠svn.reactos.org

Author: mnordell Date: Fri Oct 12 23:04:58 2012 New Revision: 57547 URL: http://svn.reactos.org/svn/reactos?rev=57547&view=rev Log: [WINETEST:MSVCRT][LOCALE] Locale inherently broken. Not even worth to test currently (source: Amine). Disabled by ROSTESTS_91_IS_FIXED Modified: trunk/rostests/winetests/msvcrt/locale.c Modified: trunk/rostests/winetests/msvcrt/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/locale.c… ============================================================================== --- trunk/rostests/winetests/msvcrt/locale.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/locale.c [iso-8859-1] Fri Oct 12 23:04:58 2012 @@ -618,6 +618,7 @@ ok(!ret, "ret == TRUE\n"); } +#if ROSTESTS_91_IS_FIXED static void test__Gettnames(void) { struct { @@ -737,6 +738,7 @@ setlocale(LC_ALL, "C"); } +#endif /* ROSTESTS_91_IS_FIXED */ START_TEST(locale) { @@ -744,5 +746,7 @@ test_crtGetStringTypeW(); test_setlocale(); +#if ROSTESTS_91_IS_FIXED test__Gettnames(); +#endif }

12 years, 2 months

[hbelusca] 57546: [ADVAPI32] - Pre-implement InitiateSystemShutdownExW. - Cosmetic formatting code (by me). Patch by Lee Schroeder. See CORE-6613 for more details. CORE-6613 #comment Committed shut...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Oct 12 22:12:44 2012 New Revision: 57546 URL: http://svn.reactos.org/svn/reactos?rev=57546&view=rev Log: [ADVAPI32] - Pre-implement InitiateSystemShutdownExW. - Cosmetic formatting code (by me). Patch by Lee Schroeder. See CORE-6613 for more details. CORE-6613 #comment Committed shutdown.c. Modified: trunk/reactos/dll/win32/advapi32/misc/shutdown.c Modified: trunk/reactos/dll/win32/advapi32/misc/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/sh… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/shutdown.c [iso-8859-1] Fri Oct 12 22:12:44 2012 @@ -10,8 +10,6 @@ #include <advapi32.h> WINE_DEFAULT_DEBUG_CHANNEL(advapi); -#define USZ {0,0,0} - /********************************************************************** * AbortSystemShutdownW * @@ -28,7 +26,7 @@ /********************************************************************** * AbortSystemShutdownA * - * @unimplemented + * see AbortSystemShutdownW */ BOOL WINAPI AbortSystemShutdownA(LPCSTR lpMachineName) @@ -42,8 +40,8 @@ Status = RtlAnsiStringToUnicodeString(&MachineNameW, &MachineNameA, TRUE); if (STATUS_SUCCESS != Status) { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; } rv = AbortSystemShutdownW(MachineNameW.Buffer); @@ -71,7 +69,8 @@ bRebootAfterShutdown, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER | - SHTDN_REASON_FLAG_PLANNED); + SHTDN_REASON_FLAG_PLANNED + /* SHTDN_REASON_MAJOR_LEGACY_API */); } /********************************************************************** @@ -94,7 +93,8 @@ bRebootAfterShutdown, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER | - SHTDN_REASON_FLAG_PLANNED); + SHTDN_REASON_FLAG_PLANNED + /* SHTDN_REASON_MAJOR_LEGACY_API */); } /****************************************************************************** @@ -110,23 +110,37 @@ BOOL bRebootAfterShutdown, DWORD dwReason) { - SHUTDOWN_ACTION Action = ShutdownNoReboot; - NTSTATUS Status; - - if (lpMachineName) - { - /* FIXME: remote machine shutdown not supported yet */ + SHUTDOWN_ACTION action; + NTSTATUS Status; + ULONG Timeout_ms; + + /* Convert to milliseconds so we can use the value later on */ + Timeout_ms = dwTimeout * 1000; + + if (lpMachineName != NULL) + { + /* FIXME: Remote system shutdown not supported yet */ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } - - if (dwTimeout) - { - } - - Status = NtShutdownSystem(Action); + else /* The local system is being used */ + { + /* FIXME: Right now, only basic shutting down and rebooting + is supported */ + if(bRebootAfterShutdown == TRUE) + { + action = ShutdownReboot; + } + else + { + action = ShutdownNoReboot; + } + + Status = NtShutdownSystem(action); + } + SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; + return (Status == STATUS_SUCCESS); } /****************************************************************************** @@ -186,6 +200,8 @@ bRebootAfterShutdown, dwReason); LastError = GetLastError(); + + /* Clear the values of both strings */ if (lpMachineName) RtlFreeUnicodeString(&MachineNameW); @@ -215,7 +231,7 @@ /****************************************************************************** * InitiateShutdownA [ADVAPI32.@] * - * @unimplamented + * see InitiateShutdownW */ DWORD WINAPI InitiateShutdownA(LPSTR lpMachineName, @@ -267,6 +283,8 @@ dwShutdownFlags, dwReason); LastError = GetLastError(); + + /* Clear the values of both strings */ if (lpMachineName) RtlFreeUnicodeString(&MachineNameW);

12 years, 2 months

[mnordell] 57545: [ROSTESTS:WINETEST][MSHTML] add missing mshtml_ros.diff

by mnordell＠svn.reactos.org

Author: mnordell Date: Fri Oct 12 22:11:14 2012 New Revision: 57545 URL: http://svn.reactos.org/svn/reactos?rev=57545&view=rev Log: [ROSTESTS:WINETEST][MSHTML] add missing mshtml_ros.diff Added: trunk/rostests/winetests/mshtml/mshtml_ros.diff Added: trunk/rostests/winetests/mshtml/mshtml_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/mshtml_r… ============================================================================== --- trunk/rostests/winetests/mshtml/mshtml_ros.diff (added) +++ trunk/rostests/winetests/mshtml/mshtml_ros.diff [iso-8859-1] Fri Oct 12 22:11:14 2012 @@ -1,0 +1,62 @@ ++Index: htmldoc.c ++=================================================================== ++--- htmldoc.c (revision 57539) +++++ htmldoc.c (working copy) ++@@ -23,6 +23,8 @@ ++ #include <stdarg.h> ++ #include <stdio.h> ++ +++#if ROSTESTS_81_IS_FIXED +++ ++ #include "windef.h" ++ #include "winbase.h" ++ #include "initguid.h" ++@@ -5272,8 +5274,11 @@ ++ ok(ref == 0, "ref=%d, expected 0\n", ref); ++ } ++ +++#endif /* ROSTESTS_81_IS_FIXED*/ +++ ++ START_TEST(htmldoc) ++ { +++#if ROSTESTS_81_IS_FIXED ++ CoInitialize(NULL); ++ container_hwnd = create_container_window(); ++ register_protocol(); ++@@ -5299,4 +5304,5 @@ ++ ++ DestroyWindow(container_hwnd); ++ CoUninitialize(); +++#endif /* ROSTESTS_81_IS_FIXED*/ ++ } +Index: htmldoc.c +=================================================================== +--- htmldoc.c (revision 57027) ++++ htmldoc.c (revision 57542) +@@ -23,6 +23,8 @@ + #include <stdarg.h> + #include <stdio.h> + ++#if ROSTESTS_81_IS_FIXED ++ + #include "windef.h" + #include "winbase.h" + #include "initguid.h" +@@ -5272,8 +5274,11 @@ + ok(ref == 0, "ref=%d, expected 0\n", ref); + } + ++#endif /* ROSTESTS_81_IS_FIXED*/ ++ + START_TEST(htmldoc) + { ++#if ROSTESTS_81_IS_FIXED + CoInitialize(NULL); + container_hwnd = create_container_window(); + register_protocol(); +@@ -5299,4 +5304,5 @@ + + DestroyWindow(container_hwnd); + CoUninitialize(); ++#endif /* ROSTESTS_81_IS_FIXED*/ + }

12 years, 2 months

[mnordell] 57544: Disable correct test with ROSTESTS_81_IS_FIXED */

by mnordell＠svn.reactos.org

Author: mnordell Date: Fri Oct 12 22:04:30 2012 New Revision: 57544 URL: http://svn.reactos.org/svn/reactos?rev=57544&view=rev Log: Disable correct test with ROSTESTS_81_IS_FIXED */ Removed: trunk/rostests/winetests/mshtml/msxml_ros.diff Modified: trunk/rostests/winetests/mshtml/htmldoc.c trunk/rostests/winetests/mshtml/htmllocation.c Modified: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… ============================================================================== --- trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] Fri Oct 12 22:04:30 2012 @@ -22,8 +22,6 @@ #include <wine/test.h> #include <stdarg.h> #include <stdio.h> - -#if ROSTESTS_81_IS_FIXED #include "windef.h" #include "winbase.h" @@ -5274,11 +5272,8 @@ ok(ref == 0, "ref=%d, expected 0\n", ref); } -#endif /* ROSTESTS_81_IS_FIXED*/ - START_TEST(htmldoc) { -#if ROSTESTS_81_IS_FIXED CoInitialize(NULL); container_hwnd = create_container_window(); register_protocol(); @@ -5304,5 +5299,4 @@ DestroyWindow(container_hwnd); CoUninitialize(); -#endif /* ROSTESTS_81_IS_FIXED*/ -} +} Modified: trunk/rostests/winetests/mshtml/htmllocation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmlloca… ============================================================================== --- trunk/rostests/winetests/mshtml/htmllocation.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/htmllocation.c [iso-8859-1] Fri Oct 12 22:04:30 2012 @@ -21,6 +21,8 @@ #include <wine/test.h> +#if ROSTESTS_81_IS_FIXED + #include "mshtml.h" #include "wininet.h" @@ -349,9 +351,11 @@ IMoniker_Release(url_mon); IBindCtx_Release(bc); } +#endif /* ROSTESTS_81_IS_FIXED */ START_TEST(htmllocation) { +#if ROSTESTS_81_IS_FIXED int i; CoInitialize(NULL); @@ -360,4 +364,5 @@ perform_test(location_tests+i); CoUninitialize(); -} +#endif /* ROSTESTS_81_IS_FIXED */ +} Removed: trunk/rostests/winetests/mshtml/msxml_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/msxml_ro… ============================================================================== --- trunk/rostests/winetests/mshtml/msxml_ros.diff [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/msxml_ros.diff (removed) @@ -1,31 +1,0 @@ -Index: htmldoc.c -=================================================================== ---- htmldoc.c (revision 57539) -+++ htmldoc.c (working copy) -@@ -23,6 +23,8 @@ - #include <stdarg.h> - #include <stdio.h> - -+#if ROSTESTS_81_IS_FIXED -+ - #include "windef.h" - #include "winbase.h" - #include "initguid.h" -@@ -5272,8 +5274,11 @@ - ok(ref == 0, "ref=%d, expected 0\n", ref); - } - -+#endif /* ROSTESTS_81_IS_FIXED*/ -+ - START_TEST(htmldoc) - { -+#if ROSTESTS_81_IS_FIXED - CoInitialize(NULL); - container_hwnd = create_container_window(); - register_protocol(); -@@ -5299,4 +5304,5 @@ - - DestroyWindow(container_hwnd); - CoUninitialize(); -+#endif /* ROSTESTS_81_IS_FIXED*/ - }

12 years, 2 months

[hbelusca] 57543: [BOOTDATA] Correct the SP number (==> SP1) we are reporting (currently SP1 of Windows Server 2003). The SP6 thingie was a remainder from our previous target, Windows NT 4 SP6.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Oct 12 20:43:48 2012 New Revision: 57543 URL: http://svn.reactos.org/svn/reactos?rev=57543&view=rev Log: [BOOTDATA] Correct the SP number (==> SP1) we are reporting (currently SP1 of Windows Server 2003). The SP6 thingie was a remainder from our previous target, Windows NT 4 SP6. Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Fri Oct 12 20:43:48 2012 @@ -1132,12 +1132,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductType",2,"WinNT" HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductSuite",0x00010002,"" +; Some installers check for SP1 +HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000100 HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders","SecurityProviders",2,"schannel.dll" HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders\SaslProfiles",,0x00000012 - -; Some installers check for SP6 -HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000600 ; Service groups HKLM,"SYSTEM\CurrentControlSet\Control\ServiceGroupOrder","List",0x00010000, \ Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Fri Oct 12 20:43:48 2012 @@ -693,8 +693,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale\Alternate Sorts","00021404",0x00000000,"" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale\Alternate Sorts","00030404",0x00000000,"" -; Some installers check for SP6 -HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000600 +; Some installers check for SP1 +HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000100 ; Service groups HKLM,"SYSTEM\CurrentControlSet\Control\ServiceGroupOrder","List",0x00010000, \ Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Fri Oct 12 20:43:48 2012 @@ -1132,12 +1132,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductType",2,"WinNT" HKLM,"SYSTEM\CurrentControlSet\Control\ProductOptions","ProductSuite",0x00010002,"" +; Some installers check for SP1 +HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000100 HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders","SecurityProviders",2,"schannel.dll" HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders\SaslProfiles",,0x00000012 - -; Some installers check for SP6 -HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000600 ; Service groups HKLM,"SYSTEM\CurrentControlSet\Control\ServiceGroupOrder","List",0x00010000, \

12 years, 2 months

[mnordell] 57542: Disable test due to crash in XUL during Release call. ROSTESTS-81

by mnordell＠svn.reactos.org

Author: mnordell Date: Fri Oct 12 20:29:50 2012 New Revision: 57542 URL: http://svn.reactos.org/svn/reactos?rev=57542&view=rev Log: Disable test due to crash in XUL during Release call. ROSTESTS-81 Added: trunk/rostests/winetests/mshtml/msxml_ros.diff Modified: trunk/rostests/winetests/mshtml/htmldoc.c Modified: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… ============================================================================== --- trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] Fri Oct 12 20:29:50 2012 @@ -22,6 +22,8 @@ #include <wine/test.h> #include <stdarg.h> #include <stdio.h> + +#if ROSTESTS_81_IS_FIXED #include "windef.h" #include "winbase.h" @@ -5272,8 +5274,11 @@ ok(ref == 0, "ref=%d, expected 0\n", ref); } +#endif /* ROSTESTS_81_IS_FIXED*/ + START_TEST(htmldoc) { +#if ROSTESTS_81_IS_FIXED CoInitialize(NULL); container_hwnd = create_container_window(); register_protocol(); @@ -5299,4 +5304,5 @@ DestroyWindow(container_hwnd); CoUninitialize(); -} +#endif /* ROSTESTS_81_IS_FIXED*/ +} Added: trunk/rostests/winetests/mshtml/msxml_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/msxml_ro… ============================================================================== --- trunk/rostests/winetests/mshtml/msxml_ros.diff (added) +++ trunk/rostests/winetests/mshtml/msxml_ros.diff [iso-8859-1] Fri Oct 12 20:29:50 2012 @@ -1,0 +1,31 @@ +Index: htmldoc.c +=================================================================== +--- htmldoc.c (revision 57539) ++++ htmldoc.c (working copy) +@@ -23,6 +23,8 @@ + #include <stdarg.h> + #include <stdio.h> + ++#if ROSTESTS_81_IS_FIXED ++ + #include "windef.h" + #include "winbase.h" + #include "initguid.h" +@@ -5272,8 +5274,11 @@ + ok(ref == 0, "ref=%d, expected 0\n", ref); + } + ++#endif /* ROSTESTS_81_IS_FIXED*/ ++ + START_TEST(htmldoc) + { ++#if ROSTESTS_81_IS_FIXED + CoInitialize(NULL); + container_hwnd = create_container_window(); + register_protocol(); +@@ -5299,4 +5304,5 @@ + + DestroyWindow(container_hwnd); + CoUninitialize(); ++#endif /* ROSTESTS_81_IS_FIXED*/ + }

12 years, 2 months

[mnordell] 57541: [WINETEST:MSXML3] [domdoc:savexml] Disable test for saving XML data until CORE_6738_IS_FIXED.

by mnordell＠svn.reactos.org

Author: mnordell Date: Fri Oct 12 17:17:33 2012 New Revision: 57541 URL: http://svn.reactos.org/svn/reactos?rev=57541&view=rev Log: [WINETEST:MSXML3] [domdoc:savexml] Disable test for saving XML data until CORE_6738_IS_FIXED. Modified: trunk/rostests/winetests/msxml3/msxml3_ros.diff Modified: trunk/rostests/winetests/msxml3/msxml3_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/msxml3_r… ============================================================================== --- trunk/rostests/winetests/msxml3/msxml3_ros.diff [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/msxml3_ros.diff [iso-8859-1] Fri Oct 12 17:17:33 2012 @@ -52,3 +52,43 @@ hr = IXMLDOMNodeList_get_length( node_list, &len ); EXPECT_HR(hr, S_OK); ok( len == 4, "len %d\n", len); +Index: domdoc.c +=================================================================== +--- domdoc.c (revision 57539) ++++ domdoc.c (revision 57540) +@@ -1398,7 +1398,9 @@ + istream_Clone + }; + ++#if CORE_6738_IS_FIXED + static IStream savestream = { &StreamVtbl }; ++#endif + + #define EXPECT_CHILDREN(node) _expect_children((IXMLDOMNode*)node, __LINE__) + static void _expect_children(IXMLDOMNode *node, int line) +@@ -7274,6 +7276,7 @@ + free_bstrs(); + } + ++#if CORE_6738_IS_FIXED + static void test_save(void) + { + IXMLDOMDocument *doc, *doc2; +@@ -7410,6 +7413,7 @@ + IXMLDOMDocument_Release(doc); + free_bstrs(); + } ++#endif /* CORE_6738_IS_FIXED */ + + static void test_testTransforms(void) + { +@@ -12538,7 +12542,9 @@ + test_XSLPattern(); + test_cloneNode(); + test_xmlTypes(); ++#if CORE_6738_IS_FIXED + test_save(); ++#endif + test_testTransforms(); + test_namespaces_basic(); + test_namespaces_change();

12 years, 2 months

← Newer
1
...
9
10
11
12
13
14
15
...
22
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 October 2012