Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[dreimer] 34519: Progress. Should work now.
by dreimer＠svn.reactos.org 15 Jul '08

15 Jul '08

Author: dreimer Date: Tue Jul 15 07:38:49 2008 New Revision: 34519 URL: http://svn.reactos.org/svn/reactos?rev=34519&view=rev Log: Progress. Should work now. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Tue Jul 15 07:38:49 2008 @@ -2,6 +2,7 @@ - Added: Tool to set the Architecture to build ROS for. (Daniel Reimer) - Updated: NASM to 2.03.01 (Daniel Reimer) +- Updated: NSIS to 2.38 (Daniel Reimer) - Updated: Subversion to 1.5 (Daniel Reimer) - Updated: GDB to 6.8-3 (Daniel Reimer) - Updated: Binutils 2.18.50 Build 20080109. (Daniel Reimer) Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Tue Jul 15 07:38:49 2008 @@ -170,8 +170,16 @@ File /r Components\Tools\libeay32.dll File /r Components\Tools\ssleay32.dll File /r Components\Tools\libaprutil.dll + File /r Components\Tools\libdb44.dll File /r Components\Tools\libapriconv.dll - File /r Components\Tools\libdb44.dll + File /r Components\Tools\libsvn_client-1.dll + File /r Components\Tools\libsvn_delta-1.dll + File /r Components\Tools\libsvn_diff-1.dll + File /r Components\Tools\libsvn_fs-1.dll + File /r Components\Tools\libsvn_ra-1.dll + File /r Components\Tools\libsvn_repos-1.dll + File /r Components\Tools\libsvn_subr-1.dll + File /r Components\Tools\libsvn_wc-1.dll SetOutPath "$INSTDIR\Tools\licenses" SetOverwrite try File /r Components\Tools\licenses\*.* @@ -222,7 +230,20 @@ File /r Root\Config.cmd SectionEnd -Section -StartMenuShortcuts SEC10 +Section "PowerShell RosBE Version" SEC10 + SetShellVarContext current + SetOutPath "$INSTDIR" + SetOverwrite try + File /r Root\sSVN.cmd + File /r Components\Powershell\Build.ps1 + File /r Components\Powershell\Clean.ps1 + File /r Components\Powershell\Help.ps1 + File /r Components\Powershell\MinGW.ps1 + File /r Components\Powershell\RosBE.ps1 + File /r Components\Powershell\rosbe-gcc-env.ps1 +SectionEnd + +Section -StartMenuShortcuts SEC11 SetShellVarContext current ;; @@ -242,7 +263,7 @@ !insertmacro MUI_STARTMENU_WRITE_END SectionEnd -Section /o "Desktop Shortcuts" SEC11 +Section /o "Desktop Shortcuts" SEC12 SetShellVarContext current ;; @@ -254,7 +275,7 @@ CreateShortCut "$DESKTOP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" SectionEnd -Section /o "Quick Launch Shortcuts" SEC12 +Section /o "Quick Launch Shortcuts" SEC13 SetShellVarContext current ;; @@ -266,7 +287,7 @@ CreateShortCut "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" SectionEnd -Section -Post SEC13 +Section -Post SEC14 WriteUninstaller "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\RosBE.cmd" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"

1 0

[dreimer] 34518: RosBE v1.3 in teh works.
by dreimer＠svn.reactos.org 15 Jul '08

15 Jul '08

Author: dreimer Date: Tue Jul 15 06:53:40 2008 New Revision: 34518 URL: http://svn.reactos.org/svn/reactos?rev=34518&view=rev Log: RosBE v1.3 in teh works. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Tue Jul 15 06:53:40 2008 @@ -1,6 +1,14 @@ -*** XXX xxrd, 2008 - RosBE 1.3 Released +*** July 17th, 2008 - RosBE 1.3 Released - Added: Tool to set the Architecture to build ROS for. (Daniel Reimer) +- Updated: NASM to 2.03.01 (Daniel Reimer) +- Updated: Subversion to 1.5 (Daniel Reimer) +- Updated: GDB to 6.8-3 (Daniel Reimer) +- Updated: Binutils 2.18.50 Build 20080109. (Daniel Reimer) +- Updated: MingW32 Make 3.81-3 (Daniel Reimer) +- Updated: ccache 2.4 is now a native Version Without Cygwin (Colin Finck) +- Other small Fixes here and there (Daniel Reimer) +- Added: Basic PowerShell Version of RosBE (Daniel Reimer) *** January 23rd, 2008 - RosBE 1.2 Released Modified: trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/LIC… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/LICENSE.txt [iso-8859-1] Tue Jul 15 06:53:40 2008 @@ -1,4 +1,4 @@ -ReactOS Build Environment v1.2 +ReactOS Build Environment v1.3 Various parts of the ReactOS Build Environment are under different license's, the license's are as follows. (The complete text for each license is included in this document excluding Subversion) Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Tue Jul 15 06:53:40 2008 @@ -21,7 +21,7 @@ color 0A if not defined APPDATA set APPDATA=%USERPROFILE% set PATH=%SystemRoot%\system32;%SystemRoot% -set _ROSBE_VERSION=1.2 +set _ROSBE_VERSION=1.3 set _ROSBE_BASEDIR=%~dp0 set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1% set _ROSBE_MODE=RosBE Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Tue Jul 15 06:53:40 2008 @@ -1,5 +1,5 @@ !define PRODUCT_NAME "ReactOS Build Environment for Windows" -!define PRODUCT_VERSION "1.2" +!define PRODUCT_VERSION "1.3" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKCU" @@ -17,13 +17,13 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "1.2.0.0" +VIAddVersionKey /LANG=1033 "FileVersion" "1.3.0.0" VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" VIAddVersionKey /LANG=1033 "CompanyName" "ReactOS Team" -VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2007 ReactOS Team" -VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2007 ReactOS Team" +VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2008 ReactOS Team" +VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2008 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" VIProductVersion "1.2.0.0" @@ -192,7 +192,6 @@ SetOutPath "$INSTDIR\4.1.3\bin" SetOverwrite try File /r Components\Tools\ccache.exe - File /r Components\Tools\cygwin1.dll SectionEnd Section "GDB - The GNU Project Debugger" SEC07

1 0

[pschweitzer] 34517: Refactored kernel MCB management: - Splitted existing functions in two files largemcb.c and mcb.c - Stubbed (from win2k3) FsRtlInitializeBaseMcb, FsRtlUninitializeBaseMcb, FsRtlResetBaseMcb, FsRtlTruncateBaseMcb, FsRtlAddBaseMcbEntry, FsRtlRemoveBaseMcbEntry, FsRtlLookupBaseMcbEntry, FsRtlLookupLastBaseMcbEntry, FsRtlLookupLastBaseMcbEntryAndIndex, FsRtlGetNextBaseMcbEntry, FsRtlSplitBaseMcb - Implemented FsRtlNumberOfRunsInBaseMcb - Added missing definitions to ntifs.h
by pschweitzer＠svn.reactos.org 15 Jul '08

15 Jul '08

Author: pschweitzer Date: Tue Jul 15 06:34:36 2008 New Revision: 34517 URL: http://svn.reactos.org/svn/reactos?rev=34517&view=rev Log: Refactored kernel MCB management: - Splitted existing functions in two files largemcb.c and mcb.c - Stubbed (from win2k3) FsRtlInitializeBaseMcb, FsRtlUninitializeBaseMcb, FsRtlResetBaseMcb, FsRtlTruncateBaseMcb, FsRtlAddBaseMcbEntry, FsRtlRemoveBaseMcbEntry, FsRtlLookupBaseMcbEntry, FsRtlLookupLastBaseMcbEntry, FsRtlLookupLastBaseMcbEntryAndIndex, FsRtlGetNextBaseMcbEntry, FsRtlSplitBaseMcb - Implemented FsRtlNumberOfRunsInBaseMcb - Added missing definitions to ntifs.h Added: branches/pierre-fsd/ntoskrnl/fsrtl/mcb.c (with props) Modified: branches/pierre-fsd/include/ddk/ntifs.h branches/pierre-fsd/ntoskrnl/fsrtl/largemcb.c branches/pierre-fsd/ntoskrnl/ntoskrnl-generic.rbuild Modified: branches/pierre-fsd/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/include/ddk/ntifs.h?… ============================================================================== --- branches/pierre-fsd/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/pierre-fsd/include/ddk/ntifs.h [iso-8859-1] Tue Jul 15 06:34:36 2008 @@ -324,6 +324,8 @@ #define MAP_PROCESS 1L #define MAP_SYSTEM 2L #define MEM_DOS_LIM 0x40000000 + +#define MCB_FLAG_RAISE_ON_ALLOCATION_FAILURE 1 #define OB_TYPE_TYPE 1 #define OB_TYPE_DIRECTORY 2 @@ -3187,6 +3189,303 @@ IN OUT POPLOCK Oplock ); +NTKERNELAPI +VOID +NTAPI +FsRtlInitializeLargeMcb ( + IN PLARGE_MCB Mcb, + IN POOL_TYPE PoolType +); + +NTKERNELAPI +VOID +NTAPI +FsRtlUninitializeLargeMcb ( + IN PLARGE_MCB Mcb +); + +NTKERNELAPI +VOID +NTAPI +FsRtlResetLargeMcb ( + IN PLARGE_MCB Mcb, + IN BOOLEAN SelfSynchronized +); + +NTKERNELAPI +VOID +NTAPI +FsRtlTruncateLargeMcb ( + IN PLARGE_MCB Mcb, + IN LONGLONG Vbn +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlAddLargeMcbEntry ( + IN PLARGE_MCB Mcb, + IN LONGLONG Vbn, + IN LONGLONG Lbn, + IN LONGLONG SectorCount +); + +NTKERNELAPI +VOID +NTAPI +FsRtlRemoveLargeMcbEntry ( + IN PLARGE_MCB Mcb, + IN LONGLONG Vbn, + IN LONGLONG SectorCount +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlLookupLargeMcbEntry ( + IN PLARGE_MCB Mcb, + IN LONGLONG Vbn, + OUT PLONGLONG Lbn OPTIONAL, + OUT PLONGLONG SectorCountFromLbn OPTIONAL, + OUT PLONGLONG StartingLbn OPTIONAL, + OUT PLONGLONG SectorCountFromStartingLbn OPTIONAL, + OUT PULONG Index OPTIONAL +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlLookupLastLargeMcbEntry ( + IN PLARGE_MCB Mcb, + OUT PLONGLONG Vbn, + OUT PLONGLONG Lbn +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlLookupLastLargeMcbEntryAndIndex ( + IN PLARGE_MCB OpaqueMcb, + OUT PLONGLONG LargeVbn, + OUT PLONGLONG LargeLbn, + OUT PULONG Index +); + +NTKERNELAPI +ULONG +NTAPI +FsRtlNumberOfRunsInLargeMcb ( + IN PLARGE_MCB Mcb +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlGetNextLargeMcbEntry ( + IN PLARGE_MCB Mcb, + IN ULONG RunIndex, + OUT PLONGLONG Vbn, + OUT PLONGLONG Lbn, + OUT PLONGLONG SectorCount +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlSplitLargeMcb ( + IN PLARGE_MCB Mcb, + IN LONGLONG Vbn, + IN LONGLONG Amount +); + +NTKERNELAPI +VOID +NTAPI +FsRtlInitializeBaseMcb ( + IN PBASE_MCB Mcb, + IN POOL_TYPE PoolType +); + +NTKERNELAPI +VOID +NTAPI +FsRtlUninitializeBaseMcb ( + IN PBASE_MCB Mcb +); + +NTKERNELAPI +VOID +NTAPI +FsRtlResetBaseMcb ( + IN PBASE_MCB Mcb +); + +NTKERNELAPI +VOID +NTAPI +FsRtlTruncateBaseMcb ( + IN PBASE_MCB Mcb, + IN LONGLONG Vbn +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlAddBaseMcbEntry ( + IN PBASE_MCB Mcb, + IN LONGLONG Vbn, + IN LONGLONG Lbn, + IN LONGLONG SectorCount +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlRemoveBaseMcbEntry ( + IN PBASE_MCB Mcb, + IN LONGLONG Vbn, + IN LONGLONG SectorCount +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlLookupBaseMcbEntry ( + IN PBASE_MCB Mcb, + IN LONGLONG Vbn, + OUT PLONGLONG Lbn OPTIONAL, + OUT PLONGLONG SectorCountFromLbn OPTIONAL, + OUT PLONGLONG StartingLbn OPTIONAL, + OUT PLONGLONG SectorCountFromStartingLbn OPTIONAL, + OUT PULONG Index OPTIONAL +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlLookupLastBaseMcbEntry ( + IN PBASE_MCB Mcb, + OUT PLONGLONG Vbn, + OUT PLONGLONG Lbn +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlLookupLastBaseMcbEntryAndIndex ( + IN PBASE_MCB OpaqueMcb, + IN OUT PLONGLONG LargeVbn, + IN OUT PLONGLONG LargeLbn, + IN OUT PULONG Index +); + +NTKERNELAPI +ULONG +NTAPI +FsRtlNumberOfRunsInBaseMcb ( + IN PBASE_MCB Mcb +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlGetNextBaseMcbEntry ( + IN PBASE_MCB Mcb, + IN ULONG RunIndex, + OUT PLONGLONG Vbn, + OUT PLONGLONG Lbn, + OUT PLONGLONG SectorCount +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlSplitBaseMcb ( + IN PBASE_MCB Mcb, + IN LONGLONG Vbn, + IN LONGLONG Amount +); + +NTKERNELAPI +VOID +NTAPI +FsRtlInitializeMcb ( + IN PMCB Mcb, + IN POOL_TYPE PoolType +); + +NTKERNELAPI +VOID +NTAPI +FsRtlUninitializeMcb ( + IN PMCB Mcb +); + +NTKERNELAPI +VOID +NTAPI +FsRtlTruncateMcb ( + IN PMCB Mcb, + IN VBN Vbn +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlAddMcbEntry ( + IN PMCB Mcb, + IN VBN Vbn, + IN LBN Lbn, + IN ULONG SectorCount +); + +NTKERNELAPI +VOID +NTAPI +FsRtlRemoveMcbEntry ( + IN PMCB Mcb, + IN VBN Vbn, + IN ULONG SectorCount +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlLookupMcbEntry ( + IN PMCB Mcb, + IN VBN Vbn, + OUT PLBN Lbn, + OUT PULONG SectorCount OPTIONAL, + OUT PULONG Index +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlLookupLastMcbEntry ( + IN PMCB Mcb, + OUT PVBN Vbn, + OUT PLBN Lbn +); + +NTKERNELAPI +ULONG +NTAPI +FsRtlNumberOfRunsInMcb ( + IN PMCB Mcb +); + +NTKERNELAPI +BOOLEAN +NTAPI +FsRtlGetNextMcbEntry ( + IN PMCB Mcb, + IN ULONG RunIndex, + OUT PVBN Vbn, + OUT PLBN Lbn, + OUT PULONG SectorCount +); + NTHALAPI VOID NTAPI Modified: branches/pierre-fsd/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/large… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] Tue Jul 15 06:34:36 2008 @@ -2,8 +2,9 @@ * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/fsrtl/largemcb.c - * PURPOSE: Mapping Control Block (MCB) support for File System Drivers + * PURPOSE: Large Mapped Control Block (MCB) support for File System Drivers * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Pierre Schweitzer (heis_spiter(a)hotmail.com) */ /* INCLUDES ******************************************************************/ @@ -13,6 +14,20 @@ #include <debug.h> /* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @unimplemented + */ +BOOLEAN +NTAPI +FsRtlAddBaseMcbEntry(IN PBASE_MCB Mcb, + IN LONGLONG Vbn, + IN LONGLONG Lbn, + IN LONGLONG SectorCount) +{ + KEBUGCHECK(0); + return FALSE; +} /* * @unimplemented @@ -29,21 +44,21 @@ } /* - * @implemented - */ -BOOLEAN -NTAPI -FsRtlAddMcbEntry(IN PMCB Mcb, - IN VBN Vbn, - IN LBN Lbn, - IN ULONG SectorCount) -{ - /* Call the newer function */ - return FsRtlAddLargeMcbEntry(&Mcb-> - DummyFieldThatSizesThisStructureCorrectly, - (LONGLONG)Vbn, - (LONGLONG)Lbn, - (LONGLONG)SectorCount); + * @unimplemented + */ +BOOLEAN +NTAPI +FsRtlGetNextBaseMcbEntry(IN PBASE_MCB Mcb, + IN ULONG RunIndex, + OUT PLONGLONG Vbn, + OUT PLONGLONG Lbn, + OUT PLONGLONG SectorCount) +{ + KEBUGCHECK(0); + *Vbn = 0; + *Lbn = 0; + *SectorCount= 0; + return FALSE; } /* @@ -65,36 +80,14 @@ } /* - * @implemented - */ -BOOLEAN -NTAPI -FsRtlGetNextMcbEntry(IN PMCB Mcb, - IN ULONG RunIndex, - OUT PVBN Vbn, - OUT PLBN Lbn, - OUT PULONG SectorCount) -{ - BOOLEAN Return = FALSE; - LONGLONG llVbn; - LONGLONG llLbn; - LONGLONG llSectorCount; - - /* Call the Large version */ - Return = FsRtlGetNextLargeMcbEntry( - &Mcb->DummyFieldThatSizesThisStructureCorrectly, - RunIndex, - &llVbn, - &llLbn, - &llSectorCount); - - /* Return the lower 32 bits */ - *Vbn = (ULONG)llVbn; - *Lbn = (ULONG)llLbn; - *SectorCount = (ULONG)llSectorCount; - - /* And return the original value */ - return Return; + * @unimplemented + */ +VOID +NTAPI +FsRtlInitializeBaseMcb(IN PBASE_MCB Mcb, + IN POOL_TYPE PoolType) +{ + KEBUGCHECK(0); } /* @@ -109,16 +102,22 @@ } /* - * @implemented - */ -VOID -NTAPI -FsRtlInitializeMcb(IN PMCB Mcb, - IN POOL_TYPE PoolType) -{ - /* Call the newer function */ - FsRtlInitializeLargeMcb(&Mcb->DummyFieldThatSizesThisStructureCorrectly, - PoolType); + * @unimplemented + */ +BOOLEAN +NTAPI +FsRtlLookupBaseMcbEntry(IN PBASE_MCB Mcb, + IN LONGLONG Vbn, + OUT PLONGLONG Lbn OPTIONAL, + OUT PLONGLONG SectorCountFromLbn OPTIONAL, + OUT PLONGLONG StartingLbn OPTIONAL, + OUT PLONGLONG SectorCountFromStartingLbn OPTIONAL, + OUT PULONG Index OPTIONAL) +{ + KEBUGCHECK(0); + *Lbn = 0; + *SectorCountFromLbn = 0; + return FALSE; } /* @@ -145,6 +144,23 @@ */ BOOLEAN NTAPI +FsRtlLookupLastBaseMcbEntryAndIndex(IN PBASE_MCB OpaqueMcb, + IN OUT PLONGLONG LargeVbn, + IN OUT PLONGLONG LargeLbn, + IN OUT PULONG Index) +{ + KEBUGCHECK(0); + *LargeVbn = 0; + *LargeLbn = 0; + *Index = 0; + return FALSE; +} + +/* + * @unimplemented + */ +BOOLEAN +NTAPI FsRtlLookupLastLargeMcbEntryAndIndex(IN PLARGE_MCB OpaqueMcb, OUT PLONGLONG LargeVbn, OUT PLONGLONG LargeLbn, @@ -162,72 +178,36 @@ */ BOOLEAN NTAPI +FsRtlLookupLastBaseMcbEntry(IN PBASE_MCB Mcb, + OUT PLONGLONG Vbn, + OUT PLONGLONG Lbn) +{ + KEBUGCHECK(0); + return FALSE; +} + +/* + * @unimplemented + */ +BOOLEAN +NTAPI FsRtlLookupLastLargeMcbEntry(IN PLARGE_MCB Mcb, OUT PLONGLONG Vbn, OUT PLONGLONG Lbn) { KEBUGCHECK(0); - return(FALSE); + return FALSE; } /* * @implemented */ -BOOLEAN -NTAPI -FsRtlLookupLastMcbEntry(IN PMCB Mcb, - OUT PVBN Vbn, - OUT PLBN Lbn) -{ - BOOLEAN Return = FALSE; - LONGLONG llVbn = 0; - LONGLONG llLbn = 0; - - /* Call the Large version */ - Return = FsRtlLookupLastLargeMcbEntry( - &Mcb->DummyFieldThatSizesThisStructureCorrectly, - &llVbn, - &llLbn); - - /* Return the lower 32-bits */ - *Vbn = (ULONG)llVbn; - *Lbn = (ULONG)llLbn; - - /* And return the original value */ - return Return; -} - -/* - * @implemented - */ -BOOLEAN -NTAPI -FsRtlLookupMcbEntry(IN PMCB Mcb, - IN VBN Vbn, - OUT PLBN Lbn, - OUT PULONG SectorCount OPTIONAL, - OUT PULONG Index) -{ - BOOLEAN Return = FALSE; - LONGLONG llLbn; - LONGLONG llSectorCount; - - /* Call the Large version */ - Return = FsRtlLookupLargeMcbEntry(&Mcb-> - DummyFieldThatSizesThisStructureCorrectly, - (LONGLONG)Vbn, - &llLbn, - &llSectorCount, - NULL, - NULL, - Index); - - /* Return the lower 32-bits */ - *Lbn = (ULONG)llLbn; - if (SectorCount) *SectorCount = (ULONG)llSectorCount; - - /* And return the original value */ - return Return; +ULONG +NTAPI +FsRtlNumberOfRunsInBaseMcb(IN PBASE_MCB Mcb) +{ + /* Return the count */ + return Mcb->PairCount; } /* @@ -249,15 +229,16 @@ } /* - * @implemented - */ -ULONG -NTAPI -FsRtlNumberOfRunsInMcb (IN PMCB Mcb) -{ - /* Call the newer function */ - return FsRtlNumberOfRunsInLargeMcb( - &Mcb->DummyFieldThatSizesThisStructureCorrectly); + * @unimplemented + */ +BOOLEAN +NTAPI +FsRtlRemoveBaseMcbEntry(IN PBASE_MCB Mcb, + IN LONGLONG Vbn, + IN LONGLONG SectorCount) +{ + KEBUGCHECK(0); + return FALSE; } /* @@ -273,18 +254,13 @@ } /* - * @implemented - */ -VOID -NTAPI -FsRtlRemoveMcbEntry(IN PMCB Mcb, - IN VBN Vbn, - IN ULONG SectorCount) -{ - /* Call the large function */ - FsRtlRemoveLargeMcbEntry(&Mcb->DummyFieldThatSizesThisStructureCorrectly, - (LONGLONG)Vbn, - (LONGLONG)SectorCount); + * @unimplemented + */ +VOID +NTAPI +FsRtlResetBaseMcb(IN PBASE_MCB Mcb) +{ + KEBUGCHECK(0); } /* @@ -296,6 +272,19 @@ IN BOOLEAN SelfSynchronized) { KEBUGCHECK(0); +} + +/* + * @unimplemented + */ +BOOLEAN +NTAPI +FsRtlSplitBaseMcb(IN PBASE_MCB Mcb, + IN LONGLONG Vbn, + IN LONGLONG Amount) +{ + KEBUGCHECK(0); + return FALSE; } /* @@ -316,6 +305,17 @@ */ VOID NTAPI +FsRtlTruncateBaseMcb(IN PBASE_MCB Mcb, + IN LONGLONG Vbn) +{ + KEBUGCHECK(0); +} + +/* + * @unimplemented + */ +VOID +NTAPI FsRtlTruncateLargeMcb(IN PLARGE_MCB Mcb, IN LONGLONG Vbn) { @@ -323,16 +323,13 @@ } /* - * @implemented - */ -VOID -NTAPI -FsRtlTruncateMcb (IN PMCB Mcb, - IN VBN Vbn) -{ - /* Call the newer function */ - FsRtlTruncateLargeMcb(&Mcb->DummyFieldThatSizesThisStructureCorrectly, - (LONGLONG)Vbn); + * @unimplemented + */ +VOID +NTAPI +FsRtlUninitializeBaseMcb(IN PBASE_MCB Mcb) +{ + KEBUGCHECK(0); } /* @@ -345,14 +342,3 @@ KEBUGCHECK(0); } -/* - * @implemented - */ -VOID -NTAPI -FsRtlUninitializeMcb(IN PMCB Mcb) -{ - /* Call the newer function */ - FsRtlUninitializeLargeMcb(&Mcb->DummyFieldThatSizesThisStructureCorrectly); -} - Added: branches/pierre-fsd/ntoskrnl/fsrtl/mcb.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/mcb.c… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/mcb.c (added) +++ branches/pierre-fsd/ntoskrnl/fsrtl/mcb.c [iso-8859-1] Tue Jul 15 06:34:36 2008 @@ -1,0 +1,190 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/fsrtl/mcb.c + * PURPOSE: Mapped Control Block (MCB) support for File System Drivers + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +BOOLEAN +NTAPI +FsRtlAddMcbEntry(IN PMCB Mcb, + IN VBN Vbn, + IN LBN Lbn, + IN ULONG SectorCount) +{ + /* Call the newer function */ + return FsRtlAddLargeMcbEntry(&Mcb-> + DummyFieldThatSizesThisStructureCorrectly, + (LONGLONG)Vbn, + (LONGLONG)Lbn, + (LONGLONG)SectorCount); +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +FsRtlGetNextMcbEntry(IN PMCB Mcb, + IN ULONG RunIndex, + OUT PVBN Vbn, + OUT PLBN Lbn, + OUT PULONG SectorCount) +{ + BOOLEAN Return = FALSE; + LONGLONG llVbn; + LONGLONG llLbn; + LONGLONG llSectorCount; + + /* Call the Large version */ + Return = FsRtlGetNextLargeMcbEntry( + &Mcb->DummyFieldThatSizesThisStructureCorrectly, + RunIndex, + &llVbn, + &llLbn, + &llSectorCount); + + /* Return the lower 32 bits */ + *Vbn = (ULONG)llVbn; + *Lbn = (ULONG)llLbn; + *SectorCount = (ULONG)llSectorCount; + + /* And return the original value */ + return Return; +} + +/* + * @implemented + */ +VOID +NTAPI +FsRtlInitializeMcb(IN PMCB Mcb, + IN POOL_TYPE PoolType) +{ + /* Call the newer function */ + FsRtlInitializeLargeMcb(&Mcb->DummyFieldThatSizesThisStructureCorrectly, + PoolType); +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +FsRtlLookupLastMcbEntry(IN PMCB Mcb, + OUT PVBN Vbn, + OUT PLBN Lbn) +{ + BOOLEAN Return = FALSE; + LONGLONG llVbn = 0; + LONGLONG llLbn = 0; + + /* Call the Large version */ + Return = FsRtlLookupLastLargeMcbEntry( + &Mcb->DummyFieldThatSizesThisStructureCorrectly, + &llVbn, + &llLbn); + + /* Return the lower 32-bits */ + *Vbn = (ULONG)llVbn; + *Lbn = (ULONG)llLbn; + + /* And return the original value */ + return Return; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +FsRtlLookupMcbEntry(IN PMCB Mcb, + IN VBN Vbn, + OUT PLBN Lbn, + OUT PULONG SectorCount OPTIONAL, + OUT PULONG Index) +{ + BOOLEAN Return = FALSE; + LONGLONG llLbn; + LONGLONG llSectorCount; + + /* Call the Large version */ + Return = FsRtlLookupLargeMcbEntry(&Mcb-> + DummyFieldThatSizesThisStructureCorrectly, + (LONGLONG)Vbn, + &llLbn, + &llSectorCount, + NULL, + NULL, + Index); + + /* Return the lower 32-bits */ + *Lbn = (ULONG)llLbn; + if (SectorCount) *SectorCount = (ULONG)llSectorCount; + + /* And return the original value */ + return Return; +} + +/* + * @implemented + */ +ULONG +NTAPI +FsRtlNumberOfRunsInMcb(IN PMCB Mcb) +{ + /* Call the newer function */ + return FsRtlNumberOfRunsInLargeMcb( + &Mcb->DummyFieldThatSizesThisStructureCorrectly); +} + +/* + * @implemented + */ +VOID +NTAPI +FsRtlRemoveMcbEntry(IN PMCB Mcb, + IN VBN Vbn, + IN ULONG SectorCount) +{ + /* Call the large function */ + FsRtlRemoveLargeMcbEntry(&Mcb->DummyFieldThatSizesThisStructureCorrectly, + (LONGLONG)Vbn, + (LONGLONG)SectorCount); +} + +/* + * @implemented + */ +VOID +NTAPI +FsRtlTruncateMcb(IN PMCB Mcb, + IN VBN Vbn) +{ + /* Call the newer function */ + FsRtlTruncateLargeMcb(&Mcb->DummyFieldThatSizesThisStructureCorrectly, + (LONGLONG)Vbn); +} + +/* + * @implemented + */ +VOID +NTAPI +FsRtlUninitializeMcb(IN PMCB Mcb) +{ + /* Call the newer function */ + FsRtlUninitializeLargeMcb(&Mcb->DummyFieldThatSizesThisStructureCorrectly); +} Propchange: branches/pierre-fsd/ntoskrnl/fsrtl/mcb.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/pierre-fsd/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/ntoskrnl-ge… ============================================================================== --- branches/pierre-fsd/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Tue Jul 15 06:34:36 2008 @@ -218,6 +218,7 @@ <file>fsfilter.c</file> <file>fsrtlpc.c</file> <file>largemcb.c</file> + <file>mcb.c</file> <file>name.c</file> <file>notify.c</file> <file>oplock.c</file>

1 0

[mkupfer] 34516: Maciej Bialas <bjauy AT tlen DOT pl> - Updated polish version of dll/cpl/usrmgr - See issue #3480 for more details.
by mkupfer＠svn.reactos.org 15 Jul '08

15 Jul '08

Author: mkupfer Date: Tue Jul 15 03:21:27 2008 New Revision: 34516 URL: http://svn.reactos.org/svn/reactos?rev=34516&view=rev Log: Maciej Bialas <bjauy AT tlen DOT pl> - Updated polish version of dll/cpl/usrmgr - See issue #3480 for more details. Modified: trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.rc Modified: trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.rc [iso-8859-1] Tue Jul 15 03:21:27 2008 @@ -57,6 +57,8 @@ LTEXT "Nale¿y do:", -1, 7, 7, 56, 8 CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 18, 238, 173, WS_EX_CLIENTEDGE + PUSHBUTTON "Dodaj...", IDC_USER_MEMBERSHIP_ADD, 7, 197, 50, 14 + PUSHBUTTON "Usuñ", IDC_USER_MEMBERSHIP_REMOVE, 61, 197, 50, 14, WS_DISABLED END @@ -92,6 +94,8 @@ LTEXT "Cz³onkowie:", -1, 7, 63, 45, 8 CONTROL "", IDC_GROUP_GENERAL_MEMBERS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 74, 238, 117, WS_EX_CLIENTEDGE + PUSHBUTTON "Dodaj...", IDC_GROUP_GENERAL_ADD, 7, 197, 50, 14, WS_DISABLED + PUSHBUTTON "Usuñ", IDC_GROUP_GENERAL_REMOVE, 61, 197, 50, 14, WS_DISABLED END @@ -147,6 +151,20 @@ END +IDD_USER_ADD_MEMBERSHIP DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Przynale¿noæ do grup" +FONT 8, "MS Shell Dlg" +BEGIN +LTEXT "Nale¿y do:", -1, 7, 7, 56, 8 +CONTROL "", IDC_USER_ADD_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, +7, 18, 238, 173, WS_EX_CLIENTEDGE +DEFPUSHBUTTON "OK",IDOK,156,197,50,14 +PUSHBUTTON "Anuluj",IDCANCEL,210,197,50,14 +END + + + /* Menus */ IDM_POPUP_GROUP MENU DISCARDABLE

1 0

[mkupfer] 34515: Mario Kacmar <kario AT szm DOT sk> - Slovak translation of several inf-files - See #3518 for more details.
by mkupfer＠svn.reactos.org 15 Jul '08

15 Jul '08

Author: mkupfer Date: Tue Jul 15 03:10:44 2008 New Revision: 34515 URL: http://svn.reactos.org/svn/reactos?rev=34515&view=rev Log: Mario Kacmar <kario AT szm DOT sk> - Slovak translation of several inf-files - See #3518 for more details. Modified: trunk/reactos/media/inf/display.inf trunk/reactos/media/inf/fdc.inf trunk/reactos/media/inf/hdc.inf trunk/reactos/media/inf/ports.inf trunk/reactos/media/inf/usb.inf trunk/reactos/media/inf/usbstor.inf Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/display.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/display.inf [iso-8859-1] Tue Jul 15 03:10:44 2008 @@ -72,9 +72,14 @@ - + + + + + + Modified: trunk/reactos/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/fdc.inf?rev=3451… ============================================================================== --- trunk/reactos/media/inf/fdc.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/fdc.inf [iso-8859-1] Tue Jul 15 03:10:44 2008 @@ -69,5 +69,12 @@ + + +e + +e + + Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=3451… ============================================================================== --- trunk/reactos/media/inf/hdc.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/hdc.inf [iso-8859-1] Tue Jul 15 03:10:44 2008 @@ -83,5 +83,13 @@ + + +e + +e + + + Modified: trunk/reactos/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ports.inf?rev=34… ============================================================================== --- trunk/reactos/media/inf/ports.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/ports.inf [iso-8859-1] Tue Jul 15 03:10:44 2008 @@ -91,4 +91,16 @@ - + + + + + + +n + +n + +o + +o Modified: trunk/reactos/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usb.inf?rev=3451… ============================================================================== --- trunk/reactos/media/inf/usb.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/usb.inf [iso-8859-1] Tue Jul 15 03:10:44 2008 @@ -47,4 +47,12 @@ + + + +o +) + +o +" Modified: trunk/reactos/media/inf/usbstor.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbstor.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/usbstor.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/usbstor.inf [iso-8859-1] Tue Jul 15 03:10:44 2008 @@ -48,4 +48,8 @@ + + + +

1 0

[tkreuzer] 34514: IntRectangle: - use coordinate transformation - if transform is not diagonal, call IntGdiPolygon IntRectangle/IntGdiPolygon: - use special locking order to avoid lockups - don't unlock objects that weren't locked IntGdiPie: - if transform is cheese, call IntGdiCheeseCake
by tkreuzer＠svn.reactos.org 15 Jul '08

15 Jul '08

Author: tkreuzer Date: Mon Jul 14 21:06:38 2008 New Revision: 34514 URL: http://svn.reactos.org/svn/reactos?rev=34514&view=rev Log: IntRectangle: - use coordinate transformation - if transform is not diagonal, call IntGdiPolygon IntRectangle/IntGdiPolygon: - use special locking order to avoid lockups - don't unlock objects that weren't locked IntGdiPie: - if transform is cheese, call IntGdiCheeseCake Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Mon Jul 14 21:06:38 2008 @@ -73,10 +73,6 @@ Dc_Attr = dc->pDc_Attr; if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); - /* FIXME - BitmapObj can be NULL!!!! don't assert but handle this case gracefully! */ - ASSERT(BitmapObj); - /* Convert to screen coordinates */ IntLPtoDP(dc, UnsafePoints, Count); for (CurrentPoint = 0; CurrentPoint < Count; CurrentPoint++) @@ -99,17 +95,22 @@ DestRect.bottom = max(DestRect.bottom, UnsafePoints[CurrentPoint].y); } + /* Special locking order to avoid lock-ups */ + FillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); + PenBrushObj = PENOBJ_LockPen(Dc_Attr->hpen); + BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); + /* FIXME - BitmapObj can be NULL!!!! don't assert but handle this case gracefully! */ + ASSERT(BitmapObj); + /* Now fill the polygon with the current brush. */ - FillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); if (FillBrushObj && !(FillBrushObj->flAttrs & GDIBRUSH_IS_NULL)) { IntGdiInitBrushInstance(&FillBrushInst, FillBrushObj, dc->XlateBrush); ret = FillPolygon ( dc, BitmapObj, &FillBrushInst.BrushObject, ROP2_TO_MIX(Dc_Attr->jROP2), UnsafePoints, Count, DestRect ); } - BRUSHOBJ_UnlockBrush(FillBrushObj); - - /* get BRUSHOBJ from current pen. */ - PenBrushObj = PENOBJ_LockPen(Dc_Attr->hpen); + if (FillBrushObj) + BRUSHOBJ_UnlockBrush(FillBrushObj); + // Draw the Polygon Edges with the current pen ( if not a NULL pen ) if (PenBrushObj && !(PenBrushObj->flAttrs & GDIBRUSH_IS_NULL)) { @@ -149,7 +150,8 @@ ROP2_TO_MIX(Dc_Attr->jROP2)); /* MIX */ } } - PENOBJ_UnlockPen(PenBrushObj); + if (PenBrushObj) + PENOBJ_UnlockPen(PenBrushObj); } BITMAPOBJ_UnlockBitmap(BitmapObj); @@ -524,8 +526,8 @@ int RightRect, int BottomRect) { - BITMAPOBJ *BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); - PGDIBRUSHOBJ PenBrushObj, FillBrushObj; + BITMAPOBJ *BitmapObj = NULL; + PGDIBRUSHOBJ PenBrushObj = NULL, FillBrushObj = NULL; GDIBRUSHINST PenBrushInst, FillBrushInst; BOOL ret = FALSE; // default to failure RECTL DestRect; @@ -533,29 +535,54 @@ PDC_ATTR Dc_Attr; ASSERT ( dc ); // caller's responsibility to set this up - /* FIXME - BitmapObj can be NULL!!! Don't assert but handle this case gracefully! */ - ASSERT ( BitmapObj ); Dc_Attr = dc->pDc_Attr; if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + /* Do we rotate or shear? */ +// if (!(dc->DcLevel.mxWorldToDevice.flAccel & MXACC_DIAGONAL)) + if (dc->DcLevel.xformWorld2Vport.eM12 != 0. || dc->DcLevel.xformWorld2Vport.eM21 != 0.) + { + POINTL DestCoords[4]; + DestCoords[0].x = DestCoords[3].x = LeftRect; + DestCoords[0].y = DestCoords[1].y = TopRect; + DestCoords[1].x = DestCoords[2].x = RightRect; + DestCoords[2].y = DestCoords[3].y = BottomRect; + return IntGdiPolygon(dc, DestCoords, 4); + } + if ( PATH_IsPathOpen(dc->DcLevel) ) { - ret = PATH_Rectangle ( dc, LeftRect, TopRect, RightRect, BottomRect ); - } - else - { - LeftRect += dc->ptlDCOrig.x; - RightRect += dc->ptlDCOrig.x - 1; - TopRect += dc->ptlDCOrig.y; - BottomRect += dc->ptlDCOrig.y - 1; - + return PATH_Rectangle ( dc, LeftRect, TopRect, RightRect, BottomRect ); + } + + { DestRect.left = LeftRect; DestRect.right = RightRect; - DestRect.top = TopRect; + DestRect.top = TopRect; DestRect.bottom = BottomRect; + IntLPtoDP(dc, (LPPOINT)&DestRect, 2); + + DestRect.left += dc->ptlDCOrig.x; + DestRect.right += dc->ptlDCOrig.x - 1; + DestRect.top += dc->ptlDCOrig.y; + DestRect.bottom += dc->ptlDCOrig.y - 1; + + /* Special locking order to avoid lock-ups! */ FillBrushObj = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); + PenBrushObj = PENOBJ_LockPen(Dc_Attr->hpen); + if (!PenBrushObj) + { + ret = FALSE; + goto cleanup; + } + BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); + if (!BitmapObj) + { + ret = FALSE; + goto cleanup; + } if ( FillBrushObj ) { @@ -576,17 +603,6 @@ } } - BRUSHOBJ_UnlockBrush(FillBrushObj); - - /* get BRUSHOBJ from current pen. */ - PenBrushObj = PENOBJ_LockPen(Dc_Attr->hpen); - if (PenBrushObj == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - BITMAPOBJ_UnlockBitmap(BitmapObj); - return FALSE; - } - IntGdiInitBrushInstance(&PenBrushInst, PenBrushObj, dc->XlatePen); // Draw the rectangle with the current pen @@ -599,41 +615,48 @@ ret = ret && IntEngLineTo(&BitmapObj->SurfObj, dc->CombinedClip, &PenBrushInst.BrushObject, - LeftRect, TopRect, RightRect, TopRect, + DestRect.left, DestRect.top, DestRect.right, DestRect.top, &DestRect, // Bounding rectangle Mix); ret = ret && IntEngLineTo(&BitmapObj->SurfObj, dc->CombinedClip, &PenBrushInst.BrushObject, - RightRect, TopRect, RightRect, BottomRect, + DestRect.right, DestRect.top, DestRect.right, DestRect.bottom, &DestRect, // Bounding rectangle Mix); ret = ret && IntEngLineTo(&BitmapObj->SurfObj, dc->CombinedClip, &PenBrushInst.BrushObject, - RightRect, BottomRect, LeftRect, BottomRect, + DestRect.right, DestRect.bottom, DestRect.left, DestRect.bottom, &DestRect, // Bounding rectangle Mix); ret = ret && IntEngLineTo(&BitmapObj->SurfObj, dc->CombinedClip, &PenBrushInst.BrushObject, - LeftRect, BottomRect, LeftRect, TopRect, + DestRect.left, DestRect.bottom, DestRect.left, DestRect.top, &DestRect, // Bounding rectangle Mix); } + } + +cleanup: + if (FillBrushObj) + BRUSHOBJ_UnlockBrush(FillBrushObj); + + if (PenBrushObj) PENOBJ_UnlockPen(PenBrushObj); - } - - BITMAPOBJ_UnlockBitmap(BitmapObj); + + if (BitmapObj) + BITMAPOBJ_UnlockBitmap(BitmapObj); /* Move current position in DC? MSDN: The current position is neither used nor updated by Rectangle. */ - return TRUE; + return ret; } BOOL

1 0

[mkupfer] 34513: - Fixes country codes. - See issue #3488 for more details.
by mkupfer＠svn.reactos.org 14 Jul '08

14 Jul '08

Author: mkupfer Date: Mon Jul 14 17:55:37 2008 New Revision: 34513 URL: http://svn.reactos.org/svn/reactos?rev=34513&view=rev Log: - Fixes country codes. - See issue #3488 for more details. Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Mon Jul 14 17:55:37 2008 @@ -997,9 +997,9 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\64","Name",0x00000000,"New Zealand" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\7","CountryCode",0x00010001,0x00000007 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\7","Name",0x00000000,"Russia" -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\705","CountryCode",0x00010001,0x00000007 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\705","CountryCode",0x00010001,0x000002C1 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\705","Name",0x00000000,"Kazakhstan" -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\708","CountryCode",0x00010001,0x00000007 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\708","CountryCode",0x00010001,0x000002C4 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\708","Name",0x00000000,"Tajikistan" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\81","CountryCode",0x00010001,0x00000051 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\81","Name",0x00000000,"Japan" Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] Mon Jul 14 17:55:37 2008 @@ -997,9 +997,9 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\64","Name",0x00000000,"New Zealand" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\7","CountryCode",0x00010001,0x00000007 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\7","Name",0x00000000,"Russia" -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\705","CountryCode",0x00010001,0x00000007 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\705","CountryCode",0x00010001,0x000002C1 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\705","Name",0x00000000,"Kazakhstan" -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\708","CountryCode",0x00010001,0x00000007 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\708","CountryCode",0x00010001,0x000002C4 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\708","Name",0x00000000,"Tajikistan" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\81","CountryCode",0x00010001,0x00000051 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\81","Name",0x00000000,"Japan"

1 0

[silverblade] 34512: Implemented WODM_BREAKLOOP (as used by waveOutBreakLoop). When playback is occurring between a buffer marked with WHDR_BEGINLOOP and a buffer marked with WHDR_ENDLOOP and this is called, the "remaining loops" counter is set to zero so that when the end buffer of the loop is reached, looping does not occur.
by silverblade＠svn.reactos.org 14 Jul '08

14 Jul '08

Author: silverblade Date: Mon Jul 14 17:52:11 2008 New Revision: 34512 URL: http://svn.reactos.org/svn/reactos?rev=34512&view=rev Log: Implemented WODM_BREAKLOOP (as used by waveOutBreakLoop). When playback is occurring between a buffer marked with WHDR_BEGINLOOP and a buffer marked with WHDR_ENDLOOP and this is called, the "remaining loops" counter is set to zero so that when the end buffer of the loop is reached, looping does not occur. Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wave.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/snd… ============================================================================== --- branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] Mon Jul 14 17:52:11 2008 @@ -185,7 +185,7 @@ WaveHeaders[0].lpData = (PVOID) Buffer; WaveHeaders[0].dwBufferLength = 1000000; WaveHeaders[0].dwFlags = WHDR_PREPARED | WHDR_BEGINLOOP; - WaveHeaders[0].dwLoops = 0; + WaveHeaders[0].dwLoops = 5; WaveHeaders[1].lpData = (PVOID) ((PCHAR)Buffer + 1000000); WaveHeaders[1].dwBufferLength = 1000000; @@ -217,6 +217,9 @@ // SOUND_DEBUG_HEX(Result); + POPUP("Click for WODM_BREAKLOOP"); + Result = wodMessage(0, WODM_BREAKLOOP, (DWORD) InstanceData, (DWORD) 0, 0); + POPUP("Click for WODM_PAUSE"); Result = wodMessage(0, WODM_PAUSE, (DWORD) InstanceData, (DWORD) 0, 0); Modified: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Mon Jul 14 17:52:11 2008 @@ -236,6 +236,7 @@ MMSETWAVESTATE_FUNC PauseWaveDevice; MMSETWAVESTATE_FUNC RestartWaveDevice; MMSETWAVESTATE_FUNC ResetWaveDevice; + MMSETWAVESTATE_FUNC BreakWaveDeviceLoop; } MMFUNCTION_TABLE, *PMMFUNCTION_TABLE; @@ -676,6 +677,14 @@ DefaultResetWaveDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); +MMRESULT +BreakWaveDeviceLoop( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); + +MMRESULT +DefaultBreakWaveDeviceLoop( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance); + /* wave/wodMessage.c Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/devices.c [iso-8859-1] Mon Jul 14 17:52:11 2008 @@ -67,6 +67,7 @@ Device->Functions.PauseWaveDevice = DefaultPauseWaveDevice; Device->Functions.RestartWaveDevice = DefaultRestartWaveDevice; Device->Functions.ResetWaveDevice = DefaultResetWaveDevice; + Device->Functions.BreakWaveDeviceLoop = DefaultBreakWaveDeviceLoop; if ( ! SourceFunctionTable ) { @@ -128,6 +129,12 @@ { Device->Functions.ResetWaveDevice = SourceFunctionTable->ResetWaveDevice; + } + + if ( SourceFunctionTable->BreakWaveDeviceLoop ) + { + Device->Functions.BreakWaveDeviceLoop = + SourceFunctionTable->BreakWaveDeviceLoop; } TRACE_EXIT(0); Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c [iso-8859-1] Mon Jul 14 17:52:11 2008 @@ -212,3 +212,30 @@ TRACE_EXIT(Result); return Result; } + +MMRESULT +BreakWaveDeviceLoop( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) +{ + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + + return CallUsingSoundThread(SoundDeviceInstance, + BreakWaveDeviceLoop_Request, + NULL); +} + +MMRESULT +DefaultBreakWaveDeviceLoop( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) +{ + ASSERT( SoundDeviceInstance ); + + /* + This will cause the loop to end. Note that the LoopHead member is + left intact otherwise the streaming routine may be processing the + start of the loop and think it's starting a new loop. + */ + SoundDeviceInstance->Streaming.Wave.LoopsRemaining = 0; + + return MMSYSERR_NOERROR; +} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] Mon Jul 14 17:52:11 2008 @@ -326,6 +326,8 @@ State); } +/* These are a bit repetitive... */ + MMRESULT PauseWaveDevice_Request( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, @@ -395,3 +397,25 @@ return Functions->ResetWaveDevice(SoundDeviceInstance); } + +MMRESULT +BreakWaveDeviceLoop_Request( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID Parameter) +{ + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + PMMFUNCTION_TABLE Functions; + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, + &SoundDevice); + ASSERT(Result == MMSYSERR_NOERROR); + + Result = GetSoundDeviceFunctionTable(SoundDevice, + &Functions); + ASSERT(Result == MMSYSERR_NOERROR); + + return Functions->BreakWaveDeviceLoop(SoundDeviceInstance); +} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wave.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wave.h [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wave.h [iso-8859-1] Mon Jul 14 17:52:11 2008 @@ -37,4 +37,9 @@ IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PVOID Parameter); +MMRESULT +BreakWaveDeviceLoop_Request( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PVOID Parameter); + #endif Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Mon Jul 14 17:52:11 2008 @@ -157,7 +157,11 @@ } case WODM_BREAKLOOP : - return MMSYSERR_NOTSUPPORTED; /* yet */ + { + ASSERT(Instance != NULL); + + return BreakWaveDeviceLoop(Instance); + } /* Let WINMM take care of these */ case WODM_PREPARE :

1 0

[mkupfer] 34511: - fix some wrong country codes - fix minor typo in German translation
by mkupfer＠svn.reactos.org 14 Jul '08

14 Jul '08

Author: mkupfer Date: Mon Jul 14 17:41:54 2008 New Revision: 34511 URL: http://svn.reactos.org/svn/reactos?rev=34511&view=rev Log: - fix some wrong country codes - fix minor typo in German translation Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf trunk/reactos/dll/cpl/main/lang/de-DE.rc Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Mon Jul 14 17:41:54 2008 @@ -889,13 +889,13 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List","CountryListVersion",0x00010001,0x00000019 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\1","CountryCode",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\1","Name",0x00000000,"United States of America" -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\106","CountryCode",0x00010001,0x00000001 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\106","CountryCode",0x00010001,0x0000006A HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\106","Name",0x00000000,"British Virgin Islands" -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\107","CountryCode",0x00010001,0x00000001 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\107","CountryCode",0x00010001,0x0000006B HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\107","Name",0x00000000,"Canada" -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\109","CountryCode",0x00010001,0x00000001 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\109","CountryCode",0x00010001,0x0000006D HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\109","Name",0x00000000,"Dominica" -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\110","CountryCode",0x00010001,0x00000001 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\110","CountryCode",0x00010001,0x0000006E HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\110","Name",0x00000000,"Dominican Republic" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\20","CountryCode",0x00010001,0x00000014 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\20","Name",0x00000000,"Egypt" Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] Mon Jul 14 17:41:54 2008 @@ -889,13 +889,13 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List","CountryListVersion",0x00010001,0x00000019 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\1","CountryCode",0x00010001,0x00000001 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\1","Name",0x00000000,"United States of America" -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\106","CountryCode",0x00010001,0x00000001 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\106","CountryCode",0x00010001,0x0000006A HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\106","Name",0x00000000,"British Virgin Islands" -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\107","CountryCode",0x00010001,0x00000001 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\107","CountryCode",0x00010001,0x0000006B HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\107","Name",0x00000000,"Canada" -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\109","CountryCode",0x00010001,0x00000001 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\109","CountryCode",0x00010001,0x0000006D HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\109","Name",0x00000000,"Dominica" -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\110","CountryCode",0x00010001,0x00000001 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\110","CountryCode",0x00010001,0x0000006E HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\110","Name",0x00000000,"Dominican Republic" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\20","CountryCode",0x00010001,0x00000014 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony\Country List\20","Name",0x00000000,"Egypt" Modified: trunk/reactos/dll/cpl/main/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/de-DE.rc [iso-8859-1] Mon Jul 14 17:41:54 2008 @@ -20,7 +20,7 @@ CONTROL "", IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17 LTEXT "&Klicken Sie hier, und drücken Sie zum Testen eine Taste:", -1, 15, 105, 200, 10 EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 115, 200, 15, WS_CHILD | WS_VISIBLE | WS_GROUP - GROUPBOX "&Cursorblinkgeschwindgkeit", -1, 5, 145, 230, 50 + GROUPBOX "&Cursorblinkgeschwindigkeit", -1, 5, 145, 230, 50 LTEXT "", IDC_TEXT_CURSOR_BLINK, 20, 165, 1, 8 LTEXT "Langsam", -1, 35, 165, 33, 10 LTEXT "Schnell", -1, 200, 165, 33, 10

1 0

[silverblade] 34510: Added some more cases to wodMessage (wave out message handler). Also made the WODM_CLOSE message return WAVERR_STILLPLAYING in the case where an application tries to close a sound device before sending a WODM_RESET to stop it.
by silverblade＠svn.reactos.org 14 Jul '08

14 Jul '08

Author: silverblade Date: Mon Jul 14 17:35:26 2008 New Revision: 34510 URL: http://svn.reactos.org/svn/reactos?rev=34510&view=rev Log: Added some more cases to wodMessage (wave out message handler). Also made the WODM_CLOSE message return WAVERR_STILLPLAYING in the case where an application tries to close a sound device before sending a WODM_RESET to stop it. Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Mon Jul 14 17:35:26 2008 @@ -105,18 +105,24 @@ case WODM_CLOSE : { + MMRESULT Result; + DWORD State; //SOUND_DEBUG_HEX(Instance); ASSERT(Instance != NULL); - /* TODO: Ensure its OK to close */ + /* Ensure its OK to close - is this the right state to check? */ + Result = GetWaveDeviceState(Instance, &State); + ASSERT(Result == MMSYSERR_NOERROR); + + if ( State == WAVE_DD_PLAYING ) + return WAVERR_STILLPLAYING; Result = DestroySoundDeviceInstance(Instance); - /*SOUND_DEBUG_HEX(Result);*/ + ASSERT(Result == MMSYSERR_NOERROR); - /* TODO: When do we send the callback? */ + /* TODO: Send the callback */ return Result; - /* CloseSoundDevice() */ } case WODM_WRITE : @@ -151,13 +157,20 @@ } case WODM_BREAKLOOP : - return MMSYSERR_INVALHANDLE; + return MMSYSERR_NOTSUPPORTED; /* yet */ /* Let WINMM take care of these */ case WODM_PREPARE : case WODM_UNPREPARE : return MMSYSERR_NOTSUPPORTED; + /* TODO */ + case WODM_SETVOLUME : + case WODM_GETVOLUME : + case WODM_SETPITCH : + case WODM_GETPITCH : + return MMSYSERR_NOTSUPPORTED; + default : return MMSYSERR_NOTSUPPORTED; }

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008