Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Jul 27 01:53:05 2007 New Revision: 27889 URL: http://svn.reactos.org/svn/reactos?rev=27889&view=rev Log: add shell32_ros.diff Added: trunk/reactos/dll/win32/shell32/shell32_ros.diff Added: trunk/reactos/dll/win32/shell32/shell32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_ros.diff (added) +++ trunk/reactos/dll/win32/shell32/shell32_ros.diff Fri Jul 27 01:53:05 2007 @@ -1,0 +1,77 @@ +Index: shell32_main.c +=================================================================== +--- shell32_main.c (revision 26448) ++++ shell32_main.c (working copy) +@@ -509,23 +509,59 @@ + /* get the iconlocation */ + if (SUCCEEDED(hr) && (flags & SHGFI_ICONLOCATION )) + { +- UINT uDummy,uFlags; ++ if (!(flags & SHGFI_USEFILEATTRIBUTES)) ++ { ++ UINT uDummy,uFlags; + +- hr = IShellFolder_GetUIObjectOf(psfParent, 0, 1, +- (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconA, +- &uDummy, (LPVOID*)&pei); +- if (SUCCEEDED(hr)) ++ hr = IShellFolder_GetUIObjectOf(psfParent, 0, 1, ++ (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconA, ++ &uDummy, (LPVOID*)&pei); ++ if (SUCCEEDED(hr)) ++ { ++ hr = IExtractIconW_GetIconLocation(pei, uGilFlags, ++ szLocation, MAX_PATH, &iIndex, &uFlags); ++ psfi->iIcon = iIndex; ++ ++ if (!(uFlags & GIL_NOTFILENAME)) ++ lstrcpyW (psfi->szDisplayName, szLocation); ++ else ++ ret = FALSE; ++ ++ IExtractIconA_Release(pei); ++ } ++ } ++ else + { +- hr = IExtractIconW_GetIconLocation(pei, uGilFlags, +- szLocation, MAX_PATH, &iIndex, &uFlags); +- psfi->iIcon = iIndex; +- +- if (!(uFlags & GIL_NOTFILENAME)) +- lstrcpyW (psfi->szDisplayName, szLocation); ++ if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ++ { ++ strcpyW(psfi->szDisplayName, swShell32Name); ++ psfi->iIcon = SIC_GetIconIndex(swShell32Name, -IDI_SHELL_FOLDER, 0); ++ } + else +- ret = FALSE; ++ { ++ WCHAR sTemp [MAX_PATH]; ++ WCHAR * szExt; ++ DWORD dwNr=0; ++ static const WCHAR p1W[] = {'%','1',0}; + +- IExtractIconA_Release(pei); ++ lstrcpynW(sTemp, szFullPath, MAX_PATH); ++ ++ psfi->iIcon = 0; ++ szExt = (LPWSTR) PathFindExtensionW(sTemp); ++ if ( szExt && ++ HCR_MapTypeToValueW(szExt, sTemp, MAX_PATH, TRUE) && ++ HCR_GetDefaultIconW(sTemp, sTemp, MAX_PATH, &dwNr)) ++ { ++ if (!lstrcmpW(p1W,sTemp)) /* icon is in the file */ ++ strcpyW(psfi->szDisplayName, szFullPath); ++ else ++ strcpyW(psfi->szDisplayName, sTemp); ++ ++ psfi->iIcon = SIC_GetIconIndex(psfi->szDisplayName, dwNr, 0); ++ if (psfi->iIcon == -1) ++ psfi->iIcon = 0; ++ } ++ } + } + } +

17 years, 1 month

[dreimer] 27888: - Update to > 0.3.7 - Update ToDo List of our Config Tool

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Jul 27 01:52:52 2007 New Revision: 27888 URL: http://svn.reactos.org/svn/reactos?rev=27888&view=rev Log: - Update to > 0.3.7 - Update ToDo List of our Config Tool Modified: trunk/tools/RosBE-Windows/Root/LICENSE.txt trunk/tools/RosBE-Windows/Root/README.txt trunk/tools/RosBE-Windows/Tools/config/todo.txt Modified: trunk/tools/RosBE-Windows/Root/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/LICENSE.t… ============================================================================== --- trunk/tools/RosBE-Windows/Root/LICENSE.txt (original) +++ trunk/tools/RosBE-Windows/Root/LICENSE.txt Fri Jul 27 01:52:52 2007 @@ -1,4 +1,4 @@ -ReactOS Build Environment v0.3.7 +ReactOS Build Environment v0.3.8 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) Modified: trunk/tools/RosBE-Windows/Root/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/README.tx… ============================================================================== --- trunk/tools/RosBE-Windows/Root/README.txt (original) +++ trunk/tools/RosBE-Windows/Root/README.txt Fri Jul 27 01:52:52 2007 @@ -1,7 +1,7 @@ -ReactOS Build Environment 0.3.7 +ReactOS Build Environment 0.3.8 -The ReactOS Build Environment v0.3.7 contains a complete build environment for ReactOS based on GCC 4.1.3/MinGW. +The ReactOS Build Environment v0.3.8 contains a complete build environment for ReactOS based on GCC 4.1.3/MinGW. While installing the ReactOS Build Environment you are asked to provide the directory where your ReactOS sources are located or should be checked out to (ie.reactos\), you must enter the complete path to this folder (ie. C:\projects\reactos). The path is now required for the ReactOS Build Environment to work correctly, so if you change where your sources are located you must also change the entry in the shortcuts in the start menu (the 'Start in:' entry). If you did not checkout a Source tree yet, start RosBE and type svn create. This will take a while. @@ -9,7 +9,7 @@ menu. Now you have a choice of using either the built in commands (which are displayed onscreen with information about their use) or you can build as you normally would using the standard MinGW/RBuild commands. -The ReactOS Build Environment v0.3.7 contains the following packages: +The ReactOS Build Environment v0.3.8 contains the following packages: binutils-2.17.50-200706XX mingw-runtime-3.12 Modified: trunk/tools/RosBE-Windows/Tools/config/todo.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/t… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/todo.txt (original) +++ trunk/tools/RosBE-Windows/Tools/config/todo.txt Fri Jul 27 01:52:52 2007 @@ -1,9 +1,7 @@ ToDo: -- Fix control size / positions - Load old settings - Disable Save button if there are no changes - Check validity of log path before saving -- Exe and dialog icon - Use styled controls (uxtheme) for dialog - Find out how to disable ... button - Font preview

17 years, 1 month

[cwittich] 27887: -fix crash in shell32 caused by clamwin installer (patch by w3seek)

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Jul 27 01:43:22 2007 New Revision: 27887 URL: http://svn.reactos.org/svn/reactos?rev=27887&view=rev Log: -fix crash in shell32 caused by clamwin installer (patch by w3seek) Modified: trunk/reactos/dll/win32/shell32/shell32_main.c Modified: trunk/reactos/dll/win32/shell32/shell32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.c (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.c Fri Jul 27 01:43:22 2007 @@ -509,23 +509,59 @@ /* get the iconlocation */ if (SUCCEEDED(hr) && (flags & SHGFI_ICONLOCATION )) { - UINT uDummy,uFlags; - - hr = IShellFolder_GetUIObjectOf(psfParent, 0, 1, - (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconA, - &uDummy, (LPVOID*)&pei); - if (SUCCEEDED(hr)) - { - hr = IExtractIconW_GetIconLocation(pei, uGilFlags, - szLocation, MAX_PATH, &iIndex, &uFlags); - psfi->iIcon = iIndex; - - if (!(uFlags & GIL_NOTFILENAME)) - lstrcpyW (psfi->szDisplayName, szLocation); + if (!(flags & SHGFI_USEFILEATTRIBUTES)) + { + UINT uDummy,uFlags; + + hr = IShellFolder_GetUIObjectOf(psfParent, 0, 1, + (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconA, + &uDummy, (LPVOID*)&pei); + if (SUCCEEDED(hr)) + { + hr = IExtractIconW_GetIconLocation(pei, uGilFlags, + szLocation, MAX_PATH, &iIndex, &uFlags); + psfi->iIcon = iIndex; + + if (!(uFlags & GIL_NOTFILENAME)) + lstrcpyW (psfi->szDisplayName, szLocation); + else + ret = FALSE; + + IExtractIconA_Release(pei); + } + } + else + { + if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + strcpyW(psfi->szDisplayName, swShell32Name); + psfi->iIcon = SIC_GetIconIndex(swShell32Name, -IDI_SHELL_FOLDER, 0); + } else - ret = FALSE; - - IExtractIconA_Release(pei); + { + WCHAR sTemp [MAX_PATH]; + WCHAR * szExt; + DWORD dwNr=0; + static const WCHAR p1W[] = {'%','1',0}; + + lstrcpynW(sTemp, szFullPath, MAX_PATH); + + psfi->iIcon = 0; + szExt = (LPWSTR) PathFindExtensionW(sTemp); + if ( szExt && + HCR_MapTypeToValueW(szExt, sTemp, MAX_PATH, TRUE) && + HCR_GetDefaultIconW(sTemp, sTemp, MAX_PATH, &dwNr)) + { + if (!lstrcmpW(p1W,sTemp)) /* icon is in the file */ + strcpyW(psfi->szDisplayName, szFullPath); + else + strcpyW(psfi->szDisplayName, sTemp); + + psfi->iIcon = SIC_GetIconIndex(psfi->szDisplayName, dwNr, 0); + if (psfi->iIcon == -1) + psfi->iIcon = 0; + } + } } }

17 years, 1 month

[dreimer] 27886: Fix it. Now DrFred's Tool FULLY runs.

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Jul 27 01:10:12 2007 New Revision: 27886 URL: http://svn.reactos.org/svn/reactos?rev=27886&view=rev Log: Fix it. Now DrFred's Tool FULLY runs. Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Fri Jul 27 01:10:12 2007 @@ -42,7 +42,8 @@ ) else ( set _ROSBELOGDIR=%CD%\RosBE-Logs ) -) else ( +) +if %logdiff% == 1 ( if not exist "%ROSBE_LOGPATH%\." ( echo LogFolder does not exist. ) else (

17 years, 1 month

[dreimer] 27885: Try to fix the following scenario. RosBE is being booted up, and directory is being changed. Then there shuld be made a RosBE-Logs Dir too, if theres a .svn folder. This runs... but if the dir is being changed to another by using DrFred's tool, it does not make ANY logs.... dunno why yet... HELP MEEEE

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Jul 27 00:41:56 2007 New Revision: 27885 URL: http://svn.reactos.org/svn/reactos?rev=27885&view=rev Log: Try to fix the following scenario. RosBE is being booted up, and directory is being changed. Then there shuld be made a RosBE-Logs Dir too, if theres a .svn folder. This runs... but if the dir is being changed to another by using DrFred's tool, it does not make ANY logs.... dunno why yet... HELP MEEEE Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Fri Jul 27 00:41:56 2007 @@ -29,8 +29,8 @@ :: :: Check if our log directory exists, if it doesn't, create it. :: -if %ROSBE_LOGPATH% == %CD%\RosBE-Logs ( -echo 1 +set logdiff +if %logdiff% == 0 ( if not exist "%CD%\RosBE-Logs\." ( if not exist "%CD%\.svn\." ( echo Folder is empty. No Build can be performed. @@ -42,9 +42,7 @@ ) else ( set _ROSBELOGDIR=%CD%\RosBE-Logs ) - ) else ( -echo 2 if not exist "%ROSBE_LOGPATH%\." ( echo LogFolder does not exist. ) else ( Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Fri Jul 27 00:41:56 2007 @@ -1,4 +1,8 @@ -*** July 26th, 2007 - RosBE 0.3.7 Released +*** Oct XXth, 2007 - RosBE 0.3.8 Released + +- Added DrFred's Config Tool. + +*** July 26th, 2007 - RosBE 0.3.7.1 Released - Fixed: "No SVN Tree found" message in Vista. - All commands use the current dir now. SO you can use several SVN Source Trees now. Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Fri Jul 27 00:41:56 2007 @@ -14,14 +14,30 @@ :: Set Defaults to work with and override if needed. :: color 0A -set _VER=0.3.7.1 +set _VER=0.3.8 set ROSBEBASEDIR=%~dp0 set ROSBE_SHOWTIME=1 set ROSBE_WRITELOG=1 -set ROSBE_LOGPATH=%CD%\RosBE-Logs +set _LOGDIR=%CD%\RosBE-Logs +if exist %ROSBEBASEDIR%\options.cmd ( + goto :PREV +) else ( + set logdiff=0 + goto :NEXT + +) + +:PREV call %ROSBEBASEDIR%\options.cmd +if %_LOGDIR% == %ROSBE_LOGPATH% ( + set logdiff=0 +) else ( + set logdiff=1 +) + +:NEXT title ReactOS Build Environment %_VER% if "%1" == "" ( Modified: trunk/tools/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE-Windows/RosBE.nsi Fri Jul 27 00:41:56 2007 @@ -1,5 +1,5 @@ !define PRODUCT_NAME "ReactOS Build Environment for Windows" -!define PRODUCT_VERSION "0.3.7.1" +!define PRODUCT_VERSION "0.3.8" !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" @@ -18,7 +18,7 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "0.3.7.1" +VIAddVersionKey /LANG=1033 "FileVersion" "0.3.8.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/)" @@ -26,7 +26,7 @@ VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2007 ReactOS Team" VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2007 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "0.3.7.1" +VIProductVersion "0.3.8.0" CRCCheck force SetCompressor /FINAL /SOLID lzma @@ -118,6 +118,8 @@ "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Readme.lnk" \ "$INSTDIR\readme.pdf" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options.lnk" \ + "$INSTDIR\options.exe" !insertmacro MUI_STARTMENU_WRITE_END SectionEnd

17 years, 1 month

[greatlrd] 27884: patch from Physicus, fixing drag and drop issue. do not crash the desktop if u trying move icon. (this patch are not in trunks)

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jul 27 00:24:09 2007 New Revision: 27884 URL: http://svn.reactos.org/svn/reactos?rev=27884&view=rev Log: patch from Physicus, fixing drag and drop issue. do not crash the desktop if u trying move icon. (this patch are not in trunks) Modified: branches/ros-branch-0_3_3/reactos/dll/win32/shell32/shlview.c Modified: branches/ros-branch-0_3_3/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/win32/shell32/shlview.c (original) +++ branches/ros-branch-0_3_3/reactos/dll/win32/shell32/shlview.c Fri Jul 27 00:24:09 2007 @@ -2307,12 +2307,14 @@ static HRESULT WINAPI ISVDropTarget_DragLeave(IDropTarget *iface) { IShellViewImpl *This = impl_from_IDropTarget(iface); - IDropTarget_DragLeave(This->pCurDropTarget); - - IDropTarget_Release(This->pCurDropTarget); + if (This->pCurDropTarget) + { + IDropTarget_DragLeave(This->pCurDropTarget); + IDropTarget_Release(This->pCurDropTarget); + This->pCurDropTarget = NULL; + } IDataObject_Release(This->pCurDataObject); This->pCurDataObject = NULL; - This->pCurDropTarget = NULL; This->iDragOverItem = 0; return S_OK; @@ -2323,12 +2325,15 @@ { IShellViewImpl *This = impl_from_IDropTarget(iface); - IDropTarget_Drop(This->pCurDropTarget, pDataObject, grfKeyState, pt, pdwEffect); - - IDropTarget_Release(This->pCurDropTarget); + if (This->pCurDropTarget) + { + IDropTarget_Drop(This->pCurDropTarget, pDataObject, grfKeyState, pt, pdwEffect); + IDropTarget_Release(This->pCurDropTarget); + This->pCurDropTarget = NULL; + } + IDataObject_Release(This->pCurDataObject); This->pCurDataObject = NULL; - This->pCurDropTarget = NULL; This->iDragOverItem = 0; return S_OK; @@ -2565,3 +2570,4 @@ ISVViewObject_SetAdvise, ISVViewObject_GetAdvise }; +

17 years, 1 month

[tkreuzer] 27883: - add painting.c to gdi32.def - implement FloodFill, calling NtGdiExtFloodFill - implement CreateRectRgnIndirect, calling NtGdiCreateRectRgn - remove NtGdiCreateRectRgnIndirect, NtGdiFloodFill from win32k - update ntgdibad.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jul 26 23:52:51 2007 New Revision: 27883 URL: http://svn.reactos.org/svn/reactos?rev=27883&view=rev Log: - add painting.c to gdi32.def - implement FloodFill, calling NtGdiExtFloodFill - implement CreateRectRgnIndirect, calling NtGdiCreateRectRgn - remove NtGdiCreateRectRgnIndirect, NtGdiFloodFill from win32k - update ntgdibad.h Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/gdi32/objects/painting.c trunk/reactos/dll/win32/gdi32/objects/region.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/region.c trunk/reactos/tools/nci/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Thu Jul 26 23:52:51 2007 @@ -84,7 +84,7 @@ CreatePolyPolygonRgn@16=NtGdiCreatePolyPolygonRgn@16 CreatePolygonRgn@12=NtGdiCreatePolygonRgn@12 CreateRectRgn@16=NtGdiCreateRectRgn@16 -CreateRectRgnIndirect@4=NtGdiCreateRectRgnIndirect@4 +CreateRectRgnIndirect@4 CreateRoundRectRgn@24=NtGdiCreateRoundRectRgn@24 CreateScalableFontResourceA@16 CreateScalableFontResourceW@16 @@ -234,7 +234,7 @@ FillRgn@12=NtGdiFillRgn@12 FixBrushOrgEx@16 FlattenPath@4 -FloodFill@16=NtGdiFloodFill@16 +FloodFill@16 FontIsLinked@4 FONTOBJ_cGetAllGlyphHandles@8 FONTOBJ_cGetGlyphs@20 Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild Thu Jul 26 23:52:51 2007 @@ -46,6 +46,7 @@ <file>font.c</file> <file>linedda.c</file> <file>metafile.c</file> + <file>painting.c</file> <file>pen.c</file> <file>region.c</file> <file>text.c</file> Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/painting.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/painting.c Thu Jul 26 23:52:51 2007 @@ -18,6 +18,7 @@ __asm fistp out #endif +#if 0 /* FIXME: enable this as soon as we have working usermode gdi */ LONG FASTCALL EFtoF( EFLOAT_S * efp) @@ -890,4 +891,15 @@ } return NtGdiPolyPolyDraw( hDC , Point, Count, Polys, GdiPolyPolyLine ); } - +#endif + +BOOL +WINAPI +FloodFill( + HDC hDC, + int nXStart, + int nYStart, + COLORREF crFill) +{ + return NtGdiExtFloodFill(hDC, nXStart, nYStart, crFill, FLOODFILLBORDER); +} Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c Thu Jul 26 23:52:51 2007 @@ -56,3 +56,19 @@ } return NULL; } + +HRGN +WINAPI +CreateRectRgnIndirect( + const RECT *prc +) +{ + if (prc) + { + return NtGdiCreateRectRgn(prc->left, + prc->top, + prc->right, + prc->bottom); + } + return NULL; +} Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Thu Jul 26 23:52:51 2007 @@ -245,11 +245,6 @@ INT Count, INT PolyFillMode); -/* Use NtGdiCreateRectRgn with expanded paraemters. */ -HRGN -STDCALL -NtGdiCreateRectRgnIndirect(CONST PRECT rc); - /* Use NtGdiTransformPoints with GdiDpToLp. */ BOOL STDCALL @@ -332,16 +327,6 @@ LPCWSTR lpString, UINT cbCount, CONST INT *lpDx); - -/* Use NtGdiExtFloodFill with FLOODFILLBORDER. */ -BOOL -STDCALL -NtGdiFloodFill ( - HDC hDC, - INT XStart, - INT YStart, - COLORREF Fill - ); /* Should be done in user-mode. */ BOOL 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 (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Thu Jul 26 23:52:51 2007 @@ -566,16 +566,6 @@ /* lie and say we succeded */ return TRUE; -} - -BOOL STDCALL -NtGdiFloodFill( - HDC hDC, - INT XStart, - INT YStart, - COLORREF Fill) -{ - return NtGdiExtFloodFill(hDC, XStart, YStart, Fill, FLOODFILLBORDER ); } BOOL STDCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c Thu Jul 26 23:52:51 2007 @@ -2044,31 +2044,6 @@ return NULL; } -HRGN STDCALL -NtGdiCreateRectRgnIndirect(CONST PRECT rc) -{ - RECT SafeRc = {0}; - NTSTATUS Status = STATUS_SUCCESS; - - _SEH_TRY - { - ProbeForRead(rc, - sizeof(RECT), - 1); - SafeRc = *rc; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if (!NT_SUCCESS(Status)) - { - return(NULL); - } - return(UnsafeIntCreateRectRgnIndirect(&SafeRc)); -} - HRGN STDCALL NtGdiCreateRoundRectRgn(INT left, INT top, INT right, INT bottom, Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=2… ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Thu Jul 26 23:52:51 2007 @@ -38,7 +38,6 @@ NtGdiCreatePolygonRgn 3 NtGdiCreatePolyPolygonRgn 4 NtGdiCreateRectRgn 4 -NtGdiCreateRectRgnIndirect 1 NtGdiCreateRoundRectRgn 6 NtGdiCreateScalableFontResource 4 NtGdiCreateSolidBrush 2 @@ -73,7 +72,6 @@ NtGdiFillPath 1 NtGdiFillRgn 3 NtGdiFlattenPath 1 -NtGdiFloodFill 4 NtGdiFrameRgn 5 NtGdiGdiComment 3 NtGdiFlush 0

17 years, 1 month

[dreimer] 27882: - Make DrFred's Config Tool Useable in RosBE.cmd. - Fix a bug in DrFred's Config Tool.

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Jul 26 23:30:29 2007 New Revision: 27882 URL: http://svn.reactos.org/svn/reactos?rev=27882&view=rev Log: - Make DrFred's Config Tool Useable in RosBE.cmd. - Fix a bug in DrFred's Config Tool. Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Thu Jul 26 23:30:29 2007 @@ -29,16 +29,28 @@ :: :: Check if our log directory exists, if it doesn't, create it. :: +if %ROSBE_LOGPATH% == %CD%\RosBE-Logs ( +echo 1 if not exist "%CD%\RosBE-Logs\." ( - if not exist "%CD%\.svn\." ( - echo Folder is empty. No Build can be performed. - goto :EOB + if not exist "%CD%\.svn\." ( + echo Folder is empty. No Build can be performed. + goto :EOB + ) else ( + mkdir "%CD%\RosBE-Logs" + set _ROSBELOGDIR=%CD%\RosBE-Logs + ) ) else ( - mkdir "%CD%\RosBE-Logs" set _ROSBELOGDIR=%CD%\RosBE-Logs ) + ) else ( - set _ROSBELOGDIR=%CD%\RosBE-Logs +echo 2 + if not exist "%ROSBE_LOGPATH%\." ( + echo LogFolder does not exist. + ) else ( + set _ROSBELOGDIR=%ROSBE_LOGPATH% + ) +) ) :: @@ -65,7 +77,22 @@ :: :: Now use mingw32-make to build ReactOS, passing along options, if any. :: -call buildtime "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" +if %ROSBE_SHOWTIME% == 1 ( + if %ROSBE_WRITELOG% == 1 ( + call buildtime "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" + ) + if %ROSBE_WRITELOG% == 0 ( + call buildtime "%MAKE_COMMAND%" 2>&1 + ) +) +if %ROSBE_SHOWTIME% == 0 ( + if %ROSBE_WRITELOG% == 1 ( + call "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" + ) + if %ROSBE_WRITELOG% == 0 ( + call "%MAKE_COMMAND%" 2>&1 + ) +) :: :: Highlight the fact that building has ended. Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Thu Jul 26 23:30:29 2007 @@ -10,19 +10,26 @@ :: @echo off +:: +:: Set Defaults to work with and override if needed. +:: +color 0A set _VER=0.3.7.1 set ROSBEBASEDIR=%~dp0 +set ROSBE_SHOWTIME=1 +set ROSBE_WRITELOG=1 +set ROSBE_LOGPATH=%CD%\RosBE-Logs + +call %ROSBEBASEDIR%\options.cmd title ReactOS Build Environment %_VER% if "%1" == "" ( - color 0A cls call :RosBE4 goto :EndCommandParse ) if not "%1" == "" ( - color 0A cls echo Unknown parameter specified. Exiting. goto :ExitRosBE Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Thu Jul 26 23:30:29 2007 @@ -79,8 +79,8 @@ SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_ADDSTRING, 0, (LPARAM) (Colors[i])); SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_ADDSTRING, 0, (LPARAM) (Colors[i])); } - SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_SETCURSEL, 0, 0); - SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_SETCURSEL, 0xA, 0); + SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_SETCURSEL, 0xA, 0); + SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_SETCURSEL, 0, 0); EnableWindow(GetDlgItem(Dlg, ID_BROWSE), FALSE); EnableWindow(GetDlgItem(Dlg, ID_LOGDIR), FALSE); return TRUE;

17 years, 1 month

[greatlrd] 27881: merge down 27865 and 27872 : Fixing really fuckup CreatePen / NtGdiCreatePen NtGdiCreatePen accpect 4 param, CreatePen accpect 3 param, NtGdiCreatePenIndirect does not exists in win32k, implement it in gdi32 direcly by timo k

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Jul 26 23:25:33 2007 New Revision: 27881 URL: http://svn.reactos.org/svn/reactos?rev=27881&view=rev Log: merge down 27865 and 27872 : Fixing really fuckup CreatePen / NtGdiCreatePen NtGdiCreatePen accpect 4 param, CreatePen accpect 3 param, NtGdiCreatePenIndirect does not exists in win32k, implement it in gdi32 direcly by timo k Added: branches/ros-branch-0_3_3/reactos/dll/win32/gdi32/objects/pen.c (with props) Modified: branches/ros-branch-0_3_3/reactos/dll/win32/gdi32/gdi32.def branches/ros-branch-0_3_3/reactos/dll/win32/gdi32/gdi32.rbuild branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/objects/pen.c branches/ros-branch-0_3_3/reactos/tools/nci/w32ksvc.db Modified: branches/ros-branch-0_3_3/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/win32/gdi32/gdi32.def (original) +++ branches/ros-branch-0_3_3/reactos/dll/win32/gdi32/gdi32.def Thu Jul 26 23:25:33 2007 @@ -79,8 +79,8 @@ CreateMetaFileW@4 CreatePalette@4=NtGdiCreatePalette@4 CreatePatternBrush@4 -CreatePen@12=NtGdiCreatePen@12 -CreatePenIndirect@4=NtGdiCreatePenIndirect@4 +CreatePen@12 +CreatePenIndirect@4 CreatePolyPolygonRgn@16=NtGdiCreatePolyPolygonRgn@16 CreatePolygonRgn@12=NtGdiCreatePolygonRgn@12 CreateRectRgn@16=NtGdiCreateRectRgn@16 Modified: branches/ros-branch-0_3_3/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/win32/gdi32/gdi32.rbuild (original) +++ branches/ros-branch-0_3_3/reactos/dll/win32/gdi32/gdi32.rbuild Thu Jul 26 23:25:33 2007 @@ -46,6 +46,7 @@ <file>font.c</file> <file>linedda.c</file> <file>metafile.c</file> + <file>pen.c</file> <file>region.c</file> <file>text.c</file> <file>utils.c</file> Added: branches/ros-branch-0_3_3/reactos/dll/win32/gdi32/objects/pen.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/win32/gdi32/objects/pen.c (added) +++ branches/ros-branch-0_3_3/reactos/dll/win32/gdi32/objects/pen.c Thu Jul 26 23:25:33 2007 @@ -1,0 +1,37 @@ +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + +/* + * @implemented + */ +HPEN WINAPI +CreatePenIndirect( + const LOGPEN *plgpn) +{ + if (plgpn) + { + return NtGdiCreatePen(plgpn->lopnStyle, + /* FIXME: MSDN says in docs for LOGPEN: + "If the pointer member is NULL, the pen is one pixel + wide on raster devices." Do we need to handle this? */ + plgpn->lopnWidth.x, + plgpn->lopnColor, + NULL); + } + return NULL; +} + +/* + * @implemented + */ +HPEN WINAPI +CreatePen( + int nPenStyle, + int nWidth, + COLORREF crColor) +{ + return NtGdiCreatePen(nPenStyle, nWidth, crColor, NULL); +} + Propchange: branches/ros-branch-0_3_3/reactos/dll/win32/gdi32/objects/pen.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/subsys… ============================================================================== --- branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/objects/pen.c (original) +++ branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/objects/pen.c Thu Jul 26 23:25:33 2007 @@ -242,44 +242,6 @@ } HPEN STDCALL -NtGdiCreatePenIndirect(CONST PLOGPEN LogPen) -{ - LOGPEN SafeLogPen = {0}; - NTSTATUS Status = STATUS_SUCCESS; - - _SEH_TRY - { - ProbeForRead(LogPen, - sizeof(LOGPEN), - 1); - SafeLogPen = *LogPen; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return 0; - } - - return IntGdiExtCreatePen(SafeLogPen.lopnStyle, - SafeLogPen.lopnWidth.x, - BS_SOLID, - SafeLogPen.lopnColor, - 0, - 0, - 0, - NULL, - 0, - TRUE, - 0); -} - -HPEN STDCALL NtGdiExtCreatePen( DWORD dwPenStyle, DWORD ulWidth, Modified: branches/ros-branch-0_3_3/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/tools/… ============================================================================== --- branches/ros-branch-0_3_3/reactos/tools/nci/w32ksvc.db (original) +++ branches/ros-branch-0_3_3/reactos/tools/nci/w32ksvc.db Thu Jul 26 23:25:33 2007 @@ -37,8 +37,7 @@ NtGdiCreateMetaFile 1 NtGdiCreatePalette 1 NtGdiCreatePatternBrushInternal 3 -NtGdiCreatePen 3 -NtGdiCreatePenIndirect 1 +NtGdiCreatePen 4 NtGdiCreatePolygonRgn 3 NtGdiCreatePolyPolygonRgn 4 NtGdiCreateRectRgn 4

17 years, 1 month

[greatlrd] 27880: merge down 27815 : it is UserScrollDC (complete rewrite) it fixing a large graphice glicthers in reactos.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Jul 26 22:45:33 2007 New Revision: 27880 URL: http://svn.reactos.org/svn/reactos?rev=27880&view=rev Log: merge down 27815 : it is UserScrollDC (complete rewrite) it fixing a large graphice glicthers in reactos. Modified: branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/subsys… ============================================================================== --- branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ branches/ros-branch-0_3_3/reactos/subsystems/win32/win32k/ntuser/painting.c Thu Jul 26 22:45:33 2007 @@ -1109,102 +1109,84 @@ static -DWORD FASTCALL -UserScrollDC(HDC hDC, INT dx, INT dy, const RECT *lprcScroll, - const RECT *lprcClip, HRGN hrgnUpdate, LPRECT lprcUpdate) -{ - RECT rSrc, rClipped_src, rClip, rDst, offset; - PDC DC; - - /* - * Compute device clipping region (in device coordinates). - */ - - DC = DC_LockDc(hDC); - if (NULL == DC) - { - return FALSE; - } - if (lprcScroll) - rSrc = *lprcScroll; +INT FASTCALL +UserScrollDC(HDC hDC, INT dx, INT dy, const RECT *prcScroll, + const RECT *prcClip, HRGN hrgnUpdate, LPRECT prcUpdate) +{ + PDC pDC; + RECT rcScroll, rcSrc, rcDst; + INT Result; + + IntGdiGetClipBox(hDC, &rcScroll); + if (prcScroll) + { + IntGdiIntersectRect(&rcScroll, &rcScroll, prcScroll); + } + if (prcClip) + { + IntGdiIntersectRect(&rcScroll, &rcScroll, prcClip); + } + + rcDst = rcScroll; + IntGdiOffsetRect(&rcDst, dx, dy); + IntGdiIntersectRect(&rcDst, &rcDst, &rcScroll); + rcSrc = rcDst; + IntGdiOffsetRect(&rcSrc, -dx, -dy); + + if (!NtGdiBitBlt(hDC, rcDst.left, rcDst.top, + rcDst.right - rcDst.left, rcDst.bottom - rcDst.top, + hDC, rcSrc.left, rcSrc.top, SRCCOPY, 0, 0)) + { + return ERROR; + } + + /* Calculate the region that was invalidated by moving or + could not be copied, because it was not visible */ + if (hrgnUpdate || prcUpdate) + { + HRGN hrgnOwn, hrgnVisible, hrgnDst; + + pDC = DC_LockDc(hDC); + if (!pDC) + { + return FALSE; + } + hrgnVisible = pDC->w.hVisRgn; // pDC->w.hGCClipRgn? + DC_UnlockDc(pDC); + + if (hrgnUpdate) + { + hrgnOwn = hrgnUpdate; + if (!NtGdiSetRectRgn(hrgnOwn, rcScroll.left, rcScroll.top, rcScroll.right, rcScroll.bottom)) + { + return ERROR; + } + } + else + { + hrgnOwn = UnsafeIntCreateRectRgnIndirect(&rcScroll); + } + + hrgnDst = UnsafeIntCreateRectRgnIndirect(&rcSrc); + NtGdiCombineRgn(hrgnDst, hrgnDst, hrgnVisible, RGN_AND); + NtGdiOffsetRgn(hrgnDst, dx, dy); + Result = NtGdiCombineRgn(hrgnOwn, hrgnOwn, hrgnDst, RGN_DIFF); + NtGdiDeleteObject(hrgnDst); + + if (prcUpdate) + { + NtGdiGetRgnBox(hrgnOwn, prcUpdate); + } + + if (!hrgnUpdate) + { + NtGdiDeleteObject(hrgnOwn); + } + } else - IntGdiGetClipBox(hDC, &rSrc); - IntLPtoDP(DC, (LPPOINT)&rSrc, 2); - - if (lprcClip) - rClip = *lprcClip; - else - IntGdiGetClipBox(hDC, &rClip); - IntLPtoDP(DC, (LPPOINT)&rClip, 2); - - IntGdiIntersectRect(&rClipped_src, &rSrc, &rClip); - - rDst = rClipped_src; - IntGdiSetRect(&offset, 0, 0, dx, dy); - IntLPtoDP(DC, (LPPOINT)&offset, 2); - IntGdiOffsetRect(&rDst, offset.right - offset.left, offset.bottom - offset.top); - IntGdiIntersectRect(&rDst, &rDst, &rClip); - - /* - * Copy bits, if possible. - */ - - if (rDst.bottom > rDst.top && rDst.right > rDst.left) - { - RECT rDst_lp = rDst, rSrc_lp = rDst; - - IntGdiOffsetRect(&rSrc_lp, offset.left - offset.right, offset.top - offset.bottom); - IntDPtoLP(DC, (LPPOINT)&rDst_lp, 2); - IntDPtoLP(DC, (LPPOINT)&rSrc_lp, 2); - DC_UnlockDc(DC); - - if (!NtGdiBitBlt(hDC, rDst_lp.left, rDst_lp.top, rDst_lp.right - rDst_lp.left, - rDst_lp.bottom - rDst_lp.top, hDC, rSrc_lp.left, rSrc_lp.top, - SRCCOPY, 0, 0)) - return FALSE; - } - else - { - DC_UnlockDc(DC); - } - - /* - * Compute update areas. This is the clipped source or'ed with the - * unclipped source translated minus the clipped src translated (rDst) - * all clipped to rClip. - */ - - if (hrgnUpdate || lprcUpdate) - { - HRGN hRgn = hrgnUpdate, hRgn2; - - if (hRgn) - NtGdiSetRectRgn(hRgn, rClipped_src.left, rClipped_src.top, rClipped_src.right, rClipped_src.bottom); - else - hRgn = NtGdiCreateRectRgn(rClipped_src.left, rClipped_src.top, rClipped_src.right, rClipped_src.bottom); - - hRgn2 = UnsafeIntCreateRectRgnIndirect(&rSrc); - NtGdiOffsetRgn(hRgn2, offset.right - offset.left, offset.bottom - offset.top); - NtGdiCombineRgn(hRgn, hRgn, hRgn2, RGN_OR); - - NtGdiSetRectRgn(hRgn2, rDst.left, rDst.top, rDst.right, rDst.bottom); - NtGdiCombineRgn(hRgn, hRgn, hRgn2, RGN_DIFF); - - NtGdiSetRectRgn(hRgn2, rClip.left, rClip.top, rClip.right, rClip.bottom); - NtGdiCombineRgn(hRgn, hRgn, hRgn2, RGN_AND); - - if (lprcUpdate) - { - NtGdiGetRgnBox(hRgn, lprcUpdate); - - /* Put the lprcUpdate in logical coordinate */ - NtGdiDPtoLP(hDC, (LPPOINT)lprcUpdate, 2); - } - if (!hrgnUpdate) - NtGdiDeleteObject(hRgn); - NtGdiDeleteObject(hRgn2); - } - return TRUE; + Result = NULLREGION; + + return Result; } @@ -1218,21 +1200,78 @@ */ DWORD STDCALL -NtUserScrollDC(HDC hDC, INT dx, INT dy, const RECT *lprcScroll, - const RECT *lprcClip, HRGN hrgnUpdate, LPRECT lprcUpdate) +NtUserScrollDC(HDC hDC, INT dx, INT dy, const RECT *prcUnsafeScroll, + const RECT *prcUnsafeClip, HRGN hrgnUpdate, LPRECT prcUnsafeUpdate) { DECLARE_RETURN(DWORD); + RECT rcScroll, rcClip, rcUpdate; + NTSTATUS Status = STATUS_SUCCESS; DPRINT("Enter NtUserScrollDC\n"); UserEnterExclusive(); - RETURN( UserScrollDC(hDC, dx, dy, lprcScroll, lprcClip, hrgnUpdate, lprcUpdate)); + _SEH_TRY + { + if (prcUnsafeScroll) + { + ProbeForRead(prcUnsafeScroll, sizeof(*prcUnsafeScroll), 1); + rcScroll = *prcUnsafeScroll; + } + if (prcUnsafeClip) + { + ProbeForRead(prcUnsafeClip, sizeof(*prcUnsafeClip), 1); + rcClip = *prcUnsafeClip; + } + if (prcUnsafeUpdate) + { + ProbeForWrite(prcUnsafeUpdate, sizeof(*prcUnsafeUpdate), 1); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN(FALSE); + } + + if (UserScrollDC(hDC, dx, dy, + prcUnsafeScroll? &rcScroll : 0, + prcUnsafeClip? &rcClip : 0, hrgnUpdate, + prcUnsafeUpdate? &rcUpdate : NULL) == ERROR) + { + /* FIXME: SetLastError? */ + RETURN(FALSE); + } + + if (prcUnsafeUpdate) + { + _SEH_TRY + { + *prcUnsafeUpdate = rcUpdate; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + if (!NT_SUCCESS(Status)) + { + /* FIXME: SetLastError? */ + /* FIXME: correct? We have already scrolled! */ + RETURN(FALSE); + } + } + + RETURN(TRUE); CLEANUP: DPRINT("Leave NtUserScrollDC, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; - } /* @@ -1243,18 +1282,16 @@ */ DWORD STDCALL -NtUserScrollWindowEx(HWND hWnd, INT dx, INT dy, const RECT *UnsafeRect, - const RECT *UnsafeClipRect, HRGN hrgnUpdate, LPRECT rcUpdate, UINT flags) -{ - RECT rc, cliprc, caretrc, rect, clipRect; +NtUserScrollWindowEx(HWND hWnd, INT dx, INT dy, const RECT *prcUnsafeScroll, + const RECT *prcUnsafeClip, HRGN hrgnUpdate, LPRECT prcUnsafeUpdate, UINT flags) +{ + RECT rcScroll, rcClip, rcCaret, rcUpdate; INT Result; PWINDOW_OBJECT Window = NULL, CaretWnd; HDC hDC; - HRGN hrgnTemp; + HRGN hrgnOwn = NULL, hrgnTemp; HWND hwndCaret; - BOOL bUpdate = (rcUpdate || hrgnUpdate || flags & (SW_INVALIDATE | SW_ERASE)); - BOOL bOwnRgn = TRUE; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; DECLARE_RETURN(DWORD); USER_REFERENCE_ENTRY Ref, CaretRef; @@ -1269,52 +1306,59 @@ } UserRefObjectCo(Window, &Ref); - IntGetClientRect(Window, &rc); - - if (NULL != UnsafeRect) - { - Status = MmCopyFromCaller(&rect, UnsafeRect, sizeof(RECT)); - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( ERROR); - } - IntGdiIntersectRect(&rc, &rc, &rect); - } - - if (NULL != UnsafeClipRect) - { - Status = MmCopyFromCaller(&clipRect, UnsafeClipRect, sizeof(RECT)); - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( ERROR); - } - IntGdiIntersectRect(&cliprc, &rc, &clipRect); - } + IntGetClientRect(Window, &rcScroll); + + _SEH_TRY + { + if (prcUnsafeScroll) + { + ProbeForRead(prcUnsafeScroll, sizeof(*prcUnsafeScroll), 1); + IntGdiIntersectRect(&rcScroll, &rcScroll, prcUnsafeScroll); + } + + if (prcUnsafeClip) + { + ProbeForRead(prcUnsafeClip, sizeof(*prcUnsafeClip), 1); + IntGdiIntersectRect(&rcClip, &rcScroll, prcUnsafeClip); + } + else + rcClip = rcScroll; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN(ERROR); + } + + if (rcClip.right <= rcClip.left || rcClip.bottom <= rcClip.top || + (dx == 0 && dy == 0)) + { + RETURN(NULLREGION); + } + + if (hrgnUpdate) + hrgnOwn = hrgnUpdate; else - cliprc = rc; - - if (cliprc.right <= cliprc.left || cliprc.bottom <= cliprc.top || - (dx == 0 && dy == 0)) - { - RETURN( NULLREGION); - } - - caretrc = rc; - hwndCaret = co_IntFixCaret(Window, &caretrc, flags); - - if (hrgnUpdate) - bOwnRgn = FALSE; - else if (bUpdate) - hrgnUpdate = NtGdiCreateRectRgn(0, 0, 0, 0); + hrgnOwn = NtGdiCreateRectRgn(0, 0, 0, 0); hDC = UserGetDCEx(Window, 0, DCX_CACHE | DCX_USESTYLE); - if (hDC) - { - UserScrollDC(hDC, dx, dy, &rc, &cliprc, hrgnUpdate, rcUpdate); - UserReleaseDC(Window, hDC, FALSE); - } + if (!hDC) + { + /* FIXME: SetLastError? */ + RETURN(ERROR); + } + + rcCaret = rcScroll; + hwndCaret = co_IntFixCaret(Window, &rcCaret, flags); + + Result = UserScrollDC(hDC, dx, dy, &rcScroll, &rcClip, hrgnOwn, prcUnsafeUpdate? &rcUpdate : NULL); + UserReleaseDC(Window, hDC, FALSE); /* * Take into account the fact that some damage may have occurred during @@ -1322,76 +1366,90 @@ */ hrgnTemp = NtGdiCreateRectRgn(0, 0, 0, 0); - Result = co_UserGetUpdateRgn(Window, hrgnTemp, FALSE); - if (Result != NULLREGION) - { - HRGN hrgnClip = UnsafeIntCreateRectRgnIndirect(&cliprc); + if (co_UserGetUpdateRgn(Window, hrgnTemp, FALSE) != NULLREGION) + { + HRGN hrgnClip = UnsafeIntCreateRectRgnIndirect(&rcClip); NtGdiOffsetRgn(hrgnTemp, dx, dy); NtGdiCombineRgn(hrgnTemp, hrgnTemp, hrgnClip, RGN_AND); co_UserRedrawWindow(Window, NULL, hrgnTemp, RDW_INVALIDATE | RDW_ERASE); NtGdiDeleteObject(hrgnClip); } - NtGdiDeleteObject(hrgnTemp); if (flags & SW_SCROLLCHILDREN) { - HWND *List = IntWinListChildren(Window); - if (List) - { - int i; - RECT r, dummy; - POINT ClientOrigin; - PWINDOW_OBJECT Wnd; - USER_REFERENCE_ENTRY WndRef; - - IntGetClientOrigin(Window, &ClientOrigin); - for (i = 0; List[i]; i++) + PWINDOW_OBJECT Child; + RECT rcChild; + POINT ClientOrigin; + USER_REFERENCE_ENTRY WndRef; + RECT rcDummy; + + IntGetClientOrigin(Window, &ClientOrigin); + for (Child = Window->FirstChild; Child; Child = Child->NextSibling) + { + rcChild = Child->WindowRect; + rcChild.left -= ClientOrigin.x; + rcChild.top -= ClientOrigin.y; + rcChild.right -= ClientOrigin.x; + rcChild.bottom -= ClientOrigin.y; + + if (! prcUnsafeScroll || IntGdiIntersectRect(&rcDummy, &rcChild, &rcScroll)) { - if (!(Wnd = UserGetWindowObject(List[i]))) - continue; - - r = Wnd->WindowRect; - r.left -= ClientOrigin.x; - r.top -= ClientOrigin.y; - r.right -= ClientOrigin.x; - r.bottom -= ClientOrigin.y; - - if (! UnsafeRect || IntGdiIntersectRect(&dummy, &r, &rc)) - { - UserRefObjectCo(Wnd, &WndRef); - co_WinPosSetWindowPos(Wnd, 0, r.left + dx, r.top + dy, 0, 0, - SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE | - SWP_NOREDRAW); - UserDerefObjectCo(Wnd); - } - + UserRefObjectCo(Child, &WndRef); + co_WinPosSetWindowPos(Child, 0, rcChild.left + dx, rcChild.top + dy, 0, 0, + SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE | + SWP_NOREDRAW); + UserDerefObjectCo(Child); } - ExFreePool(List); } } if (flags & (SW_INVALIDATE | SW_ERASE)) - co_UserRedrawWindow(Window, NULL, hrgnUpdate, RDW_INVALIDATE | RDW_ERASE | + { + co_UserRedrawWindow(Window, NULL, hrgnOwn, RDW_INVALIDATE | RDW_ERASE | ((flags & SW_ERASE) ? RDW_ERASENOW : 0) | ((flags & SW_SCROLLCHILDREN) ? RDW_ALLCHILDREN : 0)); - - if (bOwnRgn && hrgnUpdate) - NtGdiDeleteObject(hrgnUpdate); + } if ((CaretWnd = UserGetWindowObject(hwndCaret))) { UserRefObjectCo(CaretWnd, &CaretRef); - co_IntSetCaretPos(caretrc.left + dx, caretrc.top + dy); + co_IntSetCaretPos(rcCaret.left + dx, rcCaret.top + dy); co_UserShowCaret(CaretWnd); UserDerefObjectCo(CaretWnd); } + if (prcUnsafeUpdate) + { + _SEH_TRY + { + /* Probe here, to not fail on invalid pointer before scrolling */ + ProbeForWrite(prcUnsafeUpdate, sizeof(*prcUnsafeUpdate), 1); + *prcUnsafeUpdate = rcUpdate; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN(ERROR); + } + } + RETURN(Result); CLEANUP: + if (hrgnOwn && !hrgnUpdate) + { + NtGdiDeleteObject(hrgnOwn); + } + if (Window) UserDerefObjectCo(Window);

17 years, 1 month

← Newer
1
...
15
16
17
18
19
20
21
...
71
Older →

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 July 2007