[ion] 20703: - Get autochk, calc, cmd, devmgr, expand, format, gettype, hostname, lsass, msconfig, msiexec, notepad, reactos, regedit, regsvr32, reporterror, rundll32, sc, services, servman, setup, sm, sndvol32 compiling on MSVC.
8 Jan
2006
8 Jan
'06
10:06 a.m.
- Get autochk, calc, cmd, devmgr, expand, format, gettype, hostname,
lsass, msconfig, msiexec, notepad, reactos, regedit, regsvr32,
reporterror, rundll32, sc, services, servman, setup, sm, sndvol32
compiling on MSVC.
- PCHify some things.
- Reduce NDK usage.
Modified: trunk/reactos/subsys/system/cmd/filecomp.c
Modified: trunk/reactos/subsys/system/regedit/about.c
Modified: trunk/reactos/subsys/system/regedit/childwnd.c
Modified: trunk/reactos/subsys/system/regedit/edit.c
Modified: trunk/reactos/subsys/system/regedit/find.c
Modified: trunk/reactos/subsys/system/regedit/framewnd.c
Modified: trunk/reactos/subsys/system/regedit/hexedit.c
Modified: trunk/reactos/subsys/system/regedit/listview.c
Modified: trunk/reactos/subsys/system/regedit/main.c
Modified: trunk/reactos/subsys/system/regedit/regedit.c
Modified: trunk/reactos/subsys/system/regedit/regedit.xml
Modified: trunk/reactos/subsys/system/regedit/regproc.c
Modified: trunk/reactos/subsys/system/regedit/security.c
Modified: trunk/reactos/subsys/system/regedit/security.h
Modified: trunk/reactos/subsys/system/regedit/treeview.c
Modified: trunk/reactos/subsys/system/sc/sc.h
Modified: trunk/reactos/subsys/system/sc/sc.xml
Modified: trunk/reactos/subsys/system/sc/usage.c
Modified: trunk/reactos/subsys/system/servman/servman.xml
Modified: trunk/reactos/subsys/system/setup/setup.c
Modified: trunk/reactos/subsys/system/sm/sm.c
_____
Modified: trunk/reactos/subsys/system/cmd/filecomp.c
--- trunk/reactos/subsys/system/cmd/filecomp.c 2006-01-08 09:24:55 UTC
(rev 20702)
+++ trunk/reactos/subsys/system/cmd/filecomp.c 2006-01-08 10:05:37 UTC
(rev 20703)
@@ -475,7 +475,7 @@
}
}
- int compare(const void *arg1,const void *arg2)
+ int __cdecl compare(const void *arg1,const void *arg2)
{
FileName * File1;
FileName * File2;
_____
Modified: trunk/reactos/subsys/system/regedit/about.c
--- trunk/reactos/subsys/system/regedit/about.c 2006-01-08 09:24:55 UTC
(rev 20702)
+++ trunk/reactos/subsys/system/regedit/about.c 2006-01-08 10:05:37 UTC
(rev 20703)
@@ -18,16 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
*/
-#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from
Windows headers */
-#include <windows.h>
-#include <commctrl.h>
-#include <shellapi.h>
-#include <stdlib.h>
-#include <tchar.h>
-#include <process.h>
-#include <stdio.h>
+#include <regedit.h>
-#include "main.h"
void ShowAboutBox(HWND hWnd)
{
_____
Modified: trunk/reactos/subsys/system/regedit/childwnd.c
--- trunk/reactos/subsys/system/regedit/childwnd.c 2006-01-08
09:24:55 UTC (rev 20702)
+++ trunk/reactos/subsys/system/regedit/childwnd.c 2006-01-08
10:05:37 UTC (rev 20703)
@@ -18,15 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
*/
-#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from
Windows headers */
-#include <windows.h>
-#include <commctrl.h>
-#include <tchar.h>
-#include <stdio.h>
+#include <regedit.h>
-#include "main.h"
-#include "regproc.h"
-
ChildWnd* g_pChildWnd;
HBITMAP SizingPattern = 0;
HBRUSH SizingBrush = 0;
_____
Modified: trunk/reactos/subsys/system/regedit/edit.c
--- trunk/reactos/subsys/system/regedit/edit.c 2006-01-08 09:24:55 UTC
(rev 20702)
+++ trunk/reactos/subsys/system/regedit/edit.c 2006-01-08 10:05:37 UTC
(rev 20703)
@@ -18,25 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
*/
-#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from
Windows headers */
+#include <regedit.h>
-#include <windows.h>
-#include <tchar.h>
-#include <commctrl.h>
-#include <commdlg.h>
-#include <cderr.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <shellapi.h>
-#include <ctype.h>
-#include <shlwapi.h>
-
-#include "main.h"
-#include "regproc.h"
-#include "resource.h"
-#include "hexedit.h"
-
-
typedef enum _EDIT_MODE
{
EDIT_MODE_DEC,
_____
Modified: trunk/reactos/subsys/system/regedit/find.c
--- trunk/reactos/subsys/system/regedit/find.c 2006-01-08 09:24:55 UTC
(rev 20702)
+++ trunk/reactos/subsys/system/regedit/find.c 2006-01-08 10:05:37 UTC
(rev 20703)
@@ -17,21 +17,8 @@
*/
-#include <windows.h>
-#include <tchar.h>
-#include <commctrl.h>
-#include <commdlg.h>
-#include <cderr.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <shellapi.h>
-#include <objsel.h>
-#include <objbase.h>
-#include <ole2.h>
+#include <regedit.h>
-#include "main.h"
-#include "regproc.h"
-
static TCHAR s_szFindWhat[256];
static const TCHAR s_szFindFlags[] = _T("FindFlags");
static const TCHAR s_szFindFlagsR[] = _T("FindFlagsReactOS");
_____
Modified: trunk/reactos/subsys/system/regedit/framewnd.c
--- trunk/reactos/subsys/system/regedit/framewnd.c 2006-01-08
09:24:55 UTC (rev 20702)
+++ trunk/reactos/subsys/system/regedit/framewnd.c 2006-01-08
10:05:37 UTC (rev 20703)
@@ -18,21 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
*/
-#include <windows.h>
-#include <tchar.h>
-#include <commctrl.h>
-#include <commdlg.h>
-#include <cderr.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <shellapi.h>
-#include <objsel.h>
-#include <objbase.h>
-#include <ole2.h>
+#include <regedit.h>
-#include "main.h"
-#include "regproc.h"
-
/***********************************************************************
*********
* Global and Local Variables:
*/
_____
Modified: trunk/reactos/subsys/system/regedit/hexedit.c
--- trunk/reactos/subsys/system/regedit/hexedit.c 2006-01-08
09:24:55 UTC (rev 20702)
+++ trunk/reactos/subsys/system/regedit/hexedit.c 2006-01-08
10:05:37 UTC (rev 20703)
@@ -18,16 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
*/
-#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from
Windows headers */
-#include <windows.h>
-#include <commctrl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <tchar.h>
-#include <zmouse.h>
-
-#include "hexedit.h"
-
+#include <regedit.h>
typedef struct
{
HWND hWndSelf;
_____
Modified: trunk/reactos/subsys/system/regedit/listview.c
--- trunk/reactos/subsys/system/regedit/listview.c 2006-01-08
09:24:55 UTC (rev 20702)
+++ trunk/reactos/subsys/system/regedit/listview.c 2006-01-08
10:05:37 UTC (rev 20703)
@@ -18,16 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
*/
-#include <windows.h>
-#include <windowsx.h>
-#include <commctrl.h>
-#include <stdlib.h>
-#include <tchar.h>
-#include <process.h>
-#include <stdio.h>
+#include <regedit.h>
-#include "main.h"
-#include "regproc.h"
#define CX_ICON 16
#define CY_ICON 16
_____
Modified: trunk/reactos/subsys/system/regedit/main.c
--- trunk/reactos/subsys/system/regedit/main.c 2006-01-08 09:24:55 UTC
(rev 20702)
+++ trunk/reactos/subsys/system/regedit/main.c 2006-01-08 10:05:37 UTC
(rev 20703)
@@ -18,24 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
*/
-#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from
Windows headers */
-#include <windows.h>
-#include <commctrl.h>
-#include <accctrl.h>
-#include <unknwn.h>
-#include <stdlib.h>
-#include <tchar.h>
-#include <process.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <aclui.h>
-#include <cguid.h>
+#include <regedit.h>
-#include "main.h"
-#include "hexedit.h"
-#include "security.h"
-#include "regproc.h"
-
BOOL ProcessCmdLine(LPSTR lpCmdLine);
_____
Modified: trunk/reactos/subsys/system/regedit/regedit.c
--- trunk/reactos/subsys/system/regedit/regedit.c 2006-01-08
09:24:55 UTC (rev 20702)
+++ trunk/reactos/subsys/system/regedit/regedit.c 2006-01-08
10:05:37 UTC (rev 20703)
@@ -18,11 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
*/
-#include <ctype.h>
-#include <stdio.h>
-#include <windows.h>
-#include "regproc.h"
+#include <regedit.h>
+
static const char *usage =
"Usage:\n"
" regedit filename\n"
_____
Modified: trunk/reactos/subsys/system/regedit/regedit.xml
--- trunk/reactos/subsys/system/regedit/regedit.xml 2006-01-08
09:24:55 UTC (rev 20702)
+++ trunk/reactos/subsys/system/regedit/regedit.xml 2006-01-08
10:05:37 UTC (rev 20703)
@@ -29,6 +29,7 @@
<file>security.c</file>
<file>treeview.c</file>
<file>regedit.rc</file>
+ <pch>regedit.h</pch>
</module>
<directory name="clb">
<xi:include href="clb/clb.xml" />
_____
Modified: trunk/reactos/subsys/system/regedit/regproc.c
--- trunk/reactos/subsys/system/regedit/regproc.c 2006-01-08
09:24:55 UTC (rev 20702)
+++ trunk/reactos/subsys/system/regedit/regproc.c 2006-01-08
10:05:37 UTC (rev 20703)
@@ -20,18 +20,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
*/
-#include <limits.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <windows.h>
-#include <winnt.h>
-#include <winreg.h>
-#include <assert.h>
-#include <tchar.h>
-#include <malloc.h>
-#include <shlwapi.h>
-#include "regproc.h"
+#include <regedit.h>
#define REG_VAL_BUF_SIZE 4096
_____
Modified: trunk/reactos/subsys/system/regedit/security.c
--- trunk/reactos/subsys/system/regedit/security.c 2006-01-08
09:24:55 UTC (rev 20702)
+++ trunk/reactos/subsys/system/regedit/security.c 2006-01-08
10:05:37 UTC (rev 20703)
@@ -18,22 +18,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
*/
-#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from
Windows headers */
+#include <regedit.h>
+
#define INITGUID
-#include <windows.h>
-#include <tchar.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <accctrl.h>
-#include <objbase.h>
-#include <basetyps.h>
-#include <unknwn.h>
-#include <aclui.h>
-#include <cguid.h>
-#include "security.h"
-#include "regproc.h"
-#include "resource.h"
+#include <guiddef.h>
+DEFINE_GUID(IID_CRegKeySecurity, 0x965fc360, 0x16ff, 0x11d0, 0x0091,
0xcb,0x00,0xaa,0x00,0xbb,0xb7,0x23);
+
/***********************************************************************
*******
Implementation of the CRegKeySecurity interface
************************************************************************
******/
_____
Modified: trunk/reactos/subsys/system/regedit/security.h
--- trunk/reactos/subsys/system/regedit/security.h 2006-01-08
09:24:55 UTC (rev 20702)
+++ trunk/reactos/subsys/system/regedit/security.h 2006-01-08
10:05:37 UTC (rev 20703)
@@ -7,8 +7,6 @@
VOID
UnloadAclUiDll(VOID);
-DEFINE_GUID(IID_CRegKeySecurity, 0x965fc360, 0x16ff, 0x11d0, 0x0091,
0xcb,0x00,0xaa,0x00,0xbb,0xb7,0x23);
-
/***********************************************************************
*******
CRegKeySecurity
************************************************************************
******/
_____
Modified: trunk/reactos/subsys/system/regedit/treeview.c
--- trunk/reactos/subsys/system/regedit/treeview.c 2006-01-08
09:24:55 UTC (rev 20702)
+++ trunk/reactos/subsys/system/regedit/treeview.c 2006-01-08
10:05:37 UTC (rev 20703)
@@ -18,21 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
*/
-#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from
Windows headers */
+#include <regedit.h>
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#include <windows.h>
-#include <commctrl.h>
-#include <stdlib.h>
-#include <tchar.h>
-#include <process.h>
-#include <stdio.h>
-#include <string.h>
-#include <tchar.h>
-
-#include "main.h"
-
/* Global variables and constants */
/* Image_Open, Image_Closed, and Image_Root - integer variables for
indexes of the images. */
/* CX_ICON and CY_ICON - width and height of an icon. */
@@ -133,7 +120,7 @@
tvi.iSelectedImage = Image_Open;
tvi.cChildren = dwChildren;
tvi.lParam = (LPARAM)hKey;
- tvins.DUMMYUNIONNAME.item = tvi;
+ tvins.item = tvi;
tvins.hInsertAfter = (HTREEITEM)(hKey ? TVI_LAST : TVI_FIRST);
tvins.hParent = hParent;
return TreeView_InsertItem(hwndTV, &tvins);
@@ -389,7 +376,7 @@
tvi.cChildren = 5;
/* Save the heading level in the item's application-defined data
area. */
tvi.lParam = (LPARAM)NULL;
- tvins.DUMMYUNIONNAME.item = tvi;
+ tvins.item = tvi;
tvins.hInsertAfter = (HTREEITEM)TVI_FIRST;
tvins.hParent = TVI_ROOT;
/* Add the item to the tree view control. */
_____
Modified: trunk/reactos/subsys/system/sc/sc.h
--- trunk/reactos/subsys/system/sc/sc.h 2006-01-08 09:24:55 UTC (rev
20702)
+++ trunk/reactos/subsys/system/sc/sc.h 2006-01-08 10:05:37 UTC (rev
20703)
@@ -1,4 +1,5 @@
#include <windows.h>
+#include <conio.h>
#include <stdio.h>
#include <tchar.h>
_____
Modified: trunk/reactos/subsys/system/sc/sc.xml
--- trunk/reactos/subsys/system/sc/sc.xml 2006-01-08 09:24:55 UTC
(rev 20702)
+++ trunk/reactos/subsys/system/sc/sc.xml 2006-01-08 10:05:37 UTC
(rev 20703)
@@ -13,4 +13,5 @@
<file>delete.c</file>
<file>usage.c</file>
<file>sc.rc</file>
+ <pch>sc.h</pch>
</module>
_____
Modified: trunk/reactos/subsys/system/sc/usage.c
--- trunk/reactos/subsys/system/sc/usage.c 2006-01-08 09:24:55 UTC
(rev 20702)
+++ trunk/reactos/subsys/system/sc/usage.c 2006-01-08 10:05:37 UTC
(rev 20703)
@@ -8,7 +8,6 @@
* Ged Murphy 20/10/05 Created
*
*/
-#include <conio.h>
#include "sc.h"
INT MainUsage(VOID)
_____
Modified: trunk/reactos/subsys/system/servman/servman.xml
--- trunk/reactos/subsys/system/servman/servman.xml 2006-01-08
09:24:55 UTC (rev 20702)
+++ trunk/reactos/subsys/system/servman/servman.xml 2006-01-08
10:05:37 UTC (rev 20703)
@@ -20,4 +20,5 @@
<file>servman.c</file>
</compilationunit>
<file>servman.rc</file>
+ <pch>servman.h</pch>
</module>
_____
Modified: trunk/reactos/subsys/system/setup/setup.c
--- trunk/reactos/subsys/system/setup/setup.c 2006-01-08 09:24:55 UTC
(rev 20702)
+++ trunk/reactos/subsys/system/setup/setup.c 2006-01-08 10:05:37 UTC
(rev 20703)
@@ -30,14 +30,11 @@
#include <userenv.h>
#include <tchar.h>
-#define NTOS_MODE_USER
-#include <ndk/ntndk.h>
-
#define NDEBUG
#include <debug.h>
-typedef DWORD STDCALL (*PINSTALL_REACTOS)(HINSTANCE hInstance);
+typedef DWORD (STDCALL *PINSTALL_REACTOS)(HINSTANCE hInstance);
/* FUNCTIONS
****************************************************************/
_____
Modified: trunk/reactos/subsys/system/sm/sm.c
--- trunk/reactos/subsys/system/sm/sm.c 2006-01-08 09:24:55 UTC (rev
20702)
+++ trunk/reactos/subsys/system/sm/sm.c 2006-01-08 10:05:37 UTC (rev
20703)
@@ -31,8 +31,9 @@
#define WIN32_NO_STATUS
#include <windows.h>
-#define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <lpctypes.h>
+#include <lpcfuncs.h>
+#include <rtlfuncs.h>
#include <sm/helper.h>
7099
days inactive
7099
days old
0 comments
1 participants
participants (1)
-
ion＠svn.reactos.org