Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[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.

by ion＠svn.reactos.org

- 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>

18 years, 8 months

[fireball] 20702: USB stack adapted from Linux 2.6.14.3.

by fireball＠svn.reactos.org

USB stack adapted from Linux 2.6.14.3. Currently compiles with mingw and msvc, produces *lots* of warnings and doesn't work properly. Modified: branches/usb2_6/reactos/drivers/usb/miniport/common/cleanup.c Modified: branches/usb2_6/reactos/drivers/usb/miniport/common/close.c Modified: branches/usb2_6/reactos/drivers/usb/miniport/common/common.xml Modified: branches/usb2_6/reactos/drivers/usb/miniport/common/create.c Modified: branches/usb2_6/reactos/drivers/usb/miniport/common/fdo.c Modified: branches/usb2_6/reactos/drivers/usb/miniport/common/main.c Modified: branches/usb2_6/reactos/drivers/usb/miniport/common/misc.c Modified: branches/usb2_6/reactos/drivers/usb/miniport/common/pdo.c Modified: branches/usb2_6/reactos/drivers/usb/miniport/common/usbcommon.h Modified: branches/usb2_6/reactos/drivers/usb/miniport/common/usbcommon_types.h Modified: branches/usb2_6/reactos/drivers/usb/miniport/directory.xml Modified: branches/usb2_6/reactos/drivers/usb/miniport/linux/asm/bitops.h Modified: branches/usb2_6/reactos/drivers/usb/miniport/linux/bitops.h Modified: branches/usb2_6/reactos/drivers/usb/miniport/linux/cromwell_types.h Modified: branches/usb2_6/reactos/drivers/usb/miniport/linux/linux_wrapper.h Modified: branches/usb2_6/reactos/drivers/usb/miniport/linux/list.h Modified: branches/usb2_6/reactos/drivers/usb/miniport/linux/pci_hal.c Modified: branches/usb2_6/reactos/drivers/usb/miniport/linux/usb.h Modified: branches/usb2_6/reactos/drivers/usb/miniport/linux/usb_ch9.h Modified: branches/usb2_6/reactos/drivers/usb/miniport/sys/linuxwrapper.c Modified: branches/usb2_6/reactos/drivers/usb/miniport/sys/sys.xml Modified: branches/usb2_6/reactos/drivers/usb/miniport/usb_wrapper.h Modified: branches/usb2_6/reactos/drivers/usb/miniport/usbuhci/uhci-hcd.c Modified: branches/usb2_6/reactos/drivers/usb/miniport/usbuhci/uhci-hcd.h Modified: branches/usb2_6/reactos/drivers/usb/miniport/usbuhci/uhci-hub.c Added: branches/usb2_6/reactos/drivers/usb/miniport/usbuhci/uhci-q.c Modified: branches/usb2_6/reactos/drivers/usb/miniport/usbuhci/uhci.c Modified: branches/usb2_6/reactos/drivers/usb/miniport/usbuhci/usbuhci.xml Modified: branches/usb2_6/reactos/drivers/usb/usbhub/fdo.c Modified: branches/usb2_6/reactos/drivers/usb/usbhub/usbhub.c Modified: branches/usb2_6/reactos/drivers/usb/usbport/buffer_simple.c Modified: branches/usb2_6/reactos/drivers/usb/usbport/config.c Modified: branches/usb2_6/reactos/drivers/usb/usbport/core_drivers/usbkey.c Modified: branches/usb2_6/reactos/drivers/usb/usbport/core_drivers/usbmouse.c Modified: branches/usb2_6/reactos/drivers/usb/usbport/hcd-pci.c Modified: branches/usb2_6/reactos/drivers/usb/usbport/hcd.c Modified: branches/usb2_6/reactos/drivers/usb/usbport/hcd.h Modified: branches/usb2_6/reactos/drivers/usb/usbport/hub.c Modified: branches/usb2_6/reactos/drivers/usb/usbport/hub.h Modified: branches/usb2_6/reactos/drivers/usb/usbport/message.c Modified: branches/usb2_6/reactos/drivers/usb/usbport/urb.c Modified: branches/usb2_6/reactos/drivers/usb/usbport/usb-debug.c Modified: branches/usb2_6/reactos/drivers/usb/usbport/usb.c Modified: branches/usb2_6/reactos/drivers/usb/usbport/usb.h Modified: branches/usb2_6/reactos/drivers/usb/usbport/usbcore.c Modified: branches/usb2_6/reactos/drivers/usb/usbport/usbcore.rc Modified: branches/usb2_6/reactos/drivers/usb/usbport/usbport.def Added: branches/usb2_6/reactos/drivers/usb/usbport/usbport.mingw.def Modified: branches/usb2_6/reactos/drivers/usb/usbport/usbport.xml _____ Modified: branches/usb2_6/reactos/drivers/usb/miniport/common/cleanup.c --- branches/usb2_6/reactos/drivers/usb/miniport/common/cleanup.c 2006-01-08 09:00:02 UTC (rev 20701) +++ branches/usb2_6/reactos/drivers/usb/miniport/common/cleanup.c 2006-01-08 09:24:55 UTC (rev 20702) @@ -8,8 +8,6 @@ */ #define NDEBUG -#include <debug.h> - #include "usbcommon.h" NTSTATUS STDCALL _____ Modified: branches/usb2_6/reactos/drivers/usb/miniport/common/close.c --- branches/usb2_6/reactos/drivers/usb/miniport/common/close.c 2006-01-08 09:00:02 UTC (rev 20701) +++ branches/usb2_6/reactos/drivers/usb/miniport/common/close.c 2006-01-08 09:24:55 UTC (rev 20702) @@ -8,8 +8,6 @@ */ #define NDEBUG -#include <debug.h> - #include "usbcommon.h" NTSTATUS STDCALL _____ Modified: branches/usb2_6/reactos/drivers/usb/miniport/common/common.xml --- branches/usb2_6/reactos/drivers/usb/miniport/common/common.xml 2006-01-08 09:00:02 UTC (rev 20701) +++ branches/usb2_6/reactos/drivers/usb/miniport/common/common.xml 2006-01-08 09:24:55 UTC (rev 20702) @@ -1,4 +1,4 @@ -<module name="usbminiportcommon" type="objectlibrary"> +<module name="usbminiportcommon" type="objectlibrary" allowwarnings="true"> <define name="__USE_W32API" /> <include>../linux</include> <include base="usbport">.</include> _____ Modified: branches/usb2_6/reactos/drivers/usb/miniport/common/create.c --- branches/usb2_6/reactos/drivers/usb/miniport/common/create.c 2006-01-08 09:00:02 UTC (rev 20701) +++ branches/usb2_6/reactos/drivers/usb/miniport/common/create.c 2006-01-08 09:24:55 UTC (rev 20702) @@ -8,8 +8,6 @@ */ #define NDEBUG -#include <debug.h> - #include "usbcommon.h" NTSTATUS STDCALL _____ Modified: branches/usb2_6/reactos/drivers/usb/miniport/common/fdo.c --- branches/usb2_6/reactos/drivers/usb/miniport/common/fdo.c 2006-01-08 09:00:02 UTC (rev 20701) +++ branches/usb2_6/reactos/drivers/usb/miniport/common/fdo.c 2006-01-08 09:24:55 UTC (rev 20702) @@ -8,9 +8,7 @@ * James Tabor (jimtabor(a)adsl-64-217-116-74.dsl.hstntx.swbell.net) */ -#define NDEBUG -#include <debug.h> - +//#define NDEBUG #include "usbcommon.h" #define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003) @@ -48,6 +46,35 @@ } } +BOOLEAN STDCALL +HciInterruptService(IN PKINTERRUPT Interrupt, + IN OUT PVOID ServiceContext) +{ + DPRINT1("USBMP Interrupt\n"); + return FALSE; +} + +static VOID +UsbMpRegisterIsr(PDEVICE_OBJECT DeviceObject) +{ + NTSTATUS Status; + PUSBMP_DEVICE_EXTENSION DeviceExtension = (PUSBMP_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* Connect interrupt and enable them */ + DPRINT("IoConnectInterrupt: vec=0x%x,lev=0x%x,mode=0x%x,aff=0x%x\n", DeviceExtension->InterruptVector, DeviceExtension->InterruptLevel, DeviceExtension->InterruptMode, DeviceExtension->InterruptAffinity); + Status = IoConnectInterrupt( + &DeviceExtension->InterruptObject, (PKSERVICE_ROUTINE)HciInterruptService, + DeviceObject, NULL, + DeviceExtension->InterruptVector, DeviceExtension->InterruptLevel, DeviceExtension->InterruptLevel, + DeviceExtension->InterruptMode, DeviceExtension->InterruptShare, + DeviceExtension->InterruptAffinity, FALSE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("usbmp: IoConnectInterrupt() failed with status 0x%08x\n", Status); + return; + } +} + NTSTATUS STDCALL UsbMpFdoStartDevice( IN PDEVICE_OBJECT DeviceObject, @@ -74,7 +101,7 @@ /* * Store some resources in the DeviceExtension. */ - AllocatedResources = Stack->Parameters.StartDevice.AllocatedResources; + AllocatedResources = Stack->Parameters.StartDevice.AllocatedResourcesTranslated; if (AllocatedResources != NULL) { CM_FULL_RESOURCE_DESCRIPTOR *FullList; @@ -116,6 +143,14 @@ { DeviceExtension->InterruptLevel = Descriptor->u.Interrupt.Level; DeviceExtension->InterruptVector = Descriptor->u.Interrupt.Vector; + DeviceExtension->InterruptAffinity = Descriptor->u.Interrupt.Affinity; + if (Descriptor->Flags & CM_RESOURCE_INTERRUPT_LATCHED) + DeviceExtension->InterruptMode = Latched; + else + DeviceExtension->InterruptMode = LevelSensitive; + + DeviceExtension->InterruptShare = (Descriptor->ShareDisposition == CmResourceShareShared); + } else if (Descriptor->Type == CmResourceTypePort) { @@ -144,6 +179,11 @@ DeviceExtension->BaseAddress, DeviceExtension->BaseAddrLength); + /* Register Interrupt Service Routine */ + UsbMpRegisterIsr(DeviceObject); + + /* Acquire some information about the placement of the controller in the bus */ + /* Get bus number from the upper level bus driver. */ Size = sizeof(ULONG); Status = IoGetDeviceProperty( @@ -161,6 +201,23 @@ DPRINT("USBMP: Busnumber %d\n", DeviceExtension->SystemIoBusNumber); + /* Get bus device address from the upper level bus driver. */ + Size = sizeof(ULONG); + IoGetDeviceProperty( + DeviceExtension->PhysicalDeviceObject, + DevicePropertyAddress, + Size, + &DeviceExtension->SystemIoSlotNumber, + &Size); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("USBMP: IoGetDeviceProperty DevicePropertyAddress failed\n"); + DeviceExtension->SystemIoSlotNumber = 0; + } + + DPRINT("USBMP: Slotnumber 0x%x\n", DeviceExtension->SystemIoSlotNumber); + /* Init wrapper with this object */ return InitLinuxWrapper(DeviceObject); } _____ Modified: branches/usb2_6/reactos/drivers/usb/miniport/common/main.c --- branches/usb2_6/reactos/drivers/usb/miniport/common/main.c 2006-01-08 09:00:02 UTC (rev 20701) +++ branches/usb2_6/reactos/drivers/usb/miniport/common/main.c 2006-01-08 09:24:55 UTC (rev 20702) @@ -12,8 +12,6 @@ */ #define NDEBUG -#include <debug.h> - #define INITGUID #include "usbcommon.h" @@ -197,8 +195,7 @@ UNICODE_STRING LinkDeviceName; PUSBMP_DRIVER_EXTENSION DriverExtension; PUSBMP_DEVICE_EXTENSION DeviceExtension; - static ULONG DeviceNumber = 0; - BOOL AlreadyRestarted = FALSE; + ULONG DeviceNumber; // Allocate driver extension now DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); @@ -217,33 +214,18 @@ } } - /* Create a unicode device name. Allocate a new device number every time */ - do - { - DeviceNumber++; - if (DeviceNumber == 9999) - { - /* Hmm. We don't have a free number. */ - if (AlreadyRestarted) - { - Status = STATUS_UNSUCCESSFUL; - break; - } - /* Start again at DeviceNumber = 0 to find a free number */ - DeviceNumber = 0; - AlreadyRestarted = TRUE; - } - swprintf(DeviceBuffer, L"\\Device\\USBFDO-%lu", DeviceNumber); - RtlInitUnicodeString(&DeviceName, DeviceBuffer); + // Create a unicode device name + DeviceNumber = 0; //TODO: Allocate new device number every time + swprintf(DeviceBuffer, L"\\Device\\USBFDO-%lu", DeviceNumber); + RtlInitUnicodeString(&DeviceName, DeviceBuffer); - Status = IoCreateDevice(DriverObject, - sizeof(USBMP_DEVICE_EXTENSION), - &DeviceName, - FILE_DEVICE_BUS_EXTENDER, - 0, - FALSE, - &fdo); - } while (Status == STATUS_OBJECT_NAME_COLLISION); + Status = IoCreateDevice(DriverObject, + sizeof(USBMP_DEVICE_EXTENSION), + &DeviceName, + FILE_DEVICE_BUS_EXTENDER, + 0, + FALSE, + &fdo); if (!NT_SUCCESS(Status)) { @@ -414,19 +396,19 @@ USBPORT_INTERFACE UsbPortInterface; ULONG i; - DriverObject->DriverUnload = DriverUnload; - DriverObject->DriverExtension->AddDevice = AddDevice; + DriverObject->DriverUnload = (PDRIVER_UNLOAD)DriverUnload; + DriverObject->DriverExtension->AddDevice = (PDRIVER_ADD_DEVICE)AddDevice; - for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) - DriverObject->MajorFunction[i] = IrpStub; + for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) + DriverObject->MajorFunction[i] = (PDRIVER_DISPATCH)IrpStub; - DriverObject->MajorFunction[IRP_MJ_CREATE] = DispatchCreate; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = DispatchClose; - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = DispatchCleanup; - DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = DispatchDeviceControl; - DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = DispatchInternalDeviceControl; - DriverObject->MajorFunction[IRP_MJ_PNP] = DispatchPnp; - DriverObject->MajorFunction[IRP_MJ_POWER] = DispatchPower; + DriverObject->MajorFunction[IRP_MJ_CREATE] = (PDRIVER_DISPATCH)DispatchCreate; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = (PDRIVER_DISPATCH)DispatchClose; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = (PDRIVER_DISPATCH)DispatchCleanup; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = (PDRIVER_DISPATCH)DispatchDeviceControl; + DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = (PDRIVER_DISPATCH)DispatchInternalDeviceControl; + DriverObject->MajorFunction[IRP_MJ_PNP] = (PDRIVER_DISPATCH)DispatchPnp; + DriverObject->MajorFunction[IRP_MJ_POWER] = (PDRIVER_DISPATCH)DispatchPower; // Register in usbcore.sys UsbPortInterface.KbdConnectData = &KbdClassInformation; _____ Modified: branches/usb2_6/reactos/drivers/usb/miniport/common/misc.c --- branches/usb2_6/reactos/drivers/usb/miniport/common/misc.c 2006-01-08 09:00:02 UTC (rev 20701) +++ branches/usb2_6/reactos/drivers/usb/miniport/common/misc.c 2006-01-08 09:24:55 UTC (rev 20702) @@ -8,8 +8,6 @@ */ #define NDEBUG -#include <debug.h> - #include "usbcommon.h" #include <stdarg.h> @@ -39,7 +37,7 @@ IoCopyCurrentIrpStackLocationToNext(Irp); DPRINT("USBMP: Calling lower device %p [%wZ]\n", LowerDevice, &LowerDevice->DriverObject->DriverName); - IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); + IoSetCompletionRoutine(Irp, (PIO_COMPLETION_ROUTINE)ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); Status = IoCallDriver(LowerDevice, Irp); if (Status == STATUS_PENDING) _____ Modified: branches/usb2_6/reactos/drivers/usb/miniport/common/pdo.c --- branches/usb2_6/reactos/drivers/usb/miniport/common/pdo.c 2006-01-08 09:00:02 UTC (rev 20701) +++ branches/usb2_6/reactos/drivers/usb/miniport/common/pdo.c 2006-01-08 09:24:55 UTC (rev 20702) @@ -9,8 +9,6 @@ */ #define NDEBUG -#include <debug.h> - #include "usbcommon.h" extern struct usb_driver hub_driver; @@ -87,7 +85,8 @@ DeviceExtension = (PUSBMP_DEVICE_EXTENSION)DeviceObject->DeviceExtension; RtlInitUnicodeString(&String, NULL); DeviceExtension = (PUSBMP_DEVICE_EXTENSION)DeviceExtension->FunctionalDeviceObject->Device Extension; - roothub = ((struct usb_hcd*)DeviceExtension->pdev->data)->self.root_hub; + //roothub = ((struct usb_hcd*)DeviceExtension->pdev->data)->self.root_hub; + roothub = hcd_to_bus(DeviceExtension->pdev->data)->root_hub; switch (IdType) { @@ -297,7 +296,7 @@ DPRINT("USBMP: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); - Status = RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &SourceString, &Description); + Status = _RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &SourceString, &Description); if (NT_SUCCESS(Status)) Information = (ULONG_PTR)Description.Buffer; break; _____ Modified: branches/usb2_6/reactos/drivers/usb/miniport/common/usbcommon.h --- branches/usb2_6/reactos/drivers/usb/miniport/common/usbcommon.h 2006-01-08 09:00:02 UTC (rev 20701) +++ branches/usb2_6/reactos/drivers/usb/miniport/common/usbcommon.h 2006-01-08 09:24:55 UTC (rev 20702) @@ -12,6 +12,10 @@ #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define USB_MINIPORT_TAG TAG('u','s','b','m') +#ifndef RTL_CONSTANT_STRING +#define RTL_CONSTANT_STRING(s) { sizeof(s) - sizeof((s)[0]), sizeof(s), s } +#endif + #include "../../usbport/hcd.h" #include "usbcommon_types.h" _____ Modified: branches/usb2_6/reactos/drivers/usb/miniport/common/usbcommon_types.h --- branches/usb2_6/reactos/drivers/usb/miniport/common/usbcommon_types.h 2006-01-08 09:00:02 UTC (rev 20701) +++ branches/usb2_6/reactos/drivers/usb/miniport/common/usbcommon_types.h 2006-01-08 09:24:55 UTC (rev 20702) @@ -6,7 +6,7 @@ //OHCI_HW_INITIALIZATION_DATA InitializationData; //PVOID HwContext; //UNICODE_STRING RegistryPath; - + void *dummy; } USBMP_DRIVER_EXTENSION, *PUSBMP_DRIVER_EXTENSION; typedef struct _USBMP_DEVICE_EXTENSTION _____ Modified: branches/usb2_6/reactos/drivers/usb/miniport/directory.xml --- branches/usb2_6/reactos/drivers/usb/miniport/directory.xml 2006-01-08 09:00:02 UTC (rev 20701) +++ branches/usb2_6/reactos/drivers/usb/miniport/directory.xml 2006-01-08 09:24:55 UTC (rev 20702) @@ -6,10 +6,10 @@ </directory>  +</directory <directory name="usbohci"> <xi:include href="usbohci/usbohci.xml" /> -</directory> +</directory>--> <directory name="usbuhci"> <xi:include href="usbuhci/usbuhci.xml" /> </directory> _____ Modified: branches/usb2_6/reactos/drivers/usb/miniport/linux/asm/bitops.h --- branches/usb2_6/reactos/drivers/usb/miniport/linux/asm/bitops.h 2006-01-08 09:00:02 UTC (rev 20701) +++ branches/usb2_6/reactos/drivers/usb/miniport/linux/asm/bitops.h 2006-01-08 09:24:55 UTC (rev 20702) @@ -33,12 +33,24 @@ * Note that @nr may be almost arbitrarily large; this function is not * restricted to acting on a single-word quantity. */ -static __inline__ void set_bit(int nr, volatile void * addr) +static __inline void set_bit(int nr, volatile void * addr) { +#if defined(__GNUC__) __asm__ __volatile__( LOCK_PREFIX "btsl %1,%0" :"=m" (ADDR) :"Ir" (nr)); +#elif defined(_MSC_VER) + __asm { + mov eax, nr + mov ecx, addr + lock bts [ecx], eax + setc al + }; +#else + InterlockedBitTestAndSet(addr, nr); +#endif + } /** @@ -50,12 +62,18 @@ * If it's called on the same region of memory simultaneously, the effect * may be that only one operation succeeds. */ -static __inline__ void __set_bit(int nr, volatile void * addr) +static __inline void __set_bit(int nr, volatile void * addr) { +#if defined(__GNUC__) __asm__( "btsl %1,%0" :"=m" (ADDR) :"Ir" (nr)); +#elif defined(_MSC_VER) + set_bit(nr, addr); +#else +#error Unknown compiler for inline assembler +#endif } /** @@ -68,12 +86,22 @@ * you should call smp_mb__before_clear_bit() and/or smp_mb__after_clear_bit() * in order to ensure changes are visible on other processors. */ -static __inline__ void clear_bit(int nr, volatile void * addr) +static __inline void clear_bit(int nr, volatile void * addr) { +#if defined(__GNUC__) __asm__ __volatile__( LOCK_PREFIX "btrl %1,%0" :"=m" (ADDR) :"Ir" (nr)); +#elif defined(_MSC_VER) + __asm { + mov eax, nr + mov ecx, addr + lock btr [ecx], eax + }; +#else +#error Unknown compiler for inline assembler +#endif } #define smp_mb__before_clear_bit() barrier() #define smp_mb__after_clear_bit() barrier() @@ -87,12 +115,22 @@ * If it's called on the same region of memory simultaneously, the effect * may be that only one operation succeeds. */ -static __inline__ void __change_bit(int nr, volatile void * addr) +static __inline void __change_bit(int nr, volatile void * addr) { +#if defined(__GNUC__) __asm__ __volatile__( "btcl %1,%0" :"=m" (ADDR) :"Ir" (nr)); +#elif defined(_MSC_VER) + __asm { + mov eax, nr + mov ecx, addr + btc [ecx], eax + }; +#else +#error Unknown compiler for inline assembler +#endif } /** @@ -104,12 +142,22 @@ * Note that @nr may be almost arbitrarily large; this function is not * restricted to acting on a single-word quantity. */ -static __inline__ void change_bit(int nr, volatile void * addr) +static __inline void change_bit(int nr, volatile void * addr) { +#if defined(__GNUC__) __asm__ __volatile__( LOCK_PREFIX "btcl %1,%0" :"=m" (ADDR) :"Ir" (nr)); +#elif defined(_MSC_VER) + __asm { + mov eax, nr + mov ecx, addr + lock btc [ecx], eax + }; +#else +#error Unknown compiler for inline assembler +#endif } /** @@ -120,15 +168,27 @@ * This operation is atomic and cannot be reordered. * It also implies a memory barrier. */ -static __inline__ int test_and_set_bit(int nr, volatile void * addr) +static __inline int test_and_set_bit(int nr, volatile void * addr) { +#if defined(__GNUC__) int oldbit; __asm__ __volatile__( LOCK_PREFIX "btsl %2,%1\n\tsbbl %0,%0" :"=r" (oldbit),"=m" (ADDR) :"Ir" (nr) : "memory"); + return oldbit; +#elif defined(_MSC_VER) + __asm { + mov eax, nr + mov ecx, addr + lock bts [ecx], eax + setc al + }; +#else +#error Unknown compiler for inline assembler +#endif } /** @@ -140,8 +200,9 @@ * If two examples of this operation race, one can appear to succeed * but actually fail. You must protect multiple accesses with a lock. */ -static __inline__ int __test_and_set_bit(int nr, volatile void * addr) +static __inline int __test_and_set_bit(int nr, volatile void * addr) { +#if defined(__GNUC__) int oldbit; __asm__( @@ -149,6 +210,16 @@ :"=r" (oldbit),"=m" (ADDR) :"Ir" (nr)); return oldbit; +#elif defined(_MSC_VER) + __asm { + mov eax, nr + mov ecx, addr + lock bts [ecx], eax + setc al + }; +#else +#error Unknown compiler for inline assembler +#endif } /** @@ -159,8 +230,9 @@ * This operation is atomic and cannot be reordered. * It also implies a memory barrier. */ -static __inline__ int test_and_clear_bit(int nr, volatile void * addr) +static __inline int test_and_clear_bit(int nr, volatile void * addr) { +#if defined(__GNUC__) int oldbit; __asm__ __volatile__( LOCK_PREFIX @@ -168,6 +240,16 @@ :"=r" (oldbit),"=m" (ADDR) :"Ir" (nr) : "memory"); return oldbit; +#elif defined(_MSC_VER) + __asm { + mov eax, nr + mov ecx, addr + lock btr [ecx], eax + setc al + }; +#else +#error Unknown compiler for inline assembler +#endif } /** @@ -179,8 +261,9 @@ * If two examples of this operation race, one can appear to succeed * but actually fail. You must protect multiple accesses with a lock. */ -static __inline__ int __test_and_clear_bit(int nr, volatile void * addr) +static __inline int __test_and_clear_bit(int nr, volatile void * addr) { +#if defined(__GNUC__) int oldbit; __asm__( @@ -188,11 +271,22 @@ :"=r" (oldbit),"=m" (ADDR) :"Ir" (nr)); return oldbit; +#elif defined(_MSC_VER) + __asm { + mov eax, nr + mov ecx, addr + lock btr [ecx], eax + setc al + }; +#else +#error Unknown compiler for inline assembler +#endif } /* WARNING: non atomic and it can be reordered! */ -static __inline__ int __test_and_change_bit(int nr, volatile void * addr) +static __inline int __test_and_change_bit(int nr, volatile void * addr) { +#if defined(__GNUC__) int oldbit; __asm__ __volatile__( @@ -200,6 +294,16 @@ :"=r" (oldbit),"=m" (ADDR) :"Ir" (nr) : "memory"); return oldbit; +#elif defined(_MSC_VER) + __asm { + mov eax, nr + mov ecx, addr + btc [ecx], eax + setc al + }; +#else +#error Unknown compiler for inline assembler +#endif } /** @@ -210,8 +314,9 @@ * This operation is atomic and cannot be reordered. * It also implies a memory barrier. */ -static __inline__ int test_and_change_bit(int nr, volatile void * addr) +static __inline int test_and_change_bit(int nr, volatile void * addr) { +#if defined(__GNUC__) int oldbit; __asm__ __volatile__( LOCK_PREFIX @@ -219,6 +324,16 @@ :"=r" (oldbit),"=m" (ADDR) :"Ir" (nr) : "memory"); return oldbit; +#elif defined(_MSC_VER) + __asm { + mov eax, nr + mov ecx, addr + btc [ecx], eax + setc al + }; +#else +#error Unknown compiler for inline assembler +#endif } #if 0 /* Fool kernel-doc since it doesn't do macros yet */ @@ -230,26 +345,42 @@ static int test_bit(int nr, const volatile void * addr); #endif -static __inline__ int constant_test_bit(int nr, const volatile void * addr) +static __inline int constant_test_bit(int nr, const volatile void * addr) { return ((1UL << (nr & 31)) & (((const volatile unsigned int *) addr)[nr >> 5])) != 0; } -static __inline__ int variable_test_bit(int nr, volatile void * addr) +static __inline int variable_test_bit(int nr, volatile void * addr) { int oldbit; - +#if defined(__GNUC__) __asm__ __volatile__( "btl %2,%1\n\tsbbl %0,%0" :"=r" (oldbit) :"m" (ADDR),"Ir" (nr)); +#elif defined(_MSC_VER) + __asm { + mov eax, nr + mov ecx, addr + bt [ecx], eax + setc al + //mov oldbit, al + }; +#else +#error Unknown compiler for inline assembler +#endif + return oldbit; } +/* #define test_bit(nr,addr) \ (__builtin_constant_p(nr) ? \ constant_test_bit((nr),(addr)) : \ variable_test_bit((nr),(addr))) + */ +#define test_bit(nr,addr) \ +( variable_test_bit( (nr),(addr) ) ) /** * find_first_zero_bit - find the first zero bit in a memory region @@ -259,7 +390,8 @@ * Returns the bit-number of the first zero bit, not the number of the byte * containing a bit. */ -static __inline__ int find_first_zero_bit(void * addr, unsigned size) +#if defined(__GNUC__) +static __inline int find_first_zero_bit(void * addr, unsigned size) { int d0, d1, d2; int res; @@ -282,14 +414,43 @@ :"1" ((size + 31) >> 5), "2" (addr), "b" (addr)); return res; } +#elif defined(_MSC_VER) +#define find_first_zero_bit(addr, size) \ + find_next_zero_bit((addr), (size), 0) +#else +#error Unknown compiler for inline assembler +#endif /** + * ffz - find first zero in word. + * @word: The word to search + * + * Undefined if no zero exists, so code should check against ~0UL first. + */ +static __inline unsigned long ffz(unsigned long word) +{ +#if defined(__GNUC__) + __asm__("bsfl %1,%0" + :"=r" (word) + :"r" (~word)); + return word; +#elif defined(_MSC_VER) + ULONG index; + BitScanForward(&index, ~word); + return index; +#else +#error Unknown compiler for inline assembler +#endif +} + +/** * find_next_zero_bit - find the first zero bit in a memory region * @addr: The address to base the search on * @offset: The bitnumber to start searching at * @size: The maximum size to search */ -static __inline__ int find_next_zero_bit (void * addr, int size, int offset) +#if defined(__GNUC__) +static __inline int find_next_zero_bit (void * addr, int size, int offset) { unsigned long * p = ((unsigned long *) addr) + (offset >> 5); int set = 0, bit = offset & 31, res; @@ -315,20 +476,47 @@ res = find_first_zero_bit (p, size - 32 * (p - (unsigned long *) addr)); return (offset + set + res); } +#elif defined(_MSC_VER) +static __inline unsigned long find_next_zero_bit(const void *addr, unsigned long size, unsigned long offset) +{ + const unsigned long *p = addr; + unsigned long result = offset & ~63UL; + unsigned long tmp; -/** - * ffz - find first zero in word. - * @word: The word to search - * - * Undefined if no zero exists, so code should check against ~0UL first. - */ -static __inline__ unsigned long ffz(unsigned long word) -{ - __asm__("bsfl %1,%0" - :"=r" (word) - :"r" (~word)); - return word; + p += offset >> 6; + if (offset >= size) + return size; + size -= result; + offset &= 63UL; + if (offset) { + tmp = *(p++); + tmp |= ~0UL >> (64-offset); + if (size < 64) + goto found_first; + if (~tmp) + goto found_middle; + size -= 64; + result += 64; + } + while (size & ~63UL) { + if (~(tmp = *(p++))) + goto found_middle; + result += 64; + size -= 64; + } + if (!size) + return result; + tmp = *p; + found_first: + tmp |= ~0UL << size; + if (tmp == ~0UL) /* Are any bits zero? */ + return result + size; /* Nope. */ + found_middle: + return result + ffz(tmp); } +#else +#error Unknown compiler for inline assembler +#endif #ifdef __KERNEL__ _____ Modified: branches/usb2_6/reactos/drivers/usb/miniport/linux/bitops.h --- branches/usb2_6/reactos/drivers/usb/miniport/linux/bitops.h 2006-01-08 09:00:02 UTC (rev 20701) +++ branches/usb2_6/reactos/drivers/usb/miniport/linux/bitops.h 2006-01-08 09:24:55 UTC (rev 20702) @@ -1,6 +1,27 @@ #ifndef _LINUX_BITOPS_H #define _LINUX_BITOPS_H +/** + * __ffs - find first bit in word. + * @word: The word to search + * + * Undefined if no bit exists, so code should check against 0 first. + */ +static __inline unsigned long __ffs(unsigned long wrd) +{ +#if defined(__GNUC__) + __asm__("bsfl %1,%0" + :"=r" (wrd) + :"rm" (wrd)); +#elif defined(_MSC_VER) + __asm mov eax, wrd; + __asm bsf eax, eax; + __asm mov wrd, eax; +#else +#error Unknown compiler for inline assembler +#endif + return wrd; +} /* * ffs: find first bit set. This is defined the same way as @@ -8,7 +29,7 @@ * differs in spirit from the above ffz (man ffs). */ -static inline int generic_ffs(int x) +static __inline int generic_ffs(int x) { int r = 1; @@ -42,7 +63,7 @@ * of bits set) of a N-bit word */ -static inline unsigned int generic_hweight32(unsigned int w) +static __inline unsigned int generic_hweight32(unsigned int w) { unsigned int res = (w & 0x55555555) + ((w >> 1) & 0x55555555); res = (res & 0x33333333) + ((res >> 2) & 0x33333333); @@ -51,7 +72,7 @@ return (res & 0x0000FFFF) + ((res >> 16) & 0x0000FFFF); } -static inline unsigned int generic_hweight16(unsigned int w) +static __inline unsigned int generic_hweight16(unsigned int w) { unsigned int res = (w & 0x5555) + ((w >> 1) & 0x5555); res = (res & 0x3333) + ((res >> 2) & 0x3333); @@ -59,7 +80,7 @@ return (res & 0x00FF) + ((res >> 8) & 0x00FF); } -static inline unsigned int generic_hweight8(unsigned int w) +static __inline unsigned int generic_hweight8(unsigned int w) { unsigned int res = (w & 0x55) + ((w >> 1) & 0x55); res = (res & 0x33) + ((res >> 2) & 0x33); _____ Modified: branches/usb2_6/reactos/drivers/usb/miniport/linux/cromwell_types.h --- branches/usb2_6/reactos/drivers/usb/miniport/linux/cromwell_types.h 2006-01-08 09:00:02 UTC (rev 20701) +++ branches/usb2_6/reactos/drivers/usb/miniport/linux/cromwell_types.h 2006-01-08 09:24:55 UTC (rev 20702) @@ -5,9 +5,25 @@ // some typedefs to make for easy sizing //typedef unsigned long ULONG; +typedef long long u64; typedef unsigned int u32; typedef unsigned short u16; typedef unsigned char u8; + +typedef unsigned int __u32; +typedef unsigned short __u16; +typedef unsigned char __u8; + +// we don't care much about big-endian +typedef unsigned int __le32; +typedef unsigned short __le16; +typedef unsigned char __le8; + + +typedef short s16; + +typedef u32 dma_addr_t; + #ifndef bool_already_defined_ typedef int bool; #endif @@ -24,4 +40,9 @@ #define NULL ((void *)0) #endif +#define __iomem +#define __user + +typedef u32 uid_t; + #endif /* #ifndef cromwell_types_h */ _____ Modified: branches/usb2_6/reactos/drivers/usb/miniport/linux/linux_wrapper.h --- branches/usb2_6/reactos/drivers/usb/miniport/linux/linux_wrapper.h 2006-01-08 09:00:02 UTC (rev 20701) +++ branches/usb2_6/reactos/drivers/usb/miniport/linux/linux_wrapper.h 2006-01-08 09:24:55 UTC (rev 20702) @@ -11,6 +11,7 @@ * macros * * All structs and prototypes are based on kernel source 2.5.72 + * 2.6.14.3 * * Modified by Aleksey Bragin (aleksey(a)reactos.com) for ReactOS needs * @@ -23,17 +24,6 @@ /*---------------------------------------------------------------------- --*/ #include "cromwell_types.h" -typedef unsigned int __u32; -//typedef __u32 u32; -typedef unsigned short __u16; -//typedef __u16 u16; -typedef unsigned char __u8; -//typedef __u8 u8; - -typedef short s16; - -typedef u32 dma_addr_t; - typedef struct { KSPIN_LOCK SpinLock; @@ -59,7 +49,7 @@ typedef int irqreturn_t; typedef unsigned long kernel_ulong_t; -typedef int wait_queue_head_t; +typedef KEVENT wait_queue_head_t; /*---------------------------------------------------------------------- --*/ /* Stuff from xbox/linux environment */ /*---------------------------------------------------------------------- --*/ @@ -93,7 +83,7 @@ extern int memcmp(const void *,const void *,unsigned int); #else -#include "boot.h" +//#include "boot.h" #include "config.h" #endif #else @@ -109,6 +99,9 @@ /*---------------------------------------------------------------------- --*/ struct timer_list { + PKTIMER kTimer; + PKDPC kDPC; + // usual stuff void (*function)(unsigned long); unsigned long data; int expires; @@ -137,17 +130,25 @@ struct device_driver{ char *name; struct bus_type *bus; + int owner; int (*probe) (struct device * dev); int (*remove) (struct device * dev); struct list_head devices; }; +typedef struct pm_message { + int event; +} pm_message_t; + struct bus_type { char * name; int (*match)(struct device * dev, struct device_driver * drv); - struct device * (*add) (struct device * parent, char * bus_id); - int (*hotplug) (struct device *dev, char **envp, - int num_envp, char *buffer, int buffer_size); + struct device * (*add) (struct device * parent, char * bus_id); + int (*hotplug) (struct device *dev, char **envp, + int num_envp, char *buffer, int buffer_size); + int (*suspend)(struct device * dev, pm_message_t state); + int (*resume)(struct device * dev); + }; [truncated at 1000 lines; 20544 more skipped]

18 years, 8 months

[ros-diffs] [ion] 20701: - get csrss, ntvdm, smss compiling on msvc.

by ion＠svn.reactos.org

- get csrss, ntvdm, smss compiling on msvc. Modified: trunk/reactos/subsys/csrss/api/wapi.c _____ Modified: trunk/reactos/subsys/csrss/api/wapi.c --- trunk/reactos/subsys/csrss/api/wapi.c 2006-01-08 08:17:38 UTC (rev 20700) +++ trunk/reactos/subsys/csrss/api/wapi.c 2006-01-08 09:00:02 UTC (rev 20701) @@ -282,6 +282,7 @@ PORT_MESSAGE Request; PVOID Context = NULL; NTSTATUS Status = STATUS_SUCCESS; + PPORT_MESSAGE Reply = NULL; DPRINT("CSR: %s called\n", __FUNCTION__); @@ -312,7 +313,7 @@ __FUNCTION__, Status); } else { DPRINT("-- 3\n"); - PPORT_MESSAGE Reply = NULL; + /* * Tell the init thread the SM gave the * green light for boostrapping.

18 years, 8 months

[ion] 20700: - Get services compiling with msvc (dhcp, eventlog, tcvpsvcs, rpcss, umpnpmgr). Also PCHified some stuff and reduced NDK usage.

by ion＠svn.reactos.org

- Get services compiling with msvc (dhcp, eventlog, tcvpsvcs, rpcss, umpnpmgr). Also PCHified some stuff and reduced NDK usage. Modified: trunk/reactos/services/dhcp/hash.c Modified: trunk/reactos/services/dhcp/include/dhcpd.h Modified: trunk/reactos/services/dhcp/include/rosdhcp.h Modified: trunk/reactos/services/dhcp/util.c Modified: trunk/reactos/services/eventlog/eventlog.h Modified: trunk/reactos/services/rpcss/rpcss.h Modified: trunk/reactos/services/tcpsvcs/chargen.c Modified: trunk/reactos/services/tcpsvcs/daytime.c Modified: trunk/reactos/services/tcpsvcs/qotd.c Modified: trunk/reactos/services/tcpsvcs/tcpsvcs.h Modified: trunk/reactos/services/tcpsvcs/tcpsvcs.xml Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c _____ Modified: trunk/reactos/services/dhcp/hash.c --- trunk/reactos/services/dhcp/hash.c 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/dhcp/hash.c 2006-01-08 08:17:38 UTC (rev 20700) @@ -48,7 +48,7 @@ #include "rosdhcp.h" -static INLINE int do_hash PROTO ((unsigned char *, int, int)); +static __inline int do_hash PROTO ((unsigned char *, int, int)); struct hash_table *new_hash () { @@ -60,7 +60,7 @@ return rv; } -static INLINE int do_hash (name, len, size) +static __inline int do_hash (name, len, size) unsigned char *name; int len; int size; _____ Modified: trunk/reactos/services/dhcp/include/dhcpd.h --- trunk/reactos/services/dhcp/include/dhcpd.h 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/dhcp/include/dhcpd.h 2006-01-08 08:17:38 UTC (rev 20700) @@ -50,12 +50,14 @@ #define ETH_ALEN 6 #define ETHER_ADDR_LEN ETH_ALEN +#include <pshpack1.h> struct ether_header { u_int8_t ether_dhost[ETH_ALEN]; /* destination eth addr */ u_int8_t ether_shost[ETH_ALEN]; /* source ether addr */ u_int16_t ether_type; /* packet type ID field */ -} __attribute__ ((__packed__)); +}; +#include <poppack.h> struct ip { @@ -94,18 +96,18 @@ #include <sys/types.h> #include <sys/stat.h> -#include <sys/time.h> +//#include <sys/time.h> #include <ctype.h> #include <errno.h> #include <fcntl.h> #include <limits.h> -#include <unistd.h> +//#include <unistd.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <time.h> -#include <unistd.h> +//#include <unistd.h> #include "dhcp.h" #include "tree.h" @@ -274,6 +276,9 @@ #define MAX_TIME 0x7fffffff #define MIN_TIME 0 +#ifdef _MSC_VER +typedef SIZE_T ssize_t; +#endif /* External definitions... */ @@ -287,11 +292,19 @@ /* errwarn.c */ extern int warnings_occurred; +#ifdef _MSC_VER +void error(char *, ...); +int warning(char *, ...); +int note(char *, ...); +int debug(char *, ...); +int parse_warn(char *, ...); +#else void error(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2))); int warning(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2))); int note(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2))); int debug(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2))); int parse_warn(char *, ...) __attribute__ ((__format__ (__printf__, 1, 2))); +#endif /* conflex.c */ extern int lexline, lexchar; _____ Modified: trunk/reactos/services/dhcp/include/rosdhcp.h --- trunk/reactos/services/dhcp/include/rosdhcp.h 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/dhcp/include/rosdhcp.h 2006-01-08 08:17:38 UTC (rev 20700) @@ -2,12 +2,11 @@ #define ROSDHCP_H #define WIN32_NO_STATUS -#include <windows.h> +#include <winsock2.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> #include <iprtrmib.h> #include <iphlpapi.h> -#include <winsock2.h> #include <dhcpcsdk.h> #include <stdio.h> #include <setjmp.h> _____ Modified: trunk/reactos/services/dhcp/util.c --- trunk/reactos/services/dhcp/util.c 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/dhcp/util.c 2006-01-08 08:17:38 UTC (rev 20700) @@ -11,10 +11,10 @@ } int note( char *format, ... ) { + char buf[0x100]; + int ret; va_list arg_begin; va_start( arg_begin, format ); - char buf[0x100]; - int ret; ret = vsnprintf( buf, sizeof(buf), format, arg_begin ); @@ -24,10 +24,10 @@ } int debug( char *format, ... ) { + char buf[0x100]; + int ret; va_list arg_begin; va_start( arg_begin, format ); - char buf[0x100]; - int ret; ret = vsnprintf( buf, sizeof(buf), format, arg_begin ); @@ -37,10 +37,10 @@ } int warn( char *format, ... ) { + char buf[0x100]; + int ret; va_list arg_begin; va_start( arg_begin, format ); - char buf[0x100]; - int ret; ret = vsnprintf( buf, sizeof(buf), format, arg_begin ); @@ -50,10 +50,10 @@ } int warning( char *format, ... ) { + char buf[0x100]; + int ret; va_list arg_begin; va_start( arg_begin, format ); - char buf[0x100]; - int ret; ret = vsnprintf( buf, sizeof(buf), format, arg_begin ); @@ -63,9 +63,9 @@ } void error( char *format, ... ) { + char buf[0x100]; va_list arg_begin; va_start( arg_begin, format ); - char buf[0x100]; vsnprintf( buf, sizeof(buf), format, arg_begin ); _____ Modified: trunk/reactos/services/eventlog/eventlog.h --- trunk/reactos/services/eventlog/eventlog.h 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/eventlog/eventlog.h 2006-01-08 08:17:38 UTC (rev 20700) @@ -11,8 +11,11 @@ #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 <obfuncs.h> +#include <iotypes.h> #include <debug.h> #include "eventlogrpc_s.h" _____ Modified: trunk/reactos/services/rpcss/rpcss.h --- trunk/reactos/services/rpcss/rpcss.h 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/rpcss/rpcss.h 2006-01-08 08:17:38 UTC (rev 20700) @@ -6,9 +6,8 @@ #include <stdio.h> #define WIN32_NO_STATUS #include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> + VOID StartEndpointMapper(VOID); _____ Modified: trunk/reactos/services/tcpsvcs/chargen.c --- trunk/reactos/services/tcpsvcs/chargen.c 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/tcpsvcs/chargen.c 2006-01-08 08:17:38 UTC (rev 20700) @@ -12,9 +12,6 @@ * */ -#include <stdio.h> -#include <winsock2.h> -#include <tchar.h> #include "tcpsvcs.h" extern BOOL bShutDown; _____ Modified: trunk/reactos/services/tcpsvcs/daytime.c --- trunk/reactos/services/tcpsvcs/daytime.c 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/tcpsvcs/daytime.c 2006-01-08 08:17:38 UTC (rev 20700) @@ -12,10 +12,6 @@ * */ -#include <stdio.h> -#include <winsock2.h> -#include <tchar.h> -#include <time.h> #include "tcpsvcs.h" DWORD WINAPI DaytimeHandler(VOID* Sock_) _____ Modified: trunk/reactos/services/tcpsvcs/qotd.c --- trunk/reactos/services/tcpsvcs/qotd.c 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/tcpsvcs/qotd.c 2006-01-08 08:17:38 UTC (rev 20700) @@ -12,10 +12,6 @@ * */ -#include <stdio.h> -#include <winsock2.h> -#include <tchar.h> -#include <time.h> #include "tcpsvcs.h" #define QBUFSIZ 160 _____ Modified: trunk/reactos/services/tcpsvcs/tcpsvcs.h --- trunk/reactos/services/tcpsvcs/tcpsvcs.h 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/tcpsvcs/tcpsvcs.h 2006-01-08 08:17:38 UTC (rev 20700) @@ -12,11 +12,11 @@ * */ -#define WIN32_LEAN_AND_MEAN #include <stdio.h> #include <winsock2.h> #include <tchar.h> - +#include <time.h> + #define UNICODE #define _UNICODE _____ Modified: trunk/reactos/services/tcpsvcs/tcpsvcs.xml --- trunk/reactos/services/tcpsvcs/tcpsvcs.xml 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/tcpsvcs/tcpsvcs.xml 2006-01-08 08:17:38 UTC (rev 20700) @@ -13,4 +13,5 @@ <file>qotd.c</file> <file>chargen.c</file> <file>tcpsvcs.rc</file> + <pch>tcpsvcs.h</pch> </module> _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2006-01-08 06:39:31 UTC (rev 20699) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2006-01-08 08:17:38 UTC (rev 20700) @@ -28,8 +28,7 @@ /* INCLUDES *****************************************************************/ #define WIN32_NO_STATUS #include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <cmtypes.h> #include <umpnpmgr/sysguid.h> #include <wdmguid.h> #include <cfgmgr32.h>

18 years, 8 months

[ion] 20699: - Oops....

by ion＠svn.reactos.org

- Oops.... Modified: trunk/reactos/hal/halx86/mp/mps.S _____ Modified: trunk/reactos/hal/halx86/mp/mps.S --- trunk/reactos/hal/halx86/mp/mps.S 2006-01-08 06:38:39 UTC (rev 20698) +++ trunk/reactos/hal/halx86/mp/mps.S 2006-01-08 06:39:31 UTC (rev 20699) @@ -11,7 +11,7 @@ /* INCLUDES ******************************************************************/ -#include <c:\programming\reactos\include\ndk/asm.h> +#include <ndk/asm.h> /* FUNCTIONS *****************************************************************/

18 years, 8 months

[ion] 20698: - Bless halxbox too.

by ion＠svn.reactos.org

- Bless halxbox too. Modified: trunk/reactos/hal/halx86/xbox/display_xbox.c Modified: trunk/reactos/hal/halx86/xbox/font.c Modified: trunk/reactos/hal/halx86/xbox/halinit_xbox.c Modified: trunk/reactos/hal/halx86/xbox/halxbox.h Modified: trunk/reactos/hal/halx86/xbox/halxbox.xml Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c Modified: trunk/reactos/hal/halx86/xbox/pci_xbox.c _____ Modified: trunk/reactos/hal/halx86/xbox/display_xbox.c --- trunk/reactos/hal/halx86/xbox/display_xbox.c 2006-01-08 06:30:00 UTC (rev 20697) +++ trunk/reactos/hal/halx86/xbox/display_xbox.c 2006-01-08 06:38:39 UTC (rev 20698) @@ -12,10 +12,11 @@ /* For an explanation about display ownership see generic/display.c */ -#include <ntddk.h> -#include <hal.h> -#include "halxbox.h" +#include <halxbox.h> +#define NDEBUG +#include <debug.h> + #define I2C_IO_BASE 0xc000 #define CONTROL_FRAMEBUFFER_ADDRESS_OFFSET 0x600800 @@ -152,7 +153,7 @@ CursorY = 0; } -VOID STATIC +VOID static HalScrollDisplay (VOID) { ULONG Line, Col; @@ -198,7 +199,7 @@ HalpXboxOutputChar(Character, CursorX, CursorY, DEFAULT_FG_COLOR, DEFAULT_BG_COLOR); } -static BOOL +static BOOLEAN ReadfromSMBus(UCHAR Address, UCHAR bRegister, UCHAR Size, ULONG *Data_to_smbus) { int nRetriesToLive=50; @@ -276,7 +277,7 @@ } -static BOOL +static BOOLEAN I2CTransmitByteGetReturn(UCHAR bPicAddressI2cFormat, UCHAR bDataToWrite, ULONG *Return) { return ReadfromSMBus(bPicAddressI2cFormat, bDataToWrite, 1, Return); _____ Modified: trunk/reactos/hal/halx86/xbox/font.c --- trunk/reactos/hal/halx86/xbox/font.c 2006-01-08 06:30:00 UTC (rev 20697) +++ trunk/reactos/hal/halx86/xbox/font.c 2006-01-08 06:38:39 UTC (rev 20698) @@ -11,15 +11,12 @@ * Note: Converted from the XFree vga.bdf font */ -#define NDEBUG +#include <halxbox.h> -#include <ntddk.h> -#include "halxbox.h" - -#include <internal/debug.h> +#define NDEBUG #include <debug.h> -BYTE XboxFont8x16[256 * 16] = +CHAR XboxFont8x16[256 * 16] = { 0x00,0x00,0x00,0x7c,0xc6,0xc6,0xde,0xde,0xde,0xdc,0xc0,0x7c,0x00,0x00,0x 00,0x00, /* 0x00 */ 0x00,0x00,0x7e,0x81,0xa5,0x81,0x81,0xa5,0x99,0x81,0x81,0x7e,0x00,0x00,0x 00,0x00, /* 0x01 */ _____ Modified: trunk/reactos/hal/halx86/xbox/halinit_xbox.c --- trunk/reactos/hal/halx86/xbox/halinit_xbox.c 2006-01-08 06:30:00 UTC (rev 20697) +++ trunk/reactos/hal/halx86/xbox/halinit_xbox.c 2006-01-08 06:38:39 UTC (rev 20698) @@ -11,13 +11,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG +#include <halxbox.h> -#include <ntddk.h> -#include <hal.h> -#include "halxbox.h" - -#include <internal/debug.h> +#define NDEBUG #include <debug.h> /* FUNCTIONS ***************************************************************/ _____ Modified: trunk/reactos/hal/halx86/xbox/halxbox.h --- trunk/reactos/hal/halx86/xbox/halxbox.h 2006-01-08 06:30:00 UTC (rev 20697) +++ trunk/reactos/hal/halx86/xbox/halxbox.h 2006-01-08 06:38:39 UTC (rev 20698) @@ -12,8 +12,11 @@ #ifndef HALXBOX_H_INCLUDED #define HALXBOX_H_INCLUDED -extern BYTE XboxFont8x16[256 * 16]; +#include <hal.h> +#include <ntdddisk.h> +extern CHAR XboxFont8x16[256 * 16]; + void HalpXboxInitPciBus(ULONG BusNumber, PBUS_HANDLER BusHandler); void HalpXboxInitPartIo(void); _____ Modified: trunk/reactos/hal/halx86/xbox/halxbox.xml --- trunk/reactos/hal/halx86/xbox/halxbox.xml 2006-01-08 06:30:00 UTC (rev 20697) +++ trunk/reactos/hal/halx86/xbox/halxbox.xml 2006-01-08 06:38:39 UTC (rev 20698) @@ -15,4 +15,5 @@ <file>part_xbox.c</file> <file>pci_xbox.c</file> <file>halxbox.rc</file> + <pch>halxbox.h</pch> </module> _____ Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c --- trunk/reactos/hal/halx86/xbox/part_xbox.c 2006-01-08 06:30:00 UTC (rev 20697) +++ trunk/reactos/hal/halx86/xbox/part_xbox.c 2006-01-08 06:38:39 UTC (rev 20698) @@ -11,13 +11,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG +#include <halxbox.h> -#include <hal.h> -#include <ntdddisk.h> -#include "halxbox.h" - -#include <internal/debug.h> +#define NDEBUG #include <debug.h> #define XBOX_SIGNATURE_SECTOR 3 @@ -35,7 +31,7 @@ { ULONG SectorStart; ULONG SectorCount; - BYTE PartitionType; + CHAR PartitionType; } XboxPartitions[] = { /* This is in the \Device\Harddisk0\Partition.. order used by the Xbox kernel */ _____ Modified: trunk/reactos/hal/halx86/xbox/pci_xbox.c --- trunk/reactos/hal/halx86/xbox/pci_xbox.c 2006-01-08 06:30:00 UTC (rev 20697) +++ trunk/reactos/hal/halx86/xbox/pci_xbox.c 2006-01-08 06:38:39 UTC (rev 20698) @@ -17,14 +17,9 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG +#include <halxbox.h> -#include <ntddk.h> -#include <hal.h> -#include <bus.h> -#include "halxbox.h" - -#include <internal/debug.h> +#define NDEBUG #include <debug.h> /* VARIABLES ***************************************************************/

18 years, 8 months

[ion] 20697: - Get MP hal and Generic HAL to build too.

by ion＠svn.reactos.org

- Get MP hal and Generic HAL to build too. Modified: trunk/reactos/hal/hal/hal.c Modified: trunk/reactos/hal/halx86/mp/apic.c Modified: trunk/reactos/hal/halx86/mp/mps.S Modified: trunk/reactos/hal/halx86/mp/mpsirql.c Modified: trunk/reactos/hal/halx86/mp/spinlock.c _____ Modified: trunk/reactos/hal/hal/hal.c --- trunk/reactos/hal/hal/hal.c 2006-01-08 06:23:17 UTC (rev 20696) +++ trunk/reactos/hal/hal/hal.c 2006-01-08 06:30:00 UTC (rev 20697) @@ -126,7 +126,7 @@ } -VOID +PVOID NTAPI HalAllocateCrashDumpRegisters( ULONG Unknown1, _____ Modified: trunk/reactos/hal/halx86/mp/apic.c --- trunk/reactos/hal/halx86/mp/apic.c 2006-01-08 06:23:17 UTC (rev 20696) +++ trunk/reactos/hal/halx86/mp/apic.c 2006-01-08 06:30:00 UTC (rev 20697) @@ -55,7 +55,8 @@ ULONG lastvalw[MAX_CPU]; #ifdef CONFIG_SMP -typedef struct __attribute__((packed)) _COMMON_AREA_INFO +#include <pshpack1.h> +typedef struct _COMMON_AREA_INFO { ULONG Stack; /* Location of AP stack */ ULONG PageDirectory; /* Page directory for an AP */ @@ -63,6 +64,7 @@ ULONG PaeModeEnabled; /* PAE mode is enabled */ ULONG Debug[16]; /* For debugging */ } COMMON_AREA_INFO, *PCOMMON_AREA_INFO; +#include <poppack.h> #endif CHAR *APstart, *APend; @@ -73,15 +75,15 @@ #define HZ (100) #define APIC_DIVISOR (16) -#define CMOS_READ(address) ({ \ +#define CMOS_READ(address) { \ WRITE_PORT_UCHAR((PUCHAR)0x70, address)); \ READ_PORT_UCHAR((PUCHAR)0x71)); \ -}) +} -#define CMOS_WRITE(address, value) ({ \ +#define CMOS_WRITE(address, value) { \ WRITE_PORT_UCHAR((PUCHAR)0x70, address); \ WRITE_PORT_UCHAR((PUCHAR)0x71, value); \ -}) +} extern ULONG_PTR KernelBase; @@ -414,7 +416,8 @@ BOOLEAN VerifyLocalAPIC(VOID) { - UINT reg0, reg1; + SIZE_T reg0, reg1; + ULONG l, h; /* The version register is read-only in a real APIC */ reg0 = APICRead(APIC_VER); DPRINT1("Getting VERSION: %x\n", reg0); @@ -461,7 +464,6 @@ return FALSE; } - ULONG l, h; Ki386Rdmsr(0x1b /*MSR_IA32_APICBASE*/, l, h); if (!(l & /*MSR_IA32_APICBASE_ENABLE*/(1<<11))) _____ Modified: trunk/reactos/hal/halx86/mp/mps.S --- trunk/reactos/hal/halx86/mp/mps.S 2006-01-08 06:23:17 UTC (rev 20696) +++ trunk/reactos/hal/halx86/mp/mps.S 2006-01-08 06:30:00 UTC (rev 20697) @@ -11,7 +11,7 @@ /* INCLUDES ******************************************************************/ -#include <ndk/asm.h> +#include <c:\programming\reactos\include\ndk/asm.h> /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/mp/mpsirql.c --- trunk/reactos/hal/halx86/mp/mpsirql.c 2006-01-08 06:23:17 UTC (rev 20696) +++ trunk/reactos/hal/halx86/mp/mpsirql.c 2006-01-08 06:30:00 UTC (rev 20697) @@ -69,7 +69,7 @@ } VOID -HalpLowerIrql(KIRQL NewIrql, BOOL FromHalEndSystemInterrupt) +HalpLowerIrql(KIRQL NewIrql, BOOLEAN FromHalEndSystemInterrupt) { ULONG Flags; UCHAR DpcRequested; _____ Modified: trunk/reactos/hal/halx86/mp/spinlock.c --- trunk/reactos/hal/halx86/mp/spinlock.c 2006-01-08 06:23:17 UTC (rev 20696) +++ trunk/reactos/hal/halx86/mp/spinlock.c 2006-01-08 06:30:00 UTC (rev 20697) @@ -49,7 +49,7 @@ { KIRQL OldIrql; - OldIrql = KfRaiseIrql(SYNCH_LEVEL); + OldIrql = KfRaiseIrql(CLOCK2_LEVEL); KiAcquireSpinLock(SpinLock); return OldIrql;

18 years, 8 months

[ion] 20696: - Remove some public APIs from internal headers.

by ion＠svn.reactos.org

- Remove some public APIs from internal headers. - Remove some internal APIs/types from public headers. - Make PSECTION_OBJECT a PVOID unless really needed (which should only be inside \mm) - Make hal buildable on msvc. - Fix some other misc. various msvc/ddk incompatibilities. Modified: trunk/reactos/hal/halx86/generic/beep.c Modified: trunk/reactos/hal/halx86/generic/dma.c Modified: trunk/reactos/hal/halx86/generic/halinit.c Modified: trunk/reactos/hal/halx86/generic/isa.c Modified: trunk/reactos/hal/halx86/generic/kdbg.c Modified: trunk/reactos/hal/halx86/generic/misc.c Modified: trunk/reactos/hal/halx86/generic/pci.c Modified: trunk/reactos/hal/halx86/generic/timer.c Modified: trunk/reactos/hal/halx86/include/hal.h Modified: trunk/reactos/hal/halx86/include/haldma.h Modified: trunk/reactos/hal/halx86/include/ioapic.h Modified: trunk/reactos/hal/halx86/include/mps.h Modified: trunk/reactos/include/ndk/iofuncs.h Modified: trunk/reactos/include/ndk/mmtypes.h Modified: trunk/reactos/ntoskrnl/cm/regfile.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/rtl.h Modified: trunk/reactos/ntoskrnl/lpc/connect.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/pageop.c Modified: trunk/reactos/ntoskrnl/mm/rmap.c Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/rtl/nls.c Modified: trunk/reactos/w32api/include/ddk/ntifs.h Modified: trunk/reactos/w32api/include/ddk/winddk.h Modified: trunk/reactos/w32api/include/ntdef.h Modified: trunk/reactos/w32api/include/winnt.h _____ Modified: trunk/reactos/hal/halx86/generic/beep.c --- trunk/reactos/hal/halx86/generic/beep.c 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/hal/halx86/generic/beep.c 2006-01-08 06:23:17 UTC (rev 20696) @@ -50,7 +50,7 @@ if (Frequency) { - DWORD Divider = CLOCKFREQ / Frequency; + ULONG Divider = CLOCKFREQ / Frequency; if (Divider > 0x10000) { _____ Modified: trunk/reactos/hal/halx86/generic/dma.c --- trunk/reactos/hal/halx86/generic/dma.c 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/hal/halx86/generic/dma.c 2006-01-08 06:23:17 UTC (rev 20696) @@ -252,7 +252,7 @@ if (MapRegisterCount > 0) { - PMAP_REGISTER_ENTRY CurrentEntry, PreviousEntry; + PROS_MAP_REGISTER_ENTRY CurrentEntry, PreviousEntry; CurrentEntry = AdapterObject->MapRegisterBase + AdapterObject->NumberOfMapRegisters; @@ -351,7 +351,7 @@ MasterAdapter->MapRegisterBase = ExAllocatePoolWithTag( NonPagedPool, - SizeOfBitmap * sizeof(MAP_REGISTER_ENTRY), + SizeOfBitmap * sizeof(ROS_MAP_REGISTER_ENTRY), TAG_DMA); if (MasterAdapter->MapRegisterBase == NULL) { @@ -360,7 +360,7 @@ } RtlZeroMemory(MasterAdapter->MapRegisterBase, - SizeOfBitmap * sizeof(MAP_REGISTER_ENTRY)); + SizeOfBitmap * sizeof(ROS_MAP_REGISTER_ENTRY)); if (!HalpGrowMapBuffers(MasterAdapter, 0x10000)) { ExFreePool(MasterAdapter); @@ -455,8 +455,8 @@ PDEVICE_DESCRIPTION DeviceDescription) { UCHAR Controller; - DMA_MODE DmaMode = { Byte: 0 }; - DMA_EXTENDED_MODE ExtendedMode = { Byte: 0 }; + DMA_MODE DmaMode = {{0 }}; + DMA_EXTENDED_MODE ExtendedMode = {{ 0 }}; PVOID AdapterBaseVa; Controller = (DeviceDescription->DmaChannel & 4) ? 2 : 1; @@ -1127,7 +1127,7 @@ if (!AdapterObject->ScatterGather) { AdapterObject->MapRegisterBase = - (PMAP_REGISTER_ENTRY)( + (PROS_MAP_REGISTER_ENTRY)( (ULONG_PTR)AdapterObject->MapRegisterBase | MAP_BASE_SW_SG); } @@ -1285,7 +1285,7 @@ if (!AdapterObject->ScatterGather) { AdapterObject->MapRegisterBase = - (PMAP_REGISTER_ENTRY)( + (PROS_MAP_REGISTER_ENTRY)( (ULONG_PTR)AdapterObject->MapRegisterBase | MAP_BASE_SW_SG); } @@ -1371,10 +1371,10 @@ if (NumberOfMapRegisters != 0) { - PMAP_REGISTER_ENTRY RealMapRegisterBase; + PROS_MAP_REGISTER_ENTRY RealMapRegisterBase; RealMapRegisterBase = - (PMAP_REGISTER_ENTRY)((ULONG_PTR)MapRegisterBase & ~MAP_BASE_SW_SG); + (PROS_MAP_REGISTER_ENTRY)((ULONG_PTR)MapRegisterBase & ~MAP_BASE_SW_SG); RtlClearBits(MasterAdapter->MapRegisters, RealMapRegisterBase - MasterAdapter->MapRegisterBase, NumberOfMapRegisters); @@ -1408,7 +1408,7 @@ if (!AdapterObject->ScatterGather) { AdapterObject->MapRegisterBase = - (PMAP_REGISTER_ENTRY)( + (PROS_MAP_REGISTER_ENTRY)( (ULONG_PTR)AdapterObject->MapRegisterBase | MAP_BASE_SW_SG); } @@ -1459,7 +1459,7 @@ VOID STDCALL HalpCopyBufferMap( PMDL Mdl, - PMAP_REGISTER_ENTRY MapRegisterBase, + PROS_MAP_REGISTER_ENTRY MapRegisterBase, PVOID CurrentVa, ULONG Length, BOOLEAN WriteToDevice) @@ -1555,7 +1555,7 @@ BOOLEAN WriteToDevice) { BOOLEAN SlaveDma = FALSE; - PMAP_REGISTER_ENTRY RealMapRegisterBase; + PROS_MAP_REGISTER_ENTRY RealMapRegisterBase; ASSERT_IRQL(DISPATCH_LEVEL); @@ -1582,7 +1582,7 @@ return TRUE; RealMapRegisterBase = - (PMAP_REGISTER_ENTRY)((ULONG_PTR)MapRegisterBase & ~MAP_BASE_SW_SG); + (PROS_MAP_REGISTER_ENTRY)((ULONG_PTR)MapRegisterBase & ~MAP_BASE_SW_SG); if (!WriteToDevice) { @@ -1655,7 +1655,7 @@ ULONG TransferOffset; ULONG TransferLength; BOOLEAN UseMapRegisters; - PMAP_REGISTER_ENTRY RealMapRegisterBase; + PROS_MAP_REGISTER_ENTRY RealMapRegisterBase; PHYSICAL_ADDRESS PhysicalAddress; PHYSICAL_ADDRESS HighestAcceptableAddress; ULONG Counter; @@ -1722,7 +1722,7 @@ */ RealMapRegisterBase = - (PMAP_REGISTER_ENTRY)((ULONG_PTR)MapRegisterBase & ~MAP_BASE_SW_SG); + (PROS_MAP_REGISTER_ENTRY)((ULONG_PTR)MapRegisterBase & ~MAP_BASE_SW_SG); /* * Try to calculate the size of the transfer. We can only transfer _____ Modified: trunk/reactos/hal/halx86/generic/halinit.c --- trunk/reactos/hal/halx86/generic/halinit.c 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/hal/halx86/generic/halinit.c 2006-01-08 06:23:17 UTC (rev 20696) @@ -52,10 +52,12 @@ } else if (BootPhase == 2) { + PHYSICAL_ADDRESS Null = {{0}}; + /* Go to blue screen */ HalClearDisplay (0x17); /* grey on blue */ - HalpZeroPageMapping = MmMapIoSpace((LARGE_INTEGER)0LL, PAGE_SIZE, MmNonCached); + HalpZeroPageMapping = MmMapIoSpace(Null, PAGE_SIZE, MmNonCached); } return TRUE; _____ Modified: trunk/reactos/hal/halx86/generic/isa.c --- trunk/reactos/hal/halx86/generic/isa.c 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/hal/halx86/generic/isa.c 2006-01-08 06:23:17 UTC (rev 20696) @@ -17,7 +17,7 @@ /* FUNCTIONS *****************************************************************/ -BOOL HalIsaProbe(VOID) +BOOLEAN HalIsaProbe(VOID) /* * FUNCTION: Probes for an ISA bus * RETURNS: True if detected _____ Modified: trunk/reactos/hal/halx86/generic/kdbg.c --- trunk/reactos/hal/halx86/generic/kdbg.c 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/hal/halx86/generic/kdbg.c 2006-01-08 06:23:17 UTC (rev 20696) @@ -87,8 +87,8 @@ KdpDoesComPortExist (PUCHAR BaseAddress) { BOOLEAN found; - BYTE mcr; - BYTE msr; + UCHAR mcr; + UCHAR msr; found = FALSE; @@ -149,14 +149,14 @@ STDCALL KdPortInitialize ( PKD_PORT_INFORMATION PortInformation, - DWORD Unknown1, - DWORD Unknown2 + ULONG Unknown1, + ULONG Unknown2 ) { ULONG BaseArray[5] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; char buffer[80]; ULONG divisor; - BYTE lcr; + UCHAR lcr; if (PortInitialized == FALSE) { @@ -282,15 +282,15 @@ STDCALL KdPortInitializeEx ( PKD_PORT_INFORMATION PortInformation, - DWORD Unknown1, - DWORD Unknown2 + ULONG Unknown1, + ULONG Unknown2 ) { ULONG BaseArray[5] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; PUCHAR ComPortBase; char buffer[80]; ULONG divisor; - BYTE lcr; + UCHAR lcr; if (PortInformation->BaudRate == 0) { _____ Modified: trunk/reactos/hal/halx86/generic/misc.c --- trunk/reactos/hal/halx86/generic/misc.c 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/hal/halx86/generic/misc.c 2006-01-08 06:23:17 UTC (rev 20696) @@ -16,14 +16,12 @@ /* FUNCTIONS ****************************************************************/ - -VOID -NTAPI -HalAllocateCrashDumpRegisters( - ULONG Unknown1, - ULONG Unknown2) +PVOID STDCALL +HalAllocateCrashDumpRegisters(IN PADAPTER_OBJECT AdapterObject, + IN OUT PULONG NumberOfMapRegisters) { UNIMPLEMENTED; + return NULL; } _____ Modified: trunk/reactos/hal/halx86/generic/pci.c --- trunk/reactos/hal/halx86/generic/pci.c 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/hal/halx86/generic/pci.c 2006-01-08 06:23:17 UTC (rev 20696) @@ -601,8 +601,8 @@ { ULONG DataSize; PCI_COMMON_CONFIG PciConfig; - UINT Address; - UINT ResourceCount; + SIZE_T Address; + SIZE_T ResourceCount; ULONG Size[PCI_TYPE0_ADDRESSES]; NTSTATUS Status = STATUS_SUCCESS; UCHAR Offset; _____ Modified: trunk/reactos/hal/halx86/generic/timer.c --- trunk/reactos/hal/halx86/generic/timer.c 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/hal/halx86/generic/timer.c 2006-01-08 06:23:17 UTC (rev 20696) @@ -96,7 +96,7 @@ * For supported compilers we use inline assembler. For the others, * portable plain C. */ -VOID STDCALL __attribute__((noinline)) +DECLSPEC_NOINLINE VOID STDCALL __KeStallExecutionProcessor(ULONG Loops) { if (!Loops) @@ -121,7 +121,9 @@ #endif } -VOID STDCALL KeStallExecutionProcessor(ULONG Microseconds) +VOID +STDCALL +KeStallExecutionProcessor(ULONG Microseconds) { PKIPCR Pcr = (PKIPCR)KeGetCurrentKPCR(); @@ -305,7 +307,8 @@ } -LARGE_INTEGER STDCALL +LARGE_INTEGER +STDCALL KeQueryPerformanceCounter(PLARGE_INTEGER PerformanceFreq) /* * FUNCTION: Queries the finest grained running count available in the system _____ Modified: trunk/reactos/hal/halx86/include/hal.h --- trunk/reactos/hal/halx86/include/hal.h 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/hal/halx86/include/hal.h 2006-01-08 06:23:17 UTC (rev 20696) @@ -12,8 +12,8 @@ #include <stdio.h> /* IFS/DDK/NDK Headers */ +#include <ntifs.h> #include <ntddk.h> -#include <ntifs.h> #include <ndk/ntndk.h> /* Internal Kernel Headers */ _____ Modified: trunk/reactos/hal/halx86/include/haldma.h --- trunk/reactos/hal/halx86/include/haldma.h 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/hal/halx86/include/haldma.h 2006-01-08 06:23:17 UTC (rev 20696) @@ -310,12 +310,12 @@ DMA_CHANNEL_STOP DmaChannelStop[8]; /* 4E0h-4FFh */ } EISA_CONTROL, *PEISA_CONTROL; -typedef struct _MAP_REGISTER_ENTRY +typedef struct _ROS_MAP_REGISTER_ENTRY { PVOID VirtualAddress; PHYSICAL_ADDRESS PhysicalAddress; ULONG Counter; -} MAP_REGISTER_ENTRY, *PMAP_REGISTER_ENTRY; +} ROS_MAP_REGISTER_ENTRY, *PROS_MAP_REGISTER_ENTRY; struct _ADAPTER_OBJECT { /* @@ -333,7 +333,7 @@ ULONG MapRegistersPerChannel; PVOID AdapterBaseVa; - PMAP_REGISTER_ENTRY MapRegisterBase; + PROS_MAP_REGISTER_ENTRY MapRegisterBase; ULONG NumberOfMapRegisters; ULONG CommittedMapRegisters; @@ -376,20 +376,21 @@ IN PDEVICE_DESCRIPTION DeviceDescription, OUT PULONG NumberOfMapRegisters); -VOID STDCALL -HalPutDmaAdapter( - PADAPTER_OBJECT AdapterObject); +/* FIXME: I added the definition to winddk.h but gcc wants it -HERE-. WHY?? */ +#ifndef _MSC_VER +NTSTATUS +NTAPI +IoAllocateAdapterChannel( + IN PADAPTER_OBJECT AdapterObject, + IN PDEVICE_OBJECT DeviceObject, + IN ULONG NumberOfMapRegisters, + IN PDRIVER_CONTROL ExecutionRoutine, + IN PVOID Context +); +#endif ULONG STDCALL HalpDmaGetDmaAlignment( PADAPTER_OBJECT AdapterObject); -NTSTATUS STDCALL -IoAllocateAdapterChannel( - IN PADAPTER_OBJECT AdapterObject, - IN PDEVICE_OBJECT DeviceObject, - IN ULONG NumberOfMapRegisters, - IN PDRIVER_CONTROL ExecutionRoutine, - IN PVOID Context); - #endif /* HALDMA_H */ _____ Modified: trunk/reactos/hal/halx86/include/ioapic.h --- trunk/reactos/hal/halx86/include/ioapic.h 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/hal/halx86/include/ioapic.h 2006-01-08 06:23:17 UTC (rev 20696) @@ -37,6 +37,7 @@ #define IOAPIC_TBL_DF1 (0xFF<< 56) /* Destination Field (logical mode) */ #define IOAPIC_TBL_VECTOR (0xFF << 0) /* Vector (10h - FEh) */ +#include <pshpack1.h> typedef struct _IOAPIC_ROUTE_ENTRY { ULONG vector : 8, delivery_mode : 3, /* 000: FIXED @@ -62,7 +63,8 @@ logical_dest : 8; } logical; } dest; -} __attribute__ ((packed)) IOAPIC_ROUTE_ENTRY, *PIOAPIC_ROUTE_ENTRY; +} IOAPIC_ROUTE_ENTRY, *PIOAPIC_ROUTE_ENTRY; +#include <poppack.h> typedef struct _IOAPIC_INFO { _____ Modified: trunk/reactos/hal/halx86/include/mps.h --- trunk/reactos/hal/halx86/include/mps.h 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/hal/halx86/include/mps.h 2006-01-08 06:23:17 UTC (rev 20696) @@ -22,7 +22,8 @@ /* MP Floating Pointer Structure */ #define MPF_SIGNATURE (('_' << 24) | ('P' << 16) | ('M' << 8) | '_') -typedef struct __attribute__((packed)) _MP_FLOATING_POINTER +#include <pshpack1.h> +typedef struct _MP_FLOATING_POINTER { ULONG Signature; /* _MP_ */ ULONG Address; /* Physical Address Pointer (0 means no configuration table exist) */ @@ -34,14 +35,15 @@ UCHAR Feature3; /* Unused (0) */ UCHAR Feature4; /* Unused (0) */ UCHAR Feature5; /* Unused (0) */ -} __attribute__((packed)) MP_FLOATING_POINTER, *PMP_FLOATING_POINTER; +} MP_FLOATING_POINTER, *PMP_FLOATING_POINTER; + #define FEATURE2_IMCRP 0x80 /* MP Configuration Table Header */ #define MPC_SIGNATURE (('P' << 24) | ('M' << 16) | ('C' << 8) | 'P') -typedef struct __attribute__((packed)) _MP_CONFIGURATION_TABLE +typedef struct _MP_CONFIGURATION_TABLE { ULONG Signature; /* PCMP */ USHORT Length; /* Size of configuration table */ @@ -56,7 +58,7 @@ USHORT ExtTableLength; /* Extended Table Length */ UCHAR ExtTableChecksum; /* Extended Table Checksum */ UCHAR Reserved; /* Reserved */ -} __attribute__((packed)) MP_CONFIGURATION_TABLE, *PMP_CONFIGURATION_TABLE; +} MP_CONFIGURATION_TABLE, *PMP_CONFIGURATION_TABLE; /* MP Configuration Table Entries */ #define MPCTE_PROCESSOR 0 /* One entry per processor */ @@ -66,7 +68,7 @@ #define MPCTE_LINTSRC 4 /* One entry per system interrupt source */ -typedef struct __attribute__((packed)) _MP_CONFIGURATION_PROCESSOR +typedef struct _MP_CONFIGURATION_PROCESSOR { UCHAR Type; /* 0 */ UCHAR ApicId; /* Local APIC ID for the processor */ @@ -75,17 +77,16 @@ ULONG CpuSignature; /* CPU signature */ ULONG FeatureFlags; /* CPUID feature value */ ULONG Reserved[2]; /* Reserved (0) */ -} __attribute__((packed)) MP_CONFIGURATION_PROCESSOR, - *PMP_CONFIGURATION_PROCESSOR; +} MP_CONFIGURATION_PROCESSOR, *PMP_CONFIGURATION_PROCESSOR; -typedef struct __attribute__((packed)) _MP_CONFIGURATION_BUS +typedef struct _MP_CONFIGURATION_BUS { UCHAR Type; /* 1 */ UCHAR BusId; /* Bus ID */ CHAR BusType[6]; /* Bus type */ -} __attribute__((packed)) MP_CONFIGURATION_BUS, *PMP_CONFIGURATION_BUS; +} MP_CONFIGURATION_BUS, *PMP_CONFIGURATION_BUS; #define MAX_BUS 32 @@ -114,21 +115,21 @@ #define BUSTYPE_XPRESS "XPRESS" -typedef struct __attribute__((packed)) _MP_CONFIGURATION_IOAPIC +typedef struct _MP_CONFIGURATION_IOAPIC { UCHAR Type; /* 2 */ UCHAR ApicId; /* I/O APIC ID */ UCHAR ApicVersion; /* I/O APIC version */ UCHAR ApicFlags; /* I/O APIC flags */ ULONG ApicAddress; /* I/O APIC base address */ -} __attribute__((packed)) MP_CONFIGURATION_IOAPIC, *PMP_CONFIGURATION_IOAPIC; +} MP_CONFIGURATION_IOAPIC, *PMP_CONFIGURATION_IOAPIC; #define MAX_IOAPIC 2 #define MP_IOAPIC_USABLE 0x01 -typedef struct __attribute__((packed)) _MP_CONFIGURATION_INTSRC +typedef struct _MP_CONFIGURATION_INTSRC { UCHAR Type; /* 3 */ UCHAR IrqType; /* Interrupt type */ @@ -137,7 +138,7 @@ UCHAR SrcBusIrq; /* Source bus interrupt */ UCHAR DstApicId; /* Destination APIC ID */ UCHAR DstApicInt; /* Destination interrupt */ -} __attribute__((packed)) MP_CONFIGURATION_INTSRC, *PMP_CONFIGURATION_INTSRC; +} MP_CONFIGURATION_INTSRC, *PMP_CONFIGURATION_INTSRC; #define MAX_IRQ_SOURCE 128 @@ -151,7 +152,7 @@ #define IRQDIR_LOW 3 -typedef struct __attribute__((packed)) _MP_CONFIGURATION_INTLOCAL +typedef struct _MP_CONFIGURATION_INTLOCAL { UCHAR Type; /* 4 */ UCHAR IrqType; /* Interrupt type */ @@ -161,6 +162,7 @@ UCHAR DstApicId; /* Destination local APIC ID */ UCHAR DstApicLInt; /* Destination local APIC interrupt */ } MP_CONFIGURATION_INTLOCAL, *PMP_CONFIGURATION_INTLOCAL; +#include <poppack.h> #define MP_APIC_ALL 0xFF _____ Modified: trunk/reactos/include/ndk/iofuncs.h --- trunk/reactos/include/ndk/iofuncs.h 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/include/ndk/iofuncs.h 2006-01-08 06:23:17 UTC (rev 20696) @@ -592,6 +592,7 @@ IN ULONG Unknown2 ); +#ifdef NTOS_MODE_USER NTSYSAPI NTSTATUS NTAPI @@ -599,6 +600,7 @@ IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock ); +#endif NTSTATUS NTAPI @@ -716,6 +718,7 @@ IN BOOLEAN RestartScan ); +#ifdef NTOS_MODE_USER NTSTATUS NTAPI ZwQueryEaFile( @@ -729,6 +732,7 @@ IN PULONG EaIndex OPTIONAL, IN BOOLEAN RestartScan ); +#endif NTSTATUS NTAPI @@ -837,6 +841,7 @@ ULONG Unknown2 ); +#ifdef NTOS_MODE_USER NTSTATUS NTAPI ZwSetEaFile( @@ -845,6 +850,7 @@ PVOID EaBuffer, ULONG EaBufferSize ); +#endif NTSYSCALLAPI NTSTATUS _____ Modified: trunk/reactos/include/ndk/mmtypes.h --- trunk/reactos/include/ndk/mmtypes.h 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/include/ndk/mmtypes.h 2006-01-08 06:23:17 UTC (rev 20696) @@ -343,6 +343,20 @@ ULONG GrowthSinceLastEstimate; } MMSUPPORT, *PMMSUPPORT; +// +// Memory Information Types +// +typedef struct _MEMORY_BASIC_INFORMATION +{ + PVOID BaseAddress; + PVOID AllocationBase; + ULONG AllocationProtect; + ULONG RegionSize; + ULONG State; + ULONG Protect; + ULONG Type; +} MEMORY_BASIC_INFORMATION,*PMEMORY_BASIC_INFORMATION; + #endif // !NTOS_MODE_USER #endif // _MMTYPES_H _____ Modified: trunk/reactos/ntoskrnl/cm/regfile.c --- trunk/reactos/ntoskrnl/cm/regfile.c 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/ntoskrnl/cm/regfile.c 2006-01-08 06:23:17 UTC (rev 20696) @@ -848,7 +848,7 @@ ULONG CreateDisposition; IO_STATUS_BLOCK IoSB; HANDLE FileHandle; - PSECTION_OBJECT SectionObject; + PVOID SectionObject; PUCHAR ViewBase; ULONG ViewSize; NTSTATUS Status; _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2006-01-08 06:23:17 UTC (rev 20696) @@ -304,13 +304,6 @@ ULONG IpiRequest ); -VOID -NTAPI -KeIpiGenericCall( - VOID (STDCALL *WorkerRoutine)(PVOID), - PVOID Argument -); - /* next file ***************************************************************/ VOID @@ -480,14 +473,6 @@ LARGE_INTEGER DueTime ); -BOOLEAN -__inline -FASTCALL -KiIsObjectSignaled( - PDISPATCHER_HEADER Object, - PKTHREAD Thread -); - VOID FASTCALL KiWaitTest( @@ -585,10 +570,6 @@ FASTCALL KiWakeQueue(IN PKQUEUE Queue); -PLIST_ENTRY -STDCALL -KeRundownQueue(IN PKQUEUE Queue); - /* INITIALIZATION FUNCTIONS *************************************************/ VOID _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2006-01-08 06:23:17 UTC (rev 20696) @@ -205,7 +205,7 @@ PMM_IMAGE_SECTION_OBJECT ImageSection; PMM_SECTION_SEGMENT Segment; }; -} SECTION_OBJECT; +} SECTION_OBJECT, *PSECTION_OBJECT; typedef struct _MEMORY_AREA { @@ -776,7 +776,7 @@ PMM_SECTION_SEGMENT Segment, ULONG Offset, ULONG OpType, - BOOL First + BOOLEAN First ); PMM_PAGEOP @@ -892,7 +892,7 @@ NTAPI MmSetDirtyAllRmaps(PFN_TYPE Page); -BOOL +BOOLEAN NTAPI MmIsDirtyPageRmap(PFN_TYPE Page); @@ -1041,7 +1041,7 @@ MmDisableVirtualMapping( PEPROCESS Process, PVOID Address, - BOOL* WasDirty, + BOOLEAN* WasDirty, PPFN_TYPE Page ); @@ -1203,8 +1203,8 @@ MmDeleteVirtualMapping( PEPROCESS Process, PVOID Address, - BOOL FreePage, - BOOL* WasDirty, + BOOLEAN FreePage, + BOOLEAN* WasDirty, PPFN_TYPE Page ); @@ -1248,18 +1248,6 @@ PULONG NrFreedPages ); -/* cont.c ********************************************************************/ - -PVOID -STDCALL -MmAllocateContiguousMemorySpecifyCache( - IN SIZE_T NumberOfBytes, - IN PHYSICAL_ADDRESS LowestAcceptableAddress, - IN PHYSICAL_ADDRESS HighestAcceptableAddress, - IN PHYSICAL_ADDRESS BoundaryAddressMultiple OPTIONAL, - IN MEMORY_CACHING_TYPE CacheType OPTIONAL -); - /* region.c ************************************************************/ NTSTATUS @@ -1313,6 +1301,21 @@ NTSTATUS NTAPI +MmMapViewOfSection( + IN PVOID SectionObject, + IN PEPROCESS Process, + IN OUT PVOID *BaseAddress, + IN ULONG ZeroBits, + IN ULONG CommitSize, + IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, + IN OUT PULONG ViewSize, + IN SECTION_INHERIT InheritDisposition, + IN ULONG AllocationType, + IN ULONG Protect +); + +NTSTATUS +NTAPI MmProtectSectionView( PMADDRESS_SPACE AddressSpace, PMEMORY_AREA MemoryArea, @@ -1335,19 +1338,6 @@ NTAPI MmInitSectionImplementation(VOID); -NTSTATUS -STDCALL -MmCreateSection( - OUT PSECTION_OBJECT *SectionObject, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN PLARGE_INTEGER MaximumSize, - IN ULONG SectionPageProtection, - IN ULONG AllocationAttributes, - IN HANDLE FileHandle OPTIONAL, - IN PFILE_OBJECT File OPTIONAL -); - NTSTATUS NTAPI MmNotPresentFaultSectionView( @@ -1408,7 +1398,7 @@ MiQueryVirtualMemory( IN HANDLE ProcessHandle, IN PVOID Address, - IN CINT VirtualMemoryInformationClass, + IN MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, OUT PVOID VirtualMemoryInformation, IN ULONG Length, OUT PULONG ResultLength _____ Modified: trunk/reactos/ntoskrnl/include/internal/rtl.h --- trunk/reactos/ntoskrnl/include/internal/rtl.h 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/ntoskrnl/include/internal/rtl.h 2006-01-08 06:23:17 UTC (rev 20696) @@ -1,7 +1,7 @@ #ifndef __NTOSKRNL_INCLUDE_INTERNAL_NLS_H #define __NTOSKRNL_INCLUDE_INTERNAL_NLS_H -extern PSECTION_OBJECT NlsSectionObject; +extern PVOID NlsSectionObject; extern ULONG NlsAnsiTableOffset; extern ULONG NlsOemTableOffset; _____ Modified: trunk/reactos/ntoskrnl/lpc/connect.c --- trunk/reactos/ntoskrnl/lpc/connect.c 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/ntoskrnl/lpc/connect.c 2006-01-08 06:23:17 UTC (rev 20696) @@ -29,7 +29,7 @@ NTSTATUS STDCALL EiConnectPort(IN PEPORT* ConnectedPort, IN PEPORT NamedPort, - IN PSECTION_OBJECT Section, + IN PVOID Section, IN LARGE_INTEGER SectionOffset, IN ULONG ViewSize, OUT PVOID* ClientSendViewBase, @@ -252,7 +252,7 @@ ULONG MaximumMessageSize; PVOID ConnectData = NULL; ULONG ConnectDataLength = 0; - PSECTION_OBJECT SectionObject; + PVOID SectionObject; LARGE_INTEGER SectionOffset; PEPORT ConnectedPort; KPROCESSOR_MODE PreviousMode; @@ -775,7 +775,7 @@ */ if (WriteMap != NULL) { - PSECTION_OBJECT SectionObject; + PVOID SectionObject; LARGE_INTEGER SectionOffset; Status = ObReferenceObjectByHandle(WriteMap->SectionHandle, _____ Modified: trunk/reactos/ntoskrnl/mm/anonmem.c --- trunk/reactos/ntoskrnl/mm/anonmem.c 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/ntoskrnl/mm/anonmem.c 2006-01-08 06:23:17 UTC (rev 20696) @@ -137,7 +137,7 @@ PMM_PAGEOP PageOp) { PFN_TYPE Page; - BOOL WasDirty; + BOOLEAN WasDirty; SWAPENTRY SwapEntry; NTSTATUS Status; _____ Modified: trunk/reactos/ntoskrnl/mm/i386/page.c --- trunk/reactos/ntoskrnl/mm/i386/page.c 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/ntoskrnl/mm/i386/page.c 2006-01-08 06:23:17 UTC (rev 20696) @@ -796,7 +796,7 @@ VOID NTAPI -MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOL* WasDirty, PPFN_TYPE Page) +MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_TYPE Page) /* * FUNCTION: Delete a virtual mapping */ @@ -916,8 +916,8 @@ VOID NTAPI -MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOL FreePage, - BOOL* WasDirty, PPFN_TYPE Page) +MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage, + BOOLEAN* WasDirty, PPFN_TYPE Page) /* * FUNCTION: Delete a virtual mapping */ _____ Modified: trunk/reactos/ntoskrnl/mm/marea.c --- trunk/reactos/ntoskrnl/mm/marea.c 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/ntoskrnl/mm/marea.c 2006-01-08 06:23:17 UTC (rev 20696) @@ -767,7 +767,7 @@ } else { - BOOL Dirty = FALSE; + BOOLEAN Dirty = FALSE; SWAPENTRY SwapEntry = 0; PFN_TYPE Page = 0; _____ Modified: trunk/reactos/ntoskrnl/mm/pageop.c --- trunk/reactos/ntoskrnl/mm/pageop.c 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/ntoskrnl/mm/pageop.c 2006-01-08 06:23:17 UTC (rev 20696) @@ -136,7 +136,7 @@ PMM_PAGEOP NTAPI MmGetPageOp(PMEMORY_AREA MArea, HANDLE Pid, PVOID Address, - PMM_SECTION_SEGMENT Segment, ULONG Offset, ULONG OpType, BOOL First) + PMM_SECTION_SEGMENT Segment, ULONG Offset, ULONG OpType, BOOLEAN First) /* * FUNCTION: Get a page operation descriptor corresponding to * the memory area and either the segment, offset pair or the _____ Modified: trunk/reactos/ntoskrnl/mm/rmap.c --- trunk/reactos/ntoskrnl/mm/rmap.c 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/ntoskrnl/mm/rmap.c 2006-01-08 06:23:17 UTC (rev 20696) @@ -353,7 +353,7 @@ ExReleaseFastMutex(&RmapListLock); } -BOOL +BOOLEAN NTAPI MmIsDirtyPageRmap(PFN_TYPE Page) { _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/ntoskrnl/mm/section.c 2006-01-08 06:23:17 UTC (rev 20696) @@ -1333,7 +1333,7 @@ MmPageOutDeleteMapping(PVOID Context, PEPROCESS Process, PVOID Address) { MM_SECTION_PAGEOUT_CONTEXT* PageOutContext; - BOOL WasDirty; + BOOLEAN WasDirty; PFN_TYPE Page; PageOutContext = (MM_SECTION_PAGEOUT_CONTEXT*)Context; @@ -2151,7 +2151,7 @@ OBJ_PERMANENT, NULL, NULL); - Status = MmCreateSection(&PhysSection, + Status = MmCreateSection((PVOID)&PhysSection, SECTION_ALL_ACCESS, &Obj, &SectionSize, @@ -3363,7 +3363,7 @@ IN HANDLE FileHandle OPTIONAL) { LARGE_INTEGER SafeMaximumSize; - PSECTION_OBJECT SectionObject; + PVOID SectionObject; KPROCESSOR_MODE PreviousMode; NTSTATUS Status = STATUS_SUCCESS; @@ -4814,7 +4814,7 @@ * @implemented */ NTSTATUS STDCALL -MmCreateSection (OUT PSECTION_OBJECT * SectionObject, +MmCreateSection (OUT PVOID * Section, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, IN PLARGE_INTEGER MaximumSize, @@ -4824,6 +4824,7 @@ IN PFILE_OBJECT File OPTIONAL) { ULONG Protection; + PSECTION_OBJECT *SectionObject = (PSECTION_OBJECT *)Section; /* * Check the protection _____ Modified: trunk/reactos/ntoskrnl/mm/virtual.c --- trunk/reactos/ntoskrnl/mm/virtual.c 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/ntoskrnl/mm/virtual.c 2006-01-08 06:23:17 UTC (rev 20696) @@ -113,7 +113,7 @@ NTSTATUS FASTCALL MiQueryVirtualMemory (IN HANDLE ProcessHandle, IN PVOID Address, - IN CINT VirtualMemoryInformationClass, + IN MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, OUT PVOID VirtualMemoryInformation, IN ULONG Length, OUT PULONG ResultLength) _____ Modified: trunk/reactos/ntoskrnl/rtl/nls.c --- trunk/reactos/ntoskrnl/rtl/nls.c 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/ntoskrnl/rtl/nls.c 2006-01-08 06:23:17 UTC (rev 20696) @@ -33,7 +33,7 @@ static PUSHORT NlsUnicodeCasemapTable = NULL; static ULONG NlsUnicodeCasemapTableSize = 0; -PSECTION_OBJECT NlsSectionObject = NULL; +PVOID NlsSectionObject = NULL; static PVOID NlsSectionBase = NULL; static ULONG NlsSectionViewSize = 0; _____ Modified: trunk/reactos/w32api/include/ddk/ntifs.h --- trunk/reactos/w32api/include/ddk/ntifs.h 2006-01-08 04:36:33 UTC (rev 20695) +++ trunk/reactos/w32api/include/ddk/ntifs.h 2006-01-08 06:23:17 UTC (rev 20696) @@ -530,7 +530,6 @@ typedef struct _KQUEUE *PKQUEUE; typedef struct _KTRAP_FRAME *PKTRAP_FRAME; typedef struct _OBJECT_DIRECTORY *POBJECT_DIRECTORY; -typedef struct _SECTION_OBJECT *PSECTION_OBJECT; typedef struct _SHARED_CACHE_MAP *PSHARED_CACHE_MAP; typedef struct _VACB *PVACB; typedef struct _VAD_HEADER *PVAD_HEADER; @@ -3423,21 +3422,6 @@ #endif -NTKERNELAPI -NTSTATUS -NTAPI -MmMapViewOfSection ( - IN PVOID SectionObject, - IN PEPROCESS Process, - IN OUT PVOID *BaseAddress, - IN ULONG ZeroBits, - IN ULONG CommitSize, - IN OUT PLARGE_INTEGER SectionOffset OPTIONAL, - IN OUT PULONG ViewSize, - IN SECTION_INHERIT InheritDisposition, - IN ULONG AllocationType, - IN ULONG Protect -); NTKERNELAPI BOOLEAN _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2006-01-08 04:36:33 UTC (rev 20695) [truncated at 1000 lines; 85 more skipped]

18 years, 8 months

[ion] 20695: - Remove auto-geenrated file.

by ion＠svn.reactos.org

- Remove auto-geenrated file. Deleted: trunk/reactos/lib/libxml2/libxml2_auto.vcproj _____ Deleted: trunk/reactos/lib/libxml2/libxml2_auto.vcproj --- trunk/reactos/lib/libxml2/libxml2_auto.vcproj 2006-01-08 02:39:11 UTC (rev 20694) +++ trunk/reactos/lib/libxml2/libxml2_auto.vcproj 2006-01-08 04:36:33 UTC (rev 20695) @@ -1,297 +0,0 @@ -<?xml version="1.0" encoding = "Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="libxml2" - ProjectGUID="88A12B0A-50F8-4114-A26B-6961FAC9B551" - Keyword="Win32Proj"> - <Platforms> - <Platform - Name="Win32"/> - </Platforms> - <ToolFiles> - <ToolFile - RelativePath="../../gccasm.rules"/> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="..\..\output-i386\lib\libxml2\Debug" - IntermediateDirectory="..\..\obj-i386\lib\libxml2\Debug" - ConfigurationType="4" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="./;include;../../.;../../include;../../inc lude/reactos;../../include/libs;../../include/drivers;../../include/subs ys;../../include/ndk" - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SW PRINTFS;STDCALL=__stdcall;HAVE_CONFIG_H;__USE_W32API;WIN32;_WINDOWS;_MBC S;HAVE_WIN32_THREADS;_REENTRANT;_WINSOCKAPI_;_M_IX86;_X86_;__i386__;_REA CTOS_;KDBG;DBG;CONFIG_SMP;_DEBUG;_LIB" - MinimalRebuild="TRUE" - BasicRuntimeChecks="3" - RuntimeLibrary="5" - BufferSecurityCheck="TRUE" - EnableFunctionLevelLinking="TRUE" - UsePrecompiledHeader="0" - WholeProgramOptimization="FALSE" - EnablePREfast="TRUE" - DisableSpecificWarnings="4201;4127" - WarningLevel="4" - Detect64BitPortabilityProblems="TRUE" - CompileAs="1" - DebugInformationFormat="4"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/libxml2.lib"/> - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="./;include;../../.;../../include;../../inc lude/reactos;../../include/libs;../../include/drivers;../../include/subs ys;../../include/ndk"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="..\..\output-i386\lib\libxml2\Release" - IntermediateDirectory="..\..\obj-i386\lib\libxml2\Release" - ConfigurationType="4" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="./;include;../../.;../../include;../../inc lude/reactos;../../include/libs;../../include/drivers;../../include/subs ys;../../include/ndk" - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SW PRINTFS;STDCALL=__stdcall;HAVE_CONFIG_H;__USE_W32API;WIN32;_WINDOWS;_MBC S;HAVE_WIN32_THREADS;_REENTRANT;_WINSOCKAPI_;_M_IX86;_X86_;__i386__;_REA CTOS_;KDBG;DBG;CONFIG_SMP;_DEBUG;_LIB;NDEBUG;_LIB" - MinimalRebuild="TRUE" - BasicRuntimeChecks="0" - RuntimeLibrary="5" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="FALSE" - UsePrecompiledHeader="0" - WholeProgramOptimization="TRUE" - FavorSizeOrSpeed="1" - StringPooling="true" - EnablePREfast="FALSE" - DisableSpecificWarnings="4201;4127" - WarningLevel="0" - Detect64BitPortabilityProblems="FALSE" - CompileAs="1" - DebugInformationFormat="4"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/libxml2.lib"/> - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="./;include;../../.;../../include;../../inc lude/reactos;../../include/libs;../../include/drivers;../../include/subs ys;../../include/ndk"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - </Configuration> - <Configuration - Name="Speed|Win32" - OutputDirectory="..\..\output-i386\lib\libxml2\Speed" - IntermediateDirectory="..\..\obj-i386\lib\libxml2\Speed" - ConfigurationType="4" - CharacterSet="2"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="./;include;../../.;../../include;../../inc lude/reactos;../../include/libs;../../include/drivers;../../include/subs ys;../../include/ndk" - PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SW PRINTFS;STDCALL=__stdcall;HAVE_CONFIG_H;__USE_W32API;WIN32;_WINDOWS;_MBC S;HAVE_WIN32_THREADS;_REENTRANT;_WINSOCKAPI_;_M_IX86;_X86_;__i386__;_REA CTOS_;KDBG;DBG;CONFIG_SMP;_DEBUG;_LIB;NDEBUG;_LIB;NDEBUG;_LIB" - MinimalRebuild="FALSE" - BasicRuntimeChecks="0" - RuntimeLibrary="5" - BufferSecurityCheck="FALSE" - EnableFunctionLevelLinking="FALSE" - UsePrecompiledHeader="0" - WholeProgramOptimization="FALSE" - EnablePREfast="FALSE" - DisableSpecificWarnings="4201;4127" - WarningLevel="4" - Detect64BitPortabilityProblems="TRUE" - CompileAs="1" - DebugInformationFormat="0"/> - <Tool - Name="VCCustomBuildTool"/> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/libxml2.lib"/> - <Tool - Name="VCResourceCompilerTool" - AdditionalIncludeDirectories="./;include;../../.;../../include;../../inc lude/reactos;../../include/libs;../../include/drivers;../../include/subs ys;../../include/ndk"/> - <Tool - Name="VCMIDLTool"/> - <Tool - Name="VCPostBuildEventTool"/> - <Tool - Name="VCPreBuildEventTool"/> - <Tool - Name="VCPreLinkEventTool"/> - <Tool - Name="VCWebServiceProxyGeneratorTool"/> - <Tool - Name="VCWebDeploymentTool"/> - </Configuration> - </Configurations> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;S"> - <File - RelativePath=".\c14n.c"> - </File> - <File - RelativePath=".\catalog.c"> - </File> - <File - RelativePath=".\chvalid.c"> - </File> - <File - RelativePath=".\debugXML.c"> - </File> - <File - RelativePath=".\dict.c"> - </File> - <File - RelativePath=".\DOCBparser.c"> - </File> - <File - RelativePath=".\encoding.c"> - </File> - <File - RelativePath=".\entities.c"> - </File> - <File - RelativePath=".\error.c"> - </File> - <File - RelativePath=".\globals.c"> - </File> - <File - RelativePath=".\hash.c"> - </File> - <File - RelativePath=".\HTMLparser.c"> - </File> - <File - RelativePath=".\HTMLtree.c"> - </File> - <File - RelativePath=".\legacy.c"> - </File> - <File - RelativePath=".\list.c"> - </File> - <File - RelativePath=".\nanoftp.c"> - </File> - <File - RelativePath=".\nanohttp.c"> - </File> - <File - RelativePath=".\parser.c"> - </File> - <File - RelativePath=".\parserInternals.c"> - </File> - <File - RelativePath=".\pattern.c"> - </File> - <File - RelativePath=".\relaxng.c"> - </File> - <File - RelativePath=".\SAX.c"> - </File> - <File - RelativePath=".\SAX2.c"> - </File> - <File - RelativePath=".\threads.c"> - </File> - <File - RelativePath=".\tree.c"> - </File> - <File - RelativePath=".\uri.c"> - </File> - <File - RelativePath=".\valid.c"> - </File> - <File - RelativePath=".\xinclude.c"> - </File> - <File - RelativePath=".\xlink.c"> - </File> - <File - RelativePath=".\xmlIO.c"> - </File> - <File - RelativePath=".\xmlmemory.c"> - </File> - <File - RelativePath=".\xmlreader.c"> - </File> - <File - RelativePath=".\xmlregexp.c"> - </File> - <File - RelativePath=".\xmlmodule.c"> - </File> - <File - RelativePath=".\xmlsave.c"> - </File> - <File - RelativePath=".\xmlschemas.c"> - </File> - <File - RelativePath=".\xmlschemastypes.c"> - </File> - <File - RelativePath=".\xmlunicode.c"> - </File> - <File - RelativePath=".\xmlwriter.c"> - </File> - <File - RelativePath=".\xpath.c"> - </File> - <File - RelativePath=".\xpointer.c"> - </File> - <File - RelativePath=".\xmlstring.c"> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl"> - </Filter> - <Filter - Name="Resource Files" - Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject>

18 years, 8 months

[cwittich] 20694: fix pch bug (patch by Brezenbak)

by cwittich＠svn.reactos.org

fix pch bug (patch by Brezenbak) Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-08 01:24:27 UTC (rev 20693) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-08 02:39:11 UTC (rev 20694) @@ -321,6 +321,9 @@ string pch_path = Path::RelativeFromDirectory ( module.pch->file.name, module.GetBasePath() ); + string::size_type pos = pch_path.find_last_of ("/"); + if ( pos != string::npos ) + pch_path.erase(0, pos+1); fprintf ( OUT, "\t\t\t\tPrecompiledHeaderThrough=\"%s\"\r\n", pch_path.c_str() ); } else

18 years, 8 months

← Newer
1
...
36
37
38
39
40
41
42
...
59
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 January 2006