Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 69211: [COMMAND] - Fix the GCC macro for structure declaration, so that referencing an offset to the structure doesn't fail anymore (ie. doing "mov dx, offset MyStruct" doesn't assemble ...
by hbelusca＠svn.reactos.org 13 Sep '15

13 Sep '15

Author: hbelusca Date: Sun Sep 13 01:18:50 2015 New Revision: 69211 URL: http://svn.reactos.org/svn/reactos?rev=69211&view=rev Log: [COMMAND] - Fix the GCC macro for structure declaration, so that referencing an offset to the structure doesn't fail anymore (ie. doing "mov dx, offset MyStruct" doesn't assemble to "mov dx, 0x100"). This fixes NTVDM not being able to start any DOS app. Reported by Aleksander Rechitskiy. CORE-9677 CORE-9679 #resolve CORE-9678 [NTVDM] - Fix newline in DPRINT. Modified: trunk/reactos/subsystems/mvdm/dos/asmxtras.inc trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c Modified: trunk/reactos/subsystems/mvdm/dos/asmxtras.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/dos/asmxtr… ============================================================================== --- trunk/reactos/subsystems/mvdm/dos/asmxtras.inc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/dos/asmxtras.inc [iso-8859-1] Sun Sep 13 01:18:50 2015 @@ -72,7 +72,7 @@ #define ENDS(...) ENDM #define VAR_STRUCT(name, struct) \ - struct name + name: struct name #define FIELD(name, field) \ name##_##field Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] Sun Sep 13 01:18:50 2015 @@ -601,7 +601,7 @@ { RemoveComSpecInfo(ComSpecInfo); #endif - DPRINT1("Exit DOS from ExitCode (prologue)!"); + DPRINT1("Exit DOS from ExitCode (prologue)!\n"); setCF(0); goto Quit; #ifndef STANDALONE

1 0

[sginsberg] 69210: [KDBG] Don't bring down the kernel either when int2c-ing from user mode
by sginsberg＠svn.reactos.org 12 Sep '15

12 Sep '15

Author: sginsberg Date: Sat Sep 12 22:01:10 2015 New Revision: 69210 URL: http://svn.reactos.org/svn/reactos?rev=69210&view=rev Log: [KDBG] Don't bring down the kernel either when int2c-ing from user mode Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=69… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Sat Sep 12 22:01:10 2015 @@ -1371,8 +1371,12 @@ KdbCurrentProcess = PsGetCurrentProcess(); /* Set continue type to kdContinue for single steps and breakpoints */ - if (ExceptionCode == STATUS_SINGLE_STEP || ExceptionCode == STATUS_BREAKPOINT) + if (ExceptionCode == STATUS_SINGLE_STEP || + ExceptionCode == STATUS_BREAKPOINT || + ExceptionCode == STATUS_ASSERTION_FAILURE) + { ContinueType = kdContinue; + } /* Check if we should handle the exception. */ /* FIXME - won't get all exceptions here :( */

1 0

[sginsberg] 69209: - Make KDBG handle assertion failures/int2C the same way as breakpoints/int3 (that is, ignore them from user-mode by default) for the time being until an internal prompt-routine ...
by sginsberg＠svn.reactos.org 12 Sep '15

12 Sep '15

Author: sginsberg Date: Sat Sep 12 21:44:48 2015 New Revision: 69209 URL: http://svn.reactos.org/svn/reactos?rev=69209&view=rev Log: - Make KDBG handle assertion failures/int2C the same way as breakpoints/int3 (that is, ignore them from user-mode by default) for the time being until an internal prompt-routine is implemented. Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=69… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Sat Sep 12 21:44:48 2015 @@ -77,7 +77,7 @@ { KdbDoNotEnter, KdbEnterFromKmode }, /* 17: Alignment Check */ { KdbDoNotEnter, KdbEnterFromKmode }, /* 18: Machine Check */ { KdbDoNotEnter, KdbEnterFromKmode }, /* 19: SIMD fault */ - { KdbEnterAlways, KdbEnterAlways }, /* 20: Assertion failure */ + { KdbEnterFromKmode, KdbDoNotEnter }, /* 20: Assertion failure */ { KdbDoNotEnter, KdbEnterFromKmode } /* Last entry: used for unknown exceptions */ };

1 0

[hbelusca] 69208: [NTVDM]: Reenable the mouse driver that I disabled by error in my previous commit.
by hbelusca＠svn.reactos.org 12 Sep '15

12 Sep '15

Author: hbelusca Date: Sat Sep 12 20:25:45 2015 New Revision: 69208 URL: http://svn.reactos.org/svn/reactos?rev=69208&view=rev Log: [NTVDM]: Reenable the mouse driver that I disabled by error in my previous commit. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] Sat Sep 12 20:25:45 2015 @@ -1300,7 +1300,7 @@ } /* Load the mouse driver */ - // DosMouseInitialize(); + DosMouseInitialize(); #ifndef STANDALONE

1 0

[ekohl] 69207: [INTL] Set the system default language and codepages. CORE-10075
by ekohl＠svn.reactos.org 12 Sep '15

12 Sep '15

Author: ekohl Date: Sat Sep 12 20:24:10 2015 New Revision: 69207 URL: http://svn.reactos.org/svn/reactos?rev=69207&view=rev Log: [INTL] Set the system default language and codepages. CORE-10075 Modified: trunk/reactos/dll/cpl/intl/advanced.c trunk/reactos/dll/cpl/intl/generalp.c Modified: trunk/reactos/dll/cpl/intl/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/advanced.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/advanced.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/advanced.c [iso-8859-1] Sat Sep 12 20:24:10 2015 @@ -213,7 +213,7 @@ EnumSystemLocales(LocalesEnumProc, LCID_SUPPORTED); /* Select current locale */ - GetLocaleInfo(GetUserDefaultLCID(), LOCALE_SLANGUAGE, langSel, sizeof(langSel)/sizeof(TCHAR)); + GetLocaleInfo(GetSystemDefaultLCID(), LOCALE_SLANGUAGE, langSel, sizeof(langSel)/sizeof(TCHAR)); SendMessage(hLangList, CB_SELECTSTRING, -1, (LPARAM)langSel); } @@ -281,6 +281,63 @@ SetupCloseInfFile(hFontInf); } + + +static +VOID +SaveSystemSettings( + LCID lcid) +{ + TCHAR ACPPage[9]; + TCHAR OEMPage[9]; + HKEY langKey; + DWORD ret; + WCHAR value[5]; + DWORD valuesize; + + ret = GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTCODEPAGE, OEMPage, sizeof(OEMPage)/sizeof(TCHAR)); + if (ret == 0) + { + PrintErrorMsgBox(IDS_ERROR_OEM_CODE_PAGE); + return; + } + + ret = GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTANSICODEPAGE, ACPPage, sizeof(ACPPage)/sizeof(TCHAR)); + if (ret == 0) + { + PrintErrorMsgBox(IDS_ERROR_ANSI_CODE_PAGE); + return; + } + + /* Set codepages */ + ret = RegOpenKey(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"), &langKey); + if (ret != ERROR_SUCCESS) + { + PrintErrorMsgBox(IDS_ERROR_NLS_CODE_REG); + return; + } + + RegSetValueEx(langKey, _T("OEMCP"), 0, REG_SZ, (BYTE *)OEMPage, (_tcslen(OEMPage) +1 ) * sizeof(TCHAR)); + RegSetValueEx(langKey, _T("ACP"), 0, REG_SZ, (BYTE *)ACPPage, (_tcslen(ACPPage) +1 ) * sizeof(TCHAR)); + + RegCloseKey(langKey); + + + wsprintf(value, _T("%04hX"), LANGIDFROMLCID(lcid)); + valuesize = (_tcslen(value) + 1) * sizeof(TCHAR); + + /* Set language */ + ret = RegOpenKey(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"), &langKey); + if (ret != ERROR_SUCCESS) + { + PrintErrorMsgBox(IDS_ERROR_NLS_KEY_REG); + return; + } + + RegSetValueEx(langKey, _T("Default"), 0, REG_SZ, (BYTE *)value, valuesize); + RegCloseKey(langKey); +} + /* Property page dialog callback */ INT_PTR CALLBACK @@ -332,6 +389,7 @@ break; SetNonUnicodeLang(hwndDlg, lcid); + SaveSystemSettings(lcid); } } break; Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] Sat Sep 12 20:24:10 2015 @@ -353,22 +353,6 @@ DWORD valuesize; DWORD i; -#if 0 - ret = GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTCODEPAGE, OEMPage, sizeof(OEMPage)/sizeof(TCHAR)); - if (ret == 0) - { - PrintErrorMsgBox(IDS_ERROR_OEM_CODE_PAGE); - return; - } - - ret = GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_IDEFAULTANSICODEPAGE, ACPPage, sizeof(ACPPage)/sizeof(TCHAR)); - if (ret == 0) - { - PrintErrorMsgBox(IDS_ERROR_ANSI_CODE_PAGE); - return; - } -#endif - ret = RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\International", 0, KEY_READ | KEY_WRITE, &localeKey); if (ret != ERROR_SUCCESS) @@ -405,47 +389,6 @@ /* Set the new locale for the current process */ NtSetDefaultLocale(TRUE, pGlobalData->lcid); -#if 0 - ret = RegOpenKey(HKEY_USERS, _T(".DEFAULT\\Control Panel\\International"), &localeKey); - if (ret != ERROR_SUCCESS) - { - PrintErrorMsgBox(IDS_ERROR_DEF_INT_KEY_REG); - return; - } - - wsprintf(value, _T("%08X"), (DWORD)lcid); - valuesize = (_tcslen(value) + 1) * sizeof(TCHAR); - - RegSetValueEx(localeKey, _T("Locale"), 0, REG_SZ, (BYTE *)value, valuesize); - RegCloseKey(localeKey); - - // Set language - ret = RegOpenKey(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"), &langKey); - if (ret != ERROR_SUCCESS) - { - PrintErrorMsgBox(IDS_ERROR_NLS_KEY_REG); - return; - } - - RegSetValueEx(langKey, _T("Default"), 0, REG_SZ, (BYTE *)value, valuesize ); - RegSetValueEx(langKey, _T("InstallLanguage"), 0, REG_SZ, (BYTE *)value, valuesize ); - - RegCloseKey(langKey); - - - /* Set language */ - ret = RegOpenKey(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage"), &langKey); - if (ret != ERROR_SUCCESS) - { - PrintErrorMsgBox(IDS_ERROR_NLS_CODE_REG); - return; - } - - RegSetValueExW(langKey, _T("OEMCP"), 0, REG_SZ, (BYTE *)OEMPage, (_tcslen(OEMPage) +1 ) * sizeof(TCHAR)); - RegSetValueExW(langKey, _T("ACP"), 0, REG_SZ, (BYTE *)ACPPage, (_tcslen(ACPPage) +1 ) * sizeof(TCHAR)); - - RegCloseKey(langKey); -#endif } /* Location enumerate procedure */ @@ -660,7 +603,6 @@ } AddNewKbLayoutsByLcid(pGlobalData->lcid); - SetNonUnicodeLang(hwndDlg, pGlobalData->lcid); } } break;

1 0

[hbelusca] 69206: [NTVDM]: Fix parentheses. Thanks GCC.
by hbelusca＠svn.reactos.org 12 Sep '15

12 Sep '15

Author: hbelusca Date: Sat Sep 12 20:13:22 2015 New Revision: 69206 URL: http://svn.reactos.org/svn/reactos?rev=69206&view=rev Log: [NTVDM]: Fix parentheses. Thanks GCC. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] Sat Sep 12 20:13:22 2015 @@ -1432,11 +1432,11 @@ /* If the list is already empty, or just contains only one element, bail out */ // FIXME: Question: if the list has only one element, is it ALWAYS RootCmd ?? // FIXME: The following is hackish. - if (IsListEmpty(&ComSpecInfoList) || - (ComSpecInfoList.Flink == &RootCmd.Entry && - ComSpecInfoList.Blink == &RootCmd.Entry) && + if ((IsListEmpty(&ComSpecInfoList) || + (ComSpecInfoList.Flink == &RootCmd.Entry && + ComSpecInfoList.Blink == &RootCmd.Entry)) && ReentrancyCount == 0 && - (WaitForSingleObject(VdmTaskEvent, 0) == WAIT_TIMEOUT)) + WaitForSingleObject(VdmTaskEvent, 0) == WAIT_TIMEOUT) { /* Nothing runs, so exit immediately */ ExitVDM(FALSE, 0);

1 0

[sginsberg] 69205: [KDBG]: Add new command "reboot" that does exactly what it says.
by sginsberg＠svn.reactos.org 12 Sep '15

12 Sep '15

Author: sginsberg Date: Sat Sep 12 20:10:43 2015 New Revision: 69205 URL: http://svn.reactos.org/svn/reactos?rev=69205&view=rev Log: [KDBG]: Add new command "reboot" that does exactly what it says. Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Sat Sep 12 20:10:43 2015 @@ -85,6 +85,7 @@ static BOOLEAN KdbpCmdTss(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdBugCheck(ULONG Argc, PCHAR Argv[]); +static BOOLEAN KdbpCmdReboot(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdFilter(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdSet(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdHelp(ULONG Argc, PCHAR Argv[]); @@ -176,6 +177,7 @@ /* Others */ { NULL, NULL, "Others", NULL }, { "bugcheck", "bugcheck", "Bugchecks the system.", KdbpCmdBugCheck }, + { "reboot", "reboot", "Reboots the system.", KdbpCmdReboot}, { "filter", "filter [error|warning|trace|info|level]+|-[componentname|default]", "Enable/disable debug channels", KdbpCmdFilter }, { "set", "set [var] [value]", "Sets var to value or displays value of var.", KdbpCmdSet }, { "dmesg", "dmesg", "Display debug messages on screen, with navigation on pages.", KdbpCmdDmesg }, @@ -2176,6 +2178,17 @@ return FALSE; } +static BOOLEAN +KdbpCmdReboot( + ULONG Argc, + PCHAR Argv[]) +{ + /* Reboot immediately (we do not return) */ + HalReturnToFirmware(HalRebootRoutine); + return FALSE; +} + + VOID KdbpPager( IN PCHAR Buffer,

1 0

[hbelusca] 69204: [NTVDM] - Add support for DOS VDM reentry, i.e. the fact that a DOS app can start a 32-bit app, which in turn can start another DOS app, ad infinitum... CORE-9711 CORE-9773 #resol...
by hbelusca＠svn.reactos.org 12 Sep '15

12 Sep '15

Author: hbelusca Date: Sat Sep 12 20:09:25 2015 New Revision: 69204 URL: http://svn.reactos.org/svn/reactos?rev=69204&view=rev Log: [NTVDM] - Add support for DOS VDM reentry, i.e. the fact that a DOS app can start a 32-bit app, which in turn can start another DOS app, ad infinitum... CORE-9711 CORE-9773 #resolve - Add a small COMMAND.COM which is, for now, completely included in NTVDM. This COMMAND.COM is needed in order to support reentrancy. The fact that I chose to put it inside NTVDM is that any user can use instead his/her own COMMAND.COM, while retaining the possibility to perform VDM reentrancy (on Windows, if you remove the COMMAND.COM in windows\system32 and replace it with your own, you will break VDM reentrancy on windows' ntvdm). CORE-5221 #resolve #comment I choose for the moment an internal COMMAND.COM, but you can recompile NTVDM to use it externally instead. Global remarks: - Quite a few DPRINTs were added for diagnostic purposes (since DOS reentrancy is a new feature), to be sure everything behaves as expected when being used with a large panel of applications. They will be removed when everything is OK. - Support for current directories and 16/32-bit environment translation (in ntvdm + basevdm-side) remain to be implemented. Other changes: - Improve a bit the VDM shutdown code by gathering it at one place (there's still room for other improvements). - Add suppport for properly pausing/resuming NTVDM. - Bufferize some console events before dispatching. Have fun ;^) Added: trunk/reactos/subsystems/mvdm/dos/CMakeLists.txt (with props) trunk/reactos/subsystems/mvdm/dos/asmxtras.inc (with props) trunk/reactos/subsystems/mvdm/dos/command.S (with props) Modified: trunk/reactos/subsystems/mvdm/CMakeLists.txt trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h trunk/reactos/subsystems/mvdm/ntvdm/emulator.c trunk/reactos/subsystems/mvdm/ntvdm/emulator.h trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/mvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/CMakeLists… Added: trunk/reactos/subsystems/mvdm/dos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/dos/CMakeL… Added: trunk/reactos/subsystems/mvdm/dos/asmxtras.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/dos/asmxtr… Added: trunk/reactos/subsystems/mvdm/dos/command.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/dos/comman… Modified: trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/CMak… Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd…

1 0

[hbelusca] 69203: [NTVDM]: Add a diagnostic dprint to check why some apps seem to fail allocating memory.
by hbelusca＠svn.reactos.org 12 Sep '15

12 Sep '15

Author: hbelusca Date: Sat Sep 12 18:13:53 2015 New Revision: 69203 URL: http://svn.reactos.org/svn/reactos?rev=69203&view=rev Log: [NTVDM]: Add a diagnostic dprint to check why some apps seem to fail allocating memory. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] Sat Sep 12 18:13:53 2015 @@ -228,6 +228,7 @@ /* If we didn't find a free block, bail out */ if (Result == 0) { + DPRINT("DosAllocateMemory FAILED. Maximum available: 0x%04X\n", MaxSize); Sda->LastErrorCode = ERROR_NOT_ENOUGH_MEMORY; if (MaxAvailable) *MaxAvailable = MaxSize; return 0; @@ -380,7 +381,7 @@ else if (NewSize < Mcb->Size) { DPRINT("Shrinking block from 0x%04X to 0x%04X\n", - Mcb->Size, NewSize); + Mcb->Size, NewSize); /* Just split the block */ NextSegment = Segment + NewSize + 1; @@ -401,8 +402,7 @@ /* Check if the operation failed */ if (!Success) { - DPRINT("DosResizeMemory FAILED. Maximum available: 0x%04X\n", - ReturnSize); + DPRINT("DosResizeMemory FAILED. Maximum available: 0x%04X\n", ReturnSize); /* Return the maximum possible size */ if (MaxAvailable) *MaxAvailable = ReturnSize; @@ -418,6 +418,7 @@ PDOS_MCB Mcb = SEGMENT_TO_MCB(BlockData - 1); DPRINT("DosFreeMemory: BlockData 0x%04X\n", BlockData); + if (BlockData == 0) { Sda->LastErrorCode = ERROR_INVALID_BLOCK;

1 0

[jimtabor] 69202: [Win32k] - Fix Alpha Blending while using layered windows in lower bit modes. See CORE-10167.
by jimtabor＠svn.reactos.org 12 Sep '15

12 Sep '15

Author: jimtabor Date: Sat Sep 12 17:29:16 2015 New Revision: 69202 URL: http://svn.reactos.org/svn/reactos?rev=69202&view=rev Log: [Win32k] - Fix Alpha Blending while using layered windows in lower bit modes. See CORE-10167. Modified: trunk/reactos/win32ss/user/ntuser/layered.c Modified: trunk/reactos/win32ss/user/ntuser/layered.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/layere… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/layered.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/layered.c [iso-8859-1] Sat Sep 12 17:29:16 2015 @@ -154,7 +154,8 @@ RECT Rect; BLENDFUNCTION blend = { AC_SRC_OVER, 0, 255, 0 }; COLORREF color_key = (info->dwFlags & ULW_COLORKEY) ? info->crKey : CLR_INVALID; - HBITMAP hBitmapBuffer, hOldBitmap; + HBITMAP hOldBitmap, hOldBitmap1, hbmSrc, hbmDst; + DIBSECTION dibs; Rect = Window; @@ -165,9 +166,17 @@ if (!info->hdcDst) hdc = UserGetDCEx(pWnd, NULL, DCX_USESTYLE); else hdc = info->hdcDst; + hbmSrc = NtGdiCreateCompatibleBitmap(info->hdcSrc, Rect.right - Rect.left, Rect.bottom - Rect.top); + hbmDst = NtGdiCreateCompatibleBitmap(info->hdcSrc, Rect.right - Rect.left, Rect.bottom - Rect.top); + + GreGetObject(hbmSrc, sizeof(DIBSECTION), &dibs); + + TRACE("Source Bitmap bc %d\n",dibs.dsBmih.biBitCount); + hdcBuffer = NtGdiCreateCompatibleDC(hdc); - hBitmapBuffer = NtGdiCreateCompatibleBitmap(hdc, Rect.right - Rect.left, Rect.bottom - Rect.top); - hOldBitmap = (HBITMAP)NtGdiSelectBitmap(hdcBuffer, hBitmapBuffer); + + hOldBitmap = (HBITMAP)NtGdiSelectBitmap(hdcBuffer, hbmSrc); + hOldBitmap1 = (HBITMAP)NtGdiSelectBitmap(hdc, hbmDst); NtGdiStretchBlt( hdcBuffer, Rect.left, @@ -209,8 +218,10 @@ blend, 0); + NtGdiSelectBitmap(hdc, hOldBitmap1); NtGdiSelectBitmap(hdcBuffer, hOldBitmap); - if (hBitmapBuffer) GreDeleteObject(hBitmapBuffer); + if (hbmSrc) GreDeleteObject(hbmSrc); + if (hbmDst) GreDeleteObject(hbmDst); if (hdcBuffer) IntGdiDeleteDC(hdcBuffer, FALSE); if (!info->hdcDst) UserReleaseDC(pWnd, hdc, FALSE); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs