Ros-diffs June 2015

ros-diffs@reactos.org

13 participants
343 discussions

[cfinck] 68007: [WINSPOOL_APITEST] - Add tests for EnumPrinters - Fix a test for EnumPrintProcessorDatatypes

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Jun 4 12:19:06 2015 New Revision: 68007 URL: http://svn.reactos.org/svn/reactos?rev=68007&view=rev Log: [WINSPOOL_APITEST] - Add tests for EnumPrinters - Fix a test for EnumPrintProcessorDatatypes Added: branches/colins-printing-for-freedom/rostests/apitests/winspool/EnumPrinters.c (with props) Modified: branches/colins-printing-for-freedom/rostests/apitests/winspool/CMakeLists.txt branches/colins-printing-for-freedom/rostests/apitests/winspool/EnumPrintProcessorDatatypes.c branches/colins-printing-for-freedom/rostests/apitests/winspool/testlist.c Modified: branches/colins-printing-for-freedom/rostests/apitests/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/winspool/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/rostests/apitests/winspool/CMakeLists.txt [iso-8859-1] Thu Jun 4 12:19:06 2015 @@ -1,6 +1,7 @@ list(APPEND SOURCE ClosePrinter.c + EnumPrinters.c EnumPrintProcessorDatatypes.c GetPrintProcessorDirectory.c OpenPrinter.c Modified: branches/colins-printing-for-freedom/rostests/apitests/winspool/EnumPrintProcessorDatatypes.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/winspool/EnumPrintProcessorDatatypes.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/rostests/apitests/winspool/EnumPrintProcessorDatatypes.c [iso-8859-1] Thu Jun 4 12:19:06 2015 @@ -48,6 +48,13 @@ ok(cbNeeded > 0, "cbNeeded is 0!\n"); ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); + // Same error has to occur with a size to small. + SetLastError(0xDEADBEEF); + ok(!EnumPrintProcessorDatatypesW(NULL, L"wInPrInT", 1, NULL, 1, &cbNeeded, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintersW returns error %lu!\n", GetLastError()); + ok(cbNeeded > 0, "cbNeeded is 0!\n"); + ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); + // Now provide the demanded size, but no buffer. SetLastError(0xDEADBEEF); ok(!EnumPrintProcessorDatatypesW(NULL, L"wInPrInT", 1, NULL, cbNeeded, &cbTemp, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); @@ -62,13 +69,6 @@ ok(cbTemp == 0, "cbTemp is %lu!\n", cbTemp); ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); - // Same error has to occur with a valid Print Processor, but a size too small. - SetLastError(0xDEADBEEF); - ok(!EnumPrintProcessorDatatypesW(NULL, L"wInPrInT", 1, NULL, cbNeeded, &cbTemp, &dwReturned), "EnumPrintProcessorDatatypesW returns TRUE!\n"); - ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "EnumPrintProcessorDatatypesW returns error %lu!\n", GetLastError()); - ok(cbTemp == 0, "cbTemp is %lu!\n", cbTemp); - ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); - // Finally use the function as intended and aim for success! pDatatypesInfo1 = HeapAlloc(GetProcessHeap(), 0, cbNeeded); SetLastError(0xDEADBEEF); Added: branches/colins-printing-for-freedom/rostests/apitests/winspool/EnumPrinters.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/winspool/EnumPrinters.c (added) +++ branches/colins-printing-for-freedom/rostests/apitests/winspool/EnumPrinters.c [iso-8859-1] Thu Jun 4 12:19:06 2015 @@ -0,0 +1,93 @@ +/* + * PROJECT: ReactOS Print Spooler DLL API Tests + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Tests for EnumPrintersA/EnumPrintersW + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winspool.h> + +START_TEST(EnumPrinters) +{ + DWORD cbNeeded; + DWORD cbTemp; + DWORD dwReturned; + PVOID pMem; + DWORD i; + DWORD dwValidLevels[] = { 0, 1, 2, 4, 5 }; + + // Level 5 is the highest supported under Windows Server 2003. Higher levels need to fail and leave the variables untouched! + cbNeeded = 0xDEADBEEF; + dwReturned = 0xDEADBEEF; + SetLastError(0xDEADBEEF); + ok(!EnumPrintersW(0, NULL, 6, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintersW returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_LEVEL, "EnumPrintersW returns error %lu!\n", GetLastError()); + ok(cbNeeded == 0xDEADBEEF, "cbNeeded is %lu!\n", cbNeeded); + ok(dwReturned == 0xDEADBEEF, "dwReturned is %lu!\n", dwReturned); + + // Same goes for level 3. + cbNeeded = 0xDEADBEEF; + dwReturned = 0xDEADBEEF; + SetLastError(0xDEADBEEF); + ok(!EnumPrintersW(0, NULL, 3, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintersW returns TRUE!\n"); + ok(GetLastError() == ERROR_INVALID_LEVEL, "EnumPrintersW returns error %lu!\n", GetLastError()); + ok(cbNeeded == 0xDEADBEEF, "cbNeeded is %lu!\n", cbNeeded); + ok(dwReturned == 0xDEADBEEF, "dwReturned is %lu!\n", dwReturned); + + // Try for all valid levels. Level 0 is valid here and returns the PRINTER_INFO_STRESS structure (documented in MS-RPRN). + for (i = 0; i < sizeof(dwValidLevels) / sizeof(DWORD); i++) + { + // Try with no valid arguments at all. + SetLastError(0xDEADBEEF); + ok(!EnumPrintersW(0, NULL, dwValidLevels[i], NULL, 0, NULL, NULL), "EnumPrintersW returns TRUE for Level %lu!\n", dwValidLevels[i]); + ok(GetLastError() == RPC_X_NULL_REF_POINTER, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), dwValidLevels[i]); + + // It has to succeed if we supply the required pointers and query no information. + SetLastError(0xDEADBEEF); + ok(EnumPrintersW(0, NULL, dwValidLevels[i], NULL, 0, &cbNeeded, &dwReturned), "EnumPrintersW returns FALSE for Level %lu!\n", dwValidLevels[i]); + ok(GetLastError() == ERROR_SUCCESS, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), dwValidLevels[i]); + ok(cbNeeded == 0, "cbNeeded is %lu for Level %lu!\n", cbNeeded, dwValidLevels[i]); + ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, dwValidLevels[i]); + + // This constant is from Windows 9x/ME times and mustn't work anymore. + SetLastError(0xDEADBEEF); + ok(EnumPrintersW(PRINTER_ENUM_DEFAULT, NULL, dwValidLevels[i], NULL, 0, &cbNeeded, &dwReturned), "EnumPrintersW returns FALSE for Level %lu!\n", dwValidLevels[i]); + ok(GetLastError() == ERROR_SUCCESS, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), dwValidLevels[i]); + ok(cbNeeded == 0, "cbNeeded is %lu for Level %lu!\n", cbNeeded, dwValidLevels[i]); + ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, dwValidLevels[i]); + + // Now things get interesting. Let's query the buffer size for information about the local printers. + SetLastError(0xDEADBEEF); + ok(!EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, dwValidLevels[i], NULL, 0, &cbNeeded, &dwReturned), "EnumPrintersW returns TRUE for Level %lu!\n", dwValidLevels[i]); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), dwValidLevels[i]); + ok(cbNeeded > 0, "cbNeeded is 0 for Level %lu!\n", dwValidLevels[i]); + ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, dwValidLevels[i]); + + // Same error has to occur with a size to small. + SetLastError(0xDEADBEEF); + ok(!EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, dwValidLevels[i], NULL, 1, &cbNeeded, &dwReturned), "EnumPrintersW returns TRUE for Level %lu!\n", dwValidLevels[i]); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), dwValidLevels[i]); + ok(cbNeeded > 0, "cbNeeded is 0 for Level %lu!\n", dwValidLevels[i]); + ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, dwValidLevels[i]); + + // Now provide the demanded size, but no buffer. + SetLastError(0xDEADBEEF); + ok(!EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, dwValidLevels[i], NULL, cbNeeded, &cbTemp, &dwReturned), "EnumPrintersW returns TRUE for Level %lu!\n", dwValidLevels[i]); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), dwValidLevels[i]); + ok(cbTemp == 0, "cbTemp is %lu for Level %lu!\n", cbTemp, dwValidLevels[i]); + ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, dwValidLevels[i]); + + // Finally use the function as intended and aim for success! + pMem = HeapAlloc(GetProcessHeap(), 0, cbNeeded); + SetLastError(0xDEADBEEF); + ok(EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, dwValidLevels[i], pMem, cbNeeded, &cbTemp, &dwReturned), "EnumPrintersW returns FALSE for Level %lu!\n", dwValidLevels[i]); + ok(GetLastError() == ERROR_SUCCESS, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), dwValidLevels[i]); + HeapFree(GetProcessHeap(), 0, pMem); + } +} Propchange: branches/colins-printing-for-freedom/rostests/apitests/winspool/EnumPrinters.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/colins-printing-for-freedom/rostests/apitests/winspool/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/winspool/testlist.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/rostests/apitests/winspool/testlist.c [iso-8859-1] Thu Jun 4 12:19:06 2015 @@ -11,6 +11,7 @@ #include <apitest.h> extern void func_ClosePrinter(void); +extern void func_EnumPrinters(void); extern void func_EnumPrintProcessorDatatypes(void); extern void func_GetPrintProcessorDirectory(void); extern void func_OpenPrinter(void); @@ -19,6 +20,7 @@ const struct test winetest_testlist[] = { { "ClosePrinter", func_ClosePrinter }, + { "EnumPrinters", func_EnumPrinters }, { "EnumPrintProcessorDatatypes", func_EnumPrintProcessorDatatypes }, { "GetPrintProcessorDirectory", func_GetPrintProcessorDirectory }, { "OpenPrinter", func_OpenPrinter },

9 years, 4 months

[cwittich] 68006: [SETUPAPI] there are three overlay icons ImageList_SetOverlayImage expects an overlay index based on 1

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Jun 4 08:29:55 2015 New Revision: 68006 URL: http://svn.reactos.org/svn/reactos?rev=68006&view=rev Log: [SETUPAPI] there are three overlay icons ImageList_SetOverlayImage expects an overlay index based on 1 Modified: trunk/reactos/dll/win32/setupapi/devclass.c Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] Thu Jun 4 08:29:55 2015 @@ -697,14 +697,14 @@ } /* Finally, add the overlay icons to the image list */ - for (i = 0; i < 2; i++) + for (i = 0; i <= 2; i++) { hIcon = LoadImage(hInstance, MAKEINTRESOURCE(500 + i), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); if (hIcon) { idx = ImageList_AddIcon(ClassImageListData->ImageList, hIcon); if (idx != -1) - ImageList_SetOverlayImage(ClassImageListData->ImageList, idx, i); + ImageList_SetOverlayImage(ClassImageListData->ImageList, idx, i + 1); DestroyIcon(hIcon); } }

9 years, 4 months

[hbelusca] 68005: [NTVDM]: Fix my fix of r68003.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jun 4 02:14:24 2015 New Revision: 68005 URL: http://svn.reactos.org/svn/reactos?rev=68005&view=rev Log: [NTVDM]: Fix my fix of r68003. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Thu Jun 4 02:14:24 2015 @@ -784,6 +784,7 @@ WINAPI Bios32Post(LPWORD Stack) { + static BOOLEAN FirstBoot = TRUE; #if 0 BOOLEAN Success; #endif @@ -884,12 +885,23 @@ switch (Bda->SoftReset) { case 0x0000: - DisplayMessage(L"NTVDM is performing a COLD reboot! The program you are currently testing does not seem to behave correctly! The VDM will shut down..."); - // Fall through + { + if (!FirstBoot) + { + DisplayMessage(L"NTVDM is performing a COLD reboot! The program you are currently testing does not seem to behave correctly! The VDM will shut down..."); + EmulatorTerminate(); + return; + } + FirstBoot = FALSE; + break; + } + case 0x1234: + { DisplayMessage(L"NTVDM is performing a WARM reboot! This is not supported at the moment. The VDM will shut down..."); EmulatorTerminate(); return; + } default: break;

9 years, 4 months

[hbelusca] 68004: [INCLUDE:ASM]: fix the .space macro definition for MASM: it aims at imitating the .space macro of GAS. Its syntax is: ".space size_in_bytes optional_fill_byte_defaults_to_zero" . ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jun 4 01:53:22 2015 New Revision: 68004 URL: http://svn.reactos.org/svn/reactos?rev=68004&view=rev Log: [INCLUDE:ASM]: fix the .space macro definition for MASM: it aims at imitating the .space macro of GAS. Its syntax is: ".space size_in_bytes optional_fill_byte_defaults_to_zero" . As previously declared, it was doing the reverse: filling *just* one (zero?) bytes with 'count' interpreted as a byte value. Also add a .skip macro that exactly does the same (and is equivalent of the same one in GAS). Modified: trunk/reactos/include/asm/asm.inc Modified: trunk/reactos/include/asm/asm.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/asm.inc?rev=68… ============================================================================== --- trunk/reactos/include/asm/asm.inc [iso-8859-1] (original) +++ trunk/reactos/include/asm/asm.inc [iso-8859-1] Thu Jun 4 01:53:22 2015 @@ -141,8 +141,12 @@ ENDM ENDM -.space MACRO count - DB 0 DUP (count) +.skip MACRO size, fill:=<0> + DB size DUP (fill) +ENDM + +.space MACRO size, fill:=<0> + .skip size, fill ENDM ljmp MACRO segment, offset

9 years, 4 months

[hbelusca] 68003: [NTVDM]: Do not rely on 0xCCCC for cold reboot checks. Fix some sentences.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jun 4 00:13:43 2015 New Revision: 68003 URL: http://svn.reactos.org/svn/reactos?rev=68003&view=rev Log: [NTVDM]: Do not rely on 0xCCCC for cold reboot checks. Fix some sentences. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Thu Jun 4 00:13:43 2015 @@ -125,10 +125,8 @@ }; /* - * Normally at F000:E05B there is the POST that finally calls the bootstrap - * interrupt. It should also check the value of Bda->SoftReset. Since we do - * all the POST in 32 bit from the start, we just place there the bootstrap - * interrupt call. + * POST code at F000:E05B. All the POST is done in 32 bit + * and only at the end it calls the bootstrap interrupt. */ static BYTE PostCode[] = { @@ -828,7 +826,7 @@ /* Shutdown after Block Move Test (unsupported) */ case 0x09: { - DisplayMessage(L"Unsupported CMOS Shutdown Status value 0x%02X. The VDM is stopping...", ShutdownStatus); + DisplayMessage(L"Unsupported CMOS Shutdown Status value 0x%02X. The VDM will shut down.", ShutdownStatus); EmulatorTerminate(); return; } @@ -883,19 +881,18 @@ * - if the word is 1234h, perform a warm reboot (aka. Ctrl-Alt-Del). Some stuff is skipped. */ - // FIXME: This is a debug temporary check: - // Since NTVDM memory is by default initialized with 0xCC, it is also - // the case for the BDA. So at first boot we get SoftReset == 0xCCCC. - // After we zero out the BDA and put valid values in it. - // If for some reason an app calls the BIOS initialization code, - // SoftReset is normally zero (unless the app puts a non-null value in SoftReset) - // and we can detect that. With the current state of NTVDM, apps calling - // by hand the BIOS init code is a sign of a bug, e.g. see MSD.EXE version 2+. - if (Bda->SoftReset != 0xCCCC) + switch (Bda->SoftReset) { - DisplayMessage(L"NTVDM is performing a COLD reboot! The program you are currently testing seems to not behave correctly! The VDM is stopping..."); - EmulatorTerminate(); - return; + case 0x0000: + DisplayMessage(L"NTVDM is performing a COLD reboot! The program you are currently testing does not seem to behave correctly! The VDM will shut down..."); + // Fall through + case 0x1234: + DisplayMessage(L"NTVDM is performing a WARM reboot! This is not supported at the moment. The VDM will shut down..."); + EmulatorTerminate(); + return; + + default: + break; } /* Initialize the BDA and the BIOS ROM Information */

9 years, 4 months

[hbelusca] 68002: [NTVDM]: Enable reads for current address and count registers (caught by Mysoft); for 16-bit accesses, be sure to drop the carry when shifting left CurrAddress; fix comments.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jun 3 21:23:30 2015 New Revision: 68002 URL: http://svn.reactos.org/svn/reactos?rev=68002&view=rev Log: [NTVDM]: Enable reads for current address and count registers (caught by Mysoft); for 16-bit accesses, be sure to drop the carry when shifting left CurrAddress; fix comments. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c [iso-8859-1] Wed Jun 3 21:23:30 2015 @@ -55,7 +55,7 @@ switch (Port) { - /* Start Address Registers */ + /* Current Address Registers */ { case 0x00: READ_ADDR(0, 0, ReadValue); @@ -83,7 +83,7 @@ return ReadValue; } - /* Count Address Registers */ + /* Current Count Registers */ { case 0x01: READ_CNT(0, 0, ReadValue); @@ -191,7 +191,7 @@ break; } - /* Count Address Registers */ + /* Base Count Registers */ { case 0x01: WRITE_CNT(0, 0, Data); @@ -457,8 +457,8 @@ length = ret * Size; /* 16-bit mode addressing, see: http://wiki.osdev.org/ISA_DMA#16_bit_issues */ - CurrAddress = (iChannel < 4) ? (DmaPageRegisters[iChannel].Page << 16) | (pDcp->DmaChannel[Channel].CurrAddress << 0) - : (DmaPageRegisters[iChannel].Page << 16) | (pDcp->DmaChannel[Channel].CurrAddress << 1); + CurrAddress = (iChannel < 4) ? (DmaPageRegisters[iChannel].Page << 16) | ((pDcp->DmaChannel[Channel].CurrAddress << 0) & 0xFFFF) + : (DmaPageRegisters[iChannel].Page << 16) | ((pDcp->DmaChannel[Channel].CurrAddress << 1) & 0xFFFF); switch (TrMode) { @@ -549,14 +549,14 @@ /* Register the I/O Ports */ /* Channels 0(Reserved)..3 */ - RegisterIoPort(0x00, NULL, DmaWritePort); /* Start Address Register 0 (Reserved) */ - RegisterIoPort(0x01, NULL, DmaWritePort); /* Count Address Register 0 (Reserved) */ - RegisterIoPort(0x02, NULL, DmaWritePort); /* Start Address Register 1 */ - RegisterIoPort(0x03, NULL, DmaWritePort); /* Count Address Register 1 */ - RegisterIoPort(0x04, NULL, DmaWritePort); /* Start Address Register 2 */ - RegisterIoPort(0x05, NULL, DmaWritePort); /* Count Address Register 2 */ - RegisterIoPort(0x06, NULL, DmaWritePort); /* Start Address Register 3 */ - RegisterIoPort(0x07, NULL, DmaWritePort); /* Count Address Register 3 */ + RegisterIoPort(0x00, DmaReadPort, DmaWritePort); /* Current(R) / Start(W) Address Register 0 (Reserved) */ + RegisterIoPort(0x01, DmaReadPort, DmaWritePort); /* Current(R) / Base (W) Count Register 0 (Reserved) */ + RegisterIoPort(0x02, DmaReadPort, DmaWritePort); /* Current(R) / Start(W) Address Register 1 */ + RegisterIoPort(0x03, DmaReadPort, DmaWritePort); /* Current(R) / Base (W) Count Register 1 */ + RegisterIoPort(0x04, DmaReadPort, DmaWritePort); /* Current(R) / Start(W) Address Register 2 */ + RegisterIoPort(0x05, DmaReadPort, DmaWritePort); /* Current(R) / Base (W) Count Register 2 */ + RegisterIoPort(0x06, DmaReadPort, DmaWritePort); /* Current(R) / Start(W) Address Register 3 */ + RegisterIoPort(0x07, DmaReadPort, DmaWritePort); /* Current(R) / Base (W) Count Register 3 */ RegisterIoPort(0x08, DmaReadPort, DmaWritePort); /* Status (Read) / Command (Write) Registers */ RegisterIoPort(0x09, NULL, DmaWritePort); /* Request Register */ @@ -569,14 +569,14 @@ /* Channels 4(Reserved)..7 */ - RegisterIoPort(0xC0, NULL, DmaWritePort); /* Start Address Register 4 (Reserved) */ - RegisterIoPort(0xC2, NULL, DmaWritePort); /* Count Address Register 4 (Reserved) */ - RegisterIoPort(0xC4, NULL, DmaWritePort); /* Start Address Register 5 */ - RegisterIoPort(0xC6, NULL, DmaWritePort); /* Count Address Register 5 */ - RegisterIoPort(0xC8, NULL, DmaWritePort); /* Start Address Register 6 */ - RegisterIoPort(0xCA, NULL, DmaWritePort); /* Count Address Register 6 */ - RegisterIoPort(0xCC, NULL, DmaWritePort); /* Start Address Register 7 */ - RegisterIoPort(0xCE, NULL, DmaWritePort); /* Count Address Register 7 */ + RegisterIoPort(0xC0, DmaReadPort, DmaWritePort); /* Current(R) / Start(W) Address Register 4 (Reserved) */ + RegisterIoPort(0xC2, DmaReadPort, DmaWritePort); /* Current(R) / Base (W) Count Register 4 (Reserved) */ + RegisterIoPort(0xC4, DmaReadPort, DmaWritePort); /* Current(R) / Start(W) Address Register 5 */ + RegisterIoPort(0xC6, DmaReadPort, DmaWritePort); /* Current(R) / Base (W) Count Register 5 */ + RegisterIoPort(0xC8, DmaReadPort, DmaWritePort); /* Current(R) / Start(W) Address Register 6 */ + RegisterIoPort(0xCA, DmaReadPort, DmaWritePort); /* Current(R) / Base (W) Count Register 6 */ + RegisterIoPort(0xCC, DmaReadPort, DmaWritePort); /* Current(R) / Start(W) Address Register 7 */ + RegisterIoPort(0xCE, DmaReadPort, DmaWritePort); /* Current(R) / Base (W) Count Register 7 */ RegisterIoPort(0xD0, DmaReadPort, DmaWritePort); /* Status (Read) / Command (Write) Registers */ RegisterIoPort(0xD2, NULL, DmaWritePort); /* Request Register */

9 years, 4 months

[aandrejevic] 68001: [NTVDM] Implement XMS functions 10h, 11h and 12h by forwarding them to the VDM DOS memory manager. CORE-9651 CORE-9741 #resolve #comment Fixed in revision 68001.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Jun 2 21:59:19 2015 New Revision: 68001 URL: http://svn.reactos.org/svn/reactos?rev=68001&view=rev Log: [NTVDM] Implement XMS functions 10h, 11h and 12h by forwarding them to the VDM DOS memory manager. CORE-9651 CORE-9741 #resolve #comment Fixed in revision 68001. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] Tue Jun 2 21:59:19 2015 @@ -20,6 +20,7 @@ #include "dos/dem.h" #include "device.h" #include "himem.h" +#include "memory.h" #define XMS_DEVICE_NAME "XMSXXXX0" @@ -564,6 +565,74 @@ break; } + /* Allocate UMB */ + case 0x10: + { + WORD Segment; + WORD MaxAvailable; + BYTE OldAllocStrategy = Sda->AllocStrategy; + BOOLEAN OldLinkState = DosUmbLinked; + + DosLinkUmb(); + Sda->AllocStrategy = DOS_ALLOC_HIGH | DOS_ALLOC_BEST_FIT; + Segment = DosAllocateMemory(getDX(), &MaxAvailable); + + if (Segment) + { + setAX(1); + setBX(Segment); + } + else + { + setAX(0); + setBL(MaxAvailable ? XMS_STATUS_SMALLER_UMB : XMS_STATUS_OUT_OF_UMBS); + setDX(MaxAvailable); + } + + Sda->AllocStrategy = OldAllocStrategy; + if (!OldLinkState) DosUnlinkUmb(); + break; + } + + /* Free UMB */ + case 0x11: + { + if (DosFreeMemory(getDX())) + { + setAX(1); + } + else + { + setAX(0); + setBL(XMS_STATUS_INVALID_UMB); + } + + break; + } + + /* Reallocate UMB */ + case 0x12: + { + WORD Segment; + WORD MaxAvailable; + + Segment = DosResizeMemory(getDX(), getBX(), &MaxAvailable); + + if (Segment) + { + setAX(1); + } + else + { + setAX(0); + setBL(Sda->LastErrorCode == ERROR_INVALID_HANDLE + ? XMS_STATUS_INVALID_UMB : XMS_STATUS_SMALLER_UMB); + setDX(MaxAvailable); + } + + break; + } + default: { DPRINT1("XMS command AH = 0x%02X NOT IMPLEMENTED\n", getAH()); Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h [iso-8859-1] Tue Jun 2 21:59:19 2015 @@ -28,6 +28,9 @@ #define XMS_STATUS_LOCKED 0xAB #define XMS_STATUS_LOCK_OVERFLOW 0xAC #define XMS_STATUS_CANNOT_LOCK 0xAD +#define XMS_STATUS_SMALLER_UMB 0xB0 +#define XMS_STATUS_OUT_OF_UMBS 0xB1 +#define XMS_STATUS_INVALID_UMB 0xB2 typedef struct _XMS_HANDLE {

9 years, 4 months

[ekohl] 68000: [CDFS] Initialize an uninitialized variable.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Jun 2 13:14:33 2015 New Revision: 68000 URL: http://svn.reactos.org/svn/reactos?rev=68000&view=rev Log: [CDFS] Initialize an uninitialized variable. Modified: trunk/reactos/drivers/filesystems/cdfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/cdfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] Tue Jun 2 13:14:33 2015 @@ -179,7 +179,7 @@ PULONG BufferLength) { PDEVICE_EXTENSION DeviceExt; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; DPRINT("CdfsGetFsFullSizeInformation()\n"); DPRINT("FsSizeInfo = %p\n", FsSizeInfo);

9 years, 4 months

[ekohl] 67999: [CDFS] Add IRP_MJ_QUERY_VOLUME_INFORMATION.FileFsFullSizeInformation to CDFS too.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Jun 2 12:37:37 2015 New Revision: 67999 URL: http://svn.reactos.org/svn/reactos?rev=67999&view=rev Log: [CDFS] Add IRP_MJ_QUERY_VOLUME_INFORMATION.FileFsFullSizeInformation to CDFS too. Modified: trunk/reactos/drivers/filesystems/cdfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/cdfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] Tue Jun 2 12:37:37 2015 @@ -171,6 +171,38 @@ } +static +NTSTATUS +CdfsGetFsFullSizeInformation( + PDEVICE_OBJECT DeviceObject, + PFILE_FS_FULL_SIZE_INFORMATION FsSizeInfo, + PULONG BufferLength) +{ + PDEVICE_EXTENSION DeviceExt; + NTSTATUS Status; + + DPRINT("CdfsGetFsFullSizeInformation()\n"); + DPRINT("FsSizeInfo = %p\n", FsSizeInfo); + + if (*BufferLength < sizeof(FILE_FS_FULL_SIZE_INFORMATION)) + return STATUS_BUFFER_OVERFLOW; + + DeviceExt = DeviceObject->DeviceExtension; + + FsSizeInfo->TotalAllocationUnits.QuadPart = DeviceExt->CdInfo.VolumeSpaceSize; + FsSizeInfo->CallerAvailableAllocationUnits.QuadPart = 0; + FsSizeInfo->ActualAvailableAllocationUnits.QuadPart = 0; + FsSizeInfo->SectorsPerAllocationUnit = 1; + FsSizeInfo->BytesPerSector = BLOCKSIZE; + + DPRINT("Finished CdfsGetFsFullSizeInformation()\n"); + if (NT_SUCCESS(Status)) + *BufferLength -= sizeof(FILE_FS_FULL_SIZE_INFORMATION); + + return Status; +} + + NTSTATUS NTAPI CdfsQueryVolumeInformation( @@ -216,12 +248,18 @@ Status = CdfsGetFsSizeInformation(DeviceObject, SystemBuffer, &BufferLength); - break; + break; case FileFsDeviceInformation: Status = CdfsGetFsDeviceInformation(DeviceObject, SystemBuffer, &BufferLength); + break; + + case FileFsFullSizeInformation: + Status = CdfsGetFsFullSizeInformation(DeviceObject, + SystemBuffer, + &BufferLength); break; default:

9 years, 4 months

[ekohl] 67998: [FASTFAT] Add IRP_MJ_QUERY_VOLUME_INFORMATION.FileFsFullSizeInformation. This fixes a number of ntdll winetests.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Jun 2 09:08:33 2015 New Revision: 67998 URL: http://svn.reactos.org/svn/reactos?rev=67998&view=rev Log: [FASTFAT] Add IRP_MJ_QUERY_VOLUME_INFORMATION.FileFsFullSizeInformation. This fixes a number of ntdll winetests. Modified: trunk/reactos/drivers/filesystems/fastfat/volume.c Modified: trunk/reactos/drivers/filesystems/fastfat/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] Tue Jun 2 09:08:33 2015 @@ -177,6 +177,38 @@ DPRINT("BufferLength %lu\n", *BufferLength); return STATUS_SUCCESS; +} + + +static +NTSTATUS +FsdGetFsFullSizeInformation( + PDEVICE_OBJECT DeviceObject, + PFILE_FS_FULL_SIZE_INFORMATION FsSizeInfo, + PULONG BufferLength) +{ + PDEVICE_EXTENSION DeviceExt; + NTSTATUS Status; + + DPRINT("FsdGetFsFullSizeInformation()\n"); + DPRINT("FsSizeInfo = %p\n", FsSizeInfo); + + if (*BufferLength < sizeof(FILE_FS_FULL_SIZE_INFORMATION)) + return STATUS_BUFFER_OVERFLOW; + + DeviceExt = DeviceObject->DeviceExtension; + Status = CountAvailableClusters(DeviceExt, &FsSizeInfo->CallerAvailableAllocationUnits); + + FsSizeInfo->TotalAllocationUnits.QuadPart = DeviceExt->FatInfo.NumberOfClusters; + FsSizeInfo->ActualAvailableAllocationUnits.QuadPart = FsSizeInfo->CallerAvailableAllocationUnits.QuadPart; + FsSizeInfo->SectorsPerAllocationUnit = DeviceExt->FatInfo.SectorsPerCluster; + FsSizeInfo->BytesPerSector = DeviceExt->FatInfo.BytesPerSector; + + DPRINT("Finished FsdGetFsFullSizeInformation()\n"); + if (NT_SUCCESS(Status)) + *BufferLength -= sizeof(FILE_FS_FULL_SIZE_INFORMATION); + + return Status; } @@ -401,6 +433,12 @@ &BufferLength); break; + case FileFsFullSizeInformation: + RC = FsdGetFsFullSizeInformation(IrpContext->DeviceObject, + SystemBuffer, + &BufferLength); + break; + default: RC = STATUS_NOT_SUPPORTED; }

9 years, 4 months

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