Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[weiden] 30660: Forward WM_UPDATEUISTATE to DefWindowProc
by weiden＠svn.reactos.org 22 Nov '07

22 Nov '07

Author: weiden Date: Thu Nov 22 08:33:22 2007 New Revision: 30660 URL: http://svn.reactos.org/svn/reactos?rev=30660&view=rev Log: Forward WM_UPDATEUISTATE to DefWindowProc Modified: trunk/reactos/dll/cpl/desk/monslctl.c trunk/reactos/dll/cpl/timedate/monthcal.c Modified: trunk/reactos/dll/cpl/desk/monslctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/monslctl.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/monslctl.c (original) +++ trunk/reactos/dll/cpl/desk/monslctl.c Thu Nov 22 08:33:22 2007 @@ -1345,7 +1345,14 @@ case WM_UPDATEUISTATE: { - DWORD OldUIState = infoPtr->UIState; + DWORD OldUIState; + + Ret = DefWindowProcW(hwnd, + uMsg, + wParam, + lParam); + + OldUIState = infoPtr->UIState; switch (LOWORD(wParam)) { case UIS_SET: Modified: trunk/reactos/dll/cpl/timedate/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/monthcal.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/monthcal.c (original) +++ trunk/reactos/dll/cpl/timedate/monthcal.c Thu Nov 22 08:33:22 2007 @@ -856,7 +856,14 @@ case WM_UPDATEUISTATE: { - DWORD OldUIState = infoPtr->UIState; + DWORD OldUIState; + + Ret = DefWindowProcW(hwnd, + uMsg, + wParam, + lParam); + + OldUIState = infoPtr->UIState; switch (LOWORD(wParam)) { case UIS_SET:

1 0

[weiden] 30659: - Support DT_PREFIXONLY and DT_HIDEPREFIX in DrawTextEx - Support DSS_PREFIXONLY and DSS_HIDEPREFIX in DrawState
by weiden＠svn.reactos.org 22 Nov '07

22 Nov '07

Author: weiden Date: Thu Nov 22 03:40:24 2007 New Revision: 30659 URL: http://svn.reactos.org/svn/reactos?rev=30659&view=rev Log: - Support DT_PREFIXONLY and DT_HIDEPREFIX in DrawTextEx - Support DSS_PREFIXONLY and DSS_HIDEPREFIX in DrawState Modified: trunk/reactos/dll/win32/user32/windows/draw.c trunk/reactos/dll/win32/user32/windows/font.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c Thu Nov 22 03:40:24 2007 @@ -1581,9 +1581,16 @@ dtflags |= DT_RIGHT; if(opcode == DST_TEXT) dtflags |= DT_NOPREFIX; + else if(opcode == DST_PREFIXTEXT) + { + if (flags & DSS_HIDEPREFIX) + dtflags |= DT_HIDEPREFIX; + if (flags & DSS_PREFIXONLY) + dtflags |= DT_PREFIXONLY; + } /* For DSS_NORMAL we just jam in the image and return */ - if((flags & 0x7ff0) == DSS_NORMAL) + if((flags & 0x79f0) == DSS_NORMAL) { return PAINTING_DrawStateJam(hdc, opcode, func, lp, len, &rc, dtflags, unicode); } Modified: trunk/reactos/dll/win32/user32/windows/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/f… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/font.c (original) +++ trunk/reactos/dll/win32/user32/windows/font.c Thu Nov 22 03:40:24 2007 @@ -1158,11 +1158,12 @@ else len_seg = len; - if (!ExtTextOutW( hdc, xseg, y, + if (!(flags & DT_PREFIXONLY)&& + !ExtTextOutW( hdc, xseg, y, ((flags & DT_NOCLIP) ? 0 : ETO_CLIPPED) | ((flags & DT_RTLREADING) ? ETO_RTLREADING : 0), rect, str, len_seg, NULL )) return 0; - if (prefix_offset != -1 && prefix_offset < len_seg) + if (prefix_offset != -1 && prefix_offset < len_seg && !(flags & DT_HIDEPREFIX)) { TEXT_DrawUnderscore (hdc, xseg, y + tm.tmAscent + 2, str, prefix_offset, (flags & DT_NOCLIP) ? NULL : rect); }

1 0

[weiden] 30658: Add missing definitions
by weiden＠svn.reactos.org 22 Nov '07

22 Nov '07

Author: weiden Date: Thu Nov 22 03:38:24 2007 New Revision: 30658 URL: http://svn.reactos.org/svn/reactos?rev=30658&view=rev Log: Add missing definitions Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h (original) +++ trunk/reactos/include/psdk/winuser.h Thu Nov 22 03:38:24 2007 @@ -514,6 +514,8 @@ #define DSS_UNION 16 #define DSS_DISABLED 32 #define DSS_MONO 128 +#define DSS_HIDEPREFIX 0x0200 +#define DSS_PREFIXONLY 0x0400 #define DSS_RIGHT 0x8000 #define DT_BOTTOM 8 #define DT_CALCRECT 1024 @@ -536,6 +538,9 @@ #define DT_VCENTER 4 #define DT_WORDBREAK 16 #define DT_INTERNAL 4096 +#define DT_NOFULLWIDTHCHARBREAK 524288 +#define DT_HIDEPREFIX 1048576 +#define DT_PREFIXONLY 2097152 #define WB_ISDELIMITER 2 #define WB_LEFT 0 #define WB_RIGHT 1

1 0

[weiden] 30657: - Display cues and focus when hitting the ALT key. - Simplify broadcasting the UI state change
by weiden＠svn.reactos.org 22 Nov '07

22 Nov '07

Author: weiden Date: Thu Nov 22 03:09:21 2007 New Revision: 30657 URL: http://svn.reactos.org/svn/reactos?rev=30657&view=rev Log: - Display cues and focus when hitting the ALT key. - Simplify broadcasting the UI state change Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c Thu Nov 22 03:09:21 2007 @@ -991,12 +991,7 @@ static BOOL CALLBACK UserSendUiUpdateMsg(HWND hwnd, LPARAM lParam) { - WPARAM wParam; - - /* Unpack WPARAM */ - wParam = MAKEWPARAM((lParam >> 3) & 0x3, - lParam & (UISF_HIDEFOCUS | UISF_HIDEACCEL | UISF_ACTIVE)); - SendMessageW(hwnd, WM_UPDATEUISTATE, wParam, 0); + SendMessageW(hwnd, WM_UPDATEUISTATE, (WPARAM)lParam, 0); return TRUE; } @@ -1773,7 +1768,7 @@ /* Always broadcast the update to all children */ EnumChildWindows(hWnd, UserSendUiUpdateMsg, - (LPARAM)Flags | ((LPARAM)Action << 3)); + (LPARAM)wParam); break; } Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c Thu Nov 22 03:09:21 2007 @@ -2313,7 +2313,9 @@ break; case WM_SYSKEYDOWN: - SendMessageW(hDlg, WM_CHANGEUISTATE, MAKEWPARAM(UIS_CLEAR, UISF_HIDEFOCUS), 0); + /* If the ALT key is being pressed display the keyboard cues */ + if (lpMsg->lParam & (1 << 29)) + SendMessageW(hDlg, WM_CHANGEUISTATE, MAKEWPARAM(UIS_CLEAR, UISF_HIDEACCEL | UISF_HIDEFOCUS), 0); break; }

1 0

[cfinck] 30656: Update mingw headers to version 3.13 Patch by encoded I made the following modifications to the patch: - excpt.h - Removed the inclusion of <windef.h>, it caused compilation problems and I don't see a need for it, also CRT headers shouldn't include PSDK headers at all - tchar.h - Removed the file as it would most-probably interfere with our PSDK tchar.h and this shouldn't be a CRT header - values.h - Removed the file, it has no real content - varargs.h - Removed the file, it just
by cfinck＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cfinck Date: Thu Nov 22 02:50:03 2007 New Revision: 30656 URL: http://svn.reactos.org/svn/reactos?rev=30656&view=rev Log: Update mingw headers to version 3.13 Patch by encoded I made the following modifications to the patch: - excpt.h - Removed the inclusion of <windef.h>, it caused compilation problems and I don't see a need for it, also CRT headers shouldn't include PSDK headers at all - tchar.h - Removed the file as it would most-probably interfere with our PSDK tchar.h and this shouldn't be a CRT header - values.h - Removed the file, it has no real content - varargs.h - Removed the file, it just contains a #include_next line to include the next available varargs.h, also #include_next directives aren't supported by MSVC See issue #2736 for more details. Added: trunk/reactos/include/crt/complex.h (with props) trunk/reactos/include/crt/dirent.h (with props) trunk/reactos/include/crt/fenv.h (with props) trunk/reactos/include/crt/libgen.h (with props) trunk/reactos/include/crt/mem.h (with props) trunk/reactos/include/crt/sys/file.h (with props) trunk/reactos/include/crt/sys/param.h (with props) trunk/reactos/include/crt/sys/unistd.h (with props) trunk/reactos/include/crt/utime.h (with props) Modified: trunk/reactos/include/crt/_mingw.h trunk/reactos/include/crt/assert.h trunk/reactos/include/crt/conio.h trunk/reactos/include/crt/ctype.h trunk/reactos/include/crt/direct.h trunk/reactos/include/crt/dos.h trunk/reactos/include/crt/errno.h trunk/reactos/include/crt/excpt.h trunk/reactos/include/crt/fcntl.h trunk/reactos/include/crt/float.h trunk/reactos/include/crt/inttypes.h trunk/reactos/include/crt/io.h trunk/reactos/include/crt/locale.h trunk/reactos/include/crt/malloc.h trunk/reactos/include/crt/mbctype.h trunk/reactos/include/crt/mbstring.h trunk/reactos/include/crt/process.h trunk/reactos/include/crt/search.h trunk/reactos/include/crt/setjmp.h trunk/reactos/include/crt/signal.h trunk/reactos/include/crt/stdint.h trunk/reactos/include/crt/stdio.h trunk/reactos/include/crt/stdlib.h trunk/reactos/include/crt/string.h trunk/reactos/include/crt/sys/stat.h trunk/reactos/include/crt/sys/time.h trunk/reactos/include/crt/sys/timeb.h trunk/reactos/include/crt/sys/utime.h trunk/reactos/include/crt/time.h trunk/reactos/include/crt/wchar.h trunk/reactos/include/crt/wctype.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw.h?rev=3… Modified: trunk/reactos/include/crt/assert.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/assert.h?rev=3… Added: trunk/reactos/include/crt/complex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/complex.h?rev=… Modified: trunk/reactos/include/crt/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/conio.h?rev=30… Modified: trunk/reactos/include/crt/ctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/ctype.h?rev=30… Modified: trunk/reactos/include/crt/direct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/direct.h?rev=3… Added: trunk/reactos/include/crt/dirent.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/dirent.h?rev=3… Modified: trunk/reactos/include/crt/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/dos.h?rev=3065… Modified: trunk/reactos/include/crt/errno.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/errno.h?rev=30… Modified: trunk/reactos/include/crt/excpt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/excpt.h?rev=30… Modified: trunk/reactos/include/crt/fcntl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/fcntl.h?rev=30… Added: trunk/reactos/include/crt/fenv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/fenv.h?rev=306… Modified: trunk/reactos/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/float.h?rev=30… Modified: trunk/reactos/include/crt/inttypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/inttypes.h?rev… Modified: trunk/reactos/include/crt/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/io.h?rev=30656… Added: trunk/reactos/include/crt/libgen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/libgen.h?rev=3… Modified: trunk/reactos/include/crt/locale.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/locale.h?rev=3… Modified: trunk/reactos/include/crt/malloc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/malloc.h?rev=3… Modified: trunk/reactos/include/crt/mbctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mbctype.h?rev=… Modified: trunk/reactos/include/crt/mbstring.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mbstring.h?rev… Added: trunk/reactos/include/crt/mem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mem.h?rev=3065… Modified: trunk/reactos/include/crt/process.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/process.h?rev=… Modified: trunk/reactos/include/crt/search.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/search.h?rev=3… Modified: trunk/reactos/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/setjmp.h?rev=3… Modified: trunk/reactos/include/crt/signal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/signal.h?rev=3… Modified: trunk/reactos/include/crt/stdint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdint.h?rev=3… Modified: trunk/reactos/include/crt/stdio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdio.h?rev=30… Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=3… Modified: trunk/reactos/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/string.h?rev=3… Added: trunk/reactos/include/crt/sys/file.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/file.h?rev… Added: trunk/reactos/include/crt/sys/param.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/param.h?re… Modified: trunk/reactos/include/crt/sys/stat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/stat.h?rev… Modified: trunk/reactos/include/crt/sys/time.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/time.h?rev… Modified: trunk/reactos/include/crt/sys/timeb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/timeb.h?re… Added: trunk/reactos/include/crt/sys/unistd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/unistd.h?r… Modified: trunk/reactos/include/crt/sys/utime.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/utime.h?re… Modified: trunk/reactos/include/crt/time.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/time.h?rev=306… Added: trunk/reactos/include/crt/utime.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/utime.h?rev=30… Modified: trunk/reactos/include/crt/wchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wchar.h?rev=30… Modified: trunk/reactos/include/crt/wctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wctype.h?rev=3…

1 0

[cfinck] 30655: Get avtest to build again by adding the _NTDDK_ define See issue #2220 for more details.
by cfinck＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cfinck Date: Thu Nov 22 01:41:24 2007 New Revision: 30655 URL: http://svn.reactos.org/svn/reactos?rev=30655&view=rev Log: Get avtest to build again by adding the _NTDDK_ define See issue #2220 for more details. Modified: trunk/rosapps/avtest/avtest.rbuild trunk/rosapps/directory.rbuild Modified: trunk/rosapps/avtest/avtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/avtest/avtest.rbuild?rev=3… ============================================================================== --- trunk/rosapps/avtest/avtest.rbuild (original) +++ trunk/rosapps/avtest/avtest.rbuild Thu Nov 22 01:41:24 2007 @@ -1,7 +1,7 @@ -<module name="avtest" type="kernelmodedriver" installbase="system32/drivers" installname="avtest.sys" warnings="true"> +<module name="avtest" type="kernelmodedriver" installbase="system32/drivers" installname="avtest.sys"> <include base="avtest">.</include> - <include base="avtest">..</include> - <define name="__USE_W32API" /> + <define name="_NTDDK_" /> <library>ks</library> <library>ntoskrnl</library> + <file>entry.c</file> </module> Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=30655… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Thu Nov 22 01:41:24 2007 @@ -1,11 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -  <directory name="applications"> <xi:include href="applications/applications.rbuild" />

1 0

[cfinck] 30654: - Use ISO C++ functions instead of deprecated POSIX-only ones to make scut compilable with both GCC and MSVC - Add a MSVC project file for scut - Start making scut portable and shareable between RosBE-Windows and RosBE-Unix. Anyway, the Unix part is still untested :-P
by cfinck＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cfinck Date: Thu Nov 22 01:22:39 2007 New Revision: 30654 URL: http://svn.reactos.org/svn/reactos?rev=30654&view=rev Log: - Use ISO C++ functions instead of deprecated POSIX-only ones to make scut compilable with both GCC and MSVC - Add a MSVC project file for scut - Start making scut portable and shareable between RosBE-Windows and RosBE-Unix. Anyway, the Unix part is still untested :-P Added: trunk/tools/RosBE/RosBE-Windows/Tools/scut.vcproj (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ (props changed) trunk/tools/RosBE/RosBE-Windows/Tools/scut.c Propchange: trunk/tools/RosBE/RosBE-Windows/Tools/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Nov 22 01:22:39 2007 @@ -1,1 +1,7 @@ *.exe +*.sln +*.ncb +*.suo +*.user +Debug +Release Modified: trunk/tools/RosBE/RosBE-Windows/Tools/scut.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/sc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/scut.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/scut.c Thu Nov 22 01:22:39 2007 @@ -8,7 +8,8 @@ * */ -//#include <unistd.h> +#include <direct.h> +#include <io.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -22,7 +23,7 @@ #define LINE_MAX 1024 char* programname; -char rosbeappdata[260]; +char rosbeappdata[248]; char shortcutfile[260]; PSHORTCUT addshortcut(PSHORTCUT ptr, char* name, char* path); @@ -44,10 +45,18 @@ int removed = 0; programname = argv[0]; - strcpy(rosbeappdata, getenv("APPDATA")); +#if defined(WIN32) + strncpy(rosbeappdata, getenv("APPDATA"), 241); strcat(rosbeappdata, "\\RosBE"); strcpy(shortcutfile, rosbeappdata); strcat(shortcutfile, "\\srclist.txt"); +#else + strncopy(rosbeappdata, getenv("HOME"), 240); + strcat(rosbeappdata, "/.RosBE"); + strcpy(shortcutfile, rosbeappdata); + strcat(shortcutfile, "/srclist.txt"); +#endif + checkfile(); if (argc > 4) @@ -336,14 +345,14 @@ fp = fopen(shortcutfile, "r"); if (!fp) { -/* if(access(rosbeappdata, F_OK) == -1) + if(_access(rosbeappdata, 0) == -1) { // Directory does not exist, create it - if(mkdir(rosbeappdata) == -1) + if(_mkdir(rosbeappdata) == -1) { fprintf(stderr, "%s: Error creating the directory for the RosBE files.\n", programname); } - }*/ + } fp = fopen(shortcutfile, "w"); if (!fp) @@ -387,11 +396,11 @@ int checkpath(char* path) { char currentdir[260]; - getcwd(currentdir, 260); - if (!chdir(path)) - { - getcwd(path, 260); - chdir(currentdir); + _getcwd(currentdir, 260); + if (!_chdir(path)) + { + _getcwd(path, 260); + _chdir(currentdir); return 1; } Added: trunk/tools/RosBE/RosBE-Windows/Tools/scut.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/sc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/scut.vcproj (added) +++ trunk/tools/RosBE/RosBE-Windows/Tools/scut.vcproj Thu Nov 22 01:22:39 2007 @@ -1,0 +1,185 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8,00" + Name="scut" + ProjectGUID="{4698046D-30AC-49E1-A767-520A75AA06FE}" + RootNamespace="scut" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="scut.c" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Propchange: trunk/tools/RosBE/RosBE-Windows/Tools/scut.vcproj ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 30653: Use _stricmp instead of _strnicmp to ensure that the function jumps into the shortcut handling block, when the user entered a shortcut name as the parameter.
by cfinck＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cfinck Date: Thu Nov 22 00:28:46 2007 New Revision: 30653 URL: http://svn.reactos.org/svn/reactos?rev=30653&view=rev Log: Use _stricmp instead of _strnicmp to ensure that the function jumps into the shortcut handling block, when the user entered a shortcut name as the parameter. Modified: trunk/tools/RosBE/RosBE-Windows/Tools/scut.c Modified: trunk/tools/RosBE/RosBE-Windows/Tools/scut.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/sc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/scut.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/scut.c Thu Nov 22 00:28:46 2007 @@ -8,7 +8,7 @@ * */ -#include <unistd.h> +//#include <unistd.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -59,9 +59,9 @@ { defaultshortcut(NULL); } - else if ((!strncmp(argv[1], "/?", 2)) || - (!_strnicmp(argv[1], "-h", 2)) || - (!_strnicmp(argv[1], "--help", 6))) + else if ((!strcmp(argv[1], "/?")) || + (!_stricmp(argv[1], "-h")) || + (!_stricmp(argv[1], "--help"))) { printf("Usage: %s [OPTIONS] [SHORTCUT] [PATH]\n", programname); printf("Manages named shortcuts to ReactOS source directories. scut started\n"); @@ -79,7 +79,7 @@ printf(" directory as you know it from previous versions.\n\n"); return 0; } - else if (!_strnicmp(argv[1], "list", 4)) + else if (!_stricmp(argv[1], "list")) { shortcuts = readshortcuts(); current = shortcuts; @@ -93,7 +93,7 @@ } freeshortcuts(shortcuts); } - else if (!_strnicmp(argv[1], "add", 3)) + else if (!_stricmp(argv[1], "add")) { shortcuts = readshortcuts(); current = shortcuts; @@ -144,7 +144,7 @@ } freeshortcuts(shortcuts); } - else if (!_strnicmp(argv[1], "rem", 3)) + else if (!_stricmp(argv[1], "rem")) { shortcuts = readshortcuts(); current = shortcuts; @@ -191,7 +191,7 @@ } freeshortcuts(shortcuts); } - else if (!_strnicmp(argv[1], "edit", 4)) + else if (!_stricmp(argv[1], "edit")) { shortcuts = readshortcuts(); current = shortcuts; @@ -252,7 +252,7 @@ } freeshortcuts(shortcuts); } - else if (!_strnicmp(argv[1], "def", 3)) + else if (!_stricmp(argv[1], "def")) { shortcuts = readshortcuts(); current = shortcuts; @@ -336,14 +336,14 @@ fp = fopen(shortcutfile, "r"); if (!fp) { - if(access(rosbeappdata, F_OK) == -1) +/* if(access(rosbeappdata, F_OK) == -1) { // Directory does not exist, create it if(mkdir(rosbeappdata) == -1) { fprintf(stderr, "%s: Error creating the directory for the RosBE files.\n", programname); } - } + }*/ fp = fopen(shortcutfile, "w"); if (!fp)

1 0

[cwittich] 30652: fix some format strings
by cwittich＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cwittich Date: Thu Nov 22 00:25:26 2007 New Revision: 30652 URL: http://svn.reactos.org/svn/reactos?rev=30652&view=rev Log: fix some format strings Modified: trunk/reactos/base/system/smss/client.c trunk/reactos/base/system/smss/initmv.c trunk/reactos/base/system/smss/initss.c trunk/reactos/base/system/smss/smapi.c trunk/reactos/base/system/smss/smapicomp.c trunk/reactos/base/system/smss/smapiexec.c Modified: trunk/reactos/base/system/smss/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/client.c?… ============================================================================== --- trunk/reactos/base/system/smss/client.c (original) +++ trunk/reactos/base/system/smss/client.c Thu Nov 22 00:25:26 2007 @@ -64,7 +64,7 @@ VOID FASTCALL SmpSetClientInitialized (PSM_CLIENT_DATA Client) { - DPRINT("SM: %s(%08lx) called\n", __FUNCTION__, Client); + DPRINT("SM: %s(%p) called\n", __FUNCTION__, Client); Client->Flags |= SM_CLIENT_FLAG_INITIALIZED; } /********************************************************************** @@ -141,7 +141,7 @@ static NTSTATUS STDCALL SmpDestroyClientObject (PSM_CLIENT_DATA Client, NTSTATUS DestroyReason) { - DPRINT("SM:%s(%08lx,%08lx) called\n", __FUNCTION__, DestroyReason); + DPRINT("SM:%s(%p,%08lx) called\n", __FUNCTION__, Client, DestroyReason); /* TODO: send shutdown to the SB port */ NtTerminateProcess (Client->ServerProcess, DestroyReason); RtlFreeHeap (SmpHeap, 0, Client); @@ -173,7 +173,7 @@ HANDLE Process; - DPRINT("SM: %s(%08lx,%08lx) called\n", __FUNCTION__, + DPRINT("SM: %s(%p,%p) called\n", __FUNCTION__, Request, ClientData); RtlEnterCriticalSection (& SmpClientDirectory.Lock); @@ -366,7 +366,7 @@ HANDLE CandidateClientProcessHandle = (HANDLE) x; LARGE_INTEGER TimeOut; - DPRINT("SM: %s(%lx) called\n", __FUNCTION__, x); + DPRINT("SM: %s(%p) called\n", __FUNCTION__, x); TimeOut.QuadPart = (LONGLONG) -300000000L; // 30s Status = NtWaitForSingleObject (CandidateClientProcessHandle, @@ -377,7 +377,7 @@ RtlEnterCriticalSection (& SmpClientDirectory.Lock); if (NULL != SmpClientDirectory.CandidateClient) { - DPRINT("SM:%s: destroy candidate %08lx\n", __FUNCTION__, + DPRINT("SM:%s: destroy candidate %p\n", __FUNCTION__, SmpClientDirectory.CandidateClient); Status = SmpDestroyClientObject (SmpClientDirectory.CandidateClient, STATUS_TIMEOUT); @@ -411,7 +411,7 @@ { NTSTATUS Status = STATUS_SUCCESS; - DPRINT("SM: %s(%lx, %S) called\n", __FUNCTION__, ProcessInfo->ProcessHandle, ProgramName); + DPRINT("SM: %s(%p, %S) called\n", __FUNCTION__, ProcessInfo->ProcessHandle, ProgramName); RtlEnterCriticalSection (& SmpClientDirectory.Lock); /* @@ -425,7 +425,7 @@ */ if (SM_INVALID_CLIENT_INDEX == SmpGetFirstFreeClientEntry()) { - DPRINT("SM: %s(%lx): out of memory!\n", + DPRINT("SM: %s(%p): out of memory!\n", __FUNCTION__, ProcessInfo->ProcessHandle); Status = STATUS_NO_MEMORY; } @@ -438,13 +438,13 @@ sizeof (SM_CLIENT_DATA)); if (NULL == SmpClientDirectory.CandidateClient) { - DPRINT("SM: %s(%lx): out of memory!\n", + DPRINT("SM: %s(%p): out of memory!\n", __FUNCTION__, ProcessInfo->ProcessHandle); Status = STATUS_NO_MEMORY; } else { - DPRINT("SM:%s(%08lx,%S): candidate is %08lx\n", __FUNCTION__, + DPRINT("SM:%s(%p,%S): candidate is %p\n", __FUNCTION__, ProcessInfo, ProgramName, SmpClientDirectory.CandidateClient); /* Initialize the candidate client. */ RtlInitializeCriticalSection(& SmpClientDirectory.CandidateClient->Lock); @@ -460,7 +460,7 @@ SM_SB_NAME_MAX_LENGTH); } } else { - DPRINT1("SM: %s: CandidateClient %08lx pending!\n", __FUNCTION__, + DPRINT1("SM: %s: CandidateClient %p pending!\n", __FUNCTION__, SmpClientDirectory.CandidateClient); Status = STATUS_DEVICE_BUSY; } @@ -528,7 +528,7 @@ INT ClientIndex = 0; INT Index = 0; - DPRINT("SM: %s(%08lx) called\n", __FUNCTION__, i); + DPRINT("SM: %s(%p) called\n", __FUNCTION__, i); RtlEnterCriticalSection (& SmpClientDirectory.Lock); @@ -563,7 +563,7 @@ NTSTATUS Status = STATUS_SUCCESS; INT ClientIndex = SM_INVALID_CLIENT_INDEX; - DPRINT("SM: %s(%08lx) called\n", __FUNCTION__, i); + DPRINT("SM: %s(%p) called\n", __FUNCTION__, i); RtlEnterCriticalSection (& SmpClientDirectory.Lock); ClientIndex = SmpLookupClient (i->SubSystemId); Modified: trunk/reactos/base/system/smss/initmv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initmv.c?… ============================================================================== --- trunk/reactos/base/system/smss/initmv.c (original) +++ trunk/reactos/base/system/smss/initmv.c Thu Nov 22 00:25:26 2007 @@ -374,7 +374,7 @@ static LPWSTR FistFileName = NULL; DPRINT("SmpMoveFilesQueryRoutine() called \n"); - DPRINT("ValueData = %S \n", ValueData); + DPRINT("ValueData = %S \n", (PWSTR) ValueData); if( !FistFileName ) { Modified: trunk/reactos/base/system/smss/initss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initss.c?… ============================================================================== --- trunk/reactos/base/system/smss/initss.c (original) +++ trunk/reactos/base/system/smss/initss.c Thu Nov 22 00:25:26 2007 @@ -59,7 +59,7 @@ ProcessInfo.Size = sizeof ProcessInfo; ProcessInfo.ProcessHandle = (HANDLE) SmSsProcessId; ProcessInfo.ClientId.UniqueProcess = (HANDLE) SmSsProcessId; - DPRINT("SM: %s: ProcessInfo.ProcessHandle=%lx\n", + DPRINT("SM: %s: ProcessInfo.ProcessHandle=%p\n", __FUNCTION__,ProcessInfo.ProcessHandle); Status = SmCreateClient (& ProcessInfo, PgmName); if (NT_SUCCESS(Status)) @@ -164,14 +164,14 @@ Status = SmRegisterInternalSubsystem (L"Session Manager", IMAGE_SUBSYSTEM_NATIVE, & hSmApiPort); if(!NT_SUCCESS(Status)) { - DPRINT1("SM: SmRegisterInternalSubsystem failed Status=%08lx\n", __FUNCTION__, Status); + DPRINT1("SM: %s SmRegisterInternalSubsystem failed Status=%08lx\n", __FUNCTION__, Status); return Status; } /* Load Required subsystems (Debug Windows) */ Status = SmpLoadRequiredSubsystems(); if(!NT_SUCCESS(Status)) { - DPRINT1("SM: SmpLoadRequiredSubsystems failed Status=%08lx\n", __FUNCTION__, Status); + DPRINT1("SM: %s SmpLoadRequiredSubsystems failed Status=%08lx\n", __FUNCTION__, Status); return Status; } /* done */ Modified: trunk/reactos/base/system/smss/smapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapi.c?r… ============================================================================== --- trunk/reactos/base/system/smss/smapi.c (original) +++ trunk/reactos/base/system/smss/smapi.c Thu Nov 22 00:25:26 2007 @@ -220,7 +220,7 @@ Status = SmBeginClientInitialization (Request, & ClientData); if(STATUS_SUCCESS == Status) { - DPRINT("SM: %s: ClientData = 0x%08lx\n", + DPRINT("SM: %s: ClientData = %p\n", __FUNCTION__, ClientData); /* * OK: the client is an environment subsystem Modified: trunk/reactos/base/system/smss/smapicomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapicomp… ============================================================================== --- trunk/reactos/base/system/smss/smapicomp.c (original) +++ trunk/reactos/base/system/smss/smapicomp.c Thu Nov 22 00:25:26 2007 @@ -38,7 +38,7 @@ DPRINT("SM: %s called\n", __FUNCTION__); - DPRINT("SM: %s: ClientId.UniqueProcess=%lx\n", + DPRINT("SM: %s: ClientId.UniqueProcess=%p\n", __FUNCTION__, Request->Header.ClientId.UniqueProcess); Status = SmCompleteClientInitialization ((ULONG) Request->Header.ClientId.UniqueProcess); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/base/system/smss/smapiexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapiexec… ============================================================================== --- trunk/reactos/base/system/smss/smapiexec.c (original) +++ trunk/reactos/base/system/smss/smapiexec.c Thu Nov 22 00:25:26 2007 @@ -194,7 +194,7 @@ DPRINT1("SM: %s: Request == NULL!\n", __FUNCTION__); return STATUS_INVALID_PARAMETER; } - DPRINT("SM: %s called from CID(%lx|%lx)\n", + DPRINT("SM: %s called from CID(%p|%p)\n", __FUNCTION__, Request->Header.ClientId.UniqueProcess, Request->Header.ClientId.UniqueThread); ExecPgm = & Request->Request.ExecPgm;

1 0

[dreimer] 30651: revert my stupidity
by dreimer＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: dreimer Date: Thu Nov 22 00:20:50 2007 New Revision: 30651 URL: http://svn.reactos.org/svn/reactos?rev=30651&view=rev Log: revert my stupidity Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Thu Nov 22 00:20:50 2007 @@ -1,6 +1,6 @@ *** XXX XXth, 200X - RosBE 1.0 Released -- Updated: GCC 4.1.3 Build 20071015 with recent patches to get makex run under Vista. (Peter Ward, TODO: name of tamlin) +- Updated: GCC 4.1.3 Build 20071015 with recent patches to get makex run under Vista. (Peter Ward, Mike Nordell) - Updated: Binutils 2.18.50 Build 20071015. (Peter Ward) - Updated: NASM to 0.99.06 (Daniel Reimer) - Updated: You can now select the components you want to install. (Daniel Reimer) @@ -41,15 +41,15 @@ - Added a small utility (chknewer) to check if one file is newer than another. This removes the dependency on test from Config.cmd and Build.cmd. (Peter Ward) - Added a small utility (chkslash) to check if a string contains a backslash '\', it's needed for the reladdr2line.cmd changes. (Peter Ward) -- Modified reladdr2line.cmd so that you can now use 'raddr2line ntdll.dll 7c90e143' (Peter Ward) +- Modified reladdr2line.cmd so that you can now use 'raddr2line ntdll.dll 7c90e143' instead of 'raddr2line output-i386\dll\ntdll\ntdll.dll 7c90e143'. You can also use part of the file name ie. 'ntdll*' instead of 'ntdll.dll' and it will match it. Searchs the current directory and all sub-directories. (does not match directories of course) - (yes you can still specify the full path if you like) -- Move GCC environment setup to rosbe-gcc-env.cmd to support 'chdefgcc', this (Peter Ward) + (yes you can still specify the full path if you like) (Peter Ward) +- Move GCC environment setup to rosbe-gcc-env.cmd to support 'chdefgcc', this file can also be used outside of the RosBE to initialize and GCC/MinGW - in the current directory. + in the current directory. (Peter Ward) - Added the command 'chdefgcc' to allow easy switching of the current toolset. (Peter Ward) - Added a minimal replacement for tee. (Peter Ward) - Added ccache 2.4 to RosBE. (Daniel Reimer)

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007