Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 37599: - Start the RPC-Server from a separate thread so the initial call to the DLL doesn't get blocked. - Ensure the server accepts more than a single call from clients.
by ekohl＠svn.reactos.org 23 Nov '08

23 Nov '08

Author: ekohl Date: Sun Nov 23 16:39:43 2008 New Revision: 37599 URL: http://svn.reactos.org/svn/reactos?rev=37599&view=rev Log: - Start the RPC-Server from a separate thread so the initial call to the DLL doesn't get blocked. - Ensure the server accepts more than a single call from clients. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Nov 23 16:39:43 2008 @@ -57,6 +57,7 @@ return Status; } + /*static*/ VOID DereferencePolicyHandle(IN OUT PLSAR_POLICY_HANDLE Policy, IN BOOLEAN Delete) @@ -81,17 +82,13 @@ RtlLeaveCriticalSection(&PolicyHandleTableLock); } -VOID -LsarStartRpcServer(VOID) + +DWORD STDCALL +LsapRpcThreadRoutine(LPVOID lpParameter) { RPC_STATUS Status; - RtlInitializeCriticalSection(&PolicyHandleTableLock); - RtlInitializeHandleTable(0x1000, - sizeof(LSAR_POLICY_HANDLE), - &PolicyHandleTable); - - TRACE("LsarStartRpcServer() called"); + TRACE("LsapRpcThreadRoutine() called"); Status = RpcServerUseProtseqEpW(L"ncacn_np", 10, @@ -100,7 +97,7 @@ if (Status != RPC_S_OK) { WARN("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); - return; + return 0; } Status = RpcServerRegisterIf(lsarpc_v0_0_s_ifspec, @@ -109,17 +106,51 @@ if (Status != RPC_S_OK) { WARN("RpcServerRegisterIf() failed (Status %lx)\n", Status); - return; + return 0; } - Status = RpcServerListen(1, 20, TRUE); + Status = RpcServerListen(1, 20, FALSE); if (Status != RPC_S_OK) { WARN("RpcServerListen() failed (Status %lx)\n", Status); - return; + return 0; } - TRACE("LsarStartRpcServer() done\n"); + TRACE("LsapRpcThreadRoutine() done\n"); + + return 0; +} + + +VOID +LsarStartRpcServer(VOID) +{ + HANDLE hThread; + + TRACE("LsarStartRpcServer() called"); + + RtlInitializeCriticalSection(&PolicyHandleTableLock); + RtlInitializeHandleTable(0x1000, + sizeof(LSAR_POLICY_HANDLE), + &PolicyHandleTable); + + hThread = CreateThread(NULL, + 0, + (LPTHREAD_START_ROUTINE) + LsapRpcThreadRoutine, + NULL, + 0, + NULL); + if (!hThread) + { + WARN("Starting LsapRpcThreadRoutine-Thread failed!\n"); + } + else + { + CloseHandle(hThread); + } + + TRACE("LsarStartRpcServer() done"); } @@ -220,8 +251,16 @@ ACCESS_MASK DesiredAccess, LSAPR_HANDLE *PolicyHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + ERR("LsarOpenPolicy called!\n"); + + *PolicyHandle = (LSAPR_HANDLE)0xcafe; + + ERR("LsarOpenPolicy done!\n"); + + return STATUS_SUCCESS; + +// UNIMPLEMENTED; +// return STATUS_NOT_IMPLEMENTED; }

1 0

[ekohl] 37598: Fix formatting. No code changes!
by ekohl＠svn.reactos.org 23 Nov '08

23 Nov '08

Author: ekohl Date: Sun Nov 23 16:36:15 2008 New Revision: 37598 URL: http://svn.reactos.org/svn/reactos?rev=37598&view=rev Log: Fix formatting. No code changes! Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg…

1 0

[dreimer] 37597: Almost finished new Updater System. Last Problem remaining, some missing error behavior and theres a problem with vars being set in updcheckproc are NOT set globally??! No idea how this could be possible...
by dreimer＠svn.reactos.org 23 Nov '08

23 Nov '08

Author: dreimer Date: Sun Nov 23 14:38:15 2008 New Revision: 37597 URL: http://svn.reactos.org/svn/reactos?rev=37597&view=rev Log: Almost finished new Updater System. Last Problem remaining, some missing error behavior and theres a problem with vars being set in updcheckproc are NOT set globally??! No idea how this could be possible... Added: trunk/tools/RosBE/RosBE-Windows/Root/updcheckproc.cmd (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Sun Nov 23 14:38:15 2008 @@ -16,11 +16,20 @@ if %_ROSBE_DEBUG% == 1 ( @echo on ) +set _ROSBE_UPDFINISH=0 +set _ROSBE_OPATH=0 +set _ROSBE_UPDDATE=0 +set _ROSBE_UPDDATE2=0 +set _ROSBE_UPDATES=0 +set _ROSBE_OPATH=%~dp0 +set _ROSBE_OPATH=%_ROSBE_OPATH:~0,-1% :: :: Set Title :: title Updating... + +cd /d %_ROSBE_BASEDIR% :: :: The Update Server. @@ -28,252 +37,94 @@ set _ROSBE_URL=http://mitglied.lycos.de/reimerdaniel/rosbe :: -:: Default Variables. +::First check for a new Updater :: -set _ROSBE_OPATH=%~dp0 -set _ROSBE_OPATH=%_ROSBE_OPATH:~0,-1% -set _ROSBE_CMDS=yes -set _ROSBE_GCC=yes -set _ROSBE_TOOLS=yes +for %%F in (update.cmd) do set _ROSBE_UPDDATE=%%~tF +"Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/update.cmd 1> NUL 2> NUL +for %%F in (update.cmd) do set _ROSBE_UPDDATE2=%%~tF +if !_ROSBE_UPDDATE! NEQ !_ROSBE_UPDDATE2! ( + cls + echo Updater got updated and needs to be restarted. + goto :EOC +) +for %%F in (updcheckproc.cmd) do set _ROSBE_UPDDATE=%%~tF +"Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/update.cmd 1> NUL 2> NUL +for %%F in (updcheckproc.cmd) do set _ROSBE_UPDDATE2=%%~tF +if !_ROSBE_UPDDATE! NEQ !_ROSBE_UPDDATE2! ( + cls + echo Updater got updated and needs to be restarted. + goto :EOC +) + +if not exist "Updates" mkdir Updates 1> NUL 2> NUL +cd Updates :: -:: Update the Vars if the params say so. +:: Parse the args. :: if "%1" == "" ( - goto :next + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 1 next + if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 2 next + if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 3 next + if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 4 next + if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 5 next + if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 6 next + if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 7 next + if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 8 next + if "!_ROSBE_UPDFINISH!" == "1" (goto :EOC) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 9 next + goto :EOC ) -elseif "%1" == "nocmds" ( - set _ROSBE_CMDS=no +if /i "%1" == "reset" ( + del /F /Q "%_ROSBE_BASEDIR%\Updates\*.*" 1> NUL 2> NUL + goto :EOC ) -elseif "%1" == "nogcc" ( - set _ROSBE_GCC=no +if /i "%1" == "nr" ( + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" %2 + goto :EOC ) -elseif "%1" == "notools" ( - set _ROSBE_TOOLS=no -) else ( - cls - echo Unknown first parameter specified. Exiting. - goto :EOU +if /i "%1" == "status" ( + mkdir tmp 1> NUL 2> NUL + copy *.txt .\tmp\. 1> NUL 2> NUL + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 1 status + if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 2 status + if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 3 status + if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 4 status + if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 5 status + if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 6 status + if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 7 status + if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 8 status + if "!_ROSBE_UPDFINISH!" == "1" (goto :UPDFIN) + call "%_ROSBE_BASEDIR%\updcheckproc.cmd" 9 status ) -if "%2" == "" ( - goto :next -) -elseif "%2" == "nocmds" ( - set _ROSBE_CMDS=no -) -elseif "%2" == "nogcc" ( - set _ROSBE_GCC=no -) -elseif "%2" == "notools" ( - set _ROSBE_TOOLS=no -) else ( - cls - echo Unknown second parameter specified. Exiting. - goto :EOU -) +:UPDFIN +del /F /Q tmp\*.* +echo Following Updates available: %_ROSBE_UPDATES% -if "%3" == "" ( - goto :next -) -elseif "%3" == "nocmds" ( - set _ROSBE_CMDS=no -) -elseif "%3" == "nogcc" ( - set _ROSBE_GCC=no -) -elseif "%3" == "notools" ( - set _ROSBE_TOOLS=no -) else ( - cls - echo Unknown third parameter specified. Exiting. - goto :EOU -) +:EOC -:next - -cd /d "%_ROSBE_BASEDIR%" - -if %_ROSBE_CMDS% == yes ( - - REM First check for a new Updater - - for %%F in (update.cmd) do set _ROSBE_UPDDATE=%%~tF - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/update.cmd - for %%F in (update.cmd) do set _ROSBE_UPDDATE2=%%~tF - - if !_ROSBE_UPDDATE! NEQ !_ROSBE_UPDDATE2! ( - cls - echo Updater got updated and needs to be restarted. - goto :EOU - ) - - REM PS1 Files. - - if exist "Build.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Build.ps1 - ) - if exist "chdefgcc.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/chdefgcc.ps1 - ) - if exist "Clean.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Clean.ps1 - ) - if exist "Help.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Help.ps1 - ) - if exist "MinGW.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/MinGW.ps1 - ) - if exist "RosBE.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/RosBE.ps1 - ) - if exist "rosbe-gcc-env.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/rosbe-gcc-env.ps1 - ) - - REM Arch Changer Files. - - if exist "charch.cmd" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/charch.cmd - ) - if exist "charch.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/charch.ps1 - ) - - REM Options Files. - - if exist "options.cmd" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/options.cmd - ) - if exist "options.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/options.ps1 - ) - - REM SVN Files. - - if exist "sSVN.cmd" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/sSVN.cmd - ) - if exist "sSVN.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/sSVN.ps1 - ) - - REM SCut Files. - - if exist "scut.cmd" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/scut.cmd - ) - if exist "scut.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/scut.ps1 - ) - - REM RelAddr2Line Files. - - if exist "reladdr2line.cmd" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/reladdr2line.cmd - ) - if exist "reladdr2line.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/reladdr2line.ps1 - ) - - REM Other Tools Files. - - if exist "Config.cmd" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Config.cmd - ) - if exist "Config.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Config.ps1 - ) - if exist "chdefdir.cmd" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/chdefdir.cmd - ) - if exist "chdefdir.ps1" ( - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/chdefdir.ps1 - ) - - REM Default Files. - - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Build.cmd - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/ChangeLog.txt - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/chdefgcc.cmd - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Clean.cmd - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Help.cmd - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/LICENSE.TXT - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/MinGW.cmd - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/mingw.ico - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/MinGW.mac - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/README.pdf - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/RosBE.cmd - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/rosbe.ico - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/RosBE.mac - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/rosbe-gcc-env.cmd - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/TimeDate.cmd -) - -if %_ROSBE_GCC% == yes ( - - REM Add Dates into Vars and load GCC packages if needed. - - if exist GCC.7z ( - for %%F in (GCC.7z) do set _ROSBE_GCCDATE=%%~tF - ) - - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/GCC.7z - - REM Add the maybe Updated Dates to another Var. - - for %%F in (GCC.7z) do set _ROSBE_GCCDATE2=%%~tF - - REM Extract GCC. - - if !_ROSBE_GCCDATE! NEQ !_ROSBE_GCCDATE2! ( - "Tools\7z.exe" x GCC.7z "%_ROSBE_BASEDIR%\i386" - ) -) -if %_ROSBE_TOOLS% == yes ( - - REM Add Dates into Vars and load Tool SRC packages if needed. - - if exist Tools.7z ( - for %%F in (Tools.7z) do set _ROSBE_TOOLSDATE=%%~tF - ) - - "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Tools.7z - - REM Add the maybe Updated Dates to another Var. - - for %%F in (Tools.7z) do set _ROSBE_TOOLSDATE2=%%~tF - - if !_ROSBE_TOOLSDATE! NEQ !_ROSBE_TOOLSDATE2! ( - "Tools\7z.exe" x Tools.7z "%TEMP%" - - REM Build the tools - - make -f %TEMP%\makefile - copy %TEMP%\*.exe "%_ROSBE_BASEDIR%\Tools" - ) -) - -:EOU - -cd /d "%_ROSBE_OPATH%" - +cd /d %_ROSBE_OPATH% if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) -:: -:: Unload Vars. -:: -set _ROSBE_URL= -set _ROSBE_GCCDATE= -set _ROSBE_TOOLSDATE= -set _ROSBE_GCCDATE2= -set _ROSBE_TOOLSDATE2= -set _ROSBE_CMDS= -set _ROSBE_GCC= -set _ROSBE_TOOLS= +set _ROSBE_UPDFINISH= set _ROSBE_OPATH= set _ROSBE_UPDDATE= -set _ROSBE_UPDDATE2= +set _ROSBE_UPDATES= +set _ROSBE_UPDDATE2= Added: trunk/tools/RosBE/RosBE-Windows/Root/updcheckproc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/updcheckproc.cmd (added) +++ trunk/tools/RosBE/RosBE-Windows/Root/updcheckproc.cmd [iso-8859-1] Sun Nov 23 14:38:15 2008 @@ -1,0 +1,65 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) +:: FILE: Root/update.cmd +:: PURPOSE: RosBE Updater. +:: COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> +:: +:: +@echo off + +setlocal +setlocal enableextensions +setlocal enabledelayedexpansion + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 1 ( + @echo on +) + +if "%2" == "status" ( + cd tmp + if not exist "%_ROSBE_VERSION%-%1.txt" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%1.txt 1> NUL 2> NUL + if exist "%_ROSBE_VERSION%-%1.txt" ( + echo %1 + set _ROSBE_UPDATES=%_ROSBE_UPDATES%, %1 + ) else ( + set _ROSBE_UPDFINISH=1 + ) + ) + goto :EOF +) +if not exist "%_ROSBE_VERSION%-%1.txt" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%1.txt 1> NUL 2> NUL +) +if exist "%_ROSBE_VERSION%-%1.txt" ( + type "%_ROSBE_VERSION%-%1.txt" + echo. + echo Install? + set /p YESNO="(yes), (no)" + if /i "!YESNO!"=="yes" ( + if not exist "%_ROSBE_VERSION%-%1.7z" ( + "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/%_ROSBE_VERSION%-%1.7z 1> NUL 2> NUL + ) + if exist "%_ROSBE_VERSION%-%1.7z" ( + "%_ROSBE_BASEDIR%\Tools\7z.exe" x "%_ROSBE_VERSION%-%1.7z" + cd "%_ROSBE_VERSION%-%1" + call "%_ROSBE_VERSION%-%1.cmd" + ) else ( + echo ERROR: This Update does not seem to exist or the Internet connection is not working correctly. + goto :EOF + ) + ) else if /i "!YESNO!"=="no" ( + del "%_ROSBE_VERSION%-%1.txt" 1> NUL 2> NUL + goto :EOF + ) +) else ( + if "%2" == "next" ( + echo set %2 + set _ROSBE_UPDFINISH=1 + ) else ( + echo ERROR: This Update does not seem to exist or the Internet connection is not working correctly. + goto :EOF + ) +) Propchange: trunk/tools/RosBE/RosBE-Windows/Root/updcheckproc.cmd ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 37596: Implement WinWatchDidStatusChange
by greatlrd＠svn.reactos.org 23 Nov '08

23 Nov '08

Author: greatlrd Date: Sun Nov 23 11:50:15 2008 New Revision: 37596 URL: http://svn.reactos.org/svn/reactos?rev=37596&view=rev Log: Implement WinWatchDidStatusChange Modified: branches/reactx/reactos/dll/win32/dciman32/dciman32.def branches/reactx/reactos/dll/win32/dciman32/dciman_main.c Modified: branches/reactx/reactos/dll/win32/dciman32/dciman32.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman32.def [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman32.def [iso-8859-1] Sun Nov 23 11:50:15 2008 @@ -16,7 +16,7 @@ GetDCRegionData@12 GetWindowRegionData@12 WinWatchClose@4 -; WinWatchDidStatusChange + WinWatchDidStatusChange@4 ; WinWatchGetClipList WinWatchNotify@12 WinWatchOpen@4 Modified: branches/reactx/reactos/dll/win32/dciman32/dciman_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] Sun Nov 23 11:50:15 2008 @@ -16,6 +16,7 @@ typedef struct _WINWATCH_INT { HWND hWnd; + BOOL WinWtachStatus; } WINWATCH_INT, *LPWINWATCH_INT; @@ -429,6 +430,12 @@ LeaveCriticalSection(&ddcs); } +BOOL WINAPI +WinWatchDidStatusChange(HWINWATCH hWW) +{ + LPWINWATCH_INT pWinwatch_int = (LPWINWATCH_INT)hWW; + return pWinwatch_int->WinWtachStatus; +} /***********************************************************************************************************/

1 0

[greatlrd] 37595: Implement WinWatchClose
by greatlrd＠svn.reactos.org 23 Nov '08

23 Nov '08

Author: greatlrd Date: Sun Nov 23 11:11:52 2008 New Revision: 37595 URL: http://svn.reactos.org/svn/reactos?rev=37595&view=rev Log: Implement WinWatchClose Modified: branches/reactx/reactos/dll/win32/dciman32/dciman32.def branches/reactx/reactos/dll/win32/dciman32/dciman_main.c Modified: branches/reactx/reactos/dll/win32/dciman32/dciman32.def URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman32.def [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman32.def [iso-8859-1] Sun Nov 23 11:11:52 2008 @@ -15,8 +15,8 @@ DCISetSrcDestClip@16 GetDCRegionData@12 GetWindowRegionData@12 -; WinWatchClose + WinWatchClose@4 ; WinWatchDidStatusChange ; WinWatchGetClipList WinWatchNotify@12 -; WinWatchOpen + WinWatchOpen@4 Modified: branches/reactx/reactos/dll/win32/dciman32/dciman_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/dciman… ============================================================================== --- branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/dciman32/dciman_main.c [iso-8859-1] Sun Nov 23 11:11:52 2008 @@ -416,6 +416,19 @@ return (HWINWATCH) pWinwatch_int; } +void WINAPI +WinWatchClose(HWINWATCH hWW) +{ + EnterCriticalSection(&ddcs); + + if (hWW != NULL) + { + HeapFree(GetProcessHeap(), 0, hWW); + } + + LeaveCriticalSection(&ddcs); +} + /***********************************************************************************************************/

1 0

[cgutman] 37594: - Merge r37593 which I accidentally committed to trunk
by cgutman＠svn.reactos.org 23 Nov '08

23 Nov '08

Author: cgutman Date: Sun Nov 23 10:58:14 2008 New Revision: 37594 URL: http://svn.reactos.org/svn/reactos?rev=37594&view=rev Log: - Merge r37593 which I accidentally committed to trunk Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Nov 23 10:58:14 2008 @@ -270,6 +270,7 @@ KIRQL OldIrql; NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_END, NULL, 0); + NdisMIndicateStatusComplete(Adapter); KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql);

1 0

[cgutman] 37593: - NDIS always calls NdisMIndicateStatusComplete immediately after calling NdisMIndicateStatus
by cgutman＠svn.reactos.org 23 Nov '08

23 Nov '08

Author: cgutman Date: Sun Nov 23 10:50:11 2008 New Revision: 37593 URL: http://svn.reactos.org/svn/reactos?rev=37593&view=rev Log: - NDIS always calls NdisMIndicateStatusComplete immediately after calling NdisMIndicateStatus Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Nov 23 10:50:11 2008 @@ -270,6 +270,7 @@ KIRQL OldIrql; NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_END, NULL, 0); + NdisMIndicateStatusComplete(Adapter); KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql);

1 0

[dchapyshev] 37592: - More correct fix
by dchapyshev＠svn.reactos.org 23 Nov '08

23 Nov '08

Author: dchapyshev Date: Sun Nov 23 09:10:09 2008 New Revision: 37592 URL: http://svn.reactos.org/svn/reactos?rev=37592&view=rev Log: - More correct fix Modified: trunk/reactos/base/setup/reactos/reactos.c Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Sun Nov 23 09:10:09 2008 @@ -28,7 +28,7 @@ #include <windows.h> #include <commctrl.h> -#include <wchar.h> +#include <tchar.h> #include <setupapi.h> #include <initguid.h> #include <devguid.h> @@ -42,23 +42,23 @@ typedef struct _LANG { - WCHAR LangId[9]; - WCHAR LangName[128]; + TCHAR LangId[9]; + TCHAR LangName[128]; } LANG, *PLANG; typedef struct _KBLAYOUT { - WCHAR LayoutId[9]; - WCHAR LayoutName[128]; - WCHAR DllName[128]; + TCHAR LayoutId[9]; + TCHAR LayoutName[128]; + TCHAR DllName[128]; } KBLAYOUT, *PKBLAYOUT; // generic entries with simple 1:1 mapping typedef struct _GENENTRY { - WCHAR Id[24]; - WCHAR Value[128]; + TCHAR Id[24]; + TCHAR Value[128]; } GENENTRY, *PGENENTRY; struct @@ -72,7 +72,7 @@ LONG FormatPart; // type of format the partition LONG SelectedLangId; // selected language (table index) LONG SelectedKBLayout; // selected keyboard layout (table index) - WCHAR InstallDir[MAX_PATH]; // installation directory on hdd + TCHAR InstallDir[MAX_PATH]; // installation directory on hdd LONG SelectedComputer; // selected computer type (table index) LONG SelectedDisplay; // selected display type (table index) LONG SelectedKeyboard; // selected keyboard type (table index) @@ -99,7 +99,7 @@ INT cySource; } IMGINFO, *PIMGINFO; -WCHAR abort_msg[512], abort_title[64]; +TCHAR abort_msg[512], abort_title[64]; HINSTANCE hInstance; BOOL isUnattend; @@ -142,7 +142,7 @@ LogFont = ncm.lfMessageFont; LogFont.lfWeight = FW_BOLD; - wcscpy(LogFont.lfFaceName, L"MS Shell Dlg"); + _tcscpy(LogFont.lfFaceName, _T("MS Shell Dlg")); hdc = GetDC(NULL); FontSize = 12; @@ -359,20 +359,20 @@ case PSN_WIZNEXT: // set the selected data { - hList = GetDlgItem(hwndDlg, IDC_LANGUAGES); - tindex = SendMessage(hList, CB_GETCURSEL, (WPARAM) 0, (LPARAM) 0); + hList =GetDlgItem(hwndDlg, IDC_LANGUAGES); + tindex = SendMessage(hList,CB_GETCURSEL, (WPARAM)0, (LPARAM)0); if (tindex != CB_ERR) { SetupData.SelectedLangId = SendMessage(hList, CB_GETITEMDATA, (WPARAM) tindex, (LPARAM) 0); - WORD LangID = wcstol(SetupData.pLanguages[SetupData.SelectedLangId].LangId, NULL, 16); + WORD LangID = _tcstol(SetupData.pLanguages[SetupData.SelectedLangId].LangId, NULL, 16); SetThreadLocale(MAKELCID(LangID, SORT_DEFAULT)); // FIXME: need to reload all resource to force // the new language setting } hList = GetDlgItem(hwndDlg, IDC_KEYLAYOUT); - tindex = SendMessage(hList, CB_GETCURSEL, (WPARAM) 0, (LPARAM) 0); + tindex = SendMessage(hList,CB_GETCURSEL, (WPARAM)0, (LPARAM)0); if (tindex != CB_ERR) { SetupData.SelectedKBLayout = SendMessage(hList, CB_GETITEMDATA, (WPARAM) tindex, (LPARAM) 0); @@ -614,7 +614,7 @@ { SendMessage(GetDlgItem(hwndDlg, IDC_PATH), WM_GETTEXT, - (WPARAM) sizeof(SetupData.InstallDir) / sizeof(WCHAR), + (WPARAM) sizeof(SetupData.InstallDir) / sizeof(TCHAR), (LPARAM) SetupData.InstallDir); EndDialog(hwndDlg, IDOK); @@ -976,11 +976,11 @@ void LoadSetupData() { WCHAR szPath[MAX_PATH]; - WCHAR tmp[10]; + TCHAR tmp[10]; WCHAR *ch; HINF hTxtsetupSif; INFCONTEXT InfContext; - //WCHAR szValue[MAX_PATH]; + //TCHAR szValue[MAX_PATH]; DWORD LineLength; LONG Count; @@ -994,7 +994,7 @@ if (hTxtsetupSif != INVALID_HANDLE_VALUE) { // get language list - Count = SetupGetLineCount(hTxtsetupSif, L"Language"); + Count = SetupGetLineCount(hTxtsetupSif, _T("Language")); if (Count > 0) { SetupData.pLanguages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LANG) * Count); @@ -1002,20 +1002,20 @@ { SetupData.LangCount = Count; Count = 0; - if (SetupFindFirstLine(hTxtsetupSif, L"Language", NULL, &InfContext)) + if (SetupFindFirstLine(hTxtsetupSif, _T("Language"), NULL, &InfContext)) { do { SetupGetStringField(&InfContext, 0, SetupData.pLanguages[Count].LangId, - sizeof(SetupData.pLanguages[Count].LangId) / sizeof(WCHAR), + sizeof(SetupData.pLanguages[Count].LangId) / sizeof(TCHAR), &LineLength); SetupGetStringField(&InfContext, 1, SetupData.pLanguages[Count].LangName, - sizeof(SetupData.pLanguages[Count].LangName) / sizeof(WCHAR), + sizeof(SetupData.pLanguages[Count].LangName) / sizeof(TCHAR), &LineLength); ++Count; } @@ -1025,7 +1025,7 @@ } // get keyboard layout list - Count = SetupGetLineCount(hTxtsetupSif, L"KeyboardLayout"); + Count = SetupGetLineCount(hTxtsetupSif, _T("KeyboardLayout")); if (Count > 0) { SetupData.pKbLayouts = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(KBLAYOUT) * Count); @@ -1033,20 +1033,20 @@ { SetupData.KbLayoutCount = Count; Count = 0; - if (SetupFindFirstLine(hTxtsetupSif, L"KeyboardLayout", NULL, &InfContext)) + if (SetupFindFirstLine(hTxtsetupSif, _T("KeyboardLayout"), NULL, &InfContext)) { do { SetupGetStringField(&InfContext, 0, SetupData.pKbLayouts[Count].LayoutId, - sizeof(SetupData.pKbLayouts[Count].LayoutId) / sizeof(WCHAR), + sizeof(SetupData.pKbLayouts[Count].LayoutId) / sizeof(TCHAR), &LineLength); SetupGetStringField(&InfContext, 1, SetupData.pKbLayouts[Count].LayoutName, - sizeof(SetupData.pKbLayouts[Count].LayoutName) / sizeof(WCHAR), + sizeof(SetupData.pKbLayouts[Count].LayoutName) / sizeof(TCHAR), &LineLength); ++Count; } @@ -1060,22 +1060,22 @@ SetupData.DefaultLang = -1; // TODO: get defaults from underlaying running system - if (SetupFindFirstLine(hTxtsetupSif, L"NLS", L"DefaultLayout", &InfContext)) - { - SetupGetStringField(&InfContext, 1, tmp, sizeof(tmp) / sizeof(WCHAR), &LineLength); + if (SetupFindFirstLine(hTxtsetupSif, _T("NLS"), _T("DefaultLayout"), &InfContext)) + { + SetupGetStringField(&InfContext, 1, tmp, sizeof(tmp) / sizeof(TCHAR), &LineLength); for (Count = 0; Count < SetupData.KbLayoutCount; Count++) - if (wcscmp(tmp, SetupData.pKbLayouts[Count].LayoutId) == 0) + if (_tcscmp(tmp, SetupData.pKbLayouts[Count].LayoutId) == 0) { SetupData.DefaultKBLayout = Count; break; } } - if (SetupFindFirstLine(hTxtsetupSif, L"NLS", L"DefaultLanguage", &InfContext)) - { - SetupGetStringField(&InfContext, 1, tmp, sizeof(tmp) / sizeof(WCHAR), &LineLength); + if (SetupFindFirstLine(hTxtsetupSif, _T("NLS"), _T("DefaultLanguage"), &InfContext)) + { + SetupGetStringField(&InfContext, 1, tmp, sizeof(tmp) / sizeof(TCHAR), &LineLength); for (Count = 0; Count < SetupData.LangCount; Count++) - if (wcscmp(tmp, SetupData.pLanguages[Count].LangId) == 0) + if (_tcscmp(tmp, SetupData.pLanguages[Count].LangId) == 0) { SetupData.DefaultLang = Count; break; @@ -1083,7 +1083,7 @@ } // get computers list - Count = SetupGetLineCount(hTxtsetupSif, L"Computer"); + Count = SetupGetLineCount(hTxtsetupSif, _T("Computer")); if (Count > 0) { SetupData.pComputers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GENENTRY) * Count); @@ -1091,20 +1091,20 @@ { SetupData.CompCount = Count; Count = 0; - if (SetupFindFirstLine(hTxtsetupSif, L"Computer", NULL, &InfContext)) + if (SetupFindFirstLine(hTxtsetupSif, _T("Computer"), NULL, &InfContext)) { do { SetupGetStringField(&InfContext, 0, SetupData.pComputers[Count].Id, - sizeof(SetupData.pComputers[Count].Id) / sizeof(WCHAR), + sizeof(SetupData.pComputers[Count].Id) / sizeof(TCHAR), &LineLength); SetupGetStringField(&InfContext, 1, SetupData.pComputers[Count].Value, - sizeof(SetupData.pComputers[Count].Value) / sizeof(WCHAR), + sizeof(SetupData.pComputers[Count].Value) / sizeof(TCHAR), &LineLength); ++Count; } @@ -1114,7 +1114,7 @@ } // get display list - Count = SetupGetLineCount(hTxtsetupSif, L"Display"); + Count = SetupGetLineCount(hTxtsetupSif, _T("Display")); if (Count > 0) { SetupData.pDisplays = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GENENTRY) * Count); @@ -1123,20 +1123,20 @@ SetupData.DispCount = Count; Count = 0; - if (SetupFindFirstLine(hTxtsetupSif, L"Display", NULL, &InfContext)) + if (SetupFindFirstLine(hTxtsetupSif, _T("Display"), NULL, &InfContext)) { do { SetupGetStringField(&InfContext, 0, SetupData.pDisplays[Count].Id, - sizeof(SetupData.pDisplays[Count].Id) / sizeof(WCHAR), + sizeof(SetupData.pDisplays[Count].Id) / sizeof(TCHAR), &LineLength); SetupGetStringField(&InfContext, 1, SetupData.pDisplays[Count].Value, - sizeof(SetupData.pDisplays[Count].Value) / sizeof(WCHAR), + sizeof(SetupData.pDisplays[Count].Value) / sizeof(TCHAR), &LineLength); ++Count; } @@ -1146,7 +1146,7 @@ } // get keyboard list - Count = SetupGetLineCount(hTxtsetupSif, L"Keyboard"); + Count = SetupGetLineCount(hTxtsetupSif, _T("Keyboard")); if (Count > 0) { SetupData.pKeyboards = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GENENTRY) * Count); @@ -1155,20 +1155,20 @@ SetupData.KeybCount = Count; Count = 0; - if (SetupFindFirstLine(hTxtsetupSif, L"Keyboard", NULL, &InfContext)) + if (SetupFindFirstLine(hTxtsetupSif, _T("Keyboard"), NULL, &InfContext)) { do { SetupGetStringField(&InfContext, 0, SetupData.pKeyboards[Count].Id, - sizeof(SetupData.pKeyboards[Count].Id) / sizeof(WCHAR), + sizeof(SetupData.pKeyboards[Count].Id) / sizeof(TCHAR), &LineLength); SetupGetStringField(&InfContext, 1, SetupData.pKeyboards[Count].Value, - sizeof(SetupData.pKeyboards[Count].Value) / sizeof(WCHAR), + sizeof(SetupData.pKeyboards[Count].Value) / sizeof(TCHAR), &LineLength); ++Count; } @@ -1178,12 +1178,12 @@ } // get install directory - if (SetupFindFirstLine(hTxtsetupSif, L"SetupData", L"DefaultPath", &InfContext)) + if (SetupFindFirstLine(hTxtsetupSif, _T("SetupData"), _T("DefaultPath"), &InfContext)) { SetupGetStringField(&InfContext, 1, SetupData.InstallDir, - sizeof(SetupData.InstallDir) / sizeof(WCHAR), + sizeof(SetupData.InstallDir) / sizeof(TCHAR), &LineLength); } SetupCloseInfFile(hTxtsetupSif); @@ -1196,7 +1196,7 @@ WCHAR *ch; HINF hUnattendedInf; INFCONTEXT InfContext; - WCHAR szValue[MAX_PATH]; + TCHAR szValue[MAX_PATH]; DWORD LineLength; //HKEY hKey; BOOL result = 0; @@ -1211,13 +1211,13 @@ if (hUnattendedInf != INVALID_HANDLE_VALUE) { - if (SetupFindFirstLine(hUnattendedInf, L"Unattend", L"UnattendSetupEnabled",&InfContext)) + if (SetupFindFirstLine(hUnattendedInf, _T("Unattend"), _T("UnattendSetupEnabled"),&InfContext)) { if (SetupGetStringField(&InfContext, 1, szValue, - sizeof(szValue) / sizeof(WCHAR), - &LineLength) && (_wcsicmp(szValue, L"yes") == 0)) + sizeof(szValue) / sizeof(TCHAR), + &LineLength) && (_tcsicmp(szValue, _T("yes")) == 0)) { result = 1; // unattendSetup enabled // read values and store in SetupData @@ -1230,10 +1230,10 @@ } int WINAPI -wWinMain(HINSTANCE hInst, - HINSTANCE hPrevInstance, - LPWSTR lpszCmdLine, - int nCmdShow) +_tWinMain(HINSTANCE hInst, + HINSTANCE hPrevInstance, + LPTSTR lpszCmdLine, + int nCmdShow) { PROPSHEETHEADER psh; HPROPSHEETPAGE ahpsp[8]; @@ -1244,8 +1244,8 @@ if (!isUnattend) { - LoadString(hInst, IDS_ABORTSETUP, abort_msg, sizeof(abort_msg) / sizeof(WCHAR)); - LoadString(hInst, IDS_ABORTSETUP2, abort_title, sizeof(abort_title) / sizeof(WCHAR)); + LoadString(hInst,IDS_ABORTSETUP, abort_msg, sizeof(abort_msg)/sizeof(TCHAR)); + LoadString(hInst,IDS_ABORTSETUP2, abort_title,sizeof(abort_title)/sizeof(TCHAR)); LoadSetupData();

1 0

[dgoette] 37591: * fix bug in language detection * let the user decide which language he want to set instead of preselecting by browser preferences * minor fixes * fix the famous metadata bug
by dgoette＠svn.reactos.org 23 Nov '08

23 Nov '08

Author: dgoette Date: Sun Nov 23 08:54:05 2008 New Revision: 37591 URL: http://svn.reactos.org/svn/reactos?rev=37591&view=rev Log: * fix bug in language detection * let the user decide which language he want to set instead of preselecting by browser preferences * minor fixes * fix the famous metadata bug Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/CMSWebsiteSaveEntry.class.… branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_ProfileEdit.clas… branches/danny-web/reactos.org/htdocs/roscms/lib/Language.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Subsystem_Bugzilla.class.p… Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/CMSWebsiteSaveEntry.class.… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/CMSWebsiteSaveEntry.class.… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/CMSWebsiteSaveEntry.class.… [iso-8859-1] Sun Nov 23 08:54:05 2008 @@ -98,6 +98,19 @@ $stmt->execute(); $rev_id = $stmt->fetchColumn(); + // get stable entry + $stmt=DBConnection::getInstance()->prepare("SELECT r.rev_id, r.data_id FROM data_tag a JOIN data_revision r ON (r.data_id = a.data_id AND r.rev_id = a.data_rev_id) JOIN data_tag_name n ON a.tag_name_id = n.tn_id JOIN data_tag_value v ON a.tag_value_id = v.tv_id WHERE r.data_id = :data_id AND r.rev_language = :lang AND r.rev_id = a.data_rev_id AND a.tag_usrid = '-1' AND n.tn_name = 'status' AND v.tv_value = 'stable' ORDER BY r.rev_id DESC LIMIT 1"); + $stmt->bindParam('data_id',$_GET['d_id'],PDO::PARAM_INT); + $stmt->bindParam('lang',$_GET['d_r_lang'],PDO::PARAM_STR); + $stmt->execute(); + $stable = $stmt->fetchOnce(PDO::FETCH_ASSOC); + if ($stable !== false) { + + // transfer from stable entry + Tag::copyFromData($stable['data_id'], $stable['rev_id'], $_GET['d_id'], $rev_id, false); + Tag::deleteByName($_GET['d_id'], $rev_id, 'status', -1); + } + // tag the revision as new or draft if ($type == 'submit') { Tag::add($_GET['d_id'], $rev_id, 'status', 'new', -1); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php [iso-8859-1] Sun Nov 23 08:54:05 2008 @@ -221,7 +221,7 @@ if (Data::copy($revision['data_id'], $revision['rev_id'], 1 /* copy mode */, $RosCMS_GET_d_r_lang)) { $stmt=DBConnection::getInstance()->prepare("SELECT data_id, rev_id, rev_language FROM data_revision WHERE data_id = :data_id AND rev_usrid = :user_id AND rev_version = 0 AND rev_language = :lang AND rev_date = :date ORDER BY rev_id DESC LIMIT 1"); $stmt->bindParam('data_id',$revision['data_id'],PDO::PARAM_STR); - $stmt->bindParam('user_id',$thisuser->id(),PDO::PARAM_INT); + $stmt->bindParam('user_id',ThisUser::getInstance()->id(),PDO::PARAM_INT); $stmt->bindParam('lang',$_GET['d_r_lang'],PDO::PARAM_STR); $stmt->bindParam('date',date('Y-m-d'),PDO::PARAM_STR); $stmt->execute(); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_ProfileEdit.clas… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_ProfileEdit.clas… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_User_ProfileEdit.clas… [iso-8859-1] Sun Nov 23 08:54:05 2008 @@ -87,7 +87,7 @@ <div class="corner4"> <div style="text-align:center; padding: 4px; ">'); - $stmt=DBConnection::getInstance()->prepare("SELECT user_id, user_name, user_fullname, user_email, user_email_activation, user_website, user_country, user_timezone, user_occupation, user_setting_multisession, user_setting_browseragent, user_setting_ipaddress, user_setting_timeout FROM users WHERE user_id = :user_id LIMIT 1"); + $stmt=DBConnection::getInstance()->prepare("SELECT user_id, user_name, user_fullname, user_email, user_email_activation, user_website, user_country, user_language, user_timezone, user_occupation, user_setting_multisession, user_setting_browseragent, user_setting_ipaddress, user_setting_timeout FROM users WHERE user_id = :user_id LIMIT 1"); $stmt->bindParam('user_id',ThisUser::getInstance()->id(),PDO::PARAM_INT); $stmt->execute(); $profile = $stmt->fetchOnce(); @@ -137,9 +137,6 @@ if (($activation_code == '' || strlen($activation_code) <= 6) && isset($_POST['registerpost']) && ($safepwd === true || $safepwd === '') && (isset($_POST['userpwd1']) && ($_POST['userpwd1'] == "" || (strlen($_POST['userpwd1']) >= $rdf_register_user_pwd_min && strlen($_POST['userpwd1']) < $rdf_register_user_pwd_max))) && isset($_POST['useremail']) && EMail::isValid($_POST['useremail']) && !$existemail) { - // user language (browser settings) - $userlang = Language::checkStatic($_SERVER["HTTP_ACCEPT_LANGUAGE"]); - // email address activation code $s = ''; for ($n=0; $n<20; $n++) { @@ -173,7 +170,7 @@ $stmt=DBConnection::getInstance()->prepare("UPDATE users SET user_timestamp_touch2 = NOW( ) , user_fullname = :fullname, user_website = :website, user_language = :language, user_country = :country, user_timezone = :timezone, user_occupation = :occupation, user_setting_multisession = :setting_multisession, user_setting_browseragent = :setting_browser, user_setting_ipaddress = :setting_ip, user_setting_timeout = :setting_timeout WHERE user_id = :user_id LIMIT 1"); $stmt->bindParam('fullname',htmlspecialchars($_POST['userfullname']),PDO::PARAM_STR); $stmt->bindParam('website',$_POST['userwebsite'],PDO::PARAM_STR); - $stmt->bindParam('language',$userlang,PDO::PARAM_STR); + $stmt->bindParam('language',Language::checkStatic($_POST['language']),PDO::PARAM_STR); $stmt->bindParam('country',$_POST['country'],PDO::PARAM_STR); $stmt->bindParam('timezone',$_POST['tzone'],PDO::PARAM_STR); $stmt->bindParam('occupation',$_POST['useroccupation'],PDO::PARAM_STR); @@ -286,6 +283,27 @@ <div class="login-form"> <label for="userfullname">First and Last Name *</label> <input name="userfullname" type="text" class="input" tabindex="5" id="userfullname" value="'.(isset($_POST['userfullname']) ? $_POST['userfullname'] : $profile['user_fullname']).'" size="50" maxlength="50" /> + </div> + + <div class="login-form"> + <label for="language"'.(isset($_POST['registerpost']) && $_POST['language'] == '' ? ' style="color:red;"' : '').'>Language</label> + <select id="language" name="language" tabindex="6"> + <option value="">Select One</option>'); + + $stmt=DBConnection::getInstance()->prepare("SELECT lang_id, lang_name, lang_name_org FROM languages ORDER BY lang_name ASC"); + $stmt->execute(); + while ($language = $stmt->fetch(PDO::FETCH_ASSOC)) { + echo '<option value="'.$language['lang_id'].'"'; + + if ((isset($_POST['language']) && $_POST['language'] == $country['lang_id']) || (empty($_POST['language']) && $language['lang_id'] == $profile['user_language'])) { + echo ' selected="selected"'; + } + + echo '>'.$language['lang_name'].' ('.$language['lang_name_org'].')</option>'; + } + + echo_strip(' + </select> </div> <div class="login-form"> Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Language.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Language.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Language.class.php [iso-8859-1] Sun Nov 23 08:54:05 2008 @@ -25,8 +25,6 @@ public static function checkStatic( $lang_code ) { global $roscms_standard_language; - - $lang_code = substr($lang_code, 0, 2); switch ($lang_code) { case 'ar': @@ -58,7 +56,7 @@ case 'uk': case 'vi': case 'zh': - $ret = $lang_code; + return $lang_code; break; case '*': default: Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Subsystem_Bugzilla.class.p… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Subsystem_Bugzilla.class.p… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Subsystem_Bugzilla.class.p… [iso-8859-1] Sun Nov 23 08:54:05 2008 @@ -171,7 +171,7 @@ } } - foreach ($global_events as $event) { + foreach ($this->global_events as $event) { $stmt=DBConnection::getInstance()->prepare("INSERT INTO ".self::DB_NAME.".email_setting (user_id, relationship, event) VALUES (LAST_INSERT_ID(), :relation, :event)"); $stmt->bindValue('relation',self::REL_ANY,PDO::PARAM_INT); $stmt->bindParam('event',$event,PDO::PARAM_INT);

1 0

[dchapyshev] 37589: - Set flag unicode="yes" - Use WCHARs instead of TCHAR
by dchapyshev＠svn.reactos.org 23 Nov '08

23 Nov '08

Author: dchapyshev Date: Sun Nov 23 08:16:46 2008 New Revision: 37589 URL: http://svn.reactos.org/svn/reactos?rev=37589&view=rev Log: - Set flag unicode="yes" - Use WCHARs instead of TCHAR Modified: trunk/reactos/base/setup/reactos/reactos.c trunk/reactos/base/setup/reactos/reactos.rbuild Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Sun Nov 23 08:16:46 2008 @@ -28,7 +28,7 @@ #include <windows.h> #include <commctrl.h> -#include <tchar.h> +#include <wchar.h> #include <setupapi.h> #include <initguid.h> #include <devguid.h> @@ -42,23 +42,23 @@ typedef struct _LANG { - TCHAR LangId[9]; - TCHAR LangName[128]; + WCHAR LangId[9]; + WCHAR LangName[128]; } LANG, *PLANG; typedef struct _KBLAYOUT { - TCHAR LayoutId[9]; - TCHAR LayoutName[128]; - TCHAR DllName[128]; + WCHAR LayoutId[9]; + WCHAR LayoutName[128]; + WCHAR DllName[128]; } KBLAYOUT, *PKBLAYOUT; // generic entries with simple 1:1 mapping typedef struct _GENENTRY { - TCHAR Id[24]; - TCHAR Value[128]; + WCHAR Id[24]; + WCHAR Value[128]; } GENENTRY, *PGENENTRY; struct @@ -72,7 +72,7 @@ LONG FormatPart; // type of format the partition LONG SelectedLangId; // selected language (table index) LONG SelectedKBLayout; // selected keyboard layout (table index) - TCHAR InstallDir[MAX_PATH]; // installation directory on hdd + WCHAR InstallDir[MAX_PATH]; // installation directory on hdd LONG SelectedComputer; // selected computer type (table index) LONG SelectedDisplay; // selected display type (table index) LONG SelectedKeyboard; // selected keyboard type (table index) @@ -99,7 +99,7 @@ INT cySource; } IMGINFO, *PIMGINFO; -TCHAR abort_msg[512], abort_title[64]; +WCHAR abort_msg[512], abort_title[64]; HINSTANCE hInstance; BOOL isUnattend; @@ -142,7 +142,7 @@ LogFont = ncm.lfMessageFont; LogFont.lfWeight = FW_BOLD; - _tcscpy(LogFont.lfFaceName, _T("MS Shell Dlg")); + wcscpy(LogFont.lfFaceName, L"MS Shell Dlg"); hdc = GetDC(NULL); FontSize = 12; @@ -359,20 +359,20 @@ case PSN_WIZNEXT: // set the selected data { - hList =GetDlgItem(hwndDlg, IDC_LANGUAGES); - tindex = SendMessage(hList,CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + hList = GetDlgItem(hwndDlg, IDC_LANGUAGES); + tindex = SendMessage(hList, CB_GETCURSEL, (WPARAM) 0, (LPARAM) 0); if (tindex != CB_ERR) { SetupData.SelectedLangId = SendMessage(hList, CB_GETITEMDATA, (WPARAM) tindex, (LPARAM) 0); - WORD LangID = strtol(SetupData.pLanguages[SetupData.SelectedLangId].LangId, NULL, 16); + WORD LangID = wcstol(SetupData.pLanguages[SetupData.SelectedLangId].LangId, NULL, 16); SetThreadLocale(MAKELCID(LangID, SORT_DEFAULT)); // FIXME: need to reload all resource to force // the new language setting } hList = GetDlgItem(hwndDlg, IDC_KEYLAYOUT); - tindex = SendMessage(hList,CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + tindex = SendMessage(hList, CB_GETCURSEL, (WPARAM) 0, (LPARAM) 0); if (tindex != CB_ERR) { SetupData.SelectedKBLayout = SendMessage(hList, CB_GETITEMDATA, (WPARAM) tindex, (LPARAM) 0); @@ -614,7 +614,7 @@ { SendMessage(GetDlgItem(hwndDlg, IDC_PATH), WM_GETTEXT, - (WPARAM) sizeof(SetupData.InstallDir) / sizeof(TCHAR), + (WPARAM) sizeof(SetupData.InstallDir) / sizeof(WCHAR), (LPARAM) SetupData.InstallDir); EndDialog(hwndDlg, IDOK); @@ -976,11 +976,11 @@ void LoadSetupData() { WCHAR szPath[MAX_PATH]; - TCHAR tmp[10]; + WCHAR tmp[10]; WCHAR *ch; HINF hTxtsetupSif; INFCONTEXT InfContext; - //TCHAR szValue[MAX_PATH]; + //WCHAR szValue[MAX_PATH]; DWORD LineLength; LONG Count; @@ -994,7 +994,7 @@ if (hTxtsetupSif != INVALID_HANDLE_VALUE) { // get language list - Count = SetupGetLineCount(hTxtsetupSif, _T("Language")); + Count = SetupGetLineCount(hTxtsetupSif, L"Language"); if (Count > 0) { SetupData.pLanguages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LANG) * Count); @@ -1002,20 +1002,20 @@ { SetupData.LangCount = Count; Count = 0; - if (SetupFindFirstLine(hTxtsetupSif, _T("Language"), NULL, &InfContext)) + if (SetupFindFirstLine(hTxtsetupSif, L"Language", NULL, &InfContext)) { do { SetupGetStringField(&InfContext, 0, SetupData.pLanguages[Count].LangId, - sizeof(SetupData.pLanguages[Count].LangId) / sizeof(TCHAR), + sizeof(SetupData.pLanguages[Count].LangId) / sizeof(WCHAR), &LineLength); SetupGetStringField(&InfContext, 1, SetupData.pLanguages[Count].LangName, - sizeof(SetupData.pLanguages[Count].LangName) / sizeof(TCHAR), + sizeof(SetupData.pLanguages[Count].LangName) / sizeof(WCHAR), &LineLength); ++Count; } @@ -1025,7 +1025,7 @@ } // get keyboard layout list - Count = SetupGetLineCount(hTxtsetupSif, _T("KeyboardLayout")); + Count = SetupGetLineCount(hTxtsetupSif, L"KeyboardLayout"); if (Count > 0) { SetupData.pKbLayouts = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(KBLAYOUT) * Count); @@ -1033,20 +1033,20 @@ { SetupData.KbLayoutCount = Count; Count = 0; - if (SetupFindFirstLine(hTxtsetupSif, _T("KeyboardLayout"), NULL, &InfContext)) + if (SetupFindFirstLine(hTxtsetupSif, L"KeyboardLayout", NULL, &InfContext)) { do { SetupGetStringField(&InfContext, 0, SetupData.pKbLayouts[Count].LayoutId, - sizeof(SetupData.pKbLayouts[Count].LayoutId) / sizeof(TCHAR), + sizeof(SetupData.pKbLayouts[Count].LayoutId) / sizeof(WCHAR), &LineLength); SetupGetStringField(&InfContext, 1, SetupData.pKbLayouts[Count].LayoutName, - sizeof(SetupData.pKbLayouts[Count].LayoutName) / sizeof(TCHAR), + sizeof(SetupData.pKbLayouts[Count].LayoutName) / sizeof(WCHAR), &LineLength); ++Count; } @@ -1060,22 +1060,22 @@ SetupData.DefaultLang = -1; // TODO: get defaults from underlaying running system - if (SetupFindFirstLine(hTxtsetupSif, _T("NLS"), _T("DefaultLayout"), &InfContext)) - { - SetupGetStringField(&InfContext, 1, tmp, sizeof(tmp) / sizeof(TCHAR), &LineLength); + if (SetupFindFirstLine(hTxtsetupSif, L"NLS", L"DefaultLayout", &InfContext)) + { + SetupGetStringField(&InfContext, 1, tmp, sizeof(tmp) / sizeof(WCHAR), &LineLength); for (Count = 0; Count < SetupData.KbLayoutCount; Count++) - if (_tcscmp(tmp, SetupData.pKbLayouts[Count].LayoutId) == 0) + if (wcscmp(tmp, SetupData.pKbLayouts[Count].LayoutId) == 0) { SetupData.DefaultKBLayout = Count; break; } } - if (SetupFindFirstLine(hTxtsetupSif, _T("NLS"), _T("DefaultLanguage"), &InfContext)) - { - SetupGetStringField(&InfContext, 1, tmp, sizeof(tmp) / sizeof(TCHAR), &LineLength); + if (SetupFindFirstLine(hTxtsetupSif, L"NLS", L"DefaultLanguage", &InfContext)) + { + SetupGetStringField(&InfContext, 1, tmp, sizeof(tmp) / sizeof(WCHAR), &LineLength); for (Count = 0; Count < SetupData.LangCount; Count++) - if (_tcscmp(tmp, SetupData.pLanguages[Count].LangId) == 0) + if (wcscmp(tmp, SetupData.pLanguages[Count].LangId) == 0) { SetupData.DefaultLang = Count; break; @@ -1083,7 +1083,7 @@ } // get computers list - Count = SetupGetLineCount(hTxtsetupSif, _T("Computer")); + Count = SetupGetLineCount(hTxtsetupSif, L"Computer"); if (Count > 0) { SetupData.pComputers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GENENTRY) * Count); @@ -1091,20 +1091,20 @@ { SetupData.CompCount = Count; Count = 0; - if (SetupFindFirstLine(hTxtsetupSif, _T("Computer"), NULL, &InfContext)) + if (SetupFindFirstLine(hTxtsetupSif, L"Computer", NULL, &InfContext)) { do { SetupGetStringField(&InfContext, 0, SetupData.pComputers[Count].Id, - sizeof(SetupData.pComputers[Count].Id) / sizeof(TCHAR), + sizeof(SetupData.pComputers[Count].Id) / sizeof(WCHAR), &LineLength); SetupGetStringField(&InfContext, 1, SetupData.pComputers[Count].Value, - sizeof(SetupData.pComputers[Count].Value) / sizeof(TCHAR), + sizeof(SetupData.pComputers[Count].Value) / sizeof(WCHAR), &LineLength); ++Count; } @@ -1114,7 +1114,7 @@ } // get display list - Count = SetupGetLineCount(hTxtsetupSif, _T("Display")); + Count = SetupGetLineCount(hTxtsetupSif, L"Display"); if (Count > 0) { SetupData.pDisplays = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GENENTRY) * Count); @@ -1123,20 +1123,20 @@ SetupData.DispCount = Count; Count = 0; - if (SetupFindFirstLine(hTxtsetupSif, _T("Display"), NULL, &InfContext)) + if (SetupFindFirstLine(hTxtsetupSif, L"Display", NULL, &InfContext)) { do { SetupGetStringField(&InfContext, 0, SetupData.pDisplays[Count].Id, - sizeof(SetupData.pDisplays[Count].Id) / sizeof(TCHAR), + sizeof(SetupData.pDisplays[Count].Id) / sizeof(WCHAR), &LineLength); SetupGetStringField(&InfContext, 1, SetupData.pDisplays[Count].Value, - sizeof(SetupData.pDisplays[Count].Value) / sizeof(TCHAR), + sizeof(SetupData.pDisplays[Count].Value) / sizeof(WCHAR), &LineLength); ++Count; } @@ -1146,7 +1146,7 @@ } // get keyboard list - Count = SetupGetLineCount(hTxtsetupSif, _T("Keyboard")); + Count = SetupGetLineCount(hTxtsetupSif, L"Keyboard"); if (Count > 0) { SetupData.pKeyboards = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GENENTRY) * Count); @@ -1155,20 +1155,20 @@ SetupData.KeybCount = Count; Count = 0; - if (SetupFindFirstLine(hTxtsetupSif, _T("Keyboard"), NULL, &InfContext)) + if (SetupFindFirstLine(hTxtsetupSif, L"Keyboard", NULL, &InfContext)) { do { SetupGetStringField(&InfContext, 0, SetupData.pKeyboards[Count].Id, - sizeof(SetupData.pKeyboards[Count].Id) / sizeof(TCHAR), + sizeof(SetupData.pKeyboards[Count].Id) / sizeof(WCHAR), &LineLength); SetupGetStringField(&InfContext, 1, SetupData.pKeyboards[Count].Value, - sizeof(SetupData.pKeyboards[Count].Value) / sizeof(TCHAR), + sizeof(SetupData.pKeyboards[Count].Value) / sizeof(WCHAR), &LineLength); ++Count; } @@ -1178,12 +1178,12 @@ } // get install directory - if (SetupFindFirstLine(hTxtsetupSif, _T("SetupData"), _T("DefaultPath"), &InfContext)) + if (SetupFindFirstLine(hTxtsetupSif, L"SetupData", L"DefaultPath", &InfContext)) { SetupGetStringField(&InfContext, 1, SetupData.InstallDir, - sizeof(SetupData.InstallDir) / sizeof(TCHAR), + sizeof(SetupData.InstallDir) / sizeof(WCHAR), &LineLength); } SetupCloseInfFile(hTxtsetupSif); @@ -1196,7 +1196,7 @@ WCHAR *ch; HINF hUnattendedInf; INFCONTEXT InfContext; - TCHAR szValue[MAX_PATH]; + WCHAR szValue[MAX_PATH]; DWORD LineLength; //HKEY hKey; BOOL result = 0; @@ -1211,13 +1211,13 @@ if (hUnattendedInf != INVALID_HANDLE_VALUE) { - if (SetupFindFirstLine(hUnattendedInf, _T("Unattend"), _T("UnattendSetupEnabled"),&InfContext)) + if (SetupFindFirstLine(hUnattendedInf, L"Unattend", L"UnattendSetupEnabled",&InfContext)) { if (SetupGetStringField(&InfContext, 1, szValue, - sizeof(szValue) / sizeof(TCHAR), - &LineLength) && (_tcsicmp(szValue, _T("yes")) == 0)) + sizeof(szValue) / sizeof(WCHAR), + &LineLength) && (_wcsicmp(szValue, L"yes") == 0)) { result = 1; // unattendSetup enabled // read values and store in SetupData @@ -1230,10 +1230,10 @@ } int WINAPI -WinMain(HINSTANCE hInst, - HINSTANCE hPrevInstance, - LPSTR lpszCmdLine, - int nCmdShow) +wWinMain(HINSTANCE hInst, + HINSTANCE hPrevInstance, + LPWSTR lpszCmdLine, + int nCmdShow) { PROPSHEETHEADER psh; HPROPSHEETPAGE ahpsp[8]; @@ -1244,8 +1244,8 @@ if (!isUnattend) { - LoadString(hInst,IDS_ABORTSETUP, abort_msg, sizeof(abort_msg)/sizeof(TCHAR)); - LoadString(hInst,IDS_ABORTSETUP2, abort_title,sizeof(abort_title)/sizeof(TCHAR)); + LoadString(hInst, IDS_ABORTSETUP, abort_msg, sizeof(abort_msg) / sizeof(WCHAR)); + LoadString(hInst, IDS_ABORTSETUP2, abort_title, sizeof(abort_title) / sizeof(WCHAR)); LoadSetupData(); Modified: trunk/reactos/base/setup/reactos/reactos.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.rbuild [iso-8859-1] Sun Nov 23 08:16:46 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="reactos" type="win32gui"> +<module name="reactos" type="win32gui" unicode="yes"> <bootstrap installbase="$(CDOUTPUT)" /> <include base="reactos">.</include> <library>kernel32</library>

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