Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[fireball] 34309: - Fix reactos.dff according to r34308.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jul 5 13:23:24 2008 New Revision: 34309 URL: http://svn.reactos.org/svn/reactos?rev=34309&view=rev Log: - Fix reactos.dff according to r34308. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Jul 5 13:23:24 2008 @@ -583,17 +583,15 @@ modules\rosapps\applications\fontview\fontview.exe 1 optional modules\rosapps\applications\gettype\gettype.exe 1 optional modules\rosapps\applications\imagesoft\imagesoft.exe 1 optional -modules\rosapps\applications\mc\mc.exe 1 optional modules\rosapps\applications\net\ncftp\ncftp.exe 1 optional modules\rosapps\applications\net\netreg\netreg.exe 1 optional modules\rosapps\applications\net\niclist\niclist.exe 1 optional +modules\rosapps\applications\net\roshttpd\roshttpd.exe 1 optional modules\rosapps\applications\notevil\notevil.exe 1 optional modules\rosapps\applications\magnify\magnify.exe 1 optional modules\rosapps\applications\packmgr\cmd-line\rosget.exe 1 optional modules\rosapps\applications\packmgr\gui\packmgr.exe 1 optional modules\rosapps\applications\packmgr\lib\package.dll 1 optional -modules\rosapps\applications\roshttpd\roshttpd.exe 1 optional -modules\rosapps\applications\screenshot\screenshot.exe 1 optional modules\rosapps\applications\sysutils\chkdsk\chkdsk.exe 1 optional modules\rosapps\applications\sysutils\systeminfo\systeminfo.exe 1 optional modules\rosapps\applications\sysutils\chklib\chklib.exe 1 optional @@ -605,6 +603,7 @@ modules\rosapps\applications\sysutils\regexpl\regexpl.exe 1 optional modules\rosapps\applications\sysutils\tcat\tcat.exe 1 optional modules\rosapps\applications\sysutils\tlist\tlist.exe 1 optional +modules\rosapps\applications\sysutils\screenshot\screenshot.exe 1 optional modules\rosapps\applications\sysutils\utils\binpatch\binpatch.exe 1 optional modules\rosapps\applications\sysutils\utils\cat\cat.exe 1 optional modules\rosapps\applications\sysutils\utils\driver\load\load.exe 1 optional

16 years, 5 months

[fireball] 34308: - Delete mc (stoneage old, there is a standalone win32 port now). - Fit apps better in dir structure. - Move old_wordpad to templates (Ged said it's a great framework).

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jul 5 13:23:03 2008 New Revision: 34308 URL: http://svn.reactos.org/svn/reactos?rev=34308&view=rev Log: - Delete mc (stoneage old, there is a standalone win32 port now). - Fit apps better in dir structure. - Move old_wordpad to templates (Ged said it's a great framework). Added: trunk/rosapps/applications/net/roshttpd/ - copied from r34303, trunk/rosapps/applications/roshttpd/ trunk/rosapps/applications/sysutils/gettype/ - copied from r34303, trunk/rosapps/applications/gettype/ trunk/rosapps/applications/sysutils/logevent/ - copied from r34303, trunk/rosapps/applications/logevent/ trunk/rosapps/applications/sysutils/screenshot/ - copied from r34303, trunk/rosapps/applications/screenshot/ trunk/rosapps/templates/old_wordpad/ - copied from r34303, trunk/rosapps/applications/old_wordpad/ Removed: trunk/rosapps/applications/gettype/ trunk/rosapps/applications/logevent/ trunk/rosapps/applications/mc/ trunk/rosapps/applications/old_wordpad/ trunk/rosapps/applications/roshttpd/ trunk/rosapps/applications/screenshot/ Modified: trunk/rosapps/applications/applications.rbuild trunk/rosapps/applications/net/directory.rbuild trunk/rosapps/applications/sysutils/sysutils.rbuild Modified: trunk/rosapps/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/applications.… ============================================================================== --- trunk/rosapps/applications/applications.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/applications.rbuild [iso-8859-1] Sat Jul 5 13:23:03 2008 @@ -25,24 +25,8 @@ <xi:include href="fraginator/fraginator.rbuild" /> </directory> --> - <directory name="gettype"> - <xi:include href="gettype/gettype.rbuild" /> - </directory> - - <directory name="imagesoft"> - <xi:include href="imagesoft/imagesoft.rbuild" /> - </directory> - - <directory name="logevent"> - <xi:include href="logevent/logevent.rbuild" /> - </directory> - <directory name="magnify"> <xi:include href="magnify/magnify.rbuild" /> - </directory> - - <directory name="mc"> - <xi:include href="mc/mc.rbuild" /> </directory> <directory name="net"> @@ -58,14 +42,6 @@ <xi:include href="packmgr/directory.rbuild" /> </directory> --> - - <directory name="roshttpd"> - <xi:include href="roshttpd/roshttpd.rbuild" /> - </directory> - - <directory name="screenshot"> - <xi:include href="screenshot/screenshot.rbuild" /> - </directory> <directory name="sysutils"> <xi:include href="sysutils/sysutils.rbuild" /> Modified: trunk/rosapps/applications/net/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/directory… ============================================================================== --- trunk/rosapps/applications/net/directory.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/net/directory.rbuild [iso-8859-1] Sat Jul 5 13:23:03 2008 @@ -12,6 +12,10 @@ <xi:include href="niclist/niclist.rbuild" /> </directory> + <directory name="roshttpd"> + <xi:include href="roshttpd/roshttpd.rbuild" /> + </directory> + <directory name="tditest"> <xi:include href="tditest/tditest.rbuild" /> </directory> Modified: trunk/rosapps/applications/sysutils/sysutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/sysu… ============================================================================== --- trunk/rosapps/applications/sysutils/sysutils.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/sysutils.rbuild [iso-8859-1] Sat Jul 5 13:23:03 2008 @@ -14,8 +14,16 @@ </directory> --> + <directory name="gettype"> + <xi:include href="gettype/gettype.rbuild" /> + </directory> + <directory name="kill"> <xi:include href="kill/kill.rbuild" /> + </directory> + + <directory name="logevent"> + <xi:include href="logevent/logevent.rbuild" /> </directory> <directory name="lsdd"> @@ -34,6 +42,10 @@ <xi:include href="regexpl/regexpl.rbuild" /> </directory> + <directory name="screenshot"> + <xi:include href="screenshot/screenshot.rbuild" /> + </directory> + <directory name="systeminfo"> <xi:include href="systeminfo/systeminfo.rbuild" /> </directory>

16 years, 5 months

[mkupfer] 34307: - converted 1st stage setup stub from message box style to property sheet style - property page for English and German added - other languages needs to be translated and enabled in rsrc.rc

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sat Jul 5 12:55:38 2008 New Revision: 34307 URL: http://svn.reactos.org/svn/reactos?rev=34307&view=rev Log: - converted 1st stage setup stub from message box style to property sheet style - property page for English and German added - other languages needs to be translated and enabled in rsrc.rc Added: trunk/reactos/base/setup/reactos/res/header.bmp (with props) trunk/reactos/base/setup/reactos/res/watermark.bmp (with props) Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/reactos.c trunk/reactos/base/setup/reactos/reactos.rbuild trunk/reactos/base/setup/reactos/reactos.rc trunk/reactos/base/setup/reactos/resource.h trunk/reactos/base/setup/reactos/rsrc.rc Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/de… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] Sat Jul 5 12:55:38 2008 @@ -2,12 +2,16 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -/* String Tables */ - -STRINGTABLE DISCARDABLE +IDD_STARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" BEGIN - IDS_CAPTION "ReactOS Setup" - IDS_TEXT "ReactOS kann nicht direkt von dieser CD installiert werden!\n\nBitte starten Sie Ihren Computer mit dieser CD um ReactOS zu installieren." + LTEXT "Willkommen beim ReactOS Setup Assistenten.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "ReactOS kann noch nicht direkt von dieser CD installiert werden! "\ + "Bitte starten Sie Ihren Computer mit dieser CD um ReactOS zu "\ + "installieren.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Klicken Sie auf Beenden um das Setup zu verlassen.", IDC_STATIC, 115, 169, 195, 17 END /* EOF */ Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Sat Jul 5 12:55:38 2008 @@ -2,11 +2,16 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -/* String Tables */ -STRINGTABLE DISCARDABLE +IDD_STARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" BEGIN - IDS_CAPTION "ReactOS Setup" - IDS_TEXT "You cannot install ReactOS directly from this CD!\n\nPlease restart your computer from this CD in order to install ReactOS." + LTEXT "Welcome to the ReactOS Setup Wizard.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "You cannot install ReactOS directly from this CD yet! "\ + "Please restart your computer from this CD in order to "\ + "install ReactOS.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Click Finish to exit the Setup.", IDC_STATIC, 115, 169, 195, 17 END /* EOF */ 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] Sat Jul 5 12:55:38 2008 @@ -1,6 +1,6 @@ /* * ReactOS applications - * Copyright (C) 2004 ReactOS Team + * Copyright (C) 2004-2008 ReactOS Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,24 +21,90 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS GUI first stage setup application * FILE: subsys/system/reactos/reactos.c - * PROGRAMMERS: Eric Kohl + * PROGRAMMERS: Eric Kohl, Matthias Kupfer */ #include <windows.h> -#include <tchar.h> +#include <commctrl.h> #include "resource.h" -/* GLOBALS ******************************************************************/ +/* FUNCTIONS ****************************************************************/ -TCHAR szCaption[256]; -TCHAR szText[256]; +static VOID +CenterWindow(HWND hWnd) +{ + HWND hWndParent; + RECT rcParent; + RECT rcWindow; -HINSTANCE hInstance; + hWndParent = GetParent(hWnd); + if (hWndParent == NULL) + hWndParent = GetDesktopWindow(); + GetWindowRect(hWndParent, &rcParent); + GetWindowRect(hWnd, &rcWindow); -/* FUNCTIONS ****************************************************************/ + SetWindowPos(hWnd, + HWND_TOP, + ((rcParent.right - rcParent.left) - (rcWindow.right - rcWindow.left)) / 2, + ((rcParent.bottom - rcParent.top) - (rcWindow.bottom - rcWindow.top)) / 2, + 0, + 0, + SWP_NOSIZE); +} + +static INT_PTR CALLBACK +StartDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + { + HWND hwndControl; + DWORD dwStyle; + + hwndControl = GetParent(hwndDlg); + + /* Center the wizard window */ + CenterWindow (hwndControl); + + dwStyle = GetWindowLong(hwndControl, GWL_STYLE); + SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + + /* Hide and disable the 'Cancel' button at the moment, + * later we use this button to cancel the setup process + * like F3 in usetup + */ + hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); + ShowWindow (hwndControl, SW_HIDE); + EnableWindow (hwndControl, FALSE); + } + break; + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: // Only "Finish" for closing the App + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); + break; + default: + break; + } + break; + default: + break; + } + + } + return FALSE; +} int WINAPI WinMain(HINSTANCE hInst, @@ -46,26 +112,38 @@ LPSTR lpszCmdLine, int nCmdShow) { - hInstance = hInst; + PROPSHEETHEADER psh; + HPROPSHEETPAGE ahpsp[1]; + PROPSHEETPAGE psp = {0}; + UINT nPages = 0; - if (!LoadString(hInstance, - IDS_CAPTION, - szCaption, - (sizeof szCaption / sizeof szCaption[0]))) - return 0; + /* Create the Start page */ + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; + psp.hInstance = hInst; + psp.lParam = 0; + psp.pfnDlgProc = StartDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_STARTPAGE); + ahpsp[nPages++] = CreatePropertySheetPage(&psp); - if (!LoadString(hInstance, - IDS_TEXT, - szText, - (sizeof szText / sizeof szText[0]))) - return 0; + // Here we can add the next pages and switch on later - MessageBox(NULL, - szText, - szCaption, - MB_OK | MB_ICONINFORMATION); + /* Create the property sheet */ + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_WIZARD97 | PSH_WATERMARK | PSH_HEADER; + psh.hInstance = hInst; + psh.hwndParent = NULL; + psh.nPages = nPages; + psh.nStartPage = 0; + psh.phpage = ahpsp; + psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK); + psh.pszbmHeader = MAKEINTRESOURCE(IDB_HEADER); + + /* Display the wizard */ + PropertySheet(&psh); return 0; + } /* EOF */ 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] Sat Jul 5 12:55:38 2008 @@ -8,6 +8,7 @@ <library>kernel32</library> <library>gdi32</library> <library>user32</library> + <library>comctl32</library> <file>reactos.c</file> <file>reactos.rc</file> </module> Modified: trunk/reactos/base/setup/reactos/reactos.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.rc [iso-8859-1] Sat Jul 5 12:55:38 2008 @@ -14,6 +14,9 @@ /* Icons */ IDI_MAIN ICON "res/reactos.ico" +/* Bitmaps */ +IDB_WATERMARK BITMAP "res/watermark.bmp" +IDB_HEADER BITMAP "res/header.bmp" /* Language-specific resources */ #include "rsrc.rc" Added: trunk/reactos/base/setup/reactos/res/header.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/res/hea… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/setup/reactos/res/header.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/setup/reactos/res/watermark.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/res/wat… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/setup/reactos/res/watermark.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/base/setup/reactos/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/resourc… ============================================================================== --- trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] Sat Jul 5 12:55:38 2008 @@ -1,5 +1,15 @@ -#define IDS_CAPTION 1000 -#define IDS_TEXT 1001 +#ifndef RESOURCE_H +#define RESOURCE_H + +#define IDB_WATERMARK 100 +#define IDB_HEADER 101 + +#define IDC_STATIC -1 + +#define IDD_STARTPAGE 2000 +#define IDC_STARTTITLE 2001 #define IDI_MAIN 3000 + +#endif Modified: trunk/reactos/base/setup/reactos/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/reactos/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/rsrc.rc [iso-8859-1] Sat Jul 5 12:55:38 2008 @@ -2,12 +2,12 @@ #include "resource.h" /* Language-specific resources */ -#include "lang/bg-BG.rc" -#include "lang/cs-CZ.rc" +/*#include "lang/bg-BG.rc" +#include "lang/cs-CZ.rc"*/ #include "lang/de-DE.rc" -#include "lang/el-GR.rc" +//#include "lang/el-GR.rc" #include "lang/en-US.rc" -#include "lang/es-ES.rc" +/*#include "lang/es-ES.rc" #include "lang/fi-FI.rc" #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" @@ -24,4 +24,4 @@ #include "lang/sv-SE.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" -#include "lang/zh-CN.rc" +#include "lang/zh-CN.rc"*/

16 years, 5 months

[cfinck] 34306: - Get our Win32 version of ccache to compile warning-free under MSVC (tested with 2008 at /W4) and GCC (tested with RosBE-Windows 1.2 at -Wall -pedantic) - Fix the MSVC project file - Add a Makefile for compiling with mingw32-gcc

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Jul 5 09:37:46 2008 New Revision: 34306 URL: http://svn.reactos.org/svn/reactos?rev=34306&view=rev Log: - Get our Win32 version of ccache to compile warning-free under MSVC (tested with 2008 at /W4) and GCC (tested with RosBE-Windows 1.2 at -Wall -pedantic) - Fix the MSVC project file - Add a Makefile for compiling with mingw32-gcc Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/Makefile Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ (props changed) trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.vcproj trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.h trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/config.h trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/execute.c trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/getopt.c trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/snprintf.c trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/util.c trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/win32-dirent.c Propchange: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 09:37:46 2008 @@ -1,0 +1,7 @@ +*.exe +*.user +*.ncb +*.suo +*.sln +Debug +Release Added: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/Makefile (added) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/Makefile [iso-8859-1] Sat Jul 5 09:37:46 2008 @@ -1,0 +1,24 @@ +# mingw32 makefile for ccache + +TARGET := ccache.exe + +.PHONY: all + +all: $(TARGET) + +CC=gcc +CFLAGS := -Wall -pedantic -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0400 -O2 +LFLAGS := -s +SRCS := args.c ccache.c cleanup.c execute.c getopt.c hash.c mdfour.c snprintf.c stats.c unify.c util.c win32-dirent.c +OBJS := $(SRCS:.c=.o) + +$(TARGET): $(OBJS) + $(CC) $(LFLAGS) -o $@ $(OBJS) + +.c.o: $< + $(CC) $(CFLAGS) -c $< -o $@ + +.PHONY: clean +clean: + -@del $(TARGET) + -@del $(OBJS) Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.vcproj [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.vcproj [iso-8859-1] Sat Jul 5 09:37:46 2008 @@ -17,7 +17,7 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="." + OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" @@ -45,8 +45,8 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" + WarningLevel="4" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool @@ -84,15 +84,12 @@ Name="VCAppVerifierTool" /> <Tool - Name="VCWebDeploymentTool" - /> - <Tool Name="VCPostBuildEventTool" /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="C:\RosBE\4.1.3\bin" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" @@ -115,11 +112,11 @@ /> <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="2" UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" + WarningLevel="4" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> <Tool @@ -157,9 +154,6 @@ /> <Tool Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" /> <Tool Name="VCPostBuildEventTool" @@ -203,10 +197,6 @@ > </File> <File - RelativePath=".\mkstemps.c" - > - </File> - <File RelativePath=".\snprintf.c" > </File> @@ -253,12 +243,6 @@ > </File> </Filter> - <Filter - Name="Ressourcendateien" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > - </Filter> </Files> <Globals> </Globals> Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c [iso-8859-1] Sat Jul 5 09:37:46 2008 @@ -126,7 +126,7 @@ { char *e; #ifdef _WIN32 - STARTUPINFO si; + STARTUPINFOA si; PROCESS_INFORMATION pi; char* merged = build_command(orig_args->argv); #endif @@ -150,7 +150,7 @@ /* strip any local args */ args_strip(orig_args, "--ccache-"); - if ((e=getenv("CCACHE_PREFIX"))) { + if ((e=getenv("CCACHE_PREFIX")) != NULL) { char *p = find_executable(e, MYNAME); if (!p) { perror(e); @@ -160,10 +160,10 @@ } #ifdef _WIN32 - ZeroMemory(&si, sizeof(STARTUPINFO)); + ZeroMemory(&si, sizeof(STARTUPINFOA)); ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); - si.cb = sizeof(STARTUPINFO); + si.cb = sizeof(STARTUPINFOA); if(!CreateProcessA(orig_args->argv[0], merged, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) { @@ -334,7 +334,7 @@ char *input_base; char *tmp; - if ((s = getenv("CCACHE_NLEVELS"))) { + if ((s = getenv("CCACHE_NLEVELS")) != NULL) { nlevels = atoi(s); if (nlevels < 1) nlevels = 1; if (nlevels > 8) nlevels = 8; @@ -646,7 +646,7 @@ } /* support user override of the compiler */ - if ((path=getenv("CCACHE_CC"))) { + if ((path=getenv("CCACHE_CC")) != NULL) { base = strdup(path); } @@ -874,7 +874,7 @@ if (!output_file) { char *p; output_file = x_strdup(input_file); - if ((p = strrchr(output_file, PATH_SEP_CHAR))) { + if ((p = strrchr(output_file, PATH_SEP_CHAR)) != NULL) { output_file = p+1; } p = strrchr(output_file, '.'); @@ -894,7 +894,7 @@ failed(); } - if ((e=getenv("CCACHE_PREFIX"))) { + if ((e=getenv("CCACHE_PREFIX")) != NULL) { char *p = find_executable(e, MYNAME); if (!p) { perror(e); Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.h [iso-8859-1] Sat Jul 5 09:37:46 2008 @@ -44,7 +44,11 @@ #define link(filename, linkname) CreateHardLinkA(linkname, filename, NULL) #define PROT_READ 0x0001 #define MAP_PRIVATE 0x02 - typedef int mode_t; + + #ifdef _MSC_VER + typedef unsigned int mode_t; + #endif + #ifndef S_ISREG #define S_ISREG(m) ((m & _S_IFREG) == _S_IFREG) #endif @@ -62,7 +66,10 @@ #define PATH_SEP USUAL_PATH_SEP #define PATH_SEP_CHAR USUAL_PATH_SEP_CHAR #define DEV_NULL "/dev/null" -#endif + + char *x_realpath(const char *path); +#endif + #include <fcntl.h> #include <time.h> #include <string.h> @@ -142,7 +149,6 @@ int lock_fd(int fd); size_t file_size(struct stat *st); int safe_open(const char *fname); -char *x_realpath(const char *path); char *gnu_getcwd(void); int create_empty_file(const char *fname); const char *get_home_directory(void); Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/config.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/config.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/config.h [iso-8859-1] Sat Jul 5 09:37:46 2008 @@ -1,4 +1,3 @@ - #define HAVE_STRING_H #define HAVE_STDLIB_H -#define HAVE_CTYPE_H +#define HAVE_CTYPE_H Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/execute.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/execute.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/execute.c [iso-8859-1] Sat Jul 5 09:37:46 2008 @@ -92,7 +92,7 @@ _close(fd); /* Spawn process (_exec* familly doesn't return) */ - status = _spawnv(_P_WAIT, argv[0], argv); + status = _spawnv(_P_WAIT, argv[0], (const char* const*)argv); out: cc_log("%s:\n stdout -> %s\n stderr -> %s\n process status=%i\n", @@ -115,7 +115,13 @@ */ char is_exec_file(const char *fname, const char *exclude_name) { - struct stat st1, st2; + struct stat st2; + +#ifdef _WIN32 + UNREFERENCED_PARAMETER(exclude_name); +#else + struct stat st1; +#endif if (access(fname, 0) == 0 && #ifndef _WIN32 /* Symlinks not used under windows */ Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/getopt.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/getopt.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/getopt.c [iso-8859-1] Sat Jul 5 09:37:46 2008 @@ -74,7 +74,7 @@ } } /* option letter okay? */ if ((optopt = (int)*place++) == (int)':' || - !(oli = strchr(ostr, optopt))) { + (oli = strchr(ostr, optopt)) == NULL) { /* * if the user didn't specify '-' as an option, * assume it means EOF. @@ -84,7 +84,7 @@ if (!*place) ++optind; if (opterr) { - if (!(p = strrchr(*nargv, '/'))) + if ((p = strrchr(*nargv, '/')) == NULL) p = *nargv; else ++p; @@ -103,7 +103,7 @@ optarg = place; else if (nargc <= ++optind) { /* no arg */ place = EMSG; - if (!(p = strrchr(*nargv, '/'))) + if ((p = strrchr(*nargv, '/')) == NULL) p = *nargv; else ++p; Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/snprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/snprintf.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/snprintf.c [iso-8859-1] Sat Jul 5 09:37:46 2008 @@ -329,7 +329,7 @@ fvalue = va_arg (args, double); break; case 'c': - dopr_outch (buffer, &currlen, maxlen, va_arg (args, int)); + dopr_outch (buffer, &currlen, maxlen, (char)va_arg (args, int)); break; case 's': strvalue = va_arg (args, char *); @@ -348,7 +348,7 @@ if (cflags == DP_C_SHORT) { short int *num; num = va_arg (args, short int *); - *num = currlen; + *num = (short)currlen; } else if (cflags == DP_C_LONG) { long int *num; num = va_arg (args, long int *); @@ -437,7 +437,7 @@ static void fmtint(char *buffer, size_t *currlen, size_t maxlen, long value, int base, int min, int max, int flags) { - int signvalue = 0; + char signvalue = 0; unsigned long uvalue; char convert[20]; int place = 0; @@ -496,7 +496,7 @@ } /* Sign */ - if (signvalue) + if (signvalue) dopr_outch (buffer, currlen, maxlen, signvalue); /* Zeros */ @@ -556,7 +556,7 @@ static double my_modf(double x0, double *iptr) { int i; - long l; + long l = 0; double x = x0; double f = 1.0; @@ -590,7 +590,7 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen, LDOUBLE fvalue, int min, int max, int flags) { - int signvalue = 0; + char signvalue = 0; double ufvalue; char iconvert[311]; char fconvert[311]; Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/util.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/util.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/util.c [iso-8859-1] Sat Jul 5 09:37:46 2008 @@ -21,10 +21,7 @@ static FILE *logfile; #ifdef _WIN32 -int fchmod(int fildes, mode_t mode) -{ - return 0; -} +#define fchmod(a, b) #endif #ifndef HAVE_MKSTEMP @@ -255,7 +252,7 @@ d = opendir(dir); if (!d) return; - while ((de = readdir(d))) { + while ((de = readdir(d)) != 0) { char *fname; struct stat st; @@ -450,7 +447,7 @@ { unsigned size = 128; - while (1) { + for(;;) { char *buffer = (char *)x_malloc(size); if (_getcwd(buffer, size) == buffer) { return buffer; @@ -486,7 +483,7 @@ #ifdef _WIN32 static char szPath[MAX_PATH]; - // "Documents and Settings\user\Application Data" is CSIDL_APPDATA + /* "Documents and Settings\user\Application Data" is CSIDL_APPDATA */ if(SHGetSpecialFolderPathA(NULL, szPath, CSIDL_PROFILE, FALSE)) { return szPath; Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/win32-dirent.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/win32-dirent.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/win32-dirent.c [iso-8859-1] Sat Jul 5 09:37:46 2008 @@ -73,7 +73,7 @@ entry.d_off = dir->filepos; strncpy (entry.d_name, find->cFileName, sizeof (entry.d_name)); - entry.d_reclen = strlen (find->cFileName); + entry.d_reclen = (unsigned short)strlen (find->cFileName); dir->filepos++; return &entry; }

16 years, 5 months

[pschweitzer] 34305: Finally reverted most of r34036: it only created problems...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jul 5 08:40:17 2008 New Revision: 34305 URL: http://svn.reactos.org/svn/reactos?rev=34305&view=rev Log: Finally reverted most of r34036: it only created problems... Modified: branches/pierre-fsd/drivers/filesystems/ntfs/fcb.c branches/pierre-fsd/drivers/filesystems/ntfs/fsctl.c branches/pierre-fsd/drivers/filesystems/ntfs/ntfs.h Modified: branches/pierre-fsd/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Sat Jul 5 08:40:17 2008 @@ -68,20 +68,15 @@ PNTFS_FCB -NtfsCreateFCB(PCWSTR FileName, PNTFS_VCB Vcb) +NtfsCreateFCB(PCWSTR FileName) { PNTFS_FCB Fcb; - - ASSERT(Vcb); - ASSERT(Vcb->Identifier.Type == NTFS_TYPE_VCB); Fcb = ExAllocatePoolWithTag(NonPagedPool, sizeof(NTFS_FCB), TAG_FCB); RtlZeroMemory(Fcb, sizeof(NTFS_FCB)); Fcb->Identifier.Type = NTFS_TYPE_FCB; Fcb->Identifier.Size = sizeof(NTFS_TYPE_FCB); - - Fcb->Vcb = Vcb; if (FileName) { @@ -99,10 +94,6 @@ ExInitializeResourceLite(&Fcb->MainResource); Fcb->RFCB.Resource = &(Fcb->MainResource); -#if 0 - ExInterlockedInsertTailList(&(Vcb->FcbListHead), &(Fcb->FcbListEntry), &(Vcb->FcbListLock)); -#endif - return(Fcb); } @@ -110,20 +101,16 @@ VOID NtfsDestroyFCB(PNTFS_FCB Fcb) { -#if 0 KIRQL oldIrql; -#endif ASSERT(Fcb); ASSERT(Fcb->Identifier.Type == NTFS_TYPE_FCB); ExDeleteResourceLite(&Fcb->MainResource); -#if 0 KeAcquireSpinLock(&(Fcb->Vcb->FcbListLock), &oldIrql); RemoveEntryList(&(Fcb->FcbListEntry)); KeReleaseSpinLock(&(Fcb->Vcb->FcbListLock), oldIrql); -#endif ExFreePool(Fcb); } @@ -189,12 +176,8 @@ NtfsAddFCBToTable(PNTFS_VCB Vcb, PNTFS_FCB Fcb) { - KIRQL oldIrql; - - KeAcquireSpinLock(&Vcb->FcbListLock, &oldIrql); Fcb->Vcb = Vcb; - InsertTailList(&Vcb->FcbListHead, &Fcb->FcbListEntry); - KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); + ExInterlockedInsertTailList(&(Vcb->FcbListHead), &(Fcb->FcbListEntry), &(Vcb->FcbListLock)); } @@ -286,7 +269,7 @@ { PNTFS_FCB Fcb; - Fcb = NtfsCreateFCB(L"\\", Vcb); + Fcb = NtfsCreateFCB(L"\\"); // memset(Fcb->entry.Filename, ' ', 11); Modified: branches/pierre-fsd/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Sat Jul 5 08:40:17 2008 @@ -381,8 +381,9 @@ Vcb->StorageDevice); InitializeListHead(&Vcb->FcbListHead); - - Fcb = NtfsCreateFCB(NULL, Vcb); + KeInitializeSpinLock(&Vcb->FcbListLock); + + Fcb = NtfsCreateFCB(NULL); if (Fcb == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -447,8 +448,6 @@ Vcb->MftBuffer = MftRecord; ExInitializeResourceLite(&Vcb->DirResource); - - KeInitializeSpinLock(&Vcb->FcbListLock); ExAcquireResourceExclusiveLite(&NtfsGlobalData->VolumeListLock, TRUE); InsertHeadList(&NtfsGlobalData->VolumeListHead, &Vcb->VolumeListEntry); Modified: branches/pierre-fsd/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sat Jul 5 08:40:17 2008 @@ -434,7 +434,7 @@ /* fcb.c */ PNTFS_FCB -NtfsCreateFCB(PCWSTR FileName, PNTFS_VCB Vcb); +NtfsCreateFCB(PCWSTR FileName); VOID NtfsDestroyFCB(PNTFS_FCB Fcb);

16 years, 5 months

[silverblade] 34304: Rename MME entrypoint files to avoid Windows issues with the aux.c file name. Now it is called auxMessage.c - the other files have been renamed accordingly.

by silverblade＠svn.reactos.org

Author: silverblade Date: Sat Jul 5 07:42:48 2008 New Revision: 34304 URL: http://svn.reactos.org/svn/reactos?rev=34304&view=rev Log: Rename MME entrypoint files to avoid Windows issues with the aux.c file name. Now it is called auxMessage.c - the other files have been renamed accordingly. Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/DriverProc.c - copied unchanged from r34299, branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/entry.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/auxMessage.c - copied unchanged from r34299, branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/aux.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/midMessage.c - copied unchanged from r34299, branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mid.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/modMessage.c - copied unchanged from r34299, branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mod.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxdMessage.c - copied unchanged from r34299, branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxd.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/widMessage.c - copied unchanged from r34299, branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wid.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wodMessage.c - copied unchanged from r34299, branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wod.c Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/aux.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/entry.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mid.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mod.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxd.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wid.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wod.c Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/aux.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/aux.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/aux.c (removed) @@ -1,31 +1,0 @@ -/* - ReactOS Sound System - MME Interface - - Purpose: - Auxiliary device message handler - - Author: - Andrew Greenwood (silverblade(a)reactos.org) - - History: - 4 July 2008 - Created -*/ - -#include <windows.h> -#include <mmsystem.h> -#include <mmddk.h> -#include <debug.h> - -APIENTRY DWORD -auxMessage( - DWORD device_id, - DWORD message, - DWORD private_handle, - DWORD parameter1, - DWORD parameter2) -{ - DPRINT("auxMessageStub called\n"); - /* TODO */ - return MMSYSERR_NOTSUPPORTED; -} Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/entry.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/entry.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/entry.c (removed) @@ -1,77 +1,0 @@ -/* - ReactOS Sound System - MME Interface - - Purpose: - Default DriverProc implementation - - Author: - Andrew Greenwood (silverblade(a)reactos.org) - - History: - 4 July 2008 - Created -*/ - -#include <windows.h> -#include <mmddk.h> -#include <ntddsnd.h> -#include <debug.h> - -LONG -DefaultDriverProc( - DWORD driver_id, - HANDLE driver_handle, - UINT message, - LONG parameter1, - LONG parameter2) -{ - switch ( message ) - { - case DRV_LOAD : - DPRINT("DRV_LOAD\n"); - return 1L; - - case DRV_FREE : - DPRINT("DRV_FREE\n"); - return 1L; - - case DRV_OPEN : - DPRINT("DRV_OPEN\n"); - return 1L; - - case DRV_CLOSE : - DPRINT("DRV_CLOSE\n"); - return 1L; - - case DRV_ENABLE : - DPRINT("DRV_ENABLE\n"); - return 1L; - - case DRV_DISABLE : - DPRINT("DRV_DISABLE\n"); - return 1L; - - /* - We don't provide configuration capabilities. This used to be - for things like I/O port, IRQ, DMA settings, etc. - */ - - case DRV_QUERYCONFIGURE : - DPRINT("DRV_QUERYCONFIGURE\n"); - return 0L; - - case DRV_CONFIGURE : - DPRINT("DRV_CONFIGURE\n"); - return 0L; - - case DRV_INSTALL : - DPRINT("DRV_INSTALL\n"); - return DRVCNF_RESTART; - }; - - return DefDriverProc(driver_id, - driver_handle, - message, - parameter1, - parameter2); -} Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mid.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mid.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mid.c (removed) @@ -1,49 +1,0 @@ -/* - ReactOS Sound System - MME Interface - - Purpose: - MIDI Input device message handler - - Author: - Andrew Greenwood (silverblade(a)reactos.org) - - History: - 4 July 2008 - Created -*/ - -#include <windows.h> -#include <mmsystem.h> -#include <mmddk.h> -#include <debug.h> - -APIENTRY DWORD -midMessage( - DWORD device_id, - DWORD message, - DWORD private_handle, - DWORD parameter1, - DWORD parameter2) -{ - DPRINT("midMessageStub called\n"); - - switch ( message ) - { - case MIDM_GETNUMDEVS : - return 0; - - case MIDM_GETDEVCAPS : - case MIDM_OPEN : - return MMSYSERR_BADDEVICEID; - - case MIDM_CLOSE : - case MIDM_ADDBUFFER : - case MIDM_START : - case MIDM_STOP : - case MIDM_RESET : - return MMSYSERR_INVALHANDLE; - - default : - return MMSYSERR_NOTSUPPORTED; - } -} Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mod.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mod.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mod.c (removed) @@ -1,48 +1,0 @@ -/* - ReactOS Sound System - MME Interface - - Purpose: - MIDI Output device message handler - - Author: - Andrew Greenwood (silverblade(a)reactos.org) - - History: - 4 July 2008 - Created -*/ - -#include <windows.h> -#include <mmsystem.h> -#include <mmddk.h> -#include <debug.h> - -APIENTRY DWORD -modMessage( - DWORD device_id, - DWORD message, - DWORD private_handle, - DWORD parameter1, - DWORD parameter2) -{ - DPRINT("modMessageStub called\n"); - - switch ( message ) - { - case MODM_GETNUMDEVS : - return 0; - - case MODM_GETDEVCAPS : - case MODM_OPEN : - return MMSYSERR_BADDEVICEID; - - case MODM_CLOSE : - case MODM_DATA : - case MODM_LONGDATA : - case MODM_RESET : - return MMSYSERR_INVALHANDLE; - - default : - return MMSYSERR_NOTSUPPORTED; - } -} Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxd.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxd.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/mxd.c (removed) @@ -1,31 +1,0 @@ -/* - ReactOS Sound System - MME Interface - - Purpose: - Mixer device message handler - - Author: - Andrew Greenwood (silverblade(a)reactos.org) - - History: - 4 July 2008 - Created -*/ - -#include <windows.h> -#include <mmsystem.h> -#include <mmddk.h> -#include <debug.h> - -APIENTRY DWORD -mxdMessage( - DWORD device_id, - DWORD message, - DWORD private_handle, - DWORD parameter1, - DWORD parameter2) -{ - DPRINT("mxdMessageStub called\n"); - /* TODO */ - return MMSYSERR_NOTSUPPORTED; -} Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wid.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wid.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wid.c (removed) @@ -1,50 +1,0 @@ -/* - ReactOS Sound System - MME Interface - - Purpose: - Wave input device message handler - - Author: - Andrew Greenwood (silverblade(a)reactos.org) - - History: - 4 July 2008 - Created -*/ - -#include <windows.h> -#include <mmsystem.h> -#include <mmddk.h> -#include <debug.h> -#include <ntddsnd.h> - -#include <mmebuddy.h> - -APIENTRY DWORD -widMessage( - DWORD device_id, - DWORD message, - DWORD private_handle, - DWORD parameter1, - DWORD parameter2) -{ - DPRINT("widMessageStub called\n"); - - switch ( message ) - { - case WIDM_GETNUMDEVS : - return GetSoundDeviceCount(WAVE_IN_DEVICE_TYPE); - - case WIDM_GETDEVCAPS : - case WIDM_OPEN : - return MMSYSERR_BADDEVICEID; - - case WIDM_CLOSE : - case WIDM_START : - case WIDM_RESET : - return MMSYSERR_INVALHANDLE; - - default : - return MMSYSERR_NOTSUPPORTED; - } -} Removed: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wod.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wod.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/wod.c (removed) @@ -1,81 +1,0 @@ -/* - ReactOS Sound System - MME Interface - - Purpose: - Wave output device message handler - - Author: - Andrew Greenwood (silverblade(a)reactos.org) - - History: - 4 July 2008 - Created -*/ - -#include <windows.h> -#include <mmsystem.h> -#include <mmddk.h> -#include <debug.h> - -#include <ntddsnd.h> -#include <mmebuddy.h> - -APIENTRY DWORD -wodMessage( - DWORD device_id, - DWORD message, - DWORD private_handle, - DWORD parameter1, - DWORD parameter2) -{ - MMRESULT Result = MMSYSERR_NOERROR; - PSOUND_DEVICE Device = NULL; - DPRINT("wodMessageStub called\n"); - - switch ( message ) - { - case WODM_GETNUMDEVS : - return GetSoundDeviceCount(WAVE_OUT_DEVICE_TYPE); - - case WODM_GETDEVCAPS : - { - UNIVERSAL_CAPS Capabilities; - - Result = GetSoundDevice(WAVE_OUT_DEVICE_TYPE, device_id, &Device); - if ( Result != MMSYSERR_NOERROR ) - return Result; - - Result = GetSoundDeviceCapabilities(Device, &Capabilities); - if ( Result != MMSYSERR_NOERROR ) - return Result; - - CopyMemory((LPWAVEOUTCAPS)parameter1, &Capabilities.WaveOut, parameter2); - - return Result; - } - - case WODM_OPEN : - /* - OpenSoundDevice(); - */ - return MMSYSERR_BADDEVICEID; - - case WODM_CLOSE : - /* CloseSoundDevice() */ - - case WODM_WRITE : - case WODM_PAUSE : - case WODM_RESTART : - case WODM_RESET : - case WODM_BREAKLOOP : - return MMSYSERR_INVALHANDLE; - - /* Let WINMM take care of these */ - case WODM_PREPARE : - case WODM_UNPREPARE : - return MMSYSERR_NOTSUPPORTED; - - default : - return MMSYSERR_NOTSUPPORTED; - } -} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild [iso-8859-1] Sat Jul 5 07:42:48 2008 @@ -10,13 +10,13 @@ <file>thread.c</file> <file>testing.c</file> <directory name="mme"> - <file>entry.c</file> - <file>wod.c</file> - <file>wid.c</file> - <file>mod.c</file> - <file>mid.c</file> - <file>mxd.c</file> - <file>aux.c</file> + <file>DriverProc.c</file> + <file>wodMessage.c</file> + <file>widMessage.c</file> + <file>modMessage.c</file> + <file>midMessage.c</file> + <file>mxdMessage.c</file> + <file>auxMessage.c</file> </directory> <directory name="wave"> <file>wavethread.c</file>

16 years, 5 months

[fireball] 34303: - Start rosapps rearrange and cleanup process.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jul 5 06:46:22 2008 New Revision: 34303 URL: http://svn.reactos.org/svn/reactos?rev=34303&view=rev Log: - Start rosapps rearrange and cleanup process. Added: trunk/rosapps/applications/cmdutils/ (props changed) - copied from r34291, trunk/rosapps/cmdutils/ trunk/rosapps/applications/devutils/ (props changed) - copied from r34291, trunk/rosapps/devutils/ trunk/rosapps/applications/downloader/ (props changed) - copied from r34291, trunk/rosapps/downloader/ trunk/rosapps/applications/fontview/ (props changed) - copied from r34291, trunk/rosapps/fontview/ trunk/rosapps/applications/fraginator/ (props changed) - copied from r34291, trunk/rosapps/fraginator/ trunk/rosapps/applications/gettype/ (props changed) - copied from r34291, trunk/rosapps/gettype/ trunk/rosapps/applications/imagesoft/ (props changed) - copied from r34291, trunk/rosapps/imagesoft/ trunk/rosapps/applications/logevent/ (props changed) - copied from r34291, trunk/rosapps/logevent/ trunk/rosapps/applications/magnify/ (props changed) - copied from r34291, trunk/rosapps/magnify/ trunk/rosapps/applications/mc/ (props changed) - copied from r34291, trunk/rosapps/mc/ trunk/rosapps/applications/net/ (props changed) - copied from r34291, trunk/rosapps/net/ trunk/rosapps/applications/notevil/ (props changed) - copied from r34291, trunk/rosapps/notevil/ trunk/rosapps/applications/old_wordpad/ (props changed) - copied from r34291, trunk/rosapps/old_wordpad/ trunk/rosapps/applications/packmgr/ (props changed) - copied from r34291, trunk/rosapps/packmgr/ trunk/rosapps/applications/roshttpd/ (props changed) - copied from r34291, trunk/rosapps/roshttpd/ trunk/rosapps/applications/screenshot/ (props changed) - copied from r34291, trunk/rosapps/screenshot/ trunk/rosapps/applications/sysutils/ (props changed) - copied from r34291, trunk/rosapps/sysutils/ trunk/rosapps/applications/winfile/ (props changed) - copied from r34291, trunk/rosapps/winfile/ trunk/rosapps/applications/winver/ (props changed) - copied from r34291, trunk/rosapps/winver/ trunk/rosapps/applications/write/ (props changed) - copied from r34291, trunk/rosapps/write/ Removed: trunk/rosapps/cmdutils/ trunk/rosapps/devutils/ trunk/rosapps/downloader/ trunk/rosapps/fontview/ trunk/rosapps/fraginator/ trunk/rosapps/gettype/ trunk/rosapps/imagesoft/ trunk/rosapps/logevent/ trunk/rosapps/magnify/ trunk/rosapps/mc/ trunk/rosapps/net/ trunk/rosapps/notevil/ trunk/rosapps/old_wordpad/ trunk/rosapps/packmgr/ trunk/rosapps/roshttpd/ trunk/rosapps/screenshot/ trunk/rosapps/sysutils/ trunk/rosapps/winfile/ trunk/rosapps/winver/ trunk/rosapps/write/ Modified: trunk/rosapps/applications/applications.rbuild trunk/rosapps/applications/mc/mkinstalldirs trunk/rosapps/applications/notevil/readme.txt trunk/rosapps/applications/sysutils/regexpl/README trunk/rosapps/directory.rbuild Modified: trunk/rosapps/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/applications.… ============================================================================== --- trunk/rosapps/applications/applications.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/applications.rbuild [iso-8859-1] Sat Jul 5 06:46:22 2008 @@ -4,4 +4,82 @@ <directory name="screensavers"> <xi:include href="screensavers/screensavers.rbuild" /> </directory> + + <directory name="cmdutils"> + <xi:include href="cmdutils/cmdutils.rbuild" /> + </directory> + + <directory name="devutils"> + <xi:include href="devutils/directory.rbuild" /> + </directory> + + <directory name="downloader"> + <xi:include href="downloader/downloader.rbuild" /> + </directory> + + <directory name="fontview"> + <xi:include href="fontview/fontview.rbuild" /> + </directory> + + <directory name="gettype"> + <xi:include href="gettype/gettype.rbuild" /> + </directory> + + <directory name="imagesoft"> + <xi:include href="imagesoft/imagesoft.rbuild" /> + </directory> + + <directory name="logevent"> + <xi:include href="logevent/logevent.rbuild" /> + </directory> + + <directory name="magnify"> + <xi:include href="magnify/magnify.rbuild" /> + </directory> + + <directory name="mc"> + <xi:include href="mc/mc.rbuild" /> + </directory> + + <directory name="net"> + <xi:include href="net/directory.rbuild" /> + </directory> + + <directory name="notevil"> + <xi:include href="notevil/notevil.rbuild" /> + </directory> + +  + + <directory name="roshttpd"> + <xi:include href="roshttpd/roshttpd.rbuild" /> + </directory> + + <directory name="screenshot"> + <xi:include href="screenshot/screenshot.rbuild" /> + </directory> + + <directory name="sysutils"> + <xi:include href="sysutils/sysutils.rbuild" /> + </directory> + + <directory name="winfile"> + <xi:include href="winfile/winfile.rbuild" /> + </directory> + + <directory name="winver"> + <xi:include href="winver/winver.rbuild" /> + </directory> + + <directory name="write"> + <xi:include href="write/write.rbuild" /> + </directory> </group> Propchange: trunk/rosapps/applications/cmdutils/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/cmdutils/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/devutils/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/devutils/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/downloader/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/downloader/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/fontview/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/fontview/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/fraginator/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/fraginator/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/gettype/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/gettype/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/imagesoft/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/imagesoft/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/logevent/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/logevent/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/magnify/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/magnify/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/mc/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/mc/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/rosapps/applications/mc/mkinstalldirs URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/mc/mkinstalld… ============================================================================== --- trunk/rosapps/applications/mc/mkinstalldirs [iso-8859-1] (original) +++ trunk/rosapps/applications/mc/mkinstalldirs [iso-8859-1] Sat Jul 5 06:46:22 2008 @@ -4,7 +4,7 @@ # Created: 1993-05-16 # Public domain -# $Id: mkinstalldirs,v 1.1 2001/12/30 09:49:36 sedwards Exp $ +# $Id$ errstatus=0 Propchange: trunk/rosapps/applications/net/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/net/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/notevil/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/notevil/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/rosapps/applications/notevil/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/notevil/readm… ============================================================================== --- trunk/rosapps/applications/notevil/readme.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/notevil/readme.txt [iso-8859-1] Sat Jul 5 06:46:22 2008 @@ -1,4 +1,4 @@ -$Id: readme.txt,v 1.1 1999/05/15 07:23:34 ea Exp $ +$Id$ ReactOS Coders Console Parade ----------------------------- Propchange: trunk/rosapps/applications/old_wordpad/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/old_wordpad/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/packmgr/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/packmgr/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/roshttpd/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/roshttpd/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/screenshot/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/screenshot/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/sysutils/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/sysutils/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/rosapps/applications/sysutils/regexpl/README URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/README [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/README [iso-8859-1] Sat Jul 5 06:46:22 2008 @@ -1,5 +1,5 @@ -*- Mode: Text -*- -$Id: README,v 1.1 2003/02/09 02:13:27 narnaoud Exp $ +$Id$ Registry Explorer is console mode tool for reading/writing ReactOS registry. Currently, access is provided only by means of interactive Propchange: trunk/rosapps/applications/winfile/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/winfile/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/winver/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/winver/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/rosapps/applications/write/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jul 5 06:46:22 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/rosapps/applications/write/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=34303… ============================================================================== --- trunk/rosapps/directory.rbuild [iso-8859-1] (original) +++ trunk/rosapps/directory.rbuild [iso-8859-1] Sat Jul 5 06:46:22 2008 @@ -5,101 +5,23 @@ <xi:include href="applications/applications.rbuild" /> </directory> - <directory name="cmdutils"> - <xi:include href="cmdutils/cmdutils.rbuild" /> - </directory> - <directory name="demos"> <xi:include href="demos/directory.rbuild" /> - </directory> - - <directory name="devutils"> - <xi:include href="devutils/directory.rbuild" /> </directory> <directory name="dflat32"> <xi:include href="dflat32/dflat32.rbuild" /> </directory> - <directory name="downloader"> - <xi:include href="downloader/downloader.rbuild" /> - </directory> - <directory name="drivers"> <xi:include href="drivers/directory.rbuild" /> </directory> - <directory name="fontview"> - <xi:include href="fontview/fontview.rbuild" /> - </directory> - - <directory name="gettype"> - <xi:include href="gettype/gettype.rbuild" /> - </directory> - - <directory name="imagesoft"> - <xi:include href="imagesoft/imagesoft.rbuild" /> - </directory> - <directory name="lib"> <xi:include href="lib/directory.rbuild" /> - </directory> - - <directory name="logevent"> - <xi:include href="logevent/logevent.rbuild" /> - </directory> - - <directory name="magnify"> - <xi:include href="magnify/magnify.rbuild" /> - </directory> - - <directory name="mc"> - <xi:include href="mc/mc.rbuild" /> - </directory> - - <directory name="net"> - <xi:include href="net/directory.rbuild" /> - </directory> - - <directory name="notevil"> - <xi:include href="notevil/notevil.rbuild" /> - </directory> - -  - - <directory name="roshttpd"> - <xi:include href="roshttpd/roshttpd.rbuild" /> - </directory> - - <directory name="screenshot"> - <xi:include href="screenshot/screenshot.rbuild" /> - </directory> - - <directory name="sysutils"> - <xi:include href="sysutils/sysutils.rbuild" /> </directory> <directory name="templates"> <xi:include href="templates/directory.rbuild" /> </directory> - - <directory name="winfile"> - <xi:include href="winfile/winfile.rbuild" /> - </directory> - - <directory name="winver"> - <xi:include href="winver/winver.rbuild" /> - </directory> - - <directory name="write"> - <xi:include href="write/write.rbuild" /> - </directory> </group>

16 years, 5 months

[fireball] 34302: - Rearrange reactos.dff according to rosapps rearrange.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jul 5 06:45:32 2008 New Revision: 34302 URL: http://svn.reactos.org/svn/reactos?rev=34302&view=rev Log: - Rearrange reactos.dff according to rosapps rearrange. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Jul 5 06:45:32 2008 @@ -565,70 +565,70 @@ modules\rosapps\applications\screensavers\starfield\starfield.scr 1 optional modules\rosapps\applications\screensavers\mazescr\mazescr.scr 1 optional modules\rosapps\applications\screensavers\butterflies\butterflies.scr 1 optional -modules\rosapps\cmdutils\comp\comp.exe 1 optional -modules\rosapps\cmdutils\mode\mode.exe 1 optional -modules\rosapps\cmdutils\sort\sort.exe 1 optional -modules\rosapps\cmdutils\tee\tee.exe 1 optional -modules\rosapps\cmdutils\touch\touch.exe 1 optional -modules\rosapps\cmdutils\uptime\uptime.exe 1 optional -modules\rosapps\cmdutils\y\y.exe 1 optional +modules\rosapps\applications\cmdutils\comp\comp.exe 1 optional +modules\rosapps\applications\cmdutils\mode\mode.exe 1 optional +modules\rosapps\applications\cmdutils\sort\sort.exe 1 optional +modules\rosapps\applications\cmdutils\tee\tee.exe 1 optional +modules\rosapps\applications\cmdutils\touch\touch.exe 1 optional +modules\rosapps\applications\cmdutils\uptime\uptime.exe 1 optional +modules\rosapps\applications\cmdutils\y\y.exe 1 optional +modules\rosapps\applications\devutils\cputointel\cputointel.exe 1 optional +modules\rosapps\applications\devutils\gdb2\gdb2.exe 1 optional +modules\rosapps\applications\devutils\gdihv\gdihv.exe 1 optional +modules\rosapps\applications\devutils\genguid\genguid.exe 1 optional +modules\rosapps\applications\devutils\roswebparser\roswebparser.exe 1 optional +modules\rosapps\applications\devutils\zoomin\zoomin.exe 1 optional +modules\rosapps\applications\downloader\downloader.exe 1 optional +modules\rosapps\applications\downloader\downloader.xml 1 optional +modules\rosapps\applications\fontview\fontview.exe 1 optional +modules\rosapps\applications\gettype\gettype.exe 1 optional +modules\rosapps\applications\imagesoft\imagesoft.exe 1 optional +modules\rosapps\applications\mc\mc.exe 1 optional +modules\rosapps\applications\net\ncftp\ncftp.exe 1 optional +modules\rosapps\applications\net\netreg\netreg.exe 1 optional +modules\rosapps\applications\net\niclist\niclist.exe 1 optional +modules\rosapps\applications\notevil\notevil.exe 1 optional +modules\rosapps\applications\magnify\magnify.exe 1 optional +modules\rosapps\applications\packmgr\cmd-line\rosget.exe 1 optional +modules\rosapps\applications\packmgr\gui\packmgr.exe 1 optional +modules\rosapps\applications\packmgr\lib\package.dll 1 optional +modules\rosapps\applications\roshttpd\roshttpd.exe 1 optional +modules\rosapps\applications\screenshot\screenshot.exe 1 optional +modules\rosapps\applications\sysutils\chkdsk\chkdsk.exe 1 optional +modules\rosapps\applications\sysutils\systeminfo\systeminfo.exe 1 optional +modules\rosapps\applications\sysutils\chklib\chklib.exe 1 optional +modules\rosapps\applications\sysutils\ctm\ctm.exe 1 optional +modules\rosapps\applications\sysutils\kill\kill.exe 1 optional +modules\rosapps\applications\sysutils\lsdd\lsdd.exe 1 optional +modules\rosapps\applications\sysutils\man\man.exe 1 optional +modules\rosapps\applications\sysutils\pedump\pedump.exe 1 optional +modules\rosapps\applications\sysutils\regexpl\regexpl.exe 1 optional +modules\rosapps\applications\sysutils\tcat\tcat.exe 1 optional +modules\rosapps\applications\sysutils\tlist\tlist.exe 1 optional +modules\rosapps\applications\sysutils\utils\binpatch\binpatch.exe 1 optional +modules\rosapps\applications\sysutils\utils\cat\cat.exe 1 optional +modules\rosapps\applications\sysutils\utils\driver\load\load.exe 1 optional +modules\rosapps\applications\sysutils\utils\driver\unload\unload.exe 1 optional +modules\rosapps\applications\sysutils\utils\infinst\infinst.exe 1 optional +modules\rosapps\applications\sysutils\utils\nts2w32err\nts2w32err.exe 1 optional +modules\rosapps\applications\sysutils\utils\objdir\objdir.exe 1 optional +modules\rosapps\applications\sysutils\utils\partinfo\partinfo.exe 1 optional +modules\rosapps\applications\sysutils\utils\ps\ps.exe 1 optional +modules\rosapps\applications\sysutils\utils\rosperf\rosperf.exe 1 optional +modules\rosapps\applications\sysutils\utils\stats\stats.exe 1 optional +modules\rosapps\applications\sysutils\utils\tickcount\tickcount.exe 1 optional +modules\rosapps\applications\winfile\winfile.exe 1 optional +modules\rosapps\applications\winver\winver.exe 1 optional +modules\rosapps\applications\write\write.exe 1 optional modules\rosapps\demos\ddraw\ddraw_demo.exe 1 optional modules\rosapps\demos\maze\maze.exe 1 optional -modules\rosapps\devutils\cputointel\cputointel.exe 1 optional -modules\rosapps\devutils\gdb2\gdb2.exe 1 optional -modules\rosapps\devutils\gdihv\gdihv.exe 1 optional -modules\rosapps\devutils\genguid\genguid.exe 1 optional -modules\rosapps\devutils\roswebparser\roswebparser.exe 1 optional -modules\rosapps\devutils\zoomin\zoomin.exe 1 optional modules\rosapps\dflat32\edit.exe 1 optional -modules\rosapps\downloader\downloader.exe 1 optional -modules\rosapps\downloader\downloader.xml 1 optional modules\rosapps\drivers\avtest\avtest.sys 1 optional modules\rosapps\drivers\ramdrv\ramdrv.sys 1 optional modules\rosapps\drivers\green\green.sys 1 optional -modules\rosapps\fontview\fontview.exe 1 optional -modules\rosapps\gettype\gettype.exe 1 optional -modules\rosapps\imagesoft\imagesoft.exe 1 optional modules\rosapps\lib\dflat32\dflat32.dll 1 optional -modules\rosapps\mc\mc.exe 1 optional -modules\rosapps\net\ncftp\ncftp.exe 1 optional -modules\rosapps\net\netreg\netreg.exe 1 optional -modules\rosapps\net\niclist\niclist.exe 1 optional -modules\rosapps\notevil\notevil.exe 1 optional -modules\rosapps\magnify\magnify.exe 1 optional -modules\rosapps\packmgr\cmd-line\rosget.exe 1 optional -modules\rosapps\packmgr\gui\packmgr.exe 1 optional -modules\rosapps\packmgr\lib\package.dll 1 optional -modules\rosapps\roshttpd\roshttpd.exe 1 optional -modules\rosapps\screenshot\screenshot.exe 1 optional -modules\rosapps\sysutils\chkdsk\chkdsk.exe 1 optional -modules\rosapps\sysutils\systeminfo\systeminfo.exe 1 optional -modules\rosapps\sysutils\chklib\chklib.exe 1 optional -modules\rosapps\sysutils\ctm\ctm.exe 1 optional -modules\rosapps\sysutils\kill\kill.exe 1 optional -modules\rosapps\sysutils\lsdd\lsdd.exe 1 optional -modules\rosapps\sysutils\man\man.exe 1 optional -modules\rosapps\sysutils\pedump\pedump.exe 1 optional -modules\rosapps\sysutils\regexpl\regexpl.exe 1 optional -modules\rosapps\sysutils\tcat\tcat.exe 1 optional -modules\rosapps\sysutils\tlist\tlist.exe 1 optional -modules\rosapps\sysutils\utils\binpatch\binpatch.exe 1 optional -modules\rosapps\sysutils\utils\cat\cat.exe 1 optional -modules\rosapps\sysutils\utils\driver\load\load.exe 1 optional -modules\rosapps\sysutils\utils\driver\unload\unload.exe 1 optional -modules\rosapps\sysutils\utils\infinst\infinst.exe 1 optional -modules\rosapps\sysutils\utils\nts2w32err\nts2w32err.exe 1 optional -modules\rosapps\sysutils\utils\objdir\objdir.exe 1 optional -modules\rosapps\sysutils\utils\partinfo\partinfo.exe 1 optional -modules\rosapps\sysutils\utils\ps\ps.exe 1 optional -modules\rosapps\sysutils\utils\rosperf\rosperf.exe 1 optional -modules\rosapps\sysutils\utils\stats\stats.exe 1 optional -modules\rosapps\sysutils\utils\tickcount\tickcount.exe 1 optional modules\rosapps\templates\dialog.exe 1 optional modules\rosapps\templates\mdi.exe 1 optional -modules\rosapps\winfile\winfile.exe 1 optional -modules\rosapps\winver\winver.exe 1 optional -modules\rosapps\write\write.exe 1 optional modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional modules\rostests\winetests\advpack\advpack_winetest.exe 7 optional modules\rostests\winetests\browseui\browseui_winetest.exe 7 optional

16 years, 5 months

[fireball] 34301: Dmitry Gorbachev: - Fix DriverEntry name. See issue #2073 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jul 5 06:37:35 2008 New Revision: 34301 URL: http://svn.reactos.org/svn/reactos?rev=34301&view=rev Log: Dmitry Gorbachev: - Fix DriverEntry name. See issue #2073 for more details. Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.rbuild trunk/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild trunk/reactos/drivers/video/displays/vga/vgaddi.rbuild Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebuf/framebuf.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/framebuf/framebuf.rbuild [iso-8859-1] Sat Jul 5 06:37:35 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="framebuf" type="kernelmodedll" entrypoint="_DrvEnableDriver@12" installbase="system32" installname="framebuf.dll"> +<module name="framebuf" type="kernelmodedll" entrypoint="DrvEnableDriver@12" installbase="system32" installname="framebuf.dll"> <importlibrary definition="framebuf.def" /> <include base="framebuf">.</include> <library>win32k</library> Modified: trunk/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra… ============================================================================== --- trunk/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild [iso-8859-1] Sat Jul 5 06:37:35 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="framebufacc" type="kernelmodedll" entrypoint="_DrvEnableDriver@12" installbase="system32" installname="framebuf.dll"> +<module name="framebufacc" type="kernelmodedll" entrypoint="DrvEnableDriver@12" installbase="system32" installname="framebuf.dll"> <importlibrary definition="framebufacc.def" /> <include base="framebufacc">.</include> <library>win32k</library> Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga/vgaddi.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/vga/vgaddi.rbuild [iso-8859-1] Sat Jul 5 06:37:35 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="vgaddi" type="kernelmodedll" entrypoint="_DrvEnableDriver@12" installbase="system32" installname="vgaddi.dll"> +<module name="vgaddi" type="kernelmodedll" entrypoint="DrvEnableDriver@12" installbase="system32" installname="vgaddi.dll"> <importlibrary definition="vgaddi.def" /> <include base="vgaddi">.</include> <library>ntoskrnl</library>

16 years, 5 months

[cwittich] 34300: don't try to dereference NULL pointers now Avira AntiVir installs without crashing the whole system

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Jul 5 04:19:56 2008 New Revision: 34300 URL: http://svn.reactos.org/svn/reactos?rev=34300&view=rev Log: don't try to dereference NULL pointers now Avira AntiVir installs without crashing the whole system Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sat Jul 5 04:19:56 2008 @@ -1550,6 +1550,8 @@ MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERSENDMESSAGEINFO)); return 0; } + if (!Window->Wnd) + return 0; } /* FIXME: Check for an exiting window. */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Sat Jul 5 04:19:56 2008 @@ -899,6 +899,9 @@ RETURN(hMonitor); } + if (!Window->Wnd) + RETURN(hMonitor); + Rect.left = Rect.right = Window->Wnd->WindowRect.left; Rect.top = Rect.bottom = Window->Wnd->WindowRect.bottom;

16 years, 5 months

← Newer
1
...
66
67
68
69
70
71
72
...
77
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008