Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 28099: Add keyboard layouts again that were removed in r27723
by weiden＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: weiden Date: Thu Aug 2 14:26:52 2007 New Revision: 28099 URL: http://svn.reactos.org/svn/reactos?rev=28099&view=rev Log: Add keyboard layouts again that were removed in r27723 Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Thu Aug 2 14:26:52 2007 @@ -88,8 +88,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout Text",0x00000000,"Ukrainian" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000455","Layout File",0x00000000,"kbdbur.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000455","Layout Text",0x00000000,"Burmese" -;HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout File",0x00000000,"kbdno.dll" -;HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout Text",0x00000000,"Norwegian" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout File",0x00000000,"kbdno.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout Text",0x00000000,"Norwegian" ; Network HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network Adapters"

1 0

[hpoussin] 28098: Also update winetests from the synced dll if present Misc cleanup
by hpoussin＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: hpoussin Date: Thu Aug 2 11:51:19 2007 New Revision: 28098 URL: http://svn.reactos.org/svn/reactos?rev=28098&view=rev Log: Also update winetests from the synced dll if present Misc cleanup Modified: trunk/tools/wineimport.cmd Modified: trunk/tools/wineimport.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/wineimport.cmd?rev=28098&r1=… ============================================================================== --- trunk/tools/wineimport.cmd (original) +++ trunk/tools/wineimport.cmd Thu Aug 2 11:51:19 2007 @@ -22,6 +22,8 @@ ECHO %0 fullprocessing {path_to_reactos} {wine_lib} [{wine_lib} ...] GOTO :eof +REM **************************************************************************** + :download IF "%2" == "" GOTO help SET CVSROOT=:pserver:cvs:cvs@cvs.winehq.org:/home/wine @@ -32,69 +34,101 @@ ) :startdownload ECHO Downloading %2 ... -IF NOT EXIST "wine\dlls\%2\makefile.in" ( - >NUL 2>NUL cvs.exe -z 3 checkout wine/dlls/%2 - IF NOT EXIST "wine\dlls\%2\" ( - ECHO Error when downloading %2. Are you sure it does exist? - COLOR 00 - GOTO :eof - ) -) ELSE ( - >NUL 2>NUL cvs.exe -z 3 update -PA wine/dlls/%2 -) +IF EXIST "wine\dlls\%2\Makefile.in" goto download_update +>NUL 2>NUL cvs.exe -z 3 checkout wine/dlls/%2 +IF EXIST "wine\dlls\%2\Makefile.in" goto download_next + +ECHO Error when downloading %2. Are you sure it does exist? +COLOR 00 +GOTO :eof +:download_update +>NUL 2>NUL cvs.exe -z 3 update -PA wine/dlls/%2 +:download_next SHIFT IF NOT "%2" == "" GOTO startdownload >NUL 2>NUL cvs.exe logout GOTO :eof +REM **************************************************************************** + :createrbuild SETLOCAL ENABLEEXTENSIONS -SETLOCAL ENABLEDELAYEDEXPANSION SET WINE_BATCH=%0 IF "%2" == "" GOTO help :startcreaterbuild -IF NOT EXIST wine\dlls\%2\makefile.in ( - ECHO WARNING: Did you forget "%WINE_BATCH% download %2"? - GOTO :createrbuildnext -) - -SET WINE_MODULE_NAME=%2 +SET WINE_RELATIVE_WINE=wine\dlls\%2 +CALL :internal_createrbuild %2 +SET WINE_RELATIVE_WINE=wine\dlls\%2\tests +IF EXIST "%WINE_RELATIVE_WINE%" CALL :internal_createrbuild %2_winetest +SHIFT +IF NOT "%2" == "" GOTO startcreaterbuild +GOTO :eof + +:internal_createrbuild +REM Syntax: internal_createrbuild {module_name} +REM Relative path to Wine DLL source code must be in %WINE_RELATIVE_WINE% +REM Name of the script must be in %WINE_BATCH% +REM .rbuild file is printed to standard output +SETLOCAL ENABLEDELAYEDEXPANSION +SET WINE_MODULE_NAME=%1 + +IF NOT EXIST "%WINE_RELATIVE_WINE%\Makefile.in" ( + ECHO WARNING: Did you forget "%WINE_BATCH% download %WINE_MODULE_NAME%"? + GOTO :eof +) IF "%WINE_MODULE_NAME:~-4%" == ".ocx" ( - SET WINE_MODULE_NAME=%WINE_MODULE_NAME:~0,-4% + SET WINE_INSTALL_NAME=%WINE_MODULE_NAME% + SET WINE_SHORT_NAME=%WINE_MODULE_NAME:~0,-4% SET WINE_MODULE_TYPE=win32ocx - SET WINE_INSTALL_NAME=%2 + SET WINE_INSTALL_BASE=system32 + SET WINE_IS_EXE=0 +) ELSE IF "%WINE_MODULE_NAME:~-9%" == "_winetest" ( + SET WINE_INSTALL_NAME=%WINE_MODULE_NAME%.exe + SET WINE_SHORT_NAME=%WINE_MODULE_NAME% + SET WINE_MODULE_TYPE=win32cui + SET WINE_INSTALL_BASE=bin + SET WINE_IS_EXE=1 ) ELSE ( + SET WINE_INSTALL_NAME=%WINE_MODULE_NAME%.dll + SET WINE_SHORT_NAME=%WINE_MODULE_NAME% SET WINE_MODULE_TYPE=win32dll - SET WINE_INSTALL_NAME=%2.dll -) - -SET WINE_LOWER=abcdefghijklmnopqrstuvwxyz0123456789_. -SET WINE_UPPER=ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_. -SET WINE_LINE=%WINE_MODULE_NAME% -SET WINE_UPPERCASE= -FOR /L %%i IN (0, 1, 13) DO ( - FOR /L %%j IN (0, 1, 37) DO ( - IF "!WINE_LOWER:~%%j,1!" == "!WINE_LINE:~%%i,1!" ( - SET WINE_UPPERCASE=!WINE_UPPERCASE!!WINE_UPPER:~%%j,1! - ) - ) + SET WINE_INSTALL_BASE=system32 + SET WINE_IS_EXE=0 ) SET WINE_HAS_DLLMAIN=0 SET WINE_HAS_DLLINSTALL=0 SET WINE_HAS_DLLREGISTERSERVER=0 -FOR /F "usebackq tokens=3,4 delims= " %%l IN ("wine\dlls\%2\%2.spec") DO ( - IF NOT "%%l" == "" CALL :internal_analysespec %%l - IF NOT "%%m" == "" CALL :internal_analysespec %%m -) - ->NUL COPY /Y wine\dlls\%2\makefile.in %WINE_TMPFILE1% - +IF EXIST "%WINE_RELATIVE_WINE%\%WINE_MODULE_NAME%.spec" ( + FOR /F "usebackq tokens=3,4 delims= " %%l IN ("%WINE_RELATIVE_WINE%\%WINE_MODULE_NAME%.spec") DO ( + IF NOT "%%l" == "" CALL :internal_analysespec %%l + IF NOT "%%m" == "" CALL :internal_analysespec %%m + ) +) +>NUL COPY /Y "%WINE_RELATIVE_WINE%\Makefile.in" %WINE_TMPFILE1% + +SET WINE_OPTION1= +SET WINE_OPTION2= IF "%WINE_HAS_DLLMAIN%" == "0" ( - ECHO ^<module name="%WINE_MODULE_NAME%" type="%WINE_MODULE_TYPE%" baseaddress="${BASEADDRESS_%WINE_UPPERCASE%}" installbase="system32" entrypoint="0" installname="%WINE_INSTALL_NAME%" allowwarnings="true"^> -) ELSE ( - ECHO ^<module name="%WINE_MODULE_NAME%" type="%WINE_MODULE_TYPE%" baseaddress="${BASEADDRESS_%WINE_UPPERCASE%}" installbase="system32" installname="%WINE_INSTALL_NAME%" allowwarnings="true"^> -) + IF "%WINE_IS_EXE%" == "0" ( + SET WINE_OPTION1= entrypoint="0" + ) +) +IF "%WINE_IS_EXE%" == "0" ( + SET WINE_LOWER=abcdefghijklmnopqrstuvwxyz0123456789_. + SET WINE_UPPER=ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_. + SET WINE_LINE=%WINE_SHORT_NAME% + SET WINE_UPPERCASE= + FOR /L %%i IN (0, 1, 13) DO ( + FOR /L %%j IN (0, 1, 37) DO ( + IF "!WINE_LOWER:~%%j,1!" == "!WINE_LINE:~%%i,1!" ( + SET WINE_UPPERCASE=!WINE_UPPERCASE!!WINE_UPPER:~%%j,1! + ) + ) + ) + SET WINE_OPTION2= baseaddress="${BASEADDRESS_!WINE_UPPERCASE!}" +) +ECHO ^<module name="%WINE_SHORT_NAME%" type="%WINE_MODULE_TYPE%"%WINE_OPTION2% installbase="%WINE_INSTALL_BASE%" installname="%WINE_INSTALL_NAME%" allowwarnings="true"%WINE_OPTION1%^> IF "%WINE_HAS_DLLINSTALL%" == "1" ( IF "%WINE_HAS_DLLREGISTERSERVER%" == "1" ( ECHO ^<autoregister infsection="OleControlDlls" type="Both" /^> @@ -106,11 +140,15 @@ ECHO ^<autoregister infsection="OleControlDlls" type="DllRegisterServer" /^> ) ) -ECHO ^<importlibrary definition="%2.spec.def" /^> -ECHO ^<include base="%WINE_MODULE_NAME%"^>.^</include^> -ECHO ^<include base="ReactOS"^>include/reactos/wine^</include^> -ECHO ^<define name="__REACTOS__" /^> -ECHO ^<define name="__WINESRC__" /^> +IF EXIST "%WINE_RELATIVE_WINE%\%WINE_MODULE_NAME%.spec" ( + ECHO ^<importlibrary definition="%WINE_MODULE_NAME%.spec.def" /^> +) +ECHO ^<include base="%WINE_SHORT_NAME%"^>.^</include^> +IF "%WINE_IS_EXE%" == "0" ( + ECHO ^<include base="ReactOS"^>include/reactos/wine^</include^> + ECHO ^<define name="__REACTOS__" /^> + ECHO ^<define name="__WINESRC__" /^> +) ECHO ^<define name="__USE_W32API" /^> ECHO ^<define name="_WIN32_IE"^>0x600^</define^> ECHO ^<define name="_WIN32_WINNT"^>0x501^</define^> @@ -127,158 +165,14 @@ IF NOT "%WINE_HAS_IDL%" == "" ( ECHO ^<include base="%WINE_MODULE_NAME%" root="intermediate"^>.^</include^> ) -ECHO ^<file^>%2.spec^</file^> +IF "%WINE_IS_EXE%" == "1" ( + ECHO ^<file^>testlist.c^</file^> +) +IF EXIST "%WINE_RELATIVE_WINE%\%WINE_MODULE_NAME%.spec" ( + ECHO ^<file^>%WINE_MODULE_NAME%.spec^</file^> +) ECHO ^</module^> - -:createrbuildnext -SHIFT -IF NOT "%2" == "" GOTO startcreaterbuild DEL %WINE_TMPFILE1% -GOTO :eof - -:link -IF "%3" == "" GOTO help -IF NOT "%4" == "" GOTO help -IF NOT EXIST "%2\ReactOS.rbuild" ( - ECHO %2\ReactOS.rbuild doesn't exit. - GOTO :help -) -IF NOT EXIST "wine\dlls\%3" ( - ECHO wine\dlls\%3 doesn't exist. - ECHO Did you forget "%WINE_BATCH% download %3"? - GOTO :eof -) -IF NOT EXIST "wine\dlls\%3\%3.rbuild" ( - ECHO wine\dlls\%3.rbuild doesn't exist. - ECHO Did you forget "%WINE_BATCH% createrbuild %3 >wine\dlls\%3\%3.rbuild"? - GOTO :eof -) ->NUL 2>NUL junction.exe "%2\dll\win32\%3.wine" "wine\dlls\%3" -IF ERRORLEVEL 1 ( - ECHO Error when executing junction.exe. Try to download the lastest version at - ECHO http://www.sysinternals.com/Utilities/Junction.html -) -GOTO :eof - -:merge -SETLOCAL ENABLEDELAYEDEXPANSION -IF "%3" == "" GOTO help -IF NOT EXIST "%2\ReactOS.rbuild" ( - ECHO %2\ReactOS.rbuild doesn't exit. - GOTO :help -) -SET WINE_ROS_DIR=%2 -:mergenext -SHIFT -IF "%2" == "" GOTO :eof -IF NOT EXIST "wine\dlls\%2" GOTO :mergenext -ATTRIB -R "%WINE_ROS_DIR%\dll\win32\%2\*" >NUL -COPY /Y "wine\dlls\%2\*.*" "%WINE_ROS_DIR%\dll\win32\%2" >NUL -SET WINE_FILES_DELETED= -FOR /F "delims=" %%f IN ('DIR /B "%WINE_ROS_DIR%\dll\win32\%2\*.*"') DO ( - IF "%%f" == ".cvsignore" ( - svn.exe delete --force "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL - DEL /Q "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL - ) ELSE IF "%%f" == "Makefile.in" ( - svn.exe delete --force "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL - DEL /Q "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL - ) ELSE IF NOT EXIST "wine\dlls\%2\%%f" ( - SET WINE_FILE=%%f - IF NOT "!WINE_FILE:~-9!" == "_ros.diff" ( - svn.exe delete "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL - IF ERRORLEVEL 2 GOTO :helpsvn - IF EXIST "%WINE_ROS_DIR%\dll\win32\%2\%%f" DEL /Q "%WINE_ROS_DIR%\dll\win32\%2\%%f" - IF EXIST "%WINE_ROS_DIR%\dll\win32\%2\%%f" RD /S /Q "%WINE_ROS_DIR%\dll\win32\%2\%%f" - SET WINE_FILES_DELETED=!WINE_FILES_DELETED! %%f - ) - ) ELSE ( - svn.exe add "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL - IF ERRORLEVEL 2 GOTO :helpsvn - svn.exe propset svn:eol-style native "%WINE_ROS_DIR%\dll\win32\%2\%%f" >NUL 2>NUL - SET >NUL - ) -) -IF EXIST "%WINE_ROS_DIR%\dll\win32\%2\%2_ros.diff" ( - svn.exe add "%WINE_ROS_DIR%\dll\win32\%2\%2_ros.diff" 2>NUL - IF ERRORLEVEL 2 GOTO :helpsvn - svn.exe propset svn:eol-style native "%WINE_ROS_DIR%\dll\win32\%2\%2_ros.diff" >NUL 2>NUL - PUSHD "%WINE_ROS_DIR%" - PUSHD "dll\win32\%2" - patch.exe -p0 -N < "%2_ros.diff" - POPD - POPD - IF ERRORLEVEL 1 ( - ECHO Error when executing patch.exe. Try to download the lastest version at - ECHO http://gnuwin32.sourceforge.net/packages/patch.htm - GOTO :eof - ) - FOR %%f IN (%WINE_FILES_DELETED%) DO ( - IF EXIST "%WINE_ROS_DIR%\dll\win32\%2\%%f" ( - REN "%WINE_ROS_DIR%\dll\win32\%2\%%f" "%WINE_TMPFILE1%" - svn.exe revert -q "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL - DEL "%WINE_ROS_DIR%\dll\win32\%2\%%f" - REN "%WINE_ROS_DIR%\dll\win32\%2\%WINE_TMPFILE1%" "%%f" - ) - ) -) -GOTO :mergenext -:helpsvn -ECHO Error when executing svn.exe. Try to download the lastest version at -ECHO http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 -GOTO :eof - -:make -SETLOCAL ENABLEEXTENSIONS -SETLOCAL ENABLEDELAYEDEXPANSION -IF "%3" == "" GOTO help -IF NOT EXIST "%2\ReactOS.rbuild" ( - ECHO %2\ReactOS.rbuild doesn't exit. - GOTO :help -) -SET WINE_LIST= -SET WINE_ROS_DIR=%2 -:make_filllist -SHIFT -IF "%2" == "" GOTO make_doit -SET WINE_MODULE_NAME=%2 -IF "%WINE_MODULE_NAME:~-4%" == ".ocx" ( - SET WINE_MODULE_NAME=%WINE_MODULE_NAME:~0,-4% -) -SET WINE_LIST=%WINE_LIST% %WINE_MODULE_NAME% -GOTO make_filllist -:make_doit -PUSHD "%WINE_ROS_DIR%" -make.exe %WINE_LIST% -POPD -GOTO :eof - -:fullprocessing -SETLOCAL ENABLEEXTENSIONS -IF "%3" == "" GOTO help -SET WINE_LIST= -SET WINE_ROS_DIR=%2 -:fullprocessing_filllist -SHIFT -IF "%2" == "" GOTO fullprocessing_download -SET WINE_LIST=%WINE_LIST% %2 -GOTO fullprocessing_filllist -:fullprocessing_download -CALL :download download%WINE_LIST% -IF ERRORLEVEL 1 GOTO :eof -FOR %%m IN (%WINE_LIST%) DO ( - >wine\dlls\%%m\%%m.rbuild CALL :createrbuild createrbuild %%m - >NUL CALL :link link "%WINE_ROS_DIR%" %%m -) -CALL :merge merge "%WINE_ROS_DIR%" %WINE_LIST% -IF ERRORLEVEL 1 GOTO :eof -IF EXIST "%WINE_ROS_DIR%\makefile.auto" DEL "%WINE_ROS_DIR%\makefile.auto" -CALL :make make "%WINE_ROS_DIR%" %WINE_LIST% -IF ERRORLEVEL 1 GOTO :eof -ECHO Compilation successful. You should try to run ReactOS to see if -ECHO no visible regressions appeared before committing the changes. -FOR %%m IN (%WINE_LIST%) DO ( - REM svn.exe commit "%WINE_ROS_DIR%\dll\win32\%%m" -m "Autosyncing with Wine HEAD" --username LOGIN --password PASSWORD --non-interactive -) GOTO :eof :internal_analyseline @@ -308,6 +202,8 @@ SET WINE_VARTYPE=1 ) ELSE IF "%1" == "RC_SRCS" ( SET WINE_VARTYPE=1 + ) ELSE IF "%1" == "CTESTS" ( + SET WINE_VARTYPE=1 ) ELSE IF "%1" == "IDL_H_SRCS" ( SET WINE_VARTYPE=1 SET WINE_HAS_IDL=1 @@ -334,3 +230,249 @@ IF "%WINE_LINE:~0,7%" == "DllMain" SET WINE_HAS_DLLMAIN=1 IF "%WINE_LINE:~0,10%" == "DllInstall" SET WINE_HAS_DLLINSTALL=1 IF "%WINE_LINE:~0,17%" == "DllRegisterServer" SET WINE_HAS_DLLREGISTERSERVER=1 +goto :eof + + +REM **************************************************************************** + +:link +IF "%3" == "" GOTO help +IF NOT "%4" == "" GOTO help +IF NOT EXIST "%2\ReactOS.rbuild" ( + ECHO %2\ReactOS.rbuild doesn't exit. + GOTO :help +) +SET WINE_RELATIVE_WINE=wine\dlls\%3 +SET WINE_RELATIVE_ROS=%2\dll\win32\%3 +IF NOT EXIST "%WINE_RELATIVE_WINE%" ( + ECHO %WINE_RELATIVE_WINE% doesn't exist. + ECHO Did you forget "%WINE_BATCH% download %3"? + GOTO :eof +) +IF NOT EXIST "%WINE_RELATIVE_WINE%\%3.rbuild" ( + ECHO %WINE_RELATIVE_WINE%\%3.rbuild doesn't exist. + ECHO Did you forget "%WINE_BATCH% createrbuild %3 >%WINE_RELATIVE_WINE%\%3.rbuild"? + GOTO :eof +) +>NUL 2>NUL junction.exe "%WINE_RELATIVE_ROS%.wine" "%WINE_RELATIVE_WINE%\%3" +IF ERRORLEVEL 1 ( + ECHO Error when executing junction.exe. Try to download the lastest version at + ECHO http://www.sysinternals.com/Utilities/Junction.html +) +GOTO :eof + +REM **************************************************************************** + +:merge +IF "%3" == "" GOTO help +IF NOT EXIST "%2\ReactOS.rbuild" ( + ECHO %2\ReactOS.rbuild doesn't exit. + GOTO :help +) +SET WINE_ROS_DIR=%2 +:mergenext +SHIFT +IF "%2" == "" GOTO :eof +SET WINE_RELATIVE_WINE=wine\dlls\%2 +SET WINE_RELATIVE_ROS=%WINE_ROS_DIR%\dll\win32\%2 +CALL :internal_merge %2 +SET WINE_RELATIVE_WINE=wine\dlls\%2\tests +SET WINE_RELATIVE_ROS=%WINE_ROS_DIR%\modules\rostests\winetests\%2 +IF EXIST "%WINE_RELATIVE_WINE%\." ( + IF EXIST "%WINE_ROS_DIR%\modules\rostests\winetests\." ( + CALL :internal_create_testlist + CALL :internal_merge %2 + ) ELSE ( + ECHO WARNING: tests for %2 will NOT be updated! + ) +) +GOTO mergenext + +:internal_merge +IF NOT EXIST "%WINE_RELATIVE_WINE%" GOTO :eof +2>NUL MKDIR "%WINE_RELATIVE_ROS%" +ATTRIB -R "%WINE_RELATIVE_ROS%\*" >NUL +COPY /Y "%WINE_RELATIVE_WINE%\*.*" "%WINE_RELATIVE_ROS%" >NUL +SET WINE_FILES_DELETED= +FOR /F "delims=" %%f IN ('DIR /B "%WINE_RELATIVE_ROS%\*.*"') DO ( + IF "%%f" == ".cvsignore" ( + svn.exe delete --force "%WINE_RELATIVE_ROS%\%%f" 2>NUL + DEL /Q "%WINE_RELATIVE_ROS%\%%f" 2>NUL + ) ELSE IF "%%f" == "Makefile.in" ( + svn.exe delete --force "%WINE_RELATIVE_ROS%\%%f" 2>NUL + DEL /Q "%WINE_RELATIVE_ROS%\%%f" 2>NUL + ) ELSE IF NOT EXIST "%WINE_RELATIVE_WINE%\%%f" ( + SET WINE_FILE=%%f + IF NOT "!WINE_FILE:~-9!" == "_ros.diff" ( + svn.exe delete "%WINE_RELATIVE_ROS%\%%f" 2>NUL + IF ERRORLEVEL 2 GOTO :helpsvn + IF EXIST "%WINE_RELATIVE_ROS%\%%f" DEL /Q "%WINE_RELATIVE_ROS%\%%f" + IF EXIST "%WINE_RELATIVE_ROS%\%%f" RD /S /Q "%WINE_RELATIVE_ROS%\%%f" + SET WINE_FILES_DELETED=!WINE_FILES_DELETED! %%f + ) + ) ELSE ( + svn.exe add "%WINE_RELATIVE_ROS%\%%f" 2>NUL + IF ERRORLEVEL 2 GOTO :helpsvn + svn.exe propset svn:eol-style native "%WINE_RELATIVE_ROS%\%%f" >NUL 2>NUL + SET >NUL + ) +) +SET WINE_PATCH_FILE=%1_ros.diff +IF EXIST "%WINE_RELATIVE_ROS%\%WINE_PATCH_FILE%" ( + svn.exe add "%WINE_RELATIVE_ROS%\%WINE_PATCH_FILE%" 2>NUL + IF ERRORLEVEL 2 GOTO :helpsvn + svn.exe propset svn:eol-style native "%WINE_RELATIVE_ROS%\%WINE_PATCH_FILE%" >NUL 2>NUL + PUSHD "%WINE_RELATIVE_ROS%" + patch.exe -p0 -N < "%WINE_PATCH_FILE%" + POPD + IF ERRORLEVEL 1 ( + ECHO Error when executing patch.exe. Try to download the lastest version at + ECHO http://gnuwin32.sourceforge.net/packages/patch.htm + GOTO :eof + ) + FOR %%f IN (%WINE_FILES_DELETED%) DO ( + IF EXIST "%WINE_RELATIVE_ROS%\%%f" ( + REN "%WINE_RELATIVE_ROS%\%%f" "%WINE_TMPFILE1%" + svn.exe revert -q "%WINE_RELATIVE_ROS%\%%f" 2>NUL + DEL "%WINE_RELATIVE_ROS%\%%f" + REN "%WINE_RELATIVE_ROS%\%WINE_TMPFILE1%" "%%f" + ) + ) +) +GOTO :eof + +:internal_create_testlist +SET WINE_TESTLIST=%WINE_RELATIVE_WINE%\testlist.c +SET WINE_FULL_LINE= +SET WINE_END_PREC_LINE= +SET WINE_VARTYPE=0 +SET WINE_TESTS= +FOR /F "eol=# delims=" %%l IN (%WINE_RELATIVE_WINE%\Makefile.in) DO ( + CALL :internal_findtest %%l +) +SETLOCAL DISABLEDELAYEDEXPANSION +>%WINE_TESTLIST% ECHO /* Automatically generated file; DO NOT EDIT!! */ +SETLOCAL ENABLEDELAYEDEXPANSION +>>%WINE_TESTLIST% ECHO. +>>%WINE_TESTLIST% ECHO #define WIN32_LEAN_AND_MEAN +>>%WINE_TESTLIST% ECHO #include ^<windows.h^> +>>%WINE_TESTLIST% ECHO. +>>%WINE_TESTLIST% ECHO #define STANDALONE +>>%WINE_TESTLIST% ECHO #include "wine/test.h" +>>%WINE_TESTLIST% ECHO. +FOR %%t IN (%WINE_TESTS%) DO ( + >>%WINE_TESTLIST% ECHO extern void func_%%t(void^); +) +>>%WINE_TESTLIST% ECHO. +>>%WINE_TESTLIST% ECHO const struct test winetest_testlist[] = +>>%WINE_TESTLIST% ECHO { +FOR %%t IN (%WINE_TESTS%) DO ( + >>%WINE_TESTLIST% ECHO { "%%t", func_%%t }, +) +>>%WINE_TESTLIST% ECHO { 0, 0 } +>>%WINE_TESTLIST% ECHO }; +GOTO :eof + +:internal_findtest +SET WINE_LINE=%* +SET WINE_END_LINE=%WINE_LINE:~-1% +IF NOT "%WINE_END_PREC_LINE%" == "\" ( + IF NOT "%WINE_VARTYPE%" == "0" ( + FOR /F "tokens=2* delims= " %%h IN ("%WINE_FULL_LINE%") DO ( + FOR %%j IN (%%i) DO ( + IF "%WINE_VARTYPE%" == "1" ( + SET WINE_CURRENT=%%j + SET WINE_TESTS=!WINE_TESTS! !WINE_CURRENT:~0,-2! + ) + ) + ) + ) + SET WINE_FULL_LINE= + IF "%1" == "CTESTS" ( + SET WINE_VARTYPE=1 + ) ELSE ( + SET WINE_VARTYPE=0 + ) +) +SET WINE_END_PREC_LINE=%WINE_END_LINE% +IF "%WINE_END_PREC_LINE%" == "\" ( + SET WINE_FULL_LINE=!WINE_FULL_LINE!!WINE_LINE:~0,-1! +) ELSE ( + SET WINE_FULL_LINE=!WINE_FULL_LINE!!WINE_LINE! +) +GOTO :eof + +:helpsvn +ECHO Error when executing svn.exe. Try to download the lastest version at +ECHO http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 +GOTO :eof + +REM **************************************************************************** + +:make +SETLOCAL ENABLEEXTENSIONS +SETLOCAL ENABLEDELAYEDEXPANSION +IF "%3" == "" GOTO help +IF NOT EXIST "%2\ReactOS.rbuild" ( + ECHO %2\ReactOS.rbuild doesn't exit. + GOTO :help +) +SET WINE_LIST= +SET WINE_ROS_DIR=%2 +:make_filllist +SHIFT +IF "%2" == "" GOTO make_doit +SET WINE_MODULE_NAME=%2 +IF "%WINE_MODULE_NAME:~-4%" == ".ocx" ( + SET WINE_MODULE_NAME=%WINE_MODULE_NAME:~0,-4% +) +SET WINE_LIST=%WINE_LIST% %WINE_MODULE_NAME% +GOTO make_filllist +:make_doit +PUSHD "%WINE_ROS_DIR%" +make.exe %WINE_LIST% +POPD +GOTO :eof + +REM **************************************************************************** + +:fullprocessing +SETLOCAL ENABLEEXTENSIONS +SETLOCAL ENABLEDELAYEDEXPANSION +IF "%3" == "" GOTO help +SET WINE_BATCH=%0 +SET WINE_LIST= +SET WINE_ROS_DIR=%2 +:fullprocessing_filllist +SHIFT +IF "%2" == "" GOTO fullprocessing_download +SET WINE_LIST=%WINE_LIST% %2 +GOTO fullprocessing_filllist +:fullprocessing_download +CALL :download download%WINE_LIST% +IF ERRORLEVEL 1 GOTO :eof +SET WINE_NEW_LIST=%WINE_LIST% +FOR %%m IN (%WINE_LIST%) DO ( + SET WINE_RELATIVE_WINE=wine\dlls\%%m + >!WINE_RELATIVE_WINE!\%%m.rbuild CALL :internal_createrbuild %%m + SET WINE_RELATIVE_WINE=wine\dlls\%%m\tests + IF EXIST "!WINE_RELATIVE_WINE!\" ( + IF NOT EXIST "%WINE_ROS_DIR%\modules\rostests\winetests\." ( + ECHO Unable to find rostests module. Please checkout it. + GOTO :eof + ) + >!WINE_RELATIVE_WINE!\%%m.rbuild CALL :internal_createrbuild %%m_winetest + SET WINE_NEW_LIST=!WINE_NEW_LIST! %%m_winetest + ) + >NUL CALL :link link "%WINE_ROS_DIR%" %%m +) +CALL :merge merge "%WINE_ROS_DIR%" %WINE_LIST% +IF ERRORLEVEL 1 GOTO :eof +IF EXIST "%WINE_ROS_DIR%\makefile.auto" DEL "%WINE_ROS_DIR%\makefile.auto" +CALL :make make "%WINE_ROS_DIR%" %WINE_NEW_LIST% +IF ERRORLEVEL 1 GOTO :eof +ECHO Compilation successful. You should try to run ReactOS to see if +ECHO no visible regressions appeared before committing the changes. +FOR %%m IN (%WINE_NEW_LIST%) DO ( + REM svn.exe commit "%WINE_ROS_DIR%\dll\win32\%%m" -m "Autosyncing with Wine HEAD" --username LOGIN --password PASSWORD --non-interactive +)

1 0

[weiden] 28097: Remove cmd_test for now...
by weiden＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: weiden Date: Thu Aug 2 11:39:55 2007 New Revision: 28097 URL: http://svn.reactos.org/svn/reactos?rev=28097&view=rev Log: Remove cmd_test for now... Modified: trunk/rostests/win32/testsets.rbuild Modified: trunk/rostests/win32/testsets.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/testsets.rbuild?rev… ============================================================================== --- trunk/rostests/win32/testsets.rbuild (original) +++ trunk/rostests/win32/testsets.rbuild Thu Aug 2 11:39:55 2007 @@ -1,9 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <group> -<directory name="cmd"> - <xi:include href="cmd/cmd_test.rbuild" /> -</directory> <directory name="gdi32"> <xi:include href="gdi32/gdi32_test.rbuild" /> </directory>

1 0

[weiden] 28096: Fix compiling rostests
by weiden＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: weiden Date: Thu Aug 2 10:59:36 2007 New Revision: 28096 URL: http://svn.reactos.org/svn/reactos?rev=28096&view=rev Log: Fix compiling rostests Added: trunk/reactos/base/shell/cmd/main.c (with props) Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/cmd.rbuild trunk/reactos/base/shell/cmd/precomp.h Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c (original) +++ trunk/reactos/base/shell/cmd/cmd.c Thu Aug 2 10:59:36 2007 @@ -1836,7 +1836,7 @@ /* * main function */ -int _tmain (int argc, const TCHAR *argv[]) +int cmd_main (int argc, const TCHAR *argv[]) { TCHAR startPath[MAX_PATH]; CONSOLE_SCREEN_BUFFER_INFO Info; Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h (original) +++ trunk/reactos/base/shell/cmd/cmd.h Thu Aug 2 10:59:36 2007 @@ -101,6 +101,7 @@ VOID AddBreakHandler (VOID); VOID RemoveBreakHandler (VOID); VOID DoCommand (LPTSTR line); +int cmd_main (int argc, const TCHAR *argv[]); extern HANDLE CMD_ModuleHandle; Modified: trunk/reactos/base/shell/cmd/cmd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rbuild?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.rbuild (original) +++ trunk/reactos/base/shell/cmd/cmd.rbuild Thu Aug 2 10:59:36 2007 @@ -1,14 +1,12 @@ -<module name="cmd" type="win32cui" installbase="system32" installname="cmd.exe" unicode="yes"> +<module name="cmd_base" type="objectlibrary"> <include base="ReactOS">include/reactos/wine</include> - <include base="cmd">.</include> + <include base="cmd_base">.</include> <define name="__USE_W32API" /> <define name="ANONYMOUSUNIONS" /> <define name="_WIN32_WINNT">0x0501</define> <define name="_DEBUG_MEM" /> - <library>kernel32</library> - <library>advapi32</library> - <library>shell32</library> - <library>user32</library> + <define name="UNICODE" /> + <define name="_UNICODE" /> <pch>precomp.h</pch> <compilationunit name="unit.c"> <file>alias.c</file> @@ -66,5 +64,18 @@ <file>where.c</file> <file>window.c</file> </compilationunit> +</module> +<module name="cmd" type="win32cui" installbase="system32" installname="cmd.exe" unicode="yes"> + <include base="ReactOS">include/reactos/wine</include> + <include base="cmd">.</include> + <define name="__USE_W32API" /> + <define name="ANONYMOUSUNIONS" /> + <define name="_WIN32_WINNT">0x0501</define> + <library>cmd_base</library> + <library>kernel32</library> + <library>advapi32</library> + <library>shell32</library> + <library>user32</library> <file>cmd.rc</file> + <file>main.c</file> </module> Added: trunk/reactos/base/shell/cmd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/main.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/main.c (added) +++ trunk/reactos/base/shell/cmd/main.c Thu Aug 2 10:59:36 2007 @@ -1,0 +1,6 @@ +#include <precomp.h> + +int _tmain (int argc, const TCHAR *argv[]) +{ + return cmd_main(argc, argv); +} Propchange: trunk/reactos/base/shell/cmd/main.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/shell/cmd/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/precomp.h?r… ============================================================================== --- trunk/reactos/base/shell/cmd/precomp.h (original) +++ trunk/reactos/base/shell/cmd/precomp.h Thu Aug 2 10:59:36 2007 @@ -1,3 +1,6 @@ +#ifndef __CMD_PRECOMP_H +#define __CMD_PRECOMP_H + #ifdef _MSC_VER #pragma warning ( disable : 4103 ) /* use #pragma pack to change alignment */ #undef _CRT_SECURE_NO_DEPRECATE @@ -32,3 +35,4 @@ #include <reactos/resource.h> +#endif /* __CMD_PRECOMP_H */

1 0

[weiden] 28095: Include stddef.h for ptrdiff_t
by weiden＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: weiden Date: Thu Aug 2 08:19:52 2007 New Revision: 28095 URL: http://svn.reactos.org/svn/reactos?rev=28095&view=rev Log: Include stddef.h for ptrdiff_t Modified: trunk/reactos/lib/inflib/inflib.h Modified: trunk/reactos/lib/inflib/inflib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.h?rev=28… ============================================================================== --- trunk/reactos/lib/inflib/inflib.h (original) +++ trunk/reactos/lib/inflib/inflib.h Thu Aug 2 08:19:52 2007 @@ -5,6 +5,7 @@ */ #include <ctype.h> +#include <stddef.h> #include <stdlib.h> #include "builddep.h"

1 0

[weiden] 28094: Fix buffer overflow in InfpAddSection. See issue #2516 for more details.
by weiden＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: weiden Date: Thu Aug 2 08:09:19 2007 New Revision: 28094 URL: http://svn.reactos.org/svn/reactos?rev=28094&view=rev Log: Fix buffer overflow in InfpAddSection. See issue #2516 for more details. Modified: trunk/reactos/lib/inflib/infcore.c trunk/reactos/lib/inflib/infpriv.h Modified: trunk/reactos/lib/inflib/infcore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infcore.c?rev=2… ============================================================================== --- trunk/reactos/lib/inflib/infcore.c (original) +++ trunk/reactos/lib/inflib/infcore.c Thu Aug 2 08:09:19 2007 @@ -181,7 +181,8 @@ } /* Allocate and initialize the new section */ - Size = sizeof(INFCACHESECTION) + (_tcslen (Name) * sizeof(TCHAR)); + Size = FIELD_OFFSET(INFCACHESECTION, + Name[_tcslen (Name) + 1]); Section = (PINFCACHESECTION)MALLOC (Size); if (Section == NULL) { @@ -285,7 +286,8 @@ PINFCACHEFIELD Field; ULONG Size; - Size = sizeof(INFCACHEFIELD) + (_tcslen(Data) * sizeof(TCHAR)); + Size = FIELD_OFFSET(INFCACHEFIELD, + Data[_tcslen(Data) + 1]); Field = (PINFCACHEFIELD)MALLOC(Size); if (Field == NULL) { Modified: trunk/reactos/lib/inflib/infpriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/infpriv.h?rev=2… ============================================================================== --- trunk/reactos/lib/inflib/infpriv.h (original) +++ trunk/reactos/lib/inflib/infpriv.h Thu Aug 2 08:09:19 2007 @@ -9,6 +9,9 @@ #ifndef INFPRIV_H_INCLUDED #define INFPRIV_H_INCLUDED +#ifndef FIELD_OFFSET +#define FIELD_OFFSET(t,f) ((ptrdiff_t)&(((t*)0)->f)) +#endif #define INF_STATUS_INSUFFICIENT_RESOURCES (0xC000009A) #define INF_STATUS_BAD_SECTION_NAME_LINE (0xC0700001)

1 0

[cwittich] 28093: fix a crash
by cwittich＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: cwittich Date: Thu Aug 2 07:08:17 2007 New Revision: 28093 URL: http://svn.reactos.org/svn/reactos?rev=28093&view=rev Log: fix a crash Modified: trunk/reactos/base/shell/cmd/where.c Modified: trunk/reactos/base/shell/cmd/where.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/where.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/where.c (original) +++ trunk/reactos/base/shell/cmd/where.c Thu Aug 2 07:08:17 2007 @@ -245,12 +245,12 @@ if (0 == _tcsicmp(pCh, pExt)) { cmd_free(pszBuffer); - cmd_free(pszBuffer2); + LocalFree(pszBuffer2); return SearchForExecutableSingle(pFileName, pFullName, NULL); } pCh = _tcstok(NULL, _T(";")); } - cmd_free(pszBuffer2); + LocalFree(pszBuffer2); } }

1 0

[cwittich] 28092: fix null pointer check
by cwittich＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: cwittich Date: Thu Aug 2 05:45:02 2007 New Revision: 28092 URL: http://svn.reactos.org/svn/reactos?rev=28092&view=rev Log: fix null pointer check Modified: trunk/reactos/base/shell/cmd/start.c Modified: trunk/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/start.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/start.c (original) +++ trunk/reactos/base/shell/cmd/start.c Thu Aug 2 05:45:02 2007 @@ -135,8 +135,8 @@ return 1; } - param =cmd_alloc ( (_tcslen(RestWithoutArgs) + 1) * sizeof(TCHAR)); - if (rest == NULL) + param = cmd_alloc ( (_tcslen(RestWithoutArgs) + 1) * sizeof(TCHAR)); + if (param == NULL) { if(comspec != NULL) cmd_free(comspec);

1 0

[tkreuzer] 28091: remove NtGdiArc, NtGdiArcTo and NtGdiChord from win32k, they are not used any longer.
by tkreuzer＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: tkreuzer Date: Thu Aug 2 05:44:59 2007 New Revision: 28091 URL: http://svn.reactos.org/svn/reactos?rev=28091&view=rev Log: remove NtGdiArc, NtGdiArcTo and NtGdiChord from win32k, they are not used any longer. Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db 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 (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Thu Aug 2 05:44:59 2007 @@ -148,22 +148,6 @@ } /******************************************************************************/ - -BOOL -STDCALL -NtGdiChord(HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect, - int XRadial1, - int YRadial1, - int XRadial2, - int YRadial2) -{ - UNIMPLEMENTED; - return FALSE; -} /* * NtGdiEllipse Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c Thu Aug 2 05:44:59 2007 @@ -284,29 +284,6 @@ return dc->w.ArcDirection; } -BOOL FASTCALL -IntGdiArc(DC *dc, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect, - int XStartArc, - int YStartArc, - int XEndArc, - int YEndArc) -{ - if(PATH_IsPathOpen(dc->w.path)) - { - return PATH_Arc(dc, LeftRect, TopRect, RightRect, BottomRect, - XStartArc, YStartArc, XEndArc, YEndArc, GdiTypeArc ); - } - - // FIXME -// EngArc(dc, LeftRect, TopRect, RightRect, BottomRect, UNIMPLEMENTED -// XStartArc, YStartArc, XEndArc, YEndArc); - - return TRUE; -} BOOL FASTCALL IntGdiPolyPolyline(DC *dc, @@ -348,102 +325,6 @@ { UNIMPLEMENTED; return FALSE; -} - -BOOL -STDCALL -NtGdiArc(HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect, - int XStartArc, - int YStartArc, - int XEndArc, - int YEndArc) -{ - DC *dc; - BOOL Ret; - - dc = DC_LockDc (hDC); - if(!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->IsIC) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - Ret = IntGdiArc(dc, - LeftRect, - TopRect, - RightRect, - BottomRect, - XStartArc, - YStartArc, - XEndArc, - YEndArc); - - DC_UnlockDc( dc ); - return Ret; -} - -BOOL -STDCALL -NtGdiArcTo(HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect, - int XRadial1, - int YRadial1, - int XRadial2, - int YRadial2) -{ - BOOL result; - DC *dc; - - dc = DC_LockDc (hDC); - if(!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->IsIC) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - // Line from current position to starting point of arc - if ( !IntGdiLineTo(dc, XRadial1, YRadial1) ) - { - DC_UnlockDc(dc); - return FALSE; - } - - //dc = DC_LockDc(hDC); - - //if(!dc) return FALSE; - - // Then the arc is drawn. - result = IntGdiArc(dc, LeftRect, TopRect, RightRect, BottomRect, - XRadial1, YRadial1, XRadial2, YRadial2); - - //DC_UnlockDc(dc); - - // If no error occured, the current position is moved to the ending point of the arc. - if(result) - IntGdiMoveToEx(dc, XRadial2, YRadial2, NULL); - - DC_UnlockDc(dc); - - return result; } INT Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Thu Aug 2 05:44:59 2007 @@ -5,13 +5,10 @@ NtGdiAlphaBlend 11 NtGdiAngleArc 6 NtGdiAnimatePalette 4 -NtGdiArc 9 NtGdiArcInternal 10 -NtGdiArcTo 9 NtGdiBeginPath 1 NtGdiBitBlt 11 NtGdiCancelDC 1 -NtGdiChord 9 NtGdiCloseEnhMetaFile 1 NtGdiCloseFigure 1 NtGdiCloseMetaFile 1

1 0

[cwittich] 28090: fix another memory leak
by cwittich＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: cwittich Date: Thu Aug 2 05:13:28 2007 New Revision: 28090 URL: http://svn.reactos.org/svn/reactos?rev=28090&view=rev Log: fix another memory leak Modified: trunk/reactos/base/shell/cmd/copy.c Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c (original) +++ trunk/reactos/base/shell/cmd/copy.c Thu Aug 2 05:13:28 2007 @@ -872,7 +872,7 @@ FindClose(hFile); if (arg!=NULL) - cmd_free(arg); + freep(arg); return 0; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs