Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 20707: - userinit, usetup, vmwinst, welcome, winefile, winlogon, winver.
by ion＠svn.reactos.org 08 Jan '06

08 Jan '06

- userinit, usetup, vmwinst, welcome, winefile, winlogon, winver. Modified: trunk/reactos/subsys/system/userinit/userinit.c Modified: trunk/reactos/subsys/system/usetup/cabinet.c Modified: trunk/reactos/subsys/system/usetup/settings.c Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.c Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/userinit/userinit.c --- trunk/reactos/subsys/system/userinit/userinit.c 2006-01-08 10:19:21 UTC (rev 20706) +++ trunk/reactos/subsys/system/userinit/userinit.c 2006-01-08 10:23:23 UTC (rev 20707) @@ -26,6 +26,7 @@ #include <cfgmgr32.h> #include "resource.h" +#define CMP_MAGIC 0x01234567 /* GLOBALS ******************************************************************/ _____ Modified: trunk/reactos/subsys/system/usetup/cabinet.c --- trunk/reactos/subsys/system/usetup/cabinet.c 2006-01-08 10:19:21 UTC (rev 20706) +++ trunk/reactos/subsys/system/usetup/cabinet.c 2006-01-08 10:23:23 UTC (rev 20707) @@ -67,12 +67,12 @@ /* Needed by zlib, but we don't want the dependency on msvcrt.dll */ -void free(void* _ptr) +void __cdecl free(void* _ptr) { RtlFreeHeap(ProcessHeap, 0, _ptr); } -void* calloc(size_t _nmemb, size_t _size) +void* __cdecl calloc(size_t _nmemb, size_t _size) { return (void*)RtlAllocateHeap (ProcessHeap, HEAP_ZERO_MEMORY, _size); } _____ Modified: trunk/reactos/subsys/system/usetup/settings.c --- trunk/reactos/subsys/system/usetup/settings.c 2006-01-08 10:19:21 UTC (rev 20706) +++ trunk/reactos/subsys/system/usetup/settings.c 2006-01-08 10:23:23 UTC (rev 20707) @@ -505,6 +505,9 @@ PWCHAR ServiceName; ULONG StartValue; NTSTATUS Status; + WCHAR RegPath [255]; + PWCHAR Buffer; + ULONG Width, Hight, Bpp; DPRINT("ProcessDisplayRegistry() called\n"); @@ -546,16 +549,14 @@ } /* Set the resolution */ - WCHAR RegPath [255]; swprintf(RegPath, L"\\Registry\\Machine\\System\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\%s\\Device0", ServiceName); - PWCHAR Buffer; if (!InfGetDataField(Context, 4, &Buffer)) { DPRINT("InfGetDataField() failed\n"); return FALSE; } - ULONG Width = wcstoul(Buffer, NULL, 10); + Width = wcstoul(Buffer, NULL, 10); Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, RegPath, L"DefaultSettings.XResolution", @@ -574,7 +575,7 @@ DPRINT("InfGetDataField() failed\n"); return FALSE; } - ULONG Hight = wcstoul(Buffer, 0, 0); + Hight = wcstoul(Buffer, 0, 0); Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, RegPath, L"DefaultSettings.YResolution", @@ -592,7 +593,7 @@ DPRINT("InfGetDataField() failed\n"); return FALSE; } - ULONG Bpp = wcstoul(Buffer, 0, 0); + Bpp = wcstoul(Buffer, 0, 0); Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, RegPath, L"DefaultSettings.BitsPerPel", _____ Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.c --- trunk/reactos/subsys/system/vmwinst/vmwinst.c 2006-01-08 10:19:21 UTC (rev 20706) +++ trunk/reactos/subsys/system/vmwinst/vmwinst.c 2006-01-08 10:23:23 UTC (rev 20707) @@ -77,10 +77,15 @@ /* Try using a VMware I/O port. If not running in VMware this'll throw an exception! */ +#ifndef _MSC_VER __asm__ __volatile__("inl %%dx, %%eax" : "=a" (ver), "=b" (magic) : "0" (0x564d5868), "d" (0x5658), "c" (0xa)); +#else +#error PLEASE WRITE THIS IN ASSEMBLY +#endif + if(magic == 0x564d5868) { *Version = ver; @@ -485,6 +490,7 @@ LPARAM lParam ) { + LPNMHDR pnmh = (LPNMHDR)lParam; switch(uMsg) { case WM_NOTIFY: @@ -495,7 +501,6 @@ hwndControl = GetParent(hwndDlg); CenterWindow (hwndControl); - LPNMHDR pnmh = (LPNMHDR)lParam; switch(pnmh->code) { case PSN_SETACTIVE: @@ -822,6 +827,7 @@ LPARAM lParam ) { + LPNMHDR pnmh = (LPNMHDR)lParam; switch(uMsg) { case WM_INITDIALOG: @@ -860,7 +866,6 @@ hwndControl = GetParent(hwndDlg); CenterWindow (hwndControl); - LPNMHDR pnmh = (LPNMHDR)lParam; switch(pnmh->code) { case PSN_SETACTIVE: _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2006-01-08 10:19:21 UTC (rev 20706) +++ trunk/reactos/subsys/system/winefile/winefile.c 2006-01-08 10:23:23 UTC (rev 20707) @@ -1125,7 +1125,7 @@ } /* directories first... */ -static int compareType(const WIN32_FIND_DATA* fd1, const WIN32_FIND_DATA* fd2) +static int __cdecl compareType(const WIN32_FIND_DATA* fd1, const WIN32_FIND_DATA* fd2) { int order1 = fd1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY? TO_DIR: TO_FILE; int order2 = fd2->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY? TO_DIR: TO_FILE; @@ -1140,7 +1140,7 @@ } -static int compareName(const void* arg1, const void* arg2) +static int __cdecl compareName(const void* arg1, const void* arg2) { const WIN32_FIND_DATA* fd1 = &(*(const Entry* const*)arg1)->data; const WIN32_FIND_DATA* fd2 = &(*(const Entry* const*)arg2)->data; @@ -1152,7 +1152,7 @@ return lstrcmpi(fd1->cFileName, fd2->cFileName); } -static int compareExt(const void* arg1, const void* arg2) +static int __cdecl compareExt(const void* arg1, const void* arg2) { const WIN32_FIND_DATA* fd1 = &(*(const Entry* const*)arg1)->data; const WIN32_FIND_DATA* fd2 = &(*(const Entry* const*)arg2)->data; @@ -1185,7 +1185,7 @@ return lstrcmpi(name1, name2); } -static int compareSize(const void* arg1, const void* arg2) +static int __cdecl compareSize(const void* arg1, const void* arg2) { const WIN32_FIND_DATA* fd1 = &(*(const Entry* const*)arg1)->data; const WIN32_FIND_DATA* fd2 = &(*(const Entry* const*)arg2)->data; @@ -1206,7 +1206,7 @@ return cmp<0? -1: cmp>0? 1: 0; } -static int compareDate(const void* arg1, const void* arg2) +static int __cdecl compareDate(const void* arg1, const void* arg2) { const WIN32_FIND_DATA* fd1 = &(*(const Entry* const*)arg1)->data; const WIN32_FIND_DATA* fd2 = &(*(const Entry* const*)arg2)->data; @@ -1219,7 +1219,7 @@ } -static int (*sortFunctions[])(const void* arg1, const void* arg2) = { +static int (__cdecl *sortFunctions[])(const void* arg1, const void* arg2) = { compareName, /* SORT_NAME */ compareExt, /* SORT_EXT */ compareSize, /* SORT_SIZE */

1 0

[ion] 20706: Thanks gge..
by ion＠svn.reactos.org 08 Jan '06

08 Jan '06

Thanks gge.. Modified: trunk/reactos/hal/hal/hal.c _____ Modified: trunk/reactos/hal/hal/hal.c --- trunk/reactos/hal/hal/hal.c 2006-01-08 10:14:14 UTC (rev 20705) +++ trunk/reactos/hal/hal/hal.c 2006-01-08 10:19:21 UTC (rev 20706) @@ -133,6 +133,7 @@ ULONG Unknown2) { UNIMPLEMENTED; + return NULL; }

1 0

[fireball] 20705: Merge r20642
by fireball＠svn.reactos.org 08 Jan '06

08 Jan '06

Merge r20642 Modified: branches/usb2_6/reactos/include/reactos/debug.h _____ Modified: branches/usb2_6/reactos/include/reactos/debug.h --- branches/usb2_6/reactos/include/reactos/debug.h 2006-01-08 10:09:23 UTC (rev 20704) +++ branches/usb2_6/reactos/include/reactos/debug.h 2006-01-08 10:14:14 UTC (rev 20705) @@ -82,7 +82,12 @@ #define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0); #else - #ifdef __GNUC__ + #ifdef _MSC_VER + static __inline void DPRINT ( const char* fmt, ... ) + { + UNREFERENCED_PARAMETER(fmt); + } + #else #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #endif #define CHECKPOINT @@ -94,17 +99,18 @@ #else /* On non-debug builds, we never show these */ -#ifdef _MSC_VER -static __inline void DPRINT1 ( const char* fmt, ... ) -{ -} -static __inline void DPRINT ( const char* fmt, ... ) -{ -} -#else - #define DPRINT1(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) - #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) -#endif + #ifdef _MSC_VER + static __inline void DPRINT1 ( const char* fmt, ... ) + { + } + static __inline void DPRINT ( const char* fmt, ... ) + { + } + #else + #define DPRINT1(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + #endif + #define CHECKPOINT1 #define CHECKPOINT #define UNIMPLEMENTED

1 0

[ion] 20704: - PCHify notepad and add missing header from regedit.
by ion＠svn.reactos.org 08 Jan '06

08 Jan '06

- PCHify notepad and add missing header from regedit. Modified: trunk/reactos/subsys/system/notepad/dialog.c Modified: trunk/reactos/subsys/system/notepad/license.c Modified: trunk/reactos/subsys/system/notepad/main.c Added: trunk/reactos/subsys/system/notepad/notepad.h Modified: trunk/reactos/subsys/system/notepad/notepad.xml Modified: trunk/reactos/subsys/system/notepad/settings.c Modified: trunk/reactos/subsys/system/notepad/text.c Added: trunk/reactos/subsys/system/regedit/regedit.h _____ Modified: trunk/reactos/subsys/system/notepad/dialog.c --- trunk/reactos/subsys/system/notepad/dialog.c 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/notepad/dialog.c 2006-01-08 10:09:23 UTC (rev 20704) @@ -20,21 +20,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define UNICODE -#define _UNICODE +#include <notepad.h> -#define _CRT_SECURE_NO_DEPRECATE - -#include <assert.h> -#include <stdio.h> -#include <windows.h> -#include <commdlg.h> -#include <tchar.h> - -#include "main.h" -#include "license.h" -#include "dialog.h" - static const WCHAR helpfileW[] = { 'n','o','t','e','p','a','d','.','h','l','p',0 }; static INT_PTR WINAPI DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam); _____ Modified: trunk/reactos/subsys/system/notepad/license.c --- trunk/reactos/subsys/system/notepad/license.c 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/notepad/license.c 2006-01-08 10:09:23 UTC (rev 20704) @@ -18,14 +18,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <windows.h> -#include "license.h" +#include <notepad.h> VOID WineLicense(HWND Wnd) { /* FIXME: should load strings from resources */ LICENSE *License = &WineLicense_En; - MessageBox(Wnd, License->License, License->LicenseCaption, + MessageBoxA(Wnd, License->License, License->LicenseCaption, MB_ICONINFORMATION | MB_OK); } @@ -34,7 +33,7 @@ { /* FIXME: should load strings from resources */ LICENSE *License = &WineLicense_En; - MessageBox(Wnd, License->Warranty, License->WarrantyCaption, + MessageBoxA(Wnd, License->Warranty, License->WarrantyCaption, MB_ICONEXCLAMATION | MB_OK); } _____ Modified: trunk/reactos/subsys/system/notepad/main.c --- trunk/reactos/subsys/system/notepad/main.c 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/notepad/main.c 2006-01-08 10:09:23 UTC (rev 20704) @@ -22,19 +22,8 @@ * */ -#define UNICODE -#define _UNICODE +#include <notepad.h> -#define _CRT_SECURE_NO_DEPRECATE - -#include <windows.h> -#include <stdio.h> -#include <tchar.h> - -#include "main.h" -#include "dialog.h" -#include "notepad_res.h" - NOTEPAD_GLOBALS Globals; static ATOM aFINDMSGSTRING; _____ Added: trunk/reactos/subsys/system/notepad/notepad.h --- trunk/reactos/subsys/system/notepad/notepad.h 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/notepad/notepad.h 2006-01-08 10:09:23 UTC (rev 20704) @@ -0,0 +1,15 @@ +#define UNICODE +#define _UNICODE + +#define _CRT_SECURE_NO_DEPRECATE + +#include <assert.h> +#include <stdio.h> +#include <windows.h> +#include <commdlg.h> +#include <tchar.h> + +#include "main.h" +#include "license.h" +#include "dialog.h" + _____ Modified: trunk/reactos/subsys/system/notepad/notepad.xml --- trunk/reactos/subsys/system/notepad/notepad.xml 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/notepad/notepad.xml 2006-01-08 10:09:23 UTC (rev 20704) @@ -15,4 +15,5 @@ <file>text.c</file> <file>settings.c</file> <file>rsrc.rc</file> + <pch>notepad.h</pch> </module> _____ Modified: trunk/reactos/subsys/system/notepad/settings.c --- trunk/reactos/subsys/system/notepad/settings.c 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/notepad/settings.c 2006-01-08 10:09:23 UTC (rev 20704) @@ -20,17 +20,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define UNICODE -#define _UNICODE +#include <notepad.h> -#include <assert.h> -#include <stdio.h> -#include <windows.h> -#include <commdlg.h> -#include <tchar.h> - -#include "main.h" - static const TCHAR s_szRegistryKey[] = { 'S','o','f','t','w','a','r','e', '\\','M','i','c','r','o','s','o','f','t', '\\','N','o','t','e','p','a','d',0 }; _____ Modified: trunk/reactos/subsys/system/notepad/text.c --- trunk/reactos/subsys/system/notepad/text.c 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/notepad/text.c 2006-01-08 10:09:23 UTC (rev 20704) @@ -20,15 +20,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define UNICODE +#include <notepad.h> -#include <assert.h> -#include <stdio.h> -#include <windows.h> -#include <commdlg.h> - -#include "main.h" - static BOOL Append(LPWSTR *ppszText, DWORD *pdwTextLen, LPCWSTR pszAppendText, DWORD dwAppendLen) { LPWSTR pszNewText; _____ Added: trunk/reactos/subsys/system/regedit/regedit.h --- trunk/reactos/subsys/system/regedit/regedit.h 2006-01-08 10:05:37 UTC (rev 20703) +++ trunk/reactos/subsys/system/regedit/regedit.h 2006-01-08 10:09:23 UTC (rev 20704) @@ -0,0 +1,29 @@ +#ifndef _REGEDIT_H +#define _REGEDIT_H + +#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ +#include <windows.h> +#include <commctrl.h> +#include <shellapi.h> +#include <shlwapi.h> +#include <stdlib.h> +#include <tchar.h> +#include <process.h> +#include <stdio.h> +#include <limits.h> +#include <accctrl.h> +#include <objbase.h> +#include <basetyps.h> +#include <unknwn.h> +#include <aclui.h> +#include <commdlg.h> +#include <cderr.h> +#include <ole2.h> +#include <objbase.h> +#include <objsel.h> +#include <assert.h> +#include "main.h" +#include "regproc.h" +#include "hexedit.h" +#include "security.h" +#endif

1 0

[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 08 Jan '06

08 Jan '06

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

1 0

[fireball] 20702: USB stack adapted from Linux 2.6.14.3.
by fireball＠svn.reactos.org 08 Jan '06

08 Jan '06

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]

1 0

[ros-diffs] [ion] 20701: - get csrss, ntvdm, smss compiling on msvc.
by ion＠svn.reactos.org 08 Jan '06

08 Jan '06

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

1 0

[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 08 Jan '06

08 Jan '06

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

1 0

[ion] 20699: - Oops....
by ion＠svn.reactos.org 08 Jan '06

08 Jan '06

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

1 0

[ion] 20698: - Bless halxbox too.
by ion＠svn.reactos.org 08 Jan '06

08 Jan '06

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

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs