Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[dreimer] 36611: Updated 64 Bit Target NSIS Script. Still tbd: Proper Uninstall Part.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Oct 1 08:29:19 2008 New Revision: 36611 URL: http://svn.reactos.org/svn/reactos?rev=36611&view=rev Log: Updated 64 Bit Target NSIS Script. Still tbd: Proper Uninstall Part. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi 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] Wed Oct 1 08:29:19 2008 @@ -25,7 +25,7 @@ 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" +VIProductVersion "1.3.0.0" CRCCheck force SetCompressor /FINAL /SOLID lzma Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Wed Oct 1 08:29:19 2008 @@ -1,5 +1,5 @@ -!define PRODUCT_NAME "ReactOS Build Environment for Windows" -!define PRODUCT_VERSION "1.3" +!define PRODUCT_NAME "ReactOS Build Environment for Windows - 64 Bit Target Compiler" +!define PRODUCT_VERSION "1.0" !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" @@ -9,7 +9,7 @@ ;; Basic installer options ;; Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile "RosBE-${PRODUCT_VERSION}.exe" +OutFile "RosBE64-${PRODUCT_VERSION}.exe" InstallDirRegKey HKCU "${PRODUCT_DIR_REGKEY}" "" ShowInstDetails show ShowUnInstDetails show @@ -17,7 +17,7 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "1.3.0.0" +VIAddVersionKey /LANG=1033 "FileVersion" "1.0.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/)" @@ -25,7 +25,7 @@ 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" +VIProductVersion "1.0.0.0" CRCCheck force SetCompressor /FINAL /SOLID lzma @@ -111,155 +111,17 @@ SetOverwrite try File /r Icons\mingw.ico File /r Icons\rosbe.ico - File /r Root\README.pdf - File /r Root\RosBE.mac - File /r Root\changelog.txt File /r Root\LICENSE.txt - File /r Root\MinGW.cmd File /r Root\charch.cmd - File /r Root\MinGW.mac - File /r Root\Build.cmd - File /r Root\chdefgcc.cmd - File /r Root\Clean.cmd - File /r Root\Help.cmd - File /r Root\RosBE.cmd - File /r Root\rosbe-gcc-env.cmd - File /r Root\TimeDate.cmd - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Components\Tools\buildtime.exe - File /r Components\Tools\chknewer.exe - File /r Components\Tools\cpucount.exe - File /r Components\Tools\flash.exe - File /r Components\Tools\getdate.exe - File /r Components\Tools\rquote.exe - File /r Components\Tools\tee.exe SectionEnd Section -MinGWGCCNASM SEC02 SetOutPath "$INSTDIR\4.1.3" SetOverwrite try - File /r Components\4.1.3\*.* -SectionEnd - -Section "RosBE Configurator (options)" SEC03 - SetShellVarContext current - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\options.cmd - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Components\Tools\options.exe - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" - SetOutPath $INSTDIR - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options.lnk" \ - "$INSTDIR\Tools\options.exe" - !insertmacro MUI_STARTMENU_WRITE_END -SectionEnd - -Section "Subversion Tools (svn, ssvn)" SEC04 - SetShellVarContext current - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\sSVN.cmd - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Components\Tools\svn.exe - File /r Components\Tools\intl3_svn.dll - File /r Components\Tools\libapr.dll - 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\libsasl.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\*.* -SectionEnd - -Section "Shortcut Tool (scut)" SEC05 - SetShellVarContext current - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\scut.cmd - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Components\Tools\scut.exe -SectionEnd - -Section "ccache - Compiler Cache" SEC06 - SetShellVarContext current - SetOutPath "$INSTDIR\4.1.3\bin" - SetOverwrite try - File /r Components\Tools\ccache.exe -SectionEnd - -Section "GDB - The GNU Project Debugger" SEC07 - SetShellVarContext current - SetOutPath "$INSTDIR\4.1.3\bin" - SetOverwrite try - File /r Components\Tools\gdb.exe - File /r Components\Tools\gdbserver.exe -SectionEnd - -Section "relAddr2Line Tool" SEC08 - SetShellVarContext current - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\reladdr2line.cmd - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Components\Tools\echoh.exe - File /r Components\Tools\raddr2line.exe - File /r Components\Tools\chkslash.exe -SectionEnd - -Section "Other Tools (chdefdir and config)" SEC09 - SetShellVarContext current - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\chdefdir.cmd - File /r Root\Config.cmd -SectionEnd - -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 "Update Script" SEC11 - SetShellVarContext current - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Components\Tools\wget.exe - File /r Components\Tools\libintl3.dll - File /r Components\Tools\libeay32.dll - File /r Components\Tools\ssleay32.dll - File /r Components\Tools\libiconv2.dll - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\update.cmd -SectionEnd - -Section -StartMenuShortcuts SEC12 + File /r Components\4.4.0\*.* +SectionEnd + +Section -StartMenuShortcuts SEC03 SetShellVarContext current ;; @@ -268,64 +130,50 @@ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" - SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" - SetOutPath $PROFILE - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" SetOutPath $INSTDIR - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE.lnk" \ - "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Readme.lnk" \ - "$INSTDIR\README.pdf" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE - 64 Bit Target.lnk" \ + "$INSTDIR\Uninstall64-${PRODUCT_VERSION}.exe" !insertmacro MUI_STARTMENU_WRITE_END SectionEnd -Section /o "Desktop Shortcuts" SEC13 +Section /o "Desktop Shortcuts" SEC04 SetShellVarContext current ;; ;; Add our desktop shortcuts. ;; - SetOutPath $REACTOS_SOURCE_DIRECTORY - CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" - SetOutPath $PROFILE - CreateShortCut "$DESKTOP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" -SectionEnd - -Section /o "Quick Launch Shortcuts" SEC14 +SectionEnd + +Section /o "Quick Launch Shortcuts" SEC05 SetShellVarContext current ;; ;; Add our quick launch shortcuts. ;; - SetOutPath $REACTOS_SOURCE_DIRECTORY - CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" - SetOutPath $PROFILE - CreateShortCut "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" -SectionEnd - -Section -Post SEC15 - WriteUninstaller "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" +SectionEnd + +Section -Post SEC06 + WriteUninstaller "$INSTDIR\Uninstall64-${PRODUCT_VERSION}.exe" WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\RosBE.cmd" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall64-${PRODUCT_VERSION}.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" SectionEnd Function un.onUninstSuccess HideWindow MessageBox MB_ICONINFORMATION|MB_OK \ - "ReactOS Build Environment was successfully removed from your computer." + "ReactOS Build Environment - 64 Bit Target was successfully removed from your computer." FunctionEnd Function un.onInit MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ - "Are you sure you want to completely remove ReactOS Build Environment and all of its components?" \ + "Are you sure you want to completely remove ReactOS Build Environment - 64 Bit Target and all of its components?" \ IDYES +2 Abort FunctionEnd @@ -338,59 +186,14 @@ ;; Clean up installed files. ;; RMDir /r /REBOOTOK "$INSTDIR\4.1.3" - RMDir /r /REBOOTOK "$INSTDIR\Tools" - RMDir /r /REBOOTOK "$SMPROGRAMS\$ICONS_GROUP" - IfFileExists "$PROFILE\RosBE\." 0 +2 - RMDir /r /REBOOTOK "$PROFILE\RosBE" - IfFileExists "$APPDATA\RosBE\." 0 +2 - RMDir /r /REBOOTOK "$APPDATA\RosBE" - Delete /REBOOTOK "$INSTDIR\Build.cmd" - Delete /REBOOTOK "$INSTDIR\Build.ps1" Delete /REBOOTOK "$INSTDIR\charch.cmd" - Delete /REBOOTOK "$INSTDIR\chdefdir.cmd" - Delete /REBOOTOK "$INSTDIR\chdefgcc.cmd" - Delete /REBOOTOK "$INSTDIR\Clean.cmd" - Delete /REBOOTOK "$INSTDIR\Clean.ps1" - Delete /REBOOTOK "$INSTDIR\Config.cmd" - Delete /REBOOTOK "$INSTDIR\Help.cmd" - Delete /REBOOTOK "$INSTDIR\Help.ps1" - Delete /REBOOTOK "$INSTDIR\MinGW.cmd" - Delete /REBOOTOK "$INSTDIR\MinGW.ps1" - Delete /REBOOTOK "$INSTDIR\options.cmd" - Delete /REBOOTOK "$INSTDIR\reladdr2line.cmd" - Delete /REBOOTOK "$INSTDIR\RosBE.cmd" - Delete /REBOOTOK "$INSTDIR\RosBE.ps1" - Delete /REBOOTOK "$INSTDIR\rosbe-gcc-env.cmd" - Delete /REBOOTOK "$INSTDIR\rosbe-gcc-env.ps1" - Delete /REBOOTOK "$INSTDIR\scut.cmd" - Delete /REBOOTOK "$INSTDIR\sSVN.cmd" - Delete /REBOOTOK "$INSTDIR\TimeDate.cmd" - Delete /REBOOTOK "$INSTDIR\update.cmd" - Delete /REBOOTOK "$INSTDIR\README.pdf" - Delete /REBOOTOK "$INSTDIR\rosbe.ico" - Delete /REBOOTOK "$INSTDIR\mingw.ico" - Delete /REBOOTOK "$INSTDIR\uninstall.ico" - Delete /REBOOTOK "$INSTDIR\MinGW.mac" - Delete /REBOOTOK "$INSTDIR\RosBE.mac" - Delete /REBOOTOK "$INSTDIR\ChangeLog.txt" - Delete /REBOOTOK "$INSTDIR\LICENSE.txt" - Delete /REBOOTOK "$INSTDIR\srclist.txt" - Delete /REBOOTOK "$INSTDIR\config.rbuild" Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" ;; Whoever dares to change this back into: RMDir /r /REBOOTOK "$INSTDIR" will be KILLED!!! RMDir /REBOOTOK "$INSTDIR" - IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" 0 +2 - Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk" IfFileExists "$DESKTOP\ReactOS Build Environment 64-bit.lnk" 0 +2 Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment 64-bit.lnk" - IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" 0 +2 - Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk" IfFileExists "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" 0 +2 Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" - IfFileExists "$DESKTOP\Standard MinGW Build Environment.lnk" 0 +2 - Delete /REBOOTOK "$DESKTOP\Standard MinGW Build Environment.lnk" - IfFileExists "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" 0 +2 - Delete /REBOOTOK "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" ;; ;; Clean up the registry.

16 years, 2 months

[hyperion] 36610: modified ke/i386/cpu.c Added CMPXCHG8B enabling/detection code for TransMeta, Centaur and Rise (source: <URL: http://www.geoffchappell.com/notes/windows/kernel/cpu/cx8.htm>). Code dead until each vendor will be officially supported Alex and others: please review

by hyperion＠svn.reactos.org

Author: hyperion Date: Wed Oct 1 06:54:29 2008 New Revision: 36610 URL: http://svn.reactos.org/svn/reactos?rev=36610&view=rev Log: modified ke/i386/cpu.c Added CMPXCHG8B enabling/detection code for TransMeta, Centaur and Rise (source: <URL: http://www.geoffchappell.com/notes/windows/kernel/cpu/cx8.htm>). Code dead until each vendor will be officially supported Alex and others: please review Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Wed Oct 1 06:54:29 2008 @@ -353,6 +353,46 @@ CpuFeatures = Reg[3]; } +#ifdef CPU_TRANSMETA + if (Vendor == CPU_TRANSMETA) + { + /* Enable CMPXCHG8B if the family (>= 5), model and stepping (>= 4.2) support it */ + if ((Reg[0] & 0x0F00) >= 0x0500 && (Reg[0] & 0x00FF) >= 0x0042) + { + WRMSR(0x80860004, RDMSR(0x80860004) | 0x0100); + FeatureBits |= KF_CMPXCHG8B; + } + } +#endif + +#ifdef CPU_CENTAUR + if (Vendor == CPU_CENTAUR) + { + /* If CMPXCHG8B is not detected, try to enable it */ + if (!(CpuFeatures & 0x00000100)) + { + if ((Reg[0] & 0x0F00) == 0x0500) + { + WRMSR(0x0107, RDMSR(0x0107) | 0x02); + FeatureBits |= KF_CMPXCHG8B; + } + else if ((Reg[0] & 0x0F00) >= 0x0600) + { + WRMSR(0x1107, (RDMSR(0x1107) | 0x02) & ~((LONGLONG)0x01)); + FeatureBits |= KF_CMPXCHG8B; + } + } + } +#endif + +#ifdef CPU_RISE + if (Vendor == CPU_RISE) + { + /* Windows Vista assumes CMPXCHG8B is always supported on Rise */ + FeatureBits |= KF_CMPXCHG8B; + } +#endif + /* Convert all CPUID Feature bits into our format */ if (CpuFeatures & 0x00000002) FeatureBits |= KF_V86_VIS | KF_CR4; if (CpuFeatures & 0x00000008) FeatureBits |= KF_LARGE_PAGE | KF_CR4;

16 years, 2 months

[gschneider] 36609: Check DC for NULL before accessing it, fixes Coverity CID 661.

by gschneider＠svn.reactos.org

Author: gschneider Date: Wed Oct 1 06:48:12 2008 New Revision: 36609 URL: http://svn.reactos.org/svn/reactos?rev=36609&view=rev Log: Check DC for NULL before accessing it, fixes Coverity CID 661. Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Wed Oct 1 06:48:12 2008 @@ -3356,13 +3356,13 @@ DWORD cscp = IntGdiGetCharSet(hDC); // If here, update everything! Dc = DC_LockDc(hDC); - Dc_Attr = Dc->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; if (!Dc) { SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; } + Dc_Attr = Dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; Dc_Attr->iCS_CP = cscp; Dc_Attr->ulDirty_ &= ~DIRTY_CHARSET; DC_UnlockDc( Dc );

16 years, 2 months

[gschneider] 36608: GetDIBits: destination height may be smaller than the source height, so the image size should always be calculated. Removed the hack in the bit copy phase that addressed the wrong bits buffer size. This allows CopyImage to work, this can be seen in taskbar icons 1-4 for example. Fixes two gdi32 winetests. Bugs #2225 and #3082 for more info. Tested: QEMU VGA/8/16/24bpp, VMWare Server VMWare Driver 8/16/32bpp, VMWare Server ReactOS VBE Driver 8/16/32bpp

by gschneider＠svn.reactos.org

Author: gschneider Date: Wed Oct 1 05:49:10 2008 New Revision: 36608 URL: http://svn.reactos.org/svn/reactos?rev=36608&view=rev Log: GetDIBits: destination height may be smaller than the source height, so the image size should always be calculated. Removed the hack in the bit copy phase that addressed the wrong bits buffer size. This allows CopyImage to work, this can be seen in taskbar icons 1-4 for example. Fixes two gdi32 winetests. Bugs #2225 and #3082 for more info. Tested: QEMU VGA/8/16/24bpp, VMWare Server VMWare Driver 8/16/32bpp, VMWare Server ReactOS VBE Driver 8/16/32bpp Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Oct 1 05:49:10 2008 @@ -552,7 +552,8 @@ coreheader->bcWidth = BitmapObj->SurfObj.sizlBitmap.cx; coreheader->bcPlanes = 1; coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); - coreheader->bcHeight = BitmapObj->SurfObj.sizlBitmap.cy; + /* Resulting height may be smaller than original height */ + coreheader->bcHeight = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan); if (BitmapObj->SurfObj.lDelta > 0) coreheader->bcHeight = -coreheader->bcHeight; @@ -563,7 +564,8 @@ ProbeForWrite(Info, sizeof(BITMAPINFO), 1); Info->bmiHeader.biWidth = BitmapObj->SurfObj.sizlBitmap.cx; - Info->bmiHeader.biHeight = BitmapObj->SurfObj.sizlBitmap.cy; + /* Resulting height may be smaller than original height */ + Info->bmiHeader.biHeight = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan); /* Report negtive height for top-down bitmaps. */ if (BitmapObj->SurfObj.lDelta > 0) Info->bmiHeader.biHeight = -Info->bmiHeader.biHeight; @@ -594,8 +596,9 @@ Info->bmiHeader.biCompression = BI_PNG; break; } - - Info->bmiHeader.biSizeImage = BitmapObj->SurfObj.cjBits; + /* Image size has to be calculated */ + Info->bmiHeader.biSizeImage = DIB_GetDIBWidthBytes(Info->bmiHeader.biWidth, + Info->bmiHeader.biBitCount) * Info->bmiHeader.biHeight; Info->bmiHeader.biXPelsPerMeter = 0; /* FIXME */ Info->bmiHeader.biYPelsPerMeter = 0; /* FIXME */ Info->bmiHeader.biClrUsed = 0; @@ -707,8 +710,7 @@ if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) { hDestBitmap = EngCreateBitmap(DestSize, - /* DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), */ - DestSize.cx * (Info->bmiHeader.biBitCount >> 3), /* HACK */ + DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), 0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, Bits);

16 years, 2 months

[gschneider] 36607: [FORMATTING], spelling, misc cleanup. No functional changes.

by gschneider＠svn.reactos.org

Author: gschneider Date: Wed Oct 1 05:05:02 2008 New Revision: 36607 URL: http://svn.reactos.org/svn/reactos?rev=36607&view=rev Log: [FORMATTING], spelling, misc cleanup. No functional changes. Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Wed Oct 1 05:05:02 2008 @@ -1065,7 +1065,7 @@ BlendObj->BlendFunction.AlphaFormat); - /* Validate input */ + /* Validate output */ OutputRect = *DestRect; if (OutputRect.right < OutputRect.left) { Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Wed Oct 1 05:05:02 2008 @@ -755,8 +755,7 @@ Bitmap.bmWidthBytes = abs(bmp->SurfObj.lDelta); Bitmap.bmPlanes = 1; Bitmap.bmBitsPixel = BitsPerFormat(bmp->SurfObj.iBitmapFormat); - //Bitmap.bmBits = bmp->SurfObj.pvBits; - Bitmap.bmBits = NULL; /* not set accoring wine test confirm in win2k */ + Bitmap.bmBits = NULL; /* not set according to wine test, confirmed in win2k */ memcpy(buffer, &Bitmap, Count); } return Count; Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Oct 1 05:05:02 2008 @@ -549,9 +549,9 @@ ProbeForWrite(Info, sizeof(BITMAPINFO), 1); coreheader = (BITMAPCOREHEADER*) Info; - coreheader->bcWidth =BitmapObj->SurfObj.sizlBitmap.cx; + coreheader->bcWidth = BitmapObj->SurfObj.sizlBitmap.cx; coreheader->bcPlanes = 1; - coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); + coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); coreheader->bcHeight = BitmapObj->SurfObj.sizlBitmap.cy; if (BitmapObj->SurfObj.lDelta > 0) @@ -665,7 +665,7 @@ { Info->bmiColors[Index].rgbRed = DestPalette->IndexedColors[Index].peRed; Info->bmiColors[Index].rgbGreen = DestPalette->IndexedColors[Index].peGreen; - Info->bmiColors[Index].rgbBlue = DestPalette->IndexedColors[Index].peBlue; + Info->bmiColors[Index].rgbBlue = DestPalette->IndexedColors[Index].peBlue; } } @@ -990,7 +990,7 @@ if (!hDc) { - hDc = IntGdiCreateDC(NULL, NULL, NULL, NULL,FALSE); + hDc = IntGdiCreateDC(NULL, NULL, NULL, NULL,FALSE); if (!hDc) { SetLastWin32Error(ERROR_INVALID_HANDLE); @@ -1031,7 +1031,7 @@ IN OPTIONAL HANDLE hSection, IN DWORD dwOffset, IN LPBITMAPINFO bmi, - DWORD Usage, + DWORD Usage, IN UINT cjHeader, IN FLONG fl, IN ULONG_PTR dwColorSpace, @@ -1148,7 +1148,8 @@ case 16: dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0x7c00; dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 1) : 0x03e0; - dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 2) : 0x001f; break; + dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 2) : 0x001f; + break; case 24: dib->dsBitfields[0] = 0xff0000; @@ -1164,11 +1165,8 @@ } dib->dshSection = section; dib->dsOffset = offset; - } - - // Create Device Dependent Bitmap and add DIB pointer - if (dib) - { + + // Create Device Dependent Bitmap and add DIB pointer Size.cx = bm.bmWidth; Size.cy = abs(bm.bmHeight); res = IntCreateBitmap(Size, bm.bmWidthBytes, @@ -1312,7 +1310,6 @@ if (NULL == palGDI) { -// RELEASEDCINFO(hDC); return NULL; } @@ -1344,7 +1341,6 @@ lpRGB[i].rgbBlue = palGDI->IndexedColors[*lpIndex].peBlue; lpIndex++; } -// RELEASEDCINFO(hDC); PALETTE_UnlockPalette(palGDI); return lpRGB;

16 years, 2 months

[gschneider] 36606: hColor is not needed in IntSetCursor, fixes Coverity CID 40.

by gschneider＠svn.reactos.org

Author: gschneider Date: Wed Oct 1 04:57:51 2008 New Revision: 36606 URL: http://svn.reactos.org/svn/reactos?rev=36606&view=rev Log: hColor is not needed in IntSetCursor, fixes Coverity CID 40. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Wed Oct 1 04:57:51 2008 @@ -107,7 +107,7 @@ PSYSTEM_CURSORINFO CurInfo; PCURICON_OBJECT OldCursor; HCURSOR Ret = (HCURSOR)0; - HBITMAP dcbmp, hColor = (HBITMAP)0; + HBITMAP dcbmp; HBITMAP hMask = 0; SURFOBJ *soMask = NULL, *soColor = NULL; XLATEOBJ *XlateObj = NULL; @@ -293,10 +293,6 @@ { EngUnlockSurface(soMask); EngDeleteSurface((HSURF)hMask); - } - if(hColor) - { - EngDeleteSurface((HSURF)hColor); } if(XlateObj) {

16 years, 2 months

[tkreuzer] 36605: fix usage of InterlockedIncrement

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Oct 1 04:44:53 2008 New Revision: 36605 URL: http://svn.reactos.org/svn/reactos?rev=36605&view=rev Log: fix usage of InterlockedIncrement Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/libxml2/threads.c Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/libxml2/threads.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/libxml2/threads.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/libxml2/threads.c [iso-8859-1] Wed Oct 1 04:44:53 2008 @@ -786,7 +786,7 @@ #if defined(HAVE_WIN32_THREADS) if (!run_once.done) { - if (InterlockedIncrement(&run_once.control) == 1) + if (InterlockedIncrement((PLONG)&run_once.control) == 1) { #if !defined(HAVE_COMPILER_TLS) globalkey = TlsAlloc();

16 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2008