Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 59558: [KERNEL32] - Move Vista+ APIs to their reservation.
by fireball＠svn.reactos.org 22 Jul '13

22 Jul '13

Author: fireball Date: Mon Jul 22 18:17:58 2013 New Revision: 59558 URL: http://svn.reactos.org/svn/reactos?rev=59558&view=rev Log: [KERNEL32] - Move Vista+ APIs to their reservation. Removed: trunk/reactos/dll/win32/kernel32/winnls/string/mui.c Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/client/vista.c Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Mon Jul 22 18:17:58 2013 @@ -75,7 +75,6 @@ winnls/string/lang.c winnls/string/lcformat.c winnls/string/lstring.c - winnls/string/mui.c winnls/string/nls.c winnls/string/sortkey.c kernel32.rc Modified: trunk/reactos/dll/win32/kernel32/client/vista.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/vista.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/vista.c [iso-8859-1] Mon Jul 22 18:17:58 2013 @@ -734,3 +734,176 @@ return (UInt32x32To64(TickCount.LowPart, SharedUserData->TickCountMultiplier) >> 24) + (UInt32x32To64(TickCount.HighPart, SharedUserData->TickCountMultiplier) << 8); } + +/* + Vista+ MUI support functions + + References: + Evolution of MUI Support across Windows Versions: http://msdn.microsoft.com/en-US/library/ee264317.aspx + Comparing Windows XP Professional Multilingual Options: http://technet.microsoft.com/en-us/library/bb457045.aspx + + More info: + http://msdn.microsoft.com/en-us/goglobal/bb978454.aspx + http://msdn.microsoft.com/en-us/library/dd319074.aspx +*/ + +/* FUNCTIONS *****************************************************************/ + +BOOL +WINAPI +GetFileMUIInfo( + DWORD dwFlags, + PCWSTR pcwszFilePath, + PFILEMUIINFO pFileMUIInfo, + DWORD *pcbFileMUIInfo) +{ + DPRINT1("%x %p %p %p\n", dwFlags, pcwszFilePath, pFileMUIInfo, pcbFileMUIInfo); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +GetFileMUIPath( + DWORD dwFlags, + PCWSTR pcwszFilePath, + PWSTR pwszLanguage, + PULONG pcchLanguage, + PWSTR pwszFileMUIPath, + PULONG pcchFileMUIPath, + PULONGLONG pululEnumerator) +{ + DPRINT1("%x %p %p %p %p %p\n", dwFlags, pcwszFilePath, pwszLanguage, pwszFileMUIPath, pcchFileMUIPath, pululEnumerator); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +GetProcessPreferredUILanguages( + DWORD dwFlags, + PULONG pulNumLanguages, + PZZWSTR pwszLanguagesBuffer, + PULONG pcchLanguagesBuffer) +{ + DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* +* @unimplemented +*/ +BOOL +WINAPI +GetSystemPreferredUILanguages( + DWORD dwFlags, + PULONG pulNumLanguages, + PZZWSTR pwszLanguagesBuffer, + PULONG pcchLanguagesBuffer) +{ + DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +GetThreadPreferredUILanguages( + DWORD dwFlags, + PULONG pulNumLanguages, + PZZWSTR pwszLanguagesBuffer, + PULONG pcchLanguagesBuffer) +{ + DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +LANGID +WINAPI +GetThreadUILanguage(VOID) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +GetUILanguageInfo( + DWORD dwFlags, + PCZZWSTR pwmszLanguage, + PZZWSTR pwszFallbackLanguages, + PDWORD pcchFallbackLanguages, + PDWORD pdwAttributes) +{ + DPRINT1("%x %p %p %p %p\n", dwFlags, pwmszLanguage, pwszFallbackLanguages, pcchFallbackLanguages, pdwAttributes); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL +WINAPI +GetUserPreferredUILanguages( + DWORD dwFlags, + PULONG pulNumLanguages, + PZZWSTR pwszLanguagesBuffer, + PULONG pcchLanguagesBuffer) +{ + DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +SetProcessPreferredUILanguages( + DWORD dwFlags, + PCZZWSTR pwszLanguagesBuffer, + PULONG pulNumLanguages) +{ + DPRINT1("%x %p %p\n", dwFlags, pwszLanguagesBuffer, pulNumLanguages); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL +WINAPI +SetThreadPreferredUILanguages( + DWORD dwFlags, + PCZZWSTR pwszLanguagesBuffer, + PULONG pulNumLanguages + ) +{ + DPRINT1("%x %p %p\n", dwFlags, pwszLanguagesBuffer, pulNumLanguages); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + Removed: trunk/reactos/dll/win32/kernel32/winnls/string/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/mui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/mui.c (removed) @@ -1,183 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: dll/win32/kernel32/winnls/mui.c - * PURPOSE: MUI support functions - * PROGRAMMERS: Edison Henrique Andreassy (ehasis(a)hotmail.com) - */ - -/* INCLUDES ******************************************************************/ -#include <k32.h> - -#define NDEBUG -#include <debug.h> - -/* - References: - Evolution of MUI Support across Windows Versions: http://msdn.microsoft.com/en-US/library/ee264317.aspx - Comparing Windows XP Professional Multilingual Options: http://technet.microsoft.com/en-us/library/bb457045.aspx - - More info: - http://msdn.microsoft.com/en-us/goglobal/bb978454.aspx - http://msdn.microsoft.com/en-us/library/dd319074.aspx -*/ - -/* FUNCTIONS *****************************************************************/ - -BOOL -WINAPI -GetFileMUIInfo( - DWORD dwFlags, - PCWSTR pcwszFilePath, - PFILEMUIINFO pFileMUIInfo, - DWORD *pcbFileMUIInfo) -{ - DPRINT1("%x %p %p %p\n", dwFlags, pcwszFilePath, pFileMUIInfo, pcbFileMUIInfo); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -GetFileMUIPath( - DWORD dwFlags, - PCWSTR pcwszFilePath, - PWSTR pwszLanguage, - PULONG pcchLanguage, - PWSTR pwszFileMUIPath, - PULONG pcchFileMUIPath, - PULONGLONG pululEnumerator) -{ - DPRINT1("%x %p %p %p %p %p\n", dwFlags, pcwszFilePath, pwszLanguage, pwszFileMUIPath, pcchFileMUIPath, pululEnumerator); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -GetProcessPreferredUILanguages( - DWORD dwFlags, - PULONG pulNumLanguages, - PZZWSTR pwszLanguagesBuffer, - PULONG pcchLanguagesBuffer) -{ - DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/* -* @unimplemented -*/ -BOOL -WINAPI -GetSystemPreferredUILanguages( - DWORD dwFlags, - PULONG pulNumLanguages, - PZZWSTR pwszLanguagesBuffer, - PULONG pcchLanguagesBuffer) -{ - DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -GetThreadPreferredUILanguages( - DWORD dwFlags, - PULONG pulNumLanguages, - PZZWSTR pwszLanguagesBuffer, - PULONG pcchLanguagesBuffer) -{ - DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/* - * @unimplemented - */ -LANGID -WINAPI -GetThreadUILanguage(VOID) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -GetUILanguageInfo( - DWORD dwFlags, - PCZZWSTR pwmszLanguage, - PZZWSTR pwszFallbackLanguages, - PDWORD pcchFallbackLanguages, - PDWORD pdwAttributes) -{ - DPRINT1("%x %p %p %p %p\n", dwFlags, pwmszLanguage, pwszFallbackLanguages, pcchFallbackLanguages, pdwAttributes); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL -WINAPI -GetUserPreferredUILanguages( - DWORD dwFlags, - PULONG pulNumLanguages, - PZZWSTR pwszLanguagesBuffer, - PULONG pcchLanguagesBuffer) -{ - DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -SetProcessPreferredUILanguages( - DWORD dwFlags, - PCZZWSTR pwszLanguagesBuffer, - PULONG pulNumLanguages) -{ - DPRINT1("%x %p %p\n", dwFlags, pwszLanguagesBuffer, pulNumLanguages); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL -WINAPI -SetThreadPreferredUILanguages( - DWORD dwFlags, - PCZZWSTR pwszLanguagesBuffer, - PULONG pulNumLanguages - ) -{ - DPRINT1("%x %p %p\n", dwFlags, pwszLanguagesBuffer, pulNumLanguages); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -}

1 0

[aandrejevic] 59557: [NTVDM] Fix bug while initializing and copying the environment strings.
by aandrejevic＠svn.reactos.org 22 Jul '13

22 Jul '13

Author: aandrejevic Date: Mon Jul 22 16:36:05 2013 New Revision: 59557 URL: http://svn.reactos.org/svn/reactos?rev=59557&view=rev Log: [NTVDM] Fix bug while initializing and copying the environment strings. Modified: branches/ntvdm/subsystems/ntvdm/dos.c Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Mon Jul 22 16:36:05 2013 @@ -83,8 +83,8 @@ strcpy(DestBuffer, Ptr); /* Advance to the next string */ + DestBuffer += strlen(Ptr); Ptr += strlen(Ptr) + 1; - DestBuffer += strlen(Ptr); /* Put a zero after the string */ *(DestBuffer++) = 0; @@ -231,6 +231,8 @@ PDOS_MCB CurrentMcb, NextMcb; BOOLEAN SearchUmb = FALSE; + DPRINT("DosAllocateMemory: Size 0x%04X\n", Size); + if (DosUmbLinked && (DosAllocStrategy & (DOS_ALLOC_HIGH | DOS_ALLOC_HIGH_LOW))) { /* Search UMB first */ @@ -246,6 +248,7 @@ /* Make sure it's valid */ if (CurrentMcb->BlockType != 'M' && CurrentMcb->BlockType != 'Z') { + DPRINT("The DOS memory arena is corrupted!\n"); DosLastError = ERROR_ARENA_TRASHED; return 0; } @@ -1750,13 +1753,13 @@ /* Copy the string into DOS memory */ strcpy(DestPtr, AsciiString); - /* Free the memory */ - HeapFree(GetProcessHeap(), 0, AsciiString); - /* Move to the next string */ SourcePtr += wcslen(SourcePtr) + 1; DestPtr += strlen(AsciiString); *(DestPtr++) = 0; + + /* Free the memory */ + HeapFree(GetProcessHeap(), 0, AsciiString); } *DestPtr = 0;

1 0

[fireball] 59556: [KERNEL32] - Stub MUI support functions (by Edison Henrique Andreassy). Don't export them yet (they need to be checked according to the Windows version, so that kernel32 export ta...
by fireball＠svn.reactos.org 22 Jul '13

22 Jul '13

Author: fireball Date: Mon Jul 22 14:45:31 2013 New Revision: 59556 URL: http://svn.reactos.org/svn/reactos?rev=59556&view=rev Log: [KERNEL32] - Stub MUI support functions (by Edison Henrique Andreassy). Don't export them yet (they need to be checked according to the Windows version, so that kernel32 export table matches our target). Added: trunk/reactos/dll/win32/kernel32/winnls/string/mui.c (with props) Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Mon Jul 22 14:45:31 2013 @@ -75,6 +75,7 @@ winnls/string/lang.c winnls/string/lcformat.c winnls/string/lstring.c + winnls/string/mui.c winnls/string/nls.c winnls/string/sortkey.c kernel32.rc Added: trunk/reactos/dll/win32/kernel32/winnls/string/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/mui.c (added) +++ trunk/reactos/dll/win32/kernel32/winnls/string/mui.c [iso-8859-1] Mon Jul 22 14:45:31 2013 @@ -0,0 +1,183 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dll/win32/kernel32/winnls/mui.c + * PURPOSE: MUI support functions + * PROGRAMMERS: Edison Henrique Andreassy (ehasis(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ +#include <k32.h> + +#define NDEBUG +#include <debug.h> + +/* + References: + Evolution of MUI Support across Windows Versions: http://msdn.microsoft.com/en-US/library/ee264317.aspx + Comparing Windows XP Professional Multilingual Options: http://technet.microsoft.com/en-us/library/bb457045.aspx + + More info: + http://msdn.microsoft.com/en-us/goglobal/bb978454.aspx + http://msdn.microsoft.com/en-us/library/dd319074.aspx +*/ + +/* FUNCTIONS *****************************************************************/ + +BOOL +WINAPI +GetFileMUIInfo( + DWORD dwFlags, + PCWSTR pcwszFilePath, + PFILEMUIINFO pFileMUIInfo, + DWORD *pcbFileMUIInfo) +{ + DPRINT1("%x %p %p %p\n", dwFlags, pcwszFilePath, pFileMUIInfo, pcbFileMUIInfo); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +GetFileMUIPath( + DWORD dwFlags, + PCWSTR pcwszFilePath, + PWSTR pwszLanguage, + PULONG pcchLanguage, + PWSTR pwszFileMUIPath, + PULONG pcchFileMUIPath, + PULONGLONG pululEnumerator) +{ + DPRINT1("%x %p %p %p %p %p\n", dwFlags, pcwszFilePath, pwszLanguage, pwszFileMUIPath, pcchFileMUIPath, pululEnumerator); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +GetProcessPreferredUILanguages( + DWORD dwFlags, + PULONG pulNumLanguages, + PZZWSTR pwszLanguagesBuffer, + PULONG pcchLanguagesBuffer) +{ + DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* +* @unimplemented +*/ +BOOL +WINAPI +GetSystemPreferredUILanguages( + DWORD dwFlags, + PULONG pulNumLanguages, + PZZWSTR pwszLanguagesBuffer, + PULONG pcchLanguagesBuffer) +{ + DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +GetThreadPreferredUILanguages( + DWORD dwFlags, + PULONG pulNumLanguages, + PZZWSTR pwszLanguagesBuffer, + PULONG pcchLanguagesBuffer) +{ + DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +LANGID +WINAPI +GetThreadUILanguage(VOID) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +GetUILanguageInfo( + DWORD dwFlags, + PCZZWSTR pwmszLanguage, + PZZWSTR pwszFallbackLanguages, + PDWORD pcchFallbackLanguages, + PDWORD pdwAttributes) +{ + DPRINT1("%x %p %p %p %p\n", dwFlags, pwmszLanguage, pwszFallbackLanguages, pcchFallbackLanguages, pdwAttributes); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL +WINAPI +GetUserPreferredUILanguages( + DWORD dwFlags, + PULONG pulNumLanguages, + PZZWSTR pwszLanguagesBuffer, + PULONG pcchLanguagesBuffer) +{ + DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +SetProcessPreferredUILanguages( + DWORD dwFlags, + PCZZWSTR pwszLanguagesBuffer, + PULONG pulNumLanguages) +{ + DPRINT1("%x %p %p\n", dwFlags, pwszLanguagesBuffer, pulNumLanguages); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL +WINAPI +SetThreadPreferredUILanguages( + DWORD dwFlags, + PCZZWSTR pwszLanguagesBuffer, + PULONG pulNumLanguages + ) +{ + DPRINT1("%x %p %p\n", dwFlags, pwszLanguagesBuffer, pulNumLanguages); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} Propchange: trunk/reactos/dll/win32/kernel32/winnls/string/mui.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/kernel32/winnls/string/mui.c ------------------------------------------------------------------------------ svn:mime-type = text/plain

1 0

[aandrejevic] 59555: [NTVDM] Add debug output.
by aandrejevic＠svn.reactos.org 22 Jul '13

22 Jul '13

Author: aandrejevic Date: Mon Jul 22 13:51:26 2013 New Revision: 59555 URL: http://svn.reactos.org/svn/reactos?rev=59555&view=rev Log: [NTVDM] Add debug output. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/ntvdm/ntvdm.h branches/ntvdm/subsystems/ntvdm/pic.c branches/ntvdm/subsystems/ntvdm/ps2.c branches/ntvdm/subsystems/ntvdm/timer.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Mon Jul 22 13:51:26 2013 @@ -7,6 +7,8 @@ */ /* INCLUDES *******************************************************************/ + +#define NDEBUG #include "bios.h" #include "emulator.h" Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Mon Jul 22 13:51:26 2013 @@ -8,6 +8,8 @@ /* INCLUDES *******************************************************************/ +#define NDEBUG + #include "dos.h" #include "bios.h" #include "emulator.h" @@ -349,11 +351,15 @@ WORD Segment = BlockData - 1, ReturnSize = 0, NextSegment; PDOS_MCB Mcb = SEGMENT_TO_MCB(Segment), NextMcb; + DPRINT("DosResizeMemory: BlockData 0x%04X, NewSize 0x%04X\n", + BlockData, + NewSize); + /* Make sure this is a valid, allocated block */ if ((Mcb->BlockType != 'M' && Mcb->BlockType != 'Z') || Mcb->OwnerPsp == 0) { Success = FALSE; - DosLastError = ERROR_INVALID_PARAMETER; + DosLastError = ERROR_INVALID_HANDLE; goto Done; } @@ -376,6 +382,7 @@ /* Make sure the next segment is free */ if (NextMcb->OwnerPsp != 0) { + DPRINT("Cannot expand memory block: next segment is not free!\n"); DosLastError = ERROR_NOT_ENOUGH_MEMORY; Success = FALSE; goto Done; @@ -397,6 +404,10 @@ /* Check if the block is larger than requested */ if (Mcb->Size > NewSize) { + DPRINT("Block too large, reducing size from 0x%04X to 0x%04X\n", + Mcb->Size, + NewSize); + /* It is, split it into two blocks */ NextMcb = SEGMENT_TO_MCB(Segment + NewSize + 1); @@ -412,6 +423,10 @@ } else if (NewSize < Mcb->Size) { + DPRINT("Shrinking block from 0x%04X to 0x%04X\n", + Mcb->Size, + NewSize); + /* Just split the block */ NextMcb = SEGMENT_TO_MCB(Segment + NewSize + 1); NextMcb->BlockType = Mcb->BlockType; @@ -427,6 +442,9 @@ /* Check if the operation failed */ if (!Success) { + DPRINT("DosResizeMemory FAILED. Maximum available: 0x%04X\n", + ReturnSize); + /* Return the maximum possible size */ if (MaxAvailable) *MaxAvailable = ReturnSize; } @@ -438,8 +456,14 @@ { PDOS_MCB Mcb = SEGMENT_TO_MCB(BlockData - 1); + DPRINT("DosFreeMemory: BlockData 0x%04X\n", BlockData); + /* Make sure the MCB is valid */ - if (Mcb->BlockType != 'M' && Mcb->BlockType != 'Z') return FALSE; + if (Mcb->BlockType != 'M' && Mcb->BlockType != 'Z') + { + DPRINT("MCB block type '%c' not valid!\n", Mcb->BlockType); + return FALSE; + } /* Mark the block as free */ Mcb->OwnerPsp = 0; @@ -452,6 +476,8 @@ DWORD Segment = FIRST_MCB_SEGMENT; PDOS_MCB Mcb = SEGMENT_TO_MCB(Segment); + DPRINT("Linking UMB\n"); + /* Check if UMBs are already linked */ if (DosUmbLinked) return FALSE; @@ -476,6 +502,8 @@ { DWORD Segment = FIRST_MCB_SEGMENT; PDOS_MCB Mcb = SEGMENT_TO_MCB(Segment); + + DPRINT("Unlinking UMB\n"); /* Check if UMBs are already unlinked */ if (!DosUmbLinked) return FALSE; @@ -505,6 +533,10 @@ { HANDLE FileHandle; WORD DosHandle; + + DPRINT("DosCreateFile: FilePath \"%s\", Attributes 0x%04X\n", + FilePath, + Attributes); /* Create the file */ FileHandle = CreateFileA(FilePath, @@ -544,6 +576,10 @@ ACCESS_MASK Access = 0; WORD DosHandle; + DPRINT("DosOpenFile: FilePath \"%s\", AccessMode 0x%04X\n", + FilePath, + AccessMode); + /* Parse the access mode */ switch (AccessMode & 3) { @@ -613,8 +649,10 @@ DWORD BytesRead32 = 0; HANDLE Handle = DosGetRealHandle(FileHandle); + DPRINT("DosReadFile: FileHandle 0x%04X, Count 0x%04X\n", FileHandle, Count); + /* Make sure the handle is valid */ - if (Handle == INVALID_HANDLE_VALUE) return ERROR_INVALID_PARAMETER; + if (Handle == INVALID_HANDLE_VALUE) return ERROR_INVALID_HANDLE; /* Read the file */ if (!ReadFile(Handle, Buffer, Count, &BytesRead32, NULL)) @@ -636,8 +674,12 @@ DWORD BytesWritten32 = 0; HANDLE Handle = DosGetRealHandle(FileHandle); + DPRINT("DosWriteFile: FileHandle 0x%04X, Count 0x%04X\n", + FileHandle, + Count); + /* Make sure the handle is valid */ - if (Handle == INVALID_HANDLE_VALUE) return ERROR_INVALID_PARAMETER; + if (Handle == INVALID_HANDLE_VALUE) return ERROR_INVALID_HANDLE; /* Write the file */ if (!WriteFile(Handle, Buffer, Count, &BytesWritten32, NULL)) @@ -658,6 +700,8 @@ BYTE SftIndex; PDOS_PSP PspBlock; LPBYTE HandleTable; + + DPRINT("DosCloseHandle: DosHandle 0x%04X\n", DosHandle); /* The system PSP has no handle table */ if (CurrentPsp == SYSTEM_PSP) return FALSE; @@ -747,6 +791,10 @@ PDWORD RelocationTable; PWORD RelocWord; + DPRINT("DosCreateProcess: CommandLine \"%s\", EnvBlock 0x%04X\n", + CommandLine, + EnvBlock); + /* Save a copy of the command line */ strcpy(CommandLineCopy, CommandLine); @@ -949,6 +997,10 @@ PDOS_MCB CurrentMcb; LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress); PDOS_PSP PspBlock = SEGMENT_TO_PSP(Psp); + + DPRINT("DosTerminateProcess: Psp 0x%04X, ReturnCode 0x%02X\n", + Psp, + ReturnCode); /* Check if this PSP is it's own parent */ if (PspBlock->ParentPsp == Psp) goto Done; @@ -1416,7 +1468,7 @@ /* Return the error code in AX */ EmulatorSetRegister(EMULATOR_REG_AX, - (Eax & 0xFFFF0000) | ERROR_INVALID_PARAMETER); + (Eax & 0xFFFF0000) | ERROR_INVALID_HANDLE); } break; Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Mon Jul 22 13:51:26 2013 @@ -8,6 +8,8 @@ /* INCLUDES *******************************************************************/ +#define NDEBUG + #include "emulator.h" #include "bios.h" #include "dos.h" Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Mon Jul 22 13:51:26 2013 @@ -7,6 +7,8 @@ */ /* INCLUDES *******************************************************************/ + +#define NDEBUG #include "ntvdm.h" #include "emulator.h" Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Mon Jul 22 13:51:26 2013 @@ -16,8 +16,6 @@ #include <stdio.h> #include <conio.h> #include <stdarg.h> - -#define NDEBUG #include <debug.h> /* DEFINES ********************************************************************/ Modified: branches/ntvdm/subsystems/ntvdm/pic.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/pic.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/pic.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/pic.c [iso-8859-1] Mon Jul 22 13:51:26 2013 @@ -8,6 +8,8 @@ /* INCLUDES *******************************************************************/ +#define NDEBUG + #include "pic.h" #include "emulator.h" Modified: branches/ntvdm/subsystems/ntvdm/ps2.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] Mon Jul 22 13:51:26 2013 @@ -7,6 +7,8 @@ */ /* INCLUDES *******************************************************************/ + +#define NDEBUG #include "ps2.h" #include "emulator.h" Modified: branches/ntvdm/subsystems/ntvdm/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/timer.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/timer.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/timer.c [iso-8859-1] Mon Jul 22 13:51:26 2013 @@ -8,6 +8,8 @@ /* INCLUDES *******************************************************************/ +#define NDEBUG + #include "timer.h" #include "pic.h"

1 0

[fireball] 59554: [RTL] - Victor Martinez Calvo: Add a missing status check in RtlpQueryRemoteProcessModules. - Aleksey Bragin: The code is quite ugly, adding this check makes it just a little bit ...
by fireball＠svn.reactos.org 22 Jul '13

22 Jul '13

Author: fireball Date: Mon Jul 22 13:45:56 2013 New Revision: 59554 URL: http://svn.reactos.org/svn/reactos?rev=59554&view=rev Log: [RTL] - Victor Martinez Calvo: Add a missing status check in RtlpQueryRemoteProcessModules. - Aleksey Bragin: The code is quite ugly, adding this check makes it just a little bit less uglier :-) CORE-7059 #resolve #comment Committed in 59554, thanks. Modified: trunk/reactos/lib/rtl/dbgbuffer.c Modified: trunk/reactos/lib/rtl/dbgbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/dbgbuffer.c?rev=59… ============================================================================== --- trunk/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] Mon Jul 22 13:45:56 2013 @@ -159,6 +159,13 @@ sizeof(LDR_DATA_TABLE_ENTRY), NULL); + if (!NT_SUCCESS(Status)) + { + /* failure */ + DPRINT( "NtReadVirtualMemory 3 0x%lx \n", Status); + return Status; + } + /* Import module name from remote Process user space. */ Unicode.Length = lmModule.FullDllName.Length; Unicode.MaximumLength = lmModule.FullDllName.MaximumLength;

1 0

[fireball] 59553: [PING] - Alexander Yastrebov: Properly write data into the standard output device depending whether it's a char or a block device. CORE-6628 #resolve #comment Patch committed in r...
by fireball＠svn.reactos.org 22 Jul '13

22 Jul '13

Author: fireball Date: Mon Jul 22 13:28:56 2013 New Revision: 59553 URL: http://svn.reactos.org/svn/reactos?rev=59553&view=rev Log: [PING] - Alexander Yastrebov: Properly write data into the standard output device depending whether it's a char or a block device. CORE-6628 #resolve #comment Patch committed in revision 59552, thank you Alexander and sorry that it took so long! Modified: trunk/reactos/base/applications/network/ping/ping.c Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] Mon Jul 22 13:28:56 2013 @@ -143,10 +143,13 @@ va_list valist; WCHAR Buf[1024]; + CHAR AnsiBuf[1024]; LPWSTR pBuf = Buf; + PCHAR pAnsiBuf = AnsiBuf; LPWSTR Format; DWORD written; UINT DataLength; + int AnsiLength; va_start(valist, uID); @@ -169,7 +172,28 @@ return; } - WriteConsole(hStdOutput, pBuf, DataLength, &written, NULL); + if(GetFileType(hStdOutput) == FILE_TYPE_CHAR) + { + /* Is a console or a printer */ + WriteConsole(hStdOutput, pBuf, DataLength, &written, NULL); + } + else + { + /* Is a pipe, socket, file or other */ + AnsiLength = WideCharToMultiByte(CP_ACP, 0, pBuf, DataLength,\ + NULL, 0, NULL, NULL); + + if(AnsiLength >= sizeof(AnsiBuf)) + pAnsiBuf = (PCHAR)HeapAlloc(GetProcessHeap(), 0, AnsiLength); + + AnsiLength = WideCharToMultiByte(CP_OEMCP, 0, pBuf, DataLength,\ + pAnsiBuf, AnsiLength, " ", NULL); + + WriteFile(hStdOutput, pAnsiBuf, AnsiLength, &written, NULL); + + if(pAnsiBuf != AnsiBuf) + HeapFree(NULL, 0, pAnsiBuf); + } if(pBuf != Buf) LocalFree(pBuf);

1 0

[fireball] 59552: [KMTESTS] - Beautify the source code a little. Also improve english in debug prints.
by fireball＠svn.reactos.org 22 Jul '13

22 Jul '13

Author: fireball Date: Mon Jul 22 12:11:38 2013 New Revision: 59552 URL: http://svn.reactos.org/svn/reactos?rev=59552&view=rev Log: [KMTESTS] - Beautify the source code a little. Also improve english in debug prints. Modified: trunk/rostests/kmtests/ntos_ke/KeDevQueue.c Modified: trunk/rostests/kmtests/ntos_ke/KeDevQueue.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeDevQueu… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeDevQueue.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ke/KeDevQueue.c [iso-8859-1] Mon Jul 22 12:11:38 2013 @@ -43,13 +43,13 @@ /* Check for properly setting up fields */ ok(!testing_queue->Busy, "(Initialize testing) Test 1:\tExpected 'not busy' status\n"); - DPRINT1("1 test complete\n"); + DPRINT1("Test 1 completed\n"); ok(testing_queue->Size == sizeof(KDEVICE_QUEUE), "(Initialize testing) Test 2:\tExpected another size for KDEVICE_QUEUE\n"); - DPRINT1("2 test complete\n"); + DPRINT1("Test 2 completed\n"); ok(testing_queue->Type == DeviceQueueObject, "(Initialize testing) Test 3:\tExpected type == DeviceQueueObject\n"); - DPRINT1("3 test complete\n"); + DPRINT1("Test 3 completed\n"); /* Make sure it does not write outside allocated buffer */ double_queue = ExAllocatePool(NonPagedPool, sizeof(KDEVICE_QUEUE) * 2); @@ -58,7 +58,7 @@ KeInitializeDeviceQueue(double_queue); ok(Check_mem((void*)((char*)double_queue + sizeof(KDEVICE_QUEUE)), NUMBER, sizeof(KDEVICE_QUEUE)), "(Initialize testing) Test 4:\tFunction uses someone else's memory \n"); - DPRINT1("4 test complete\n"); + DPRINT1("Test 4 completed\n"); //==================================================================== @@ -92,7 +92,7 @@ KeInsertDeviceQueue(testing_queue, element); ok(!element->Inserted, "Wrong 'Inserted' status\n"); - DPRINT1("1 test complete\n"); + DPRINT1("Test 1 completed\n"); /* Fill the queue*/ elem_array = ExAllocatePool(NonPagedPool, sizeof(PKDEVICE_QUEUE_ENTRY) * INSERT_COUNT); @@ -112,13 +112,13 @@ /* Check how the queue was filled */ next = &testing_queue->DeviceListHead; - DPRINT1("Arrow of tests starting\n"); + DPRINT1("Bunch of tests starting\n"); for (i = 0; i < INSERT_COUNT; i++) { next = next->Flink; key = CONTAINING_RECORD(next, KDEVICE_QUEUE_ENTRY, DeviceListEntry)->SortKey; ok(key == i, "Sort key was changed\n"); } - DPRINT1("Arrow of tests complete\n"); + DPRINT1("Bunch of tests completed\n"); trace("****************************************************\n\n"); DPRINT1("KeInsertDeviceQueue test finish\n"); @@ -146,7 +146,6 @@ trace("****************************************************\n\n"); DPRINT1("Finish KeRemoveDeviceQueue test\n"); -//==================================================================== trace("******* Testing KeRemoveEntryDeviceQueue *********** \n"); DPRINT1("\nStart KeRemoveEntryDeviceQueue test\n"); @@ -157,13 +156,13 @@ KeInsertDeviceQueue(testing_queue, elem_array[i]); } - //Delete half elements + /* Delete half of all elements in the queue */ DPRINT1("Deleting elements\n"); for (i = 0; i < INSERT_COUNT / 2; i++) { ok(KeRemoveEntryDeviceQueue(testing_queue, elem_array[i * 2 + 1]), "Element is not deleted\n"); } - //Checking queue + /* Checking queue */ DPRINT1("Checking\n"); next = &testing_queue->DeviceListHead; for (i = 0; i < INSERT_COUNT / 2 + 1; i++) { @@ -171,15 +170,14 @@ next = next->Flink; } - //Trying delete elements, which are not in this queue + /* Trying delete elements, which are not in this queue */ DPRINT1("Trying delete nonexistent elements\n"); for (i = 0; i < INSERT_COUNT / 2; i++) { ok(!KeRemoveEntryDeviceQueue(testing_queue, elem_array[i * 2 + 1]), "Wrong remove operation\n"); } trace("****************************************************\n\n"); -//Îñâîáîæäåíåè ïàìÿòè -//==================================================================== + /* Freeing memory */ for (i = 0; i < INSERT_COUNT; i++) { ExFreePool(elem_array[i]); }

1 0

[hbelusca] 59551: [HAL] Update the PCI hardware IDs. Extracted from the pci.ids database from http://pciids.sourceforge.net/ from 2013.07.20 Maintained by Martin Mares <mj@ucw.cz> and other volunte...
by hbelusca＠svn.reactos.org 21 Jul '13

21 Jul '13

Author: hbelusca Date: Sun Jul 21 23:03:04 2013 New Revision: 59551 URL: http://svn.reactos.org/svn/reactos?rev=59551&view=rev Log: [HAL] Update the PCI hardware IDs. Extracted from the pci.ids database from http://pciids.sourceforge.net/ from 2013.07.20 Maintained by Martin Mares <mj(a)ucw.cz> and other volunteers from the PCI ID Project at http://pci-ids.ucw.cz/. Modified: trunk/reactos/hal/halx86/legacy/bus/pci_classes.ids trunk/reactos/hal/halx86/legacy/bus/pci_vendors.ids [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/hal/halx86/legacy/bus/pci_classes.ids URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pci_… Modified: trunk/reactos/hal/halx86/legacy/bus/pci_vendors.ids URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pci_…

1 0

[tkreuzer] 59550: [DIBLIB] Fix right-to-left SRCCOPY, silence a warning [WIN32K] Improve EngBitBlt and EndCopyBits to properly handle device managed surfaces and support RLE compression.
by tkreuzer＠svn.reactos.org 21 Jul '13

21 Jul '13

Author: tkreuzer Date: Sun Jul 21 20:33:10 2013 New Revision: 59550 URL: http://svn.reactos.org/svn/reactos?rev=59550&view=rev Log: [DIBLIB] Fix right-to-left SRCCOPY, silence a warning [WIN32K] Improve EngBitBlt and EndCopyBits to properly handle device managed surfaces and support RLE compression. Modified: branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCCOPY.c branches/dib_rewrite/win32ss/gdi/diblib/DibLib.h branches/dib_rewrite/win32ss/gdi/eng/bitblt_new.c Modified: branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCCOPY.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCCOPY.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/BitBlt_SRCCOPY.c [iso-8859-1] Sun Jul 21 20:33:10 2013 @@ -24,13 +24,38 @@ } } +VOID +FASTCALL +Dib_BitBlt_SRCCOPY_EqSurfR2L(PBLTDATA pBltData) +{ + ULONG cLines, cjWidth; + PBYTE pjDestBase = pBltData->siDst.pjBase; + PBYTE pjSrcBase = pBltData->siSrc.pjBase; + + /* Calculate the width in bytes */ + cjWidth = pBltData->ulWidth * pBltData->siDst.jBpp / 8; + + pjDestBase -= (cjWidth - 1); + pjSrcBase -= (cjWidth - 1); + + /* Loop all lines */ + cLines = pBltData->ulHeight; + while (cLines--) + { + /* Use memmove to handle copying right-to-left with overlap */ + memmove(pjDestBase, pjSrcBase, cjWidth); + pjDestBase += pBltData->siDst.cjAdvanceY; + pjSrcBase += pBltData->siSrc.cjAdvanceY; + } +} + #define Dib_BitBlt_SRCCOPY_S8_D8_EqSurf Dib_BitBlt_SRCCOPY_EqSurf #define Dib_BitBlt_SRCCOPY_S16_D16_EqSurf Dib_BitBlt_SRCCOPY_EqSurf #define Dib_BitBlt_SRCCOPY_S24_D24_EqSurf Dib_BitBlt_SRCCOPY_EqSurf -#define Dib_BitBlt_SRCCOPY_S8_D8_EqSurfR2L Dib_BitBlt_SRCCOPY_EqSurf -#define Dib_BitBlt_SRCCOPY_S16_D16_EqSurfR2L Dib_BitBlt_SRCCOPY_EqSurf -#define Dib_BitBlt_SRCCOPY_S24_D24_EqSurfR2L Dib_BitBlt_SRCCOPY_EqSurf -#define Dib_BitBlt_SRCCOPY_S32_D32_EqSurfR2L Dib_BitBlt_SRCCOPY_EqSurf +#define Dib_BitBlt_SRCCOPY_S8_D8_EqSurfR2L Dib_BitBlt_SRCCOPY_EqSurfR2L +#define Dib_BitBlt_SRCCOPY_S16_D16_EqSurfR2L Dib_BitBlt_SRCCOPY_EqSurfR2L +#define Dib_BitBlt_SRCCOPY_S24_D24_EqSurfR2L Dib_BitBlt_SRCCOPY_EqSurfR2L +#define Dib_BitBlt_SRCCOPY_S32_D32_EqSurfR2L Dib_BitBlt_SRCCOPY_EqSurfR2L /* special movsd optimization on x86, only for left-to-right */ #if defined(_M_IX86) || defined(_M_AMD64) @@ -60,6 +85,7 @@ /* This definition will be checked against in DibLib_BitBlt.h for all "redirected" functions */ #define Dib_BitBlt_SRCCOPY_EqSurf_manual 1 +#define Dib_BitBlt_SRCCOPY_EqSurfR2L_manual 1 #define __USES_SOURCE 1 #define __USES_PATTERN 0 Modified: branches/dib_rewrite/win32ss/gdi/diblib/DibLib.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/diblib/… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/diblib/DibLib.h [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/diblib/DibLib.h [iso-8859-1] Sun Jul 21 20:33:10 2013 @@ -8,6 +8,7 @@ #include <stdarg.h> #include <windef.h> #include <wingdi.h> +#define _ENGINE_EXPORT_ #include <winddi.h> #ifdef _OPTIMIZE_DIBLIB Modified: branches/dib_rewrite/win32ss/gdi/eng/bitblt_new.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/eng/bit… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/eng/bitblt_new.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/eng/bitblt_new.c [iso-8859-1] Sun Jul 21 20:33:10 2013 @@ -14,6 +14,184 @@ }; #endif + +BOOL +APIENTRY +EngSrcBufferedBitBlt ( + _Inout_ SURFOBJ *psoTrg, + _In_ SURFOBJ *psoSrc, + _In_opt_ SURFOBJ *psoMask, + _In_opt_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ RECTL *prclTrg, + _When_(psoSrc, _In_) POINTL *pptlSrc, + _When_(psoMask, _In_) POINTL *pptlMask, + _In_opt_ BRUSHOBJ *pbo, + _When_(pbo, _In_) POINTL *pptlBrush, + _In_ ROP4 rop4) +{ + BOOL bResult; + PSURFACE psurfTmp; + SURFOBJ* psoTmp; + RECTL rclTmp; + ULONG iTmpBitmapFormat; + + /* Setup the target rect for the temp surface */ + rclTmp.left = 0; + rclTmp.top = 0; + rclTmp.right = prclTrg->right - prclTrg->left; + rclTmp.bottom = prclTrg->bottom - prclTrg->top; + + /* Get the bitmap format for the temp surface */ + iTmpBitmapFormat = psoSrc->iBitmapFormat; + if (iTmpBitmapFormat == BMF_4RLE) iTmpBitmapFormat = BMF_4BPP; + if (iTmpBitmapFormat == BMF_8RLE) iTmpBitmapFormat = BMF_8BPP; + + /* Allocate a surface */ + psurfTmp = SURFACE_AllocSurface(STYPE_BITMAP, + rclTmp.right, + rclTmp.bottom, + iTmpBitmapFormat, + 0, + 0, + NULL); + if (psurfTmp == NULL) + { + ERR("Failed to allocate a surface\n"); + return FALSE; + } + + psoTmp = &psurfTmp->SurfObj; + + /* Check if we have an RLE compressed source */ + if ((psoSrc->iBitmapFormat == BMF_4RLE) || + (psoSrc->iBitmapFormat == BMF_8RLE)) + { + SIZEL sizl; + + /* Decompress the bitmap */ + sizl.cx = rclTmp.right; + sizl.cy = rclTmp.bottom; + DecompressBitmap(sizl, + psoSrc->pvBits, + psoTmp->pvBits, + psoTmp->lDelta, + psoSrc->iBitmapFormat); + bResult = TRUE; + } + else if ((psoSrc->iBitmapFormat > BMF_8RLE)) + { + ERR("Bitmap format %d is not supported!\n", psoSrc->iBitmapFormat); + return FALSE; + } + else + { + /* Copy the bits to the temp surface */ + bResult = EngCopyBits(psoTmp, psoSrc, NULL, NULL, &rclTmp, pptlSrc); + } + + if (bResult) + { + /* Do the actual operation from the temp surface */ + bResult = IntEngBitBlt(psoTrg, + psoTmp, + psoMask, + pco, + pxlo, + prclTrg, + (PPOINTL)&rclTmp, + pptlMask, + pbo, + pptlBrush, + rop4); + } + + /* Delete the temp surface */ + GDIOBJ_vDeleteObject(&psurfTmp->BaseObject); + + return bResult; +} + +BOOL +APIENTRY +EngTrgBufferedBitBlt ( + _Inout_ SURFOBJ *psoTrg, + _In_opt_ SURFOBJ *psoSrc, + _In_opt_ SURFOBJ *psoMask, + _In_opt_ CLIPOBJ *pco, + _In_opt_ XLATEOBJ *pxlo, + _In_ RECTL *prclTrg, + _When_(psoSrc, _In_) POINTL *pptlSrc, + _When_(psoMask, _In_) POINTL *pptlMask, + _In_opt_ BRUSHOBJ *pbo, + _When_(pbo, _In_) POINTL *pptlBrush, + _In_ ROP4 rop4) +{ + BOOL bResult = TRUE; + PSURFACE psurfTmp; + SURFOBJ* psoTmp; + RECTL rclTmp; + ULONG iTmpBitmapFormat; + + /* Setup the target rect for the temp surface */ + rclTmp.left = 0; + rclTmp.top = 0; + rclTmp.right = prclTrg->right - prclTrg->left; + rclTmp.bottom = prclTrg->bottom - prclTrg->top; + + /* Get the bitmap format for the temp surface */ + iTmpBitmapFormat = psoTrg->iBitmapFormat; + + /* Allocate a surface */ + psurfTmp = SURFACE_AllocSurface(STYPE_BITMAP, + rclTmp.right, + rclTmp.bottom, + iTmpBitmapFormat, + 0, + 0, + NULL); + if (psurfTmp == NULL) + { + ERR("Failed to allocate a surface\n"); + return FALSE; + } + + psoTmp = &psurfTmp->SurfObj; + + /* Check if the ROP uses the target pixels */ + if (ROP4_USES_DEST(rop4)) + { + /* Copy the target bits to the target surface */ + bResult = EngCopyBits(psoTmp, psoSrc, NULL, NULL, &rclTmp, (PPOINTL)prclTrg); + } + + if (bResult) + { + /* Do the actual operation to the temp surface */ + bResult = IntEngBitBlt(psoTmp, + psoSrc, + psoMask, + pco, + pxlo, + &rclTmp, + pptlSrc, + pptlMask, + pbo, + pptlBrush, + rop4); + } + + if (bResult) + { + /* Copy the bits to the target surface */ + bResult = EngCopyBits(psoTrg, psoTmp, NULL, NULL, prclTrg, (PPOINTL)&rclTmp); + } + + /* Delete the temp surface */ + GDIOBJ_vDeleteObject(&psurfTmp->BaseObject); + + return bResult; +} static void @@ -98,7 +276,7 @@ BOOL APIENTRY -EngBitBlt( +EngBitBlt ( _Inout_ SURFOBJ *psoTrg, _In_opt_ SURFOBJ *psoSrc, _In_opt_ SURFOBJ *psoMask, @@ -112,37 +290,63 @@ _In_ ROP4 rop4) { BLTDATA bltdata; - ULONG i, iFunctionIndex, iDirection = CD_ANY; - RECTL rcTrg; + ULONG i, iFunctionIndex, iDirection; PFN_DIBFUNCTION pfnBitBlt; BOOL bEnumMore; RECT_ENUM rcenum; PSIZEL psizlPat; SURFOBJ *psoPattern; + PFN_DrvCopyBits pfnCopyBits; //static int count = 0; //if (++count >= 1230) __debugbreak(); /* Sanity checks */ - ASSERT(psoTrg); - ASSERT(psoTrg->iBitmapFormat >= BMF_1BPP); - ASSERT(psoTrg->iBitmapFormat <= BMF_32BPP); - ASSERT(prclTrg); - ASSERT(prclTrg->left >= 0); - ASSERT(prclTrg->top >= 0); - ASSERT(prclTrg->right <= psoTrg->sizlBitmap.cx); - ASSERT(prclTrg->bottom <= psoTrg->sizlBitmap.cy); + NT_ASSERT(psoTrg); + NT_ASSERT(psoTrg->iBitmapFormat >= BMF_1BPP); + NT_ASSERT(psoTrg->iBitmapFormat <= BMF_32BPP); + NT_ASSERT(prclTrg); + NT_ASSERT(prclTrg->left >= 0); + NT_ASSERT(prclTrg->top >= 0); + NT_ASSERT(prclTrg->right <= psoTrg->sizlBitmap.cx); + NT_ASSERT(prclTrg->bottom <= psoTrg->sizlBitmap.cy); ASSERT_DEVLOCK(psoTrg); ASSERT_DEVLOCK(psoSrc); ASSERT_DEVLOCK(psoMask); - rcTrg = *prclTrg; - + /* Check if the target is not a bitmap */ + if (psoTrg->iType != STYPE_BITMAP) + { + /* Check for special case SRCCOPY to device */ + if ((rop4 == ROP4_SRCCOPY) && + ((psoSrc->iType == STYPE_BITMAP) || (psoSrc->hdev == psoTrg->hdev))) + { + /* Use the driver's DrvCopyBits */ + pfnCopyBits = GDIDEVFUNCS(psoTrg).CopyBits; + return pfnCopyBits(psoTrg, psoSrc, pco, pxlo, prclTrg, pptlSrc); + } + + /* We need to do a buffered bitblt */ + return EngTrgBufferedBitBlt(psoTrg, + psoSrc, + psoMask, + pco, + pxlo, + prclTrg, + pptlSrc, + pptlMask, + pbo, + pptlBrush, + rop4); + } + + if (!pxlo) pxlo = &gexloTrivial.xlo; + + /* Initialize the BLTINFO structure */ bltdata.dy = 1; bltdata.rop4 = rop4; bltdata.apfnDoRop[0] = gapfnRop[ROP4_BKGND(rop4)]; bltdata.apfnDoRop[1] = gapfnRop[ROP4_FGND(rop4)]; - if (!pxlo) pxlo = &gexloTrivial.xlo; bltdata.pxlo = pxlo; bltdata.pfnXlate = XLATEOBJ_pfnXlate(pxlo); @@ -150,30 +354,61 @@ if (ROP4_USES_SOURCE(rop4)) { /* Sanity checks */ - ASSERT(psoSrc); - ASSERT(psoSrc->iBitmapFormat >= BMF_1BPP); - ASSERT(psoSrc->iBitmapFormat <= BMF_32BPP); - ASSERT(pptlSrc); - ASSERT(pptlSrc->x >= 0); - ASSERT(pptlSrc->y >= 0); - ASSERT(pptlSrc->x <= psoSrc->sizlBitmap.cx); - ASSERT(pptlSrc->y <= psoSrc->sizlBitmap.cy); - - /* Check if source and target are equal */ + NT_ASSERT(psoSrc); + NT_ASSERT(psoSrc->iBitmapFormat >= BMF_1BPP); + NT_ASSERT(psoSrc->iBitmapFormat <= BMF_8RLE); + NT_ASSERT(pptlSrc); + NT_ASSERT(pptlSrc->x >= 0); + NT_ASSERT(pptlSrc->y >= 0); + NT_ASSERT(pptlSrc->x <= psoSrc->sizlBitmap.cx); + NT_ASSERT(pptlSrc->y <= psoSrc->sizlBitmap.cy); + + /* Check for special case SRCCOPY from device */ + if ((rop4 == ROP4_SRCCOPY) && + (psoSrc->iType != STYPE_BITMAP) && + ((psoTrg->iType == STYPE_BITMAP) || (psoSrc->hdev == psoTrg->hdev))) + { + /* Use the driver's DrvCopyBits */ + pfnCopyBits = GDIDEVFUNCS(psoSrc).CopyBits; + return pfnCopyBits(psoTrg, psoSrc, pco, pxlo, prclTrg, pptlSrc); + } + + /* Check if the source is not a normal bitmap */ + if ((psoSrc->iType != STYPE_BITMAP) || + (psoSrc->iBitmapFormat > BMF_32BPP)) + { + /* We need to do a buffered bitblt */ + return EngSrcBufferedBitBlt(psoTrg, + psoSrc, + psoMask, + pco, + pxlo, + prclTrg, + pptlSrc, + pptlMask, + pbo, + pptlBrush, + rop4); + } + + /* Check if source and target surface are equal */ if (psoSrc == psoTrg) { /* Analyze the copying direction */ - if (rcTrg.top > pptlSrc->y) + if (prclTrg->top > pptlSrc->y) { /* Need to copy from bottom to top */ - iDirection = rcTrg.left < pptlSrc->x ? CD_RIGHTUP : CD_LEFTUP; + iDirection = prclTrg->left < pptlSrc->x ? CD_RIGHTUP : CD_LEFTUP; bltdata.dy = -1; } else - iDirection = rcTrg.left < pptlSrc->x ? CD_RIGHTDOWN : CD_LEFTDOWN; + { + /* We copy from top to bottom */ + iDirection = prclTrg->left < pptlSrc->x ? CD_RIGHTDOWN : CD_LEFTDOWN; + } /* Check for special right to left case */ - if ((rcTrg.top == pptlSrc->y) && (rcTrg.left > pptlSrc->x)) + if ((prclTrg->top == pptlSrc->y) && (prclTrg->left > pptlSrc->x)) { /* Use 0 as target format to get special right to left versions */ bltdata.siDst.iFormat = 0; @@ -189,11 +424,12 @@ } else { + iDirection = CD_ANY; bltdata.siDst.iFormat = psoTrg->iBitmapFormat; bltdata.siSrc.iFormat = psoSrc->iBitmapFormat; } - /* Set the source format info */ + /* Set the rest of the source format info */ bltdata.siSrc.pvScan0 = psoSrc->pvScan0; bltdata.siSrc.lDelta = psoSrc->lDelta; bltdata.siSrc.cjAdvanceY = bltdata.dy * psoSrc->lDelta; @@ -201,10 +437,11 @@ } else { + iDirection = CD_ANY; bltdata.siDst.iFormat = psoTrg->iBitmapFormat; } - /* Set the destination format info */ + /* Set the rest of the destination format info */ bltdata.siDst.pvScan0 = psoTrg->pvScan0; bltdata.siDst.lDelta = psoTrg->lDelta; bltdata.siDst.cjAdvanceY = bltdata.dy * psoTrg->lDelta; @@ -214,7 +451,7 @@ if (ROP4_USES_PATTERN(rop4)) { /* Must have a brush */ - ASSERT(pbo); // FIXME: test this! + NT_ASSERT(pbo); // FIXME: test this! /* Copy the solid color */ bltdata.ulSolidColor = pbo->iSolidColor; @@ -258,8 +495,8 @@ if (ROP4_USES_MASK(rop4)) { /* Must have a mask surface and point */ - ASSERT(psoMask); - ASSERT(pptlMask); + NT_ASSERT(psoMask); + NT_ASSERT(pptlMask); //__debugbreak(); @@ -307,7 +544,7 @@ else { /* Use the target rect */ - rcenum.arcl[0] = rcTrg; + rcenum.arcl[0] = *prclTrg; rcenum.c = 1; bEnumMore = FALSE; } @@ -319,7 +556,7 @@ for (i = 0; i < rcenum.c; i++) { /* Intersect this rect with the target rect */ - if (!RECTL_bIntersectRect(&rcenum.arcl[i], &rcenum.arcl[i], &rcTrg)) + if (!RECTL_bIntersectRect(&rcenum.arcl[i], &rcenum.arcl[i], prclTrg)) { /* This rect is outside the bounds, continue */ continue; @@ -396,11 +633,11 @@ //__debugbreak(); /* Sanity checks */ - ASSERT(IS_VALID_ROP4(rop4)); - ASSERT(psoTrg); - ASSERT(psoTrg->iBitmapFormat >= BMF_1BPP); - ASSERT(psoTrg->iBitmapFormat <= BMF_32BPP); - ASSERT(prclTrg); + NT_ASSERT(IS_VALID_ROP4(rop4)); + NT_ASSERT(psoTrg); + NT_ASSERT(psoTrg->iBitmapFormat >= BMF_1BPP); + NT_ASSERT(psoTrg->iBitmapFormat <= BMF_32BPP); + NT_ASSERT(prclTrg); /* Clip the target rect to the extents of the target surface */ rcClipped.left = max(prclTrg->left, 0); @@ -409,10 +646,11 @@ rcClipped.bottom = min(prclTrg->bottom, psoTrg->sizlBitmap.cy); /* If no clip object is given, use trivial one */ - if (!pco) pco = (CLIPOBJ*)&gxcoTrivial; - - /* Check if there is something to clip */ - if (pco->iDComplexity != DC_TRIVIAL) + if (pco == NULL) + pco = (CLIPOBJ*)&gxcoTrivial; + + /* Check if there is anything to clip */ + else if (pco->iDComplexity != DC_TRIVIAL) { /* Clip the target rect to the bounds of the clipping region */ if (!RECTL_bIntersectRect(&rcClipped, &rcClipped, &pco->rclBounds)) @@ -420,10 +658,11 @@ /* Nothing left */ return TRUE; } - } - - /* Don't pass a clip object with a single rectangle */ - if (pco->iDComplexity == DC_RECT) pco = (CLIPOBJ*)&gxcoTrivial; + + /* Don't pass a clip object with a single rectangle */ + if (pco->iDComplexity == DC_RECT) + pco = (CLIPOBJ*)&gxcoTrivial; + } /* Calculate initial offset and size */ ptOffset.x = rcClipped.left - prclTrg->left; @@ -435,8 +674,8 @@ if (ROP4_USES_SOURCE(rop4)) { /* Must have a source surface and point */ - ASSERT(psoSrc); - ASSERT(pptlSrc); + NT_ASSERT(psoSrc); + NT_ASSERT(pptlSrc); /* Get the source point */ ptSrc = *pptlSrc; @@ -455,8 +694,8 @@ if (ROP4_USES_MASK(rop4)) { /* Must have a mask surface and point */ - ASSERT(psoMask); - ASSERT(pptlMask); + NT_ASSERT(psoMask); + NT_ASSERT(pptlMask); /* Get the mask point */ ptMask = *pptlMask; @@ -503,7 +742,7 @@ (SURFOBJ_flags(psoSrc) & HOOK_BITBLT)) { ERR("Need to copy to standard bitmap format!\n"); - ASSERT(FALSE); + NT_ASSERT(FALSE); } pfnBitBlt = GDIDEVFUNCS(psoTrg).BitBlt; @@ -636,12 +875,33 @@ { PFN_DrvCopyBits pfnCopyBits; + /* Check if we have 2 incompatible non-bitmap surfaces */ + if ((psoSrc->iType != STYPE_BITMAP) && + (psoTrg->iType != STYPE_BITMAP) && + (psoSrc->hdev != psoTrg->hdev)) + { + /* We need to create a temp bitmap */ + return EngSrcBufferedBitBlt(psoTrg, + psoSrc, + NULL, + pco, + pxlo, + prclTrg, + pptlSrc, + NULL, + NULL, + NULL, + ROP4_SRCCOPY); + } + /* Is the target surface device managed? */ - if (SURFOBJ_flags(psoTrg) & HOOK_COPYBITS) + if ((psoTrg->iType != STYPE_BITMAP) || + (SURFOBJ_flags(psoTrg) & HOOK_COPYBITS)) { pfnCopyBits = GDIDEVFUNCS(psoTrg).CopyBits; } - if (SURFOBJ_flags(psoSrc) & HOOK_COPYBITS) + else if ((psoSrc->iType != STYPE_BITMAP) || + (SURFOBJ_flags(psoSrc) & HOOK_COPYBITS)) { pfnCopyBits = GDIDEVFUNCS(psoSrc).CopyBits; }

1 0

[akhaldi] 59549: [LIBXSLT] * Silence some warnings.
by akhaldi＠svn.reactos.org 21 Jul '13

21 Jul '13

Author: akhaldi Date: Sun Jul 21 16:57:57 2013 New Revision: 59549 URL: http://svn.reactos.org/svn/reactos?rev=59549&view=rev Log: [LIBXSLT] * Silence some warnings. Modified: trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt Modified: trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/CMake… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] Sun Jul 21 16:57:57 2013 @@ -47,6 +47,6 @@ add_cd_file(TARGET libxslt DESTINATION reactos/system32 FOR all) if(NOT MSVC) - add_target_compile_flags(libxslt "-Wno-pointer-sign") + add_target_compile_flags(libxslt "-Wno-pointer-sign -Wno-unused-but-set-variable -Wno-unused-function") allow_warnings(libxslt) endif()

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