Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[sserapion] 34758: Fix cast from pointer to integer of different size
by sserapion＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: sserapion Date: Thu Jul 24 16:32:08 2008 New Revision: 34758 URL: http://svn.reactos.org/svn/reactos?rev=34758&view=rev Log: Fix cast from pointer to integer of different size Modified: branches/ros-amd64-bringup/reactos/base/setup/welcome/welcome.c Modified: branches/ros-amd64-bringup/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/setup/welcome/welcome.c [iso-8859-1] Thu Jul 24 16:32:08 2008 @@ -179,7 +179,7 @@ rcRightPanel.left = rcLeftPanel.right; rcRightPanel.right = ulInnerWidth - 1; - if (!LoadString(hInstance, (UINT)MAKEINTRESOURCE(IDS_APPTITLE), szAppTitle, 80)) + if (!LoadString(hInstance, (UINT_PTR)MAKEINTRESOURCE(IDS_APPTITLE), szAppTitle, 80)) _tcscpy(szAppTitle, TEXT("ReactOS Welcome")); /* Create main window */

1 0

[janderwald] 34757: - enumerate all file types for folder options namespace applet - use mui string when available - load the title from shell32 module base - remove PSH_PROPTITLE flag
by janderwald＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: janderwald Date: Thu Jul 24 16:26:36 2008 New Revision: 34757 URL: http://svn.reactos.org/svn/reactos?rev=34757&view=rev Log: - enumerate all file types for folder options namespace applet - use mui string when available - load the title from shell32 module base - remove PSH_PROPTITLE flag Modified: trunk/reactos/dll/win32/shell32/folder_options.c Modified: trunk/reactos/dll/win32/shell32/folder_options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folder_o… ============================================================================== --- trunk/reactos/dll/win32/shell32/folder_options.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folder_options.c [iso-8859-1] Thu Jul 24 16:26:36 2008 @@ -80,6 +80,105 @@ return FALSE; } +VOID +InitializeFileTypesListCtrlColumns(HWND hDlgCtrl) +{ + RECT clientRect; + LVCOLUMNW col; + WCHAR szName[50]; + + if (!LoadStringW(shell32_hInstance, IDS_COLUMN_EXTENSION, szName, sizeof(szName) / sizeof(WCHAR))) + szName[0] = 0; + szName[(sizeof(szName)/sizeof(WCHAR))-1] = 0; + + GetClientRect(hDlgCtrl, &clientRect); + ZeroMemory(&col, sizeof(LV_COLUMN)); + col.mask = LVCF_SUBITEM | LVCF_WIDTH | LVCF_FMT; + col.iSubItem = 0; + col.pszText = szName; + col.fmt = LVCFMT_LEFT; + col.cx = (clientRect.right - clientRect.left) - GetSystemMetrics(SM_CXVSCROLL); + (void)ListView_InsertColumnW(hDlgCtrl, 0, &col); +} +INT +FindItem(HWND hDlgCtrl, WCHAR * ItemName) +{ + LVFINDINFOW findInfo; + ZeroMemory(&findInfo, sizeof(LVFINDINFOW)); + + findInfo.flags = LVFI_STRING; + findInfo.psz = ItemName; + return ListView_FindItem(hDlgCtrl, 0, &findInfo); +} + +VOID +InsertFileType(HWND hDlgCtrl, WCHAR * szName, DWORD Size, INT iItem) +{ + WCHAR szPath[100]; + HKEY hKey; + LVITEMW lvItem; + DWORD dwSize; + + if (FindItem(hDlgCtrl, szName) != -1) + return; + + wcscpy(szPath, szName); + /* get the name */ + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szPath, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + if (RegLoadMUIStringW(hKey, L"FriendlyTypeName", szName, Size, NULL, 0, NULL) != ERROR_SUCCESS) + { + dwSize = Size; + if (RegQueryValueExW(hKey, NULL, NULL, NULL, (LPBYTE)szName, &dwSize) != ERROR_SUCCESS) + { + wcscpy(szName, szPath); + } + } + RegCloseKey(hKey); + szName[(Size/sizeof(WCHAR))-1] = 0; + } + wcscat(szPath, L"\\shell"); + + ZeroMemory(&lvItem, sizeof(LVITEMW)); + lvItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE; + lvItem.state = LVIS_SELECTED; + lvItem.pszText = szName; + lvItem.iItem = iItem; + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szPath, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + lvItem.lParam = 0; + (void)ListView_InsertItemW(hDlgCtrl, &lvItem); + RegCloseKey(hKey); + } +} + +BOOL +InitializeFileTypesListCtrl(HWND hwndDlg) +{ + HWND hDlgCtrl; + DWORD dwIndex = 0; + WCHAR szName[50]; + DWORD dwName; + INT iItem = 0; + + + hDlgCtrl = GetDlgItem(hwndDlg, 14000); + InitializeFileTypesListCtrlColumns(hDlgCtrl); + + + + dwName = sizeof(szName) / sizeof(WCHAR); + + while(RegEnumKeyExW(HKEY_CLASSES_ROOT, dwIndex++, szName, &dwName, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + InsertFileType(hDlgCtrl, szName, sizeof(szName), iItem++); + dwName = sizeof(szName) / sizeof(WCHAR); + } + return TRUE; +} + + INT_PTR CALLBACK FolderOptionsFileTypesDlg( @@ -89,7 +188,12 @@ LPARAM lParam ) { - + switch(uMsg) + { + case WM_INITDIALOG: + InitializeFileTypesListCtrl(hwndDlg); + return TRUE; + } return FALSE; @@ -102,7 +206,7 @@ PROPSHEETHEADERW pinfo; HPROPSHEETPAGE hppages[3]; HPROPSHEETPAGE hpage; - UINT num_pages = 0; + UINT num_pages = 0; WCHAR szOptions[100]; hpage = SH_CreatePropertySheetPage("FOLDER_OPTIONS_GENERAL_DLG", FolderOptionsGeneralDlg, 0, NULL); @@ -116,14 +220,14 @@ hpage = SH_CreatePropertySheetPage("FOLDER_OPTIONS_FILETYPES_DLG", FolderOptionsFileTypesDlg, 0, NULL); if (hpage) hppages[num_pages++] = hpage; - + szOptions[0] = L'\0'; - LoadStringW(hInst, IDS_FOLDER_OPTIONS, szOptions, sizeof(szOptions) / sizeof(WCHAR)); - szOptions[99] = L'\0'; - + LoadStringW(shell32_hInstance, IDS_FOLDER_OPTIONS, szOptions, sizeof(szOptions) / sizeof(WCHAR)); + szOptions[(sizeof(szOptions)/sizeof(WCHAR))-1] = L'\0'; + memset(&pinfo, 0x0, sizeof(PROPSHEETHEADERW)); pinfo.dwSize = sizeof(PROPSHEETHEADERW); - pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE; + pinfo.dwFlags = PSH_NOCONTEXTHELP; pinfo.nPages = num_pages; pinfo.u3.phpage = hppages; pinfo.pszCaption = szOptions;

1 0

[tkreuzer] 34756: ntoskrnl: for now comment out all files that don't compile, the linker now get's a "-Wl, --file-alignment, 0x1000" that it does not like, let's see what we can do about that
by tkreuzer＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: tkreuzer Date: Thu Jul 24 16:08:31 2008 New Revision: 34756 URL: http://svn.reactos.org/svn/reactos?rev=34756&view=rev Log: ntoskrnl: for now comment out all files that don't compile, the linker now get's a "-Wl,--file-alignment,0x1000" that it does not like, let's see what we can do about that Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Thu Jul 24 16:08:31 2008 @@ -87,30 +87,30 @@ <file>ctxhelp.S</file> </directory> </if> - <file>apc.c</file> - <file>balmgr.c</file> - <file>bug.c</file> - <file>clock.c</file> +  +  +  +  <file>config.c</file> <file>devqueue.c</file> - <file>dpc.c</file> +  <file>eventobj.c</file> - <file>except.c</file> - <file>freeldr.c</file> - <file>gate.c</file> - <file>gmutex.c</file> +  +  +  +  <file>ipi.c</file> - <file>krnlinit.c</file> - <file>mutex.c</file> - <file>procobj.c</file> - <file>profobj.c</file> - <file>queue.c</file> - <file>semphobj.c</file> +  +  +  +  +  +  <file>spinlock.c</file> - <file>thrdschd.c</file> - <file>thrdobj.c</file> - <file>timerobj.c</file> - <file>wait.c</file> +  +  +  +  </directory> <directory name="cc"> <file>cacheman.c</file> @@ -145,9 +145,9 @@ <file>cmdata.c</file> <file>cmdelay.c</file> <file>cmindex.c</file> - <file>cminit.c</file> +  <file>cmhook.c</file> - <file>cmkcbncb.c</file> +  <file>cmkeydel.c</file> <file>cmlazy.c</file> <file>cmmapvw.c</file> @@ -155,18 +155,18 @@ <file>cmparse.c</file> <file>cmse.c</file> <file>cmsecach.c</file> - <file>cmsysini.c</file> +  <file>cmvalue.c</file> <file>cmvalche.c</file> <file>cmwraprs.c</file> - <file>ntapi.c</file> +  </directory> <directory name="dbgk"> - <file>dbgkutil.c</file> - <file>dbgkobj.c</file> +  +  </directory> <directory name="ex" root="intermediate"> - <file>zw.S</file> +  </directory> <directory name="ex"> <if property="ARCH" value="i386"> @@ -176,35 +176,35 @@ <file>ioport.S</file> </directory> </if> - <file>atom.c</file> +  <file>callback.c</file> <file>dbgctrl.c</file> <file>efi.c</file> - <file>event.c</file> - <file>evtpair.c</file> +  +  <file>exintrin.c</file> <file>fastinterlck.c</file> <file>fmutex.c</file> - <file>handle.c</file> - <file>harderr.c</file> +  +  <file>hdlsterm.c</file> - <file>init.c</file> +  <file>keyedevt.c</file> - <file>locale.c</file> - <file>lookas.c</file> - <file>mutant.c</file> - <file>pushlock.c</file> - <file>profile.c</file> - <file>resource.c</file> +  +  +  +  +  +  <file>rundown.c</file> - <file>sem.c</file> +  <file>shutdown.c</file> - <file>sysinfo.c</file> - <file>time.c</file> - <file>timer.c</file> - <file>uuid.c</file> +  +  +  +  <file>win32k.c</file> - <file>work.c</file> +  <file>xipdisp.c</file> <file>zone.c</file> </directory> @@ -244,13 +244,13 @@ <file>deviface.c</file> <file>driver.c</file> <file>drvrlist.c</file> - <file>error.c</file> - <file>file.c</file> - <file>iocomp.c</file> +  +  +  <file>ioevent.c</file> - <file>iofunc.c</file> +  <file>iomdl.c</file> - <file>iomgr.c</file> +  <file>iorsrce.c</file> <file>iotimer.c</file> <file>iowork.c</file> @@ -259,12 +259,12 @@ <file>ramdisk.c</file> <file>rawfs.c</file> <file>remlock.c</file> - <file>util.c</file> +  <file>symlink.c</file> - <file>volume.c</file> +  </directory> <directory name="pnpmgr"> - <file>plugplay.c</file> +  <file>pnpdma.c</file> <file>pnpmgr.c</file> <file>pnpnotify.c</file> @@ -287,19 +287,19 @@ </directory> </if> <if property="KDBG" value="1"> - <file>kdb.c</file> - <file>kdb_cli.c</file> - <file>kdb_expr.c</file> +  +  +  <file>kdb_keyboard.c</file> - <file>kdb_serial.c</file> +  </if> <if property="DBG_OR_KDBG" value="true"> - <file>kdb_symbols.c</file> +  </if> </directory> <directory name="kd"> <directory name="wrappers"> - <file>bochs.c</file> +  <if property="ARCH" value="i386"> <file>gdbstub.c</file> </if> @@ -310,7 +310,7 @@ </directory> <file>kdinit.c</file> <file>kdio.c</file> - <file>kdmain.c</file> +  </directory> </if> <if property="_WINKD_" value ="1"> @@ -326,13 +326,13 @@ </if> <directory name="lpc"> <file>close.c</file> - <file>complete.c</file> - <file>connect.c</file> - <file>create.c</file> +  +  +  <file>listen.c</file> <file>port.c</file> - <file>reply.c</file> - <file>send.c</file> +  +  </directory> <directory name="mm"> <if property="ARCH" value="i386"> @@ -351,37 +351,37 @@ <file>page.c</file> </directory> </if> - <file>anonmem.c</file> +  <file>aspace.c</file> <file>balance.c</file> - <file>cont.c</file> +  <file>drvlck.c</file> <file>freelist.c</file> - <file>iospace.c</file> +  <file>kmap.c</file> <file>marea.c</file> - <file>mdlsup.c</file> - <file>mm.c</file> - <file>mminit.c</file> - <file>mpw.c</file> - <file>ncache.c</file> - <file>npool.c</file> - <file>pagefile.c</file> +  +  +  +  +  +  +  <file>pageop.c</file> <file>pager.c</file> <file>pagfault.c</file> <file>paging.c</file> <file>pe.c</file> <file>physical.c</file> - <file>pool.c</file> - <file>ppool.c</file> - <file>procsup.c</file> - <file>region.c</file> +  +  +  +  <file>rmap.c</file> - <file>section.c</file> - <file>sysldr.c</file> +  +  <file>verifier.c</file> - <file>virtual.c</file> +  <file>wset.c</file> <if property="_ELF_" value="1"> <file>elf32.c</file> @@ -389,20 +389,20 @@ </if> </directory> <directory name="ob"> - <file>obdir.c</file> - <file>obinit.c</file> - <file>obhandle.c</file> +  +  +  <file>obname.c</file> <file>oblife.c</file> <file>obref.c</file> - <file>obsdcach.c</file> +  <file>obsecure.c</file> - <file>oblink.c</file> - <file>obwait.c</file> +  +  </directory> <directory name="po"> <file>power.c</file> - <file>events.c</file> +  </directory> <directory name="ps"> <if property="ARCH" value="i386"> @@ -415,18 +415,18 @@ <file>psctx.c</file> </directory> </if> - <file>debug.c</file> - <file>job.c</file> - <file>kill.c</file> +  +  +  <file>psnotify.c</file> - <file>process.c</file> - <file>psmgr.c</file> - <file>query.c</file> +  +  +  <file>quota.c</file> - <file>security.c</file> - <file>state.c</file> - <file>thread.c</file> - <file>win32.c</file> +  +  +  +  </directory> <directory name="rtl"> <if property="ARCH" value="arm"> @@ -434,20 +434,20 @@ <file>rtlexcpt.c</file> </directory> </if> - <file>libsupp.c</file> +  <file>misc.c</file> <file>strtok.c</file> </directory> <directory name="se"> <file>access.c</file> <file>acl.c</file> - <file>audit.c</file> - <file>lsa.c</file> +  +  <file>priv.c</file> - <file>sd.c</file> +  <file>semgr.c</file> <file>sid.c</file> - <file>token.c</file> +  </directory> <directory name="vdm"> <if property="ARCH" value="i386">

1 0

[hpoussin] 34755: Use a common .spec file instead of a .def file per architecture
by hpoussin＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: hpoussin Date: Thu Jul 24 15:54:32 2008 New Revision: 34755 URL: http://svn.reactos.org/svn/reactos?rev=34755&view=rev Log: Use a common .spec file instead of a .def file per architecture Added: trunk/reactos/drivers/base/bootvid/bootvid.spec (with props) Removed: trunk/reactos/drivers/base/bootvid/bootvid_arm.def trunk/reactos/drivers/base/bootvid/bootvid_i386.def Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.rbuild [iso-8859-1] Thu Jul 24 15:54:32 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="bootvid" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="bootvid.dll"> - <importlibrary definition="bootvid_$(ARCH).def"></importlibrary> + <importlibrary definition="bootvid.spec.def"></importlibrary> <bootstrap installbase="$(CDOUTPUT)" nameoncd="bootvid.dll" /> <include base="bootvid">.</include> <library>ntoskrnl</library> @@ -14,11 +14,12 @@ </directory> </if> <if property="ARCH" value="arm"> - <directory name="arm"> + <directory name="arm"> <file>bootvid.c</file> <file>bootdata.c</file> </directory> </if> <file>bootvid.rc</file> + <file>bootvid.spec</file> <pch>precomp.h</pch> </module> Added: trunk/reactos/drivers/base/bootvid/bootvid.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.spec (added) +++ trunk/reactos/drivers/base/bootvid/bootvid.spec [iso-8859-1] Thu Jul 24 15:54:32 2008 @@ -1,0 +1,11 @@ +@ stdcall VidBitBlt(ptr long long) +@ stdcall VidBufferToScreenBlt(ptr long long long long long) +@ stdcall VidCleanUp() +@ stdcall VidDisplayString(str) +@ stdcall VidDisplayStringXY(str long long long) +@ stdcall VidInitialize(long) +@ stdcall VidResetDisplay(long) +@ stdcall VidScreenToBufferBlt(ptr long long long long long) +@ stdcall VidSetScrollRegion(long long long long) +@ stdcall VidSetTextColor(long) +@ stdcall VidSolidColorFill(long long long long long) Propchange: trunk/reactos/drivers/base/bootvid/bootvid.spec ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/drivers/base/bootvid/bootvid_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid_arm.def [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/bootvid_arm.def (removed) @@ -1,15 +1,0 @@ -LIBRARY BOOTVID.DLL - -EXPORTS -VidBitBlt -VidBufferToScreenBlt -VidCleanUp -VidDisplayString -VidDisplayStringXY -VidInitialize -VidResetDisplay -VidScreenToBufferBlt -VidSetScrollRegion -VidSetTextColor -VidSolidColorFill - Removed: trunk/reactos/drivers/base/bootvid/bootvid_i386.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid_i386.def [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/bootvid_i386.def (removed) @@ -1,15 +1,0 @@ -LIBRARY BOOTVID.DLL - -EXPORTS -VidBitBlt@12 -VidBufferToScreenBlt@24 -VidCleanUp@0 -VidDisplayString@4 -VidDisplayStringXY -VidInitialize@4 -VidResetDisplay@4 -VidScreenToBufferBlt@24 -VidSetScrollRegion@16 -VidSetTextColor@4 -VidSolidColorFill@20 -

1 0

[sserapion] 34754: Fix passing of command line args so it works on win64 too.
by sserapion＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: sserapion Date: Thu Jul 24 15:15:36 2008 New Revision: 34754 URL: http://svn.reactos.org/svn/reactos?rev=34754&view=rev Log: Fix passing of command line args so it works on win64 too. Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt1.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wcrt1.c Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt1.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt1.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt1.c [iso-8859-1] Thu Jul 24 15:15:36 2008 @@ -47,6 +47,10 @@ void __set_app_type(int); #endif /* __MSVCRT__ */ +#ifndef __initenv +extern char ***_imp____initenv; +#define __initenv (*_imp____initenv) +#endif /* * Setup the default file handles to have the _CRT_fmode mode, as well as @@ -235,7 +239,7 @@ * that one calls WinMain. See main.c in the 'lib' dir * for more details. */ - nRet = main (_argc, _argv, _environ); + nRet = main (_argc, _argv, __initenv); /* * Perform exit processing for the C library. This means Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wcrt1.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wcrt1.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wcrt1.c [iso-8859-1] Thu Jul 24 15:15:36 2008 @@ -45,6 +45,10 @@ __MINGW_IMPORT void __set_app_type(int); #endif /* __MSVCRT__ */ +#ifndef __winitenv +extern wchar_t ***_imp____winitenv; +#define __winitenv (*_imp____winitenv) +#endif /* * Setup the default file handles to have the _CRT_fmode mode, as well as @@ -233,7 +237,7 @@ * that one calls WinMain. See main.c in the 'lib' dir * for more details. */ - nRet = wmain (_argc, _wargv, NULL); + nRet = wmain (_argc, _wargv, __winitenv); /* * Perform exit processing for the C library. This means

1 0

[tkreuzer] 34753: - add ntoskrnl to the build again, as we will need it now. - add ke.h, mm.h and intrin_i.h for amd64 currently copied from i386 - remove Interlocked funtions from private ntoskrnl header that don't belong there, this will probably break x86 build, but who cares ; -) At least the header compiles now...
by tkreuzer＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: tkreuzer Date: Thu Jul 24 15:07:30 2008 New Revision: 34753 URL: http://svn.reactos.org/svn/reactos?rev=34753&view=rev Log: - add ntoskrnl to the build again, as we will need it now. - add ke.h, mm.h and intrin_i.h for amd64 currently copied from i386 - remove Interlocked funtions from private ntoskrnl header that don't belong there, this will probably break x86 build, but who cares ;-) At least the header compiles now... Added: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h (with props) branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h (with props) branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h (with props) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arch/intrin_i.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arch/ke.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arch/mm.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.rbuild Added: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h (added) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] Thu Jul 24 15:07:30 2008 @@ -1,0 +1,415 @@ +#ifndef _INTRIN_INTERNAL_ +#define _INTRIN_INTERNAL_ + +#ifdef CONFIG_SMP +#define LOCK "lock ; " +#else +#define LOCK "" +#endif + +#if defined(__GNUC__) + +#define Ke386SetInterruptDescriptorTable(X) \ + __asm__("lidt %0\n\t" \ + : /* no outputs */ \ + : "m" (X)); + +#define Ke386GetInterruptDescriptorTable(X) \ + __asm__("sidt %0\n\t" \ + : /* no outputs */ \ + : "m" (X)); + +#define Ke386SetGlobalDescriptorTable(X) \ + __asm__("lgdt %0\n\t" \ + : /* no outputs */ \ + : "m" (X)); + +#define Ke386GetGlobalDescriptorTable(X) \ + __asm__("sgdt %0\n\t" \ + : /* no outputs */ \ + : "m" (X)); + +#define Ke386GetLocalDescriptorTable(X) \ + __asm__("sldt %0\n\t" \ + : /* no outputs */ \ + : "m" (X)); + +#define Ke386SetLocalDescriptorTable(X) \ + __asm__("lldt %w0\n\t" \ + : /* no outputs */ \ + : "q" (X)); + +#define Ke386SetTr(X) __asm__ __volatile__("ltr %%ax" : :"a" (X)); + +#define Ke386GetTr(X) \ + __asm__("str %0\n\t" \ + : /* no outputs */ \ + : "m" (X)); + +#define Ke386SaveFlags(x) __asm__ __volatile__("pushfl ; popl %0":"=g" (x): /* no input */) +#define Ke386RestoreFlags(x) __asm__ __volatile__("pushl %0 ; popfl": /* no output */ :"g" (x):"memory") + +#define _Ke386GetSeg(N) ({ \ + unsigned int __d; \ + __asm__("movl %%" #N ",%0\n\t" :"=r" (__d)); \ + __d; \ + }) + +#define _Ke386SetSeg(N,X) __asm__ __volatile__("movl %0,%%" #N : :"r" (X)); + +#define _Ke386GetDr(N) ({ \ + unsigned int __d; \ + __asm__("movl %%dr" #N ",%0\n\t" :"=r" (__d)); \ + __d; \ + }) + +#define _Ke386SetDr(N,X) __asm__ __volatile__("movl %0,%%dr" #N : :"r" (X)); + + +static inline void Ki386Cpuid(ULONG Op, PULONG Eax, PULONG Ebx, PULONG Ecx, PULONG Edx) +{ + __asm__("cpuid" + : "=a" (*Eax), "=b" (*Ebx), "=c" (*Ecx), "=d" (*Edx) + : "0" (Op)); +} + +#define Ke386Rdmsr(msr,val1,val2) __asm__ __volatile__("rdmsr" : "=a" (val1), "=d" (val2) : "c" (msr)) +#define Ke386Wrmsr(msr,val1,val2) __asm__ __volatile__("wrmsr" : /* no outputs */ : "c" (msr), "a" (val1), "d" (val2)) + +#define Ke386HaltProcessor() __asm__("hlt\n\t"); + +#define Ke386FnInit() __asm__("fninit\n\t"); + + +// +// CR Macros +// +#define Ke386SetCr2(X) __asm__ __volatile__("movl %0,%%cr2" : :"r" (X)); + +// +// DR Macros +// +#define Ke386GetDr0() _Ke386GetDr(0) +#define Ke386GetDr1() _Ke386GetDr(1) +#define Ke386SetDr0(X) _Ke386SetDr(0,X) +#define Ke386SetDr1(X) _Ke386SetDr(1,X) +#define Ke386GetDr2() _Ke386GetDr(2) +#define Ke386SetDr2(X) _Ke386SetDr(2,X) +#define Ke386GetDr3() _Ke386GetDr(3) +#define Ke386SetDr3(X) _Ke386SetDr(3,X) +#define Ke386GetDr4() _Ke386GetDr(4) +#define Ke386SetDr4(X) _Ke386SetDr(4,X) +#define Ke386GetDr6() _Ke386GetDr(6) +#define Ke386SetDr6(X) _Ke386SetDr(6,X) +#define Ke386GetDr7() _Ke386GetDr(7) +#define Ke386SetDr7(X) _Ke386SetDr(7,X) + +// +// Segment Macros +// +#define Ke386GetSs() _Ke386GetSeg(ss) +#define Ke386GetFs() _Ke386GetSeg(fs) +#define Ke386SetFs(X) _Ke386SetSeg(fs, X) +#define Ke386SetDs(X) _Ke386SetSeg(ds, X) +#define Ke386SetEs(X) _Ke386SetSeg(es, X) + +#elif defined(_MSC_VER) + +VOID +FORCEINLINE +Ke386Wrmsr(IN ULONG Register, + IN ULONG Var1, + IN ULONG Var2) +{ + __asm mov eax, Var1; + __asm mov edx, Var2; + __asm wrmsr; +} + +ULONGLONG +FORCEINLINE +Ke386Rdmsr(IN ULONG Register, + IN ULONG Var1, + IN ULONG Var2) +{ + __asm mov eax, Var1; + __asm mov edx, Var2; + __asm rdmsr; +} + +VOID +FORCEINLINE +Ki386Cpuid(IN ULONG Operation, + OUT PULONG Var1, + OUT PULONG Var2, + OUT PULONG Var3, + OUT PULONG Var4) +{ + __asm mov eax, Operation; + __asm cpuid; + __asm mov [Var1], eax; + __asm mov [Var2], ebx; + __asm mov [Var3], ecx; + __asm mov [Var4], edx; +} + +VOID +FORCEINLINE +Ke386FnInit(VOID) +{ + __asm fninit; +} + +VOID +FORCEINLINE +Ke386HaltProcessor(VOID) +{ + __asm hlt; +} + +VOID +FORCEINLINE +Ke386GetInterruptDescriptorTable(OUT KDESCRIPTOR Descriptor) +{ + __asm sidt Descriptor; +} + +VOID +FORCEINLINE +Ke386SetInterruptDescriptorTable(IN KDESCRIPTOR Descriptor) +{ + __asm lidt Descriptor; +} + +VOID +FORCEINLINE +Ke386GetGlobalDescriptorTable(OUT KDESCRIPTOR Descriptor) +{ + __asm sgdt Descriptor; +} + +VOID +FORCEINLINE +Ke386SetGlobalDescriptorTable(IN KDESCRIPTOR Descriptor) +{ + __asm lgdt Descriptor; +} + +VOID +FORCEINLINE +Ke386GetLocalDescriptorTable(OUT USHORT Descriptor) +{ + __asm sldt Descriptor; +} + +VOID +FORCEINLINE +Ke386SetLocalDescriptorTable(IN USHORT Descriptor) +{ + __asm lldt Descriptor; +} + +VOID +FORCEINLINE +Ke386SaveFlags(IN ULONG Flags) +{ + __asm pushf; + __asm pop Flags; +} + +VOID +FORCEINLINE +Ke386RestoreFlags(IN ULONG Flags) +{ + __asm push Flags; + __asm popf; +} + +VOID +FORCEINLINE +Ke386SetTr(IN USHORT Tr) +{ + __asm ltr Tr; +} + +USHORT +FORCEINLINE +Ke386GetTr(IN USHORT Tr) +{ + __asm str Tr; +} + +// +// CR Macros +// +VOID +FORCEINLINE +Ke386SetCr2(IN ULONG Value) +{ + __asm mov eax, Value; + __asm mov cr2, eax; +} + +// +// DR Macros +// +ULONG +FORCEINLINE +Ke386GetDr0(VOID) +{ + __asm mov eax, dr0; +} + +ULONG +FORCEINLINE +Ke386GetDr1(VOID) +{ + __asm mov eax, dr1; +} + +ULONG +FORCEINLINE +Ke386GetDr2(VOID) +{ + __asm mov eax, dr2; +} + +ULONG +FORCEINLINE +Ke386GetDr3(VOID) +{ + __asm mov eax, dr3; +} + +ULONG +FORCEINLINE +Ke386GetDr6(VOID) +{ + __asm mov eax, dr6; +} + +ULONG +FORCEINLINE +Ke386GetDr7(VOID) +{ + __asm mov eax, dr7; +} + +VOID +FORCEINLINE +Ke386SetDr0(IN ULONG Value) +{ + __asm mov eax, Value; + __asm mov dr0, eax; +} + +VOID +FORCEINLINE +Ke386SetDr1(IN ULONG Value) +{ + __asm mov eax, Value; + __asm mov dr1, eax; +} + +VOID +FORCEINLINE +Ke386SetDr2(IN ULONG Value) +{ + __asm mov eax, Value; + __asm mov dr2, eax; +} + +VOID +FORCEINLINE +Ke386SetDr3(IN ULONG Value) +{ + __asm mov eax, Value; + __asm mov dr3, eax; +} + +VOID +FORCEINLINE +Ke386SetDr6(IN ULONG Value) +{ + __asm mov eax, Value; + __asm mov dr6, eax; +} + +VOID +FORCEINLINE +Ke386SetDr7(IN ULONG Value) +{ + __asm mov eax, Value; + __asm mov dr7, eax; +} + +// +// Segment Macros +// +USHORT +FORCEINLINE +Ke386GetSs(VOID) +{ + __asm mov ax, ss; +} + +USHORT +FORCEINLINE +Ke386GetFs(VOID) +{ + __asm mov ax, fs; +} + +USHORT +FORCEINLINE +Ke386GetDs(VOID) +{ + __asm mov ax, ds; +} + +USHORT +FORCEINLINE +Ke386GetEs(VOID) +{ + __asm mov ax, es; +} + +VOID +FORCEINLINE +Ke386SetSs(IN USHORT Value) +{ + __asm mov ax, Value; + __asm mov ss, ax; +} + +VOID +FORCEINLINE +Ke386SetFs(IN USHORT Value) +{ + __asm mov ax, Value; + __asm mov fs, ax; +} + +VOID +FORCEINLINE +Ke386SetDs(IN USHORT Value) +{ + __asm mov ax, Value; + __asm mov ds, ax; +} + +VOID +FORCEINLINE +Ke386SetEs(IN USHORT Value) +{ + __asm mov ax, Value; + __asm mov es, ax; +} + +#else +#error Unknown compiler for inline assembler +#endif + +#endif + +/* EOF */ Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h (added) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Thu Jul 24 15:07:30 2008 @@ -1,0 +1,141 @@ +#ifndef __NTOSKRNL_INCLUDE_INTERNAL_I386_KE_H +#define __NTOSKRNL_INCLUDE_INTERNAL_I386_KE_H + +#if __GNUC__ >=3 +#pragma GCC system_header +#endif + +#define X86_EFLAGS_TF 0x00000100 /* Trap flag */ +#define X86_EFLAGS_IF 0x00000200 /* Interrupt Enable flag */ +#define X86_EFLAGS_IOPL 0x00003000 /* I/O Privilege Level bits */ +#define X86_EFLAGS_NT 0x00004000 /* Nested Task flag */ +#define X86_EFLAGS_RF 0x00010000 /* Resume flag */ +#define X86_EFLAGS_VM 0x00020000 /* Virtual Mode */ +#define X86_EFLAGS_ID 0x00200000 /* CPUID detection flag */ + +#define X86_CR0_PE 0x00000001 /* enable Protected Mode */ +#define X86_CR0_NE 0x00000020 /* enable native FPU error reporting */ +#define X86_CR0_TS 0x00000008 /* enable exception on FPU instruction for task switch */ +#define X86_CR0_EM 0x00000004 /* enable FPU emulation (disable FPU) */ +#define X86_CR0_MP 0x00000002 /* enable FPU monitoring */ +#define X86_CR0_WP 0x00010000 /* enable Write Protect (copy on write) */ +#define X86_CR0_PG 0x80000000 /* enable Paging */ + +#define X86_CR4_PAE 0x00000020 /* enable physical address extensions */ +#define X86_CR4_PGE 0x00000080 /* enable global pages */ +#define X86_CR4_OSFXSR 0x00000200 /* enable FXSAVE/FXRSTOR instructions */ +#define X86_CR4_OSXMMEXCPT 0x00000400 /* enable #XF exception */ + +#define X86_FEATURE_VME 0x00000002 /* Virtual 8086 Extensions are present */ +#define X86_FEATURE_TSC 0x00000010 /* time stamp counters are present */ +#define X86_FEATURE_PAE 0x00000040 /* physical address extension is present */ +#define X86_FEATURE_CX8 0x00000100 /* CMPXCHG8B instruction present */ +#define X86_FEATURE_SYSCALL 0x00000800 /* SYSCALL/SYSRET support present */ +#define X86_FEATURE_PGE 0x00002000 /* Page Global Enable */ +#define X86_FEATURE_MMX 0x00800000 /* MMX extension present */ +#define X86_FEATURE_FXSR 0x01000000 /* FXSAVE/FXRSTOR instructions present */ +#define X86_FEATURE_SSE 0x02000000 /* SSE extension present */ +#define X86_FEATURE_SSE2 0x04000000 /* SSE2 extension present */ +#define X86_FEATURE_HT 0x10000000 /* Hyper-Threading present */ + +#define X86_EXT_FEATURE_SSE3 0x00000001 /* SSE3 extension present */ +#define X86_EXT_FEATURE_3DNOW 0x40000000 /* 3DNOW! extension present */ + +#define FRAME_EDITED 0xFFF8 + +#ifndef __ASM__ + +//#include "intrin_i.h" + +#define KeArchFnInit() Ke386FnInit() +#define KeArchHaltProcessor() Ke386HaltProcessor() + +extern ULONG Ke386CacheAlignment; + +struct _KPCR; +VOID +KiInitializeGdt(struct _KPCR* Pcr); +VOID +Ki386ApplicationProcessorInitializeTSS(VOID); + +VOID +FASTCALL +Ki386InitializeTss( + IN PKTSS Tss, + IN PKIDTENTRY Idt, + IN PKGDTENTRY Gdt +); + +VOID +KiGdtPrepareForApplicationProcessorInit(ULONG Id); +VOID +Ki386InitializeLdt(VOID); +VOID +Ki386SetProcessorFeatures(VOID); + +VOID +NTAPI +KiSetCR0Bits(VOID); + +VOID +NTAPI +KiGetCacheInformation(VOID); + +BOOLEAN +NTAPI +KiIsNpxPresent( + VOID +); + +BOOLEAN +NTAPI +KiIsNpxErrataPresent( + VOID +); + +VOID +NTAPI +KiSetProcessorType(VOID); + +ULONG +NTAPI +KiGetFeatureBits(VOID); + +ULONG KeAllocateGdtSelector(ULONG Desc[2]); +VOID KeFreeGdtSelector(ULONG Entry); +VOID +NtEarlyInitVdm(VOID); +VOID +KeApplicationProcessorInitDispatcher(VOID); +VOID +KeCreateApplicationProcessorIdleThread(ULONG Id); + +typedef +VOID +(NTAPI*PKSYSTEM_ROUTINE)(PKSTART_ROUTINE StartRoutine, + PVOID StartContext); + +VOID +NTAPI +Ke386InitThreadWithContext(PKTHREAD Thread, + PKSYSTEM_ROUTINE SystemRoutine, + PKSTART_ROUTINE StartRoutine, + PVOID StartContext, + PCONTEXT Context); +#define KeArchInitThreadWithContext(Thread,SystemRoutine,StartRoutine,StartContext,Context) \ + Ke386InitThreadWithContext(Thread,SystemRoutine,StartRoutine,StartContext,Context) + +#ifdef _NTOSKRNL_ /* FIXME: Move flags above to NDK instead of here */ +VOID +NTAPI +KiThreadStartup(PKSYSTEM_ROUTINE SystemRoutine, + PKSTART_ROUTINE StartRoutine, + PVOID StartContext, + BOOLEAN UserThread, + KTRAP_FRAME TrapFrame); +#endif + +#endif +#endif /* __NTOSKRNL_INCLUDE_INTERNAL_I386_KE_H */ + +/* EOF */ Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h (added) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Thu Jul 24 15:07:30 2008 @@ -1,0 +1,31 @@ +/* + * Lowlevel memory managment definitions + */ + +#ifndef __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H +#define __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H + +struct _EPROCESS; +PULONG MmGetPageDirectory(VOID); + +#define PAGE_MASK(x) ((x)&(~0xfff)) +#define PAE_PAGE_MASK(x) ((x)&(~0xfffLL)) + +/* Base addresses of PTE and PDE */ +#define PAGETABLE_MAP (0xc0000000) +#define PAGEDIRECTORY_MAP (0xc0000000 + (PAGETABLE_MAP / (1024))) + +/* Converting address to a corresponding PDE or PTE entry */ +#define MiAddressToPde(x) \ + ((PMMPTE)(((((ULONG)(x)) >> 22) << 2) + PAGEDIRECTORY_MAP)) +#define MiAddressToPte(x) \ + ((PMMPTE)(((((ULONG)(x)) >> 12) << 2) + PAGETABLE_MAP)) + +#define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (1024 * PAGE_SIZE)) +#define ADDR_TO_PDE_OFFSET(v) ((((ULONG)(v)) / (1024 * PAGE_SIZE))) +#define ADDR_TO_PTE_OFFSET(v) ((((ULONG)(v)) % (1024 * PAGE_SIZE)) / PAGE_SIZE) + +/* Easy accessing PFN in PTE */ +#define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) + +#endif /* __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H */ Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arch/intrin_i.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arch/intrin_i.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arch/intrin_i.h [iso-8859-1] Thu Jul 24 15:07:30 2008 @@ -27,6 +27,8 @@ #include "../mips/intrin_i.h" #elif defined(_M_ARM) #include "../arm/intrin_i.h" +#elif defined(_M_AMD64) +#include "../amd64/intrin_i.h" #else #error "Unknown processor" #endif Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arch/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arch/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arch/ke.h [iso-8859-1] Thu Jul 24 15:07:30 2008 @@ -27,6 +27,8 @@ #include "../mips/ke.h" #elif defined(_M_ARM) #include "../arm/ke.h" +#elif defined(_M_AMD64) +#include "../amd64/ke.h" #else #error "Unknown processor" #endif Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arch/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arch/mm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arch/mm.h [iso-8859-1] Thu Jul 24 15:07:30 2008 @@ -27,6 +27,8 @@ #include <internal/mips/mm.h> #elif defined(_M_ARM) #include <internal/arm/mm.h> +#elif defined(_M_AMD64) +#include <internal/amd64/mm.h> #else #error "Unknown processor" #endif Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] Thu Jul 24 15:07:30 2008 @@ -17,7 +17,7 @@ #ifdef _NTOSKRNL_ -#ifndef _ARM_ +#if !defined (_ARM_) && !defined (_M_AMD64) #define KeGetCurrentThread _KeGetCurrentThread #define KeGetPreviousMode _KeGetPreviousMode #endif @@ -34,7 +34,7 @@ #define InterlockedExchange _InterlockedExchange #define InterlockedExchangeAdd _InterlockedExchangeAdd -#include "ke.h" +//#include "ke.h" #include "i386/mm.h" #include "i386/fpu.h" #include "i386/v86m.h" @@ -102,49 +102,6 @@ IN PVOID ContextData, IN ULONG Size); -/* FIXME: Interlocked functions that need to be made into a public header */ -#ifdef __GNUC__ -FORCEINLINE -LONG -InterlockedAnd(IN OUT LONG volatile *Target, - IN LONG Set) -{ - LONG i; - LONG j; - - j = *Target; - do { - i = j; - j = InterlockedCompareExchange((PLONG)Target, - i & Set, - i); - - } while (i != j); - - return j; -} - -FORCEINLINE -LONG -InterlockedOr(IN OUT LONG volatile *Target, - IN LONG Set) -{ - LONG i; - LONG j; - - j = *Target; - do { - i = j; - j = InterlockedCompareExchange((PLONG)Target, - i | Set, - i); - - } while (i != j); - - return j; -} -#endif - /* * generic information class probing code */ @@ -309,6 +266,7 @@ #endif +#ifndef _WIN64 C_ASSERT(FIELD_OFFSET(KUSER_SHARED_DATA, SystemCall) == 0x300); C_ASSERT(FIELD_OFFSET(KTHREAD, InitialStack) == KTHREAD_INITIAL_STACK); C_ASSERT(FIELD_OFFSET(KTHREAD, Teb) == KTHREAD_TEB); @@ -322,6 +280,8 @@ C_ASSERT(FIELD_OFFSET(KPROCESS, DirectoryTableBase) == KPROCESS_DIRECTORY_TABLE_BASE); //C_ASSERT(FIELD_OFFSET(KPCR, Tib.ExceptionList) == KPCR_EXCEPTION_LIST); //C_ASSERT(FIELD_OFFSET(KPCR, Self) == KPCR_SELF); +#endif + #ifdef _M_IX86 C_ASSERT(FIELD_OFFSET(KPCR, IRR) == KPCR_IRR); C_ASSERT(FIELD_OFFSET(KPCR, IDR) == KPCR_IDR); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.rbuild [iso-8859-1] Thu Jul 24 15:07:30 2008 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> <module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe"> -  - <importlibrary definition="ntoskrnl_$(ARCH).def" /> + <xi:include href="ntoskrnl-generic.rbuild" /> </module> </group>

1 0

[tkreuzer] 34752: add KeGetCurrentThread prototype to winddk
by tkreuzer＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: tkreuzer Date: Thu Jul 24 15:02:31 2008 New Revision: 34752 URL: http://svn.reactos.org/svn/reactos?rev=34752&view=rev Log: add KeGetCurrentThread prototype to winddk Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Thu Jul 24 15:02:31 2008 @@ -5500,6 +5500,12 @@ ULONG Dummy; } KFLOATING_SAVE, *PKFLOATING_SAVE; +NTKERNELAPI +PRKTHREAD +NTAPI +KeGetCurrentThread( + VOID); + #elif defined(__PowerPC__) typedef ULONG PFN_NUMBER, *PPFN_NUMBER;

1 0

[hpoussin] 34751: Update IDL file with new MS Vista functions
by hpoussin＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: hpoussin Date: Thu Jul 24 14:50:09 2008 New Revision: 34751 URL: http://svn.reactos.org/svn/reactos?rev=34751&view=rev Log: Update IDL file with new MS Vista functions Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/include/reactos/idl/pnp.idl Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Thu Jul 24 14:50:09 2008 @@ -160,7 +160,7 @@ /* Function 0 */ -DWORD PNP_Function0( +DWORD PNP_Disconnect( handle_t hBinding) { UNREFERENCED_PARAMETER(hBinding); @@ -170,7 +170,7 @@ /* Function 1 */ -DWORD PNP_Function1( +DWORD PNP_Connect( handle_t hBinding) { UNREFERENCED_PARAMETER(hBinding); @@ -1681,7 +1681,7 @@ /* Function 55 */ -DWORD PNP_Function55( +DWORD PNP_SetHwProf( handle_t hBinding) { UNIMPLEMENTED; @@ -1690,7 +1690,7 @@ /* Function 56 */ -DWORD PNP_Function56( +DWORD PNP_QueryArbitratorFreeData( handle_t hBinding) { UNIMPLEMENTED; @@ -1699,7 +1699,7 @@ /* Function 57 */ -DWORD PNP_Function57( +DWORD PNP_QueryArbitratorFreeSize( handle_t hBinding) { UNIMPLEMENTED; @@ -1710,7 +1710,7 @@ /* Function 58 */ CONFIGRET PNP_RunDetection( - handle_t BindingHandle, + handle_t hBinding, DWORD ulFlags) { UNIMPLEMENTED; @@ -1719,7 +1719,7 @@ /* Function 59 */ -DWORD PNP_Function59( +DWORD PNP_RegisterNotification( handle_t hBinding) { UNIMPLEMENTED; @@ -1728,7 +1728,7 @@ /* Function 60 */ -DWORD PNP_Function60( +DWORD PNP_UnregisterNotification( handle_t hBinding) { UNIMPLEMENTED; @@ -1831,6 +1831,69 @@ PNP_PROP_SIZE PropertySize, BYTE *PropertyBuffer, DWORD Flags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 68 */ +DWORD PNP_InstallDevInst( + handle_t hBinding) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 69 */ +DWORD PNP_ApplyPowerSettings( + handle_t hBinding) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 70 */ +DWORD PNP_DriverStoreAddDriverPackage( + handle_t hBinding) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 71 */ +DWORD PNP_DriverStoreDeleteDriverPackage( + handle_t hBinding) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 72 */ +DWORD PNP_RegisterServiceNotification( + handle_t hBinding) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 73 */ +DWORD PNP_SetActiveService( + handle_t hBinding) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 74 */ +DWORD PNP_DeleteServiceDevices( + handle_t hBinding) { UNIMPLEMENTED; return CR_CALL_NOT_IMPLEMENTED; Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] Thu Jul 24 14:50:09 2008 @@ -253,11 +253,11 @@ interface pnp { /* Function 0 */ - DWORD PNP_Function0( + DWORD PNP_Disconnect( [in] handle_t hBinding); /* FIXME */ /* Function 1 */ - DWORD PNP_Function1( + DWORD PNP_Connect( [in] handle_t hBinding); /* FIXME */ /* Function 2 */ @@ -716,15 +716,15 @@ [in] DWORD ulFlags); /* Function 55 */ - DWORD PNP_Function55( + DWORD PNP_SetHwProf( [in] handle_t hBinding); /* Function 56 */ - DWORD PNP_Function56( + DWORD PNP_QueryArbitratorFreeData( [in] handle_t hBinding); /* Function 57 */ - DWORD PNP_Function57( + DWORD PNP_QueryArbitratorFreeSize( [in] handle_t hBinding); /* Function 58 */ @@ -733,12 +733,14 @@ [in] DWORD ulFlags); /* Function 59 */ - DWORD PNP_Function59( + DWORD PNP_RegisterNotification( [in] handle_t hBinding); /* Function 60 */ - DWORD PNP_Function60( + DWORD PNP_UnregisterNotification( [in] handle_t hBinding); + +cpp_quote("#if _WIN32_WINNT >= 0x0501") /* Function 61 */ DWORD PNP_GetCustomDevProp( @@ -769,6 +771,8 @@ [in] handle_t hBinding, [out] DWORD *pulSSDIFlags, [in] DWORD ulFlags); + +cpp_quote("#if _WIN32_WINNT >= 0x0600") /* Function 65 */ DWORD PNP_GetObjectPropKeys( @@ -805,4 +809,36 @@ [in] PNP_PROP_SIZE PropertySize, [in, unique, size_is(PropertySize)] BYTE *PropertyBuffer, [in] DWORD Flags); + + /* Function 68 */ + DWORD PNP_InstallDevInst( + [in] handle_t hBinding); /* FIXME */ + + /* Function 69 */ + DWORD PNP_ApplyPowerSettings( + [in] handle_t hBinding); /* FIXME */ + + /* Function 70 */ + DWORD PNP_DriverStoreAddDriverPackage( + [in] handle_t hBinding); /* FIXME */ + + /* Function 71 */ + DWORD PNP_DriverStoreDeleteDriverPackage( + [in] handle_t hBinding); /* FIXME */ + + /* Function 72 */ + DWORD PNP_RegisterServiceNotification( + [in] handle_t hBinding); /* FIXME */ + + /* Function 73 */ + DWORD PNP_SetActiveService( + [in] handle_t hBinding); /* FIXME */ + + /* Function 74 */ + DWORD PNP_DeleteServiceDevices( + [in] handle_t hBinding); /* FIXME */ + +cpp_quote("#endif /* WIN32_WINNT >= 0x0600 */") +cpp_quote("#endif /* WIN32_WINNT >= 0x0501 */") + }

1 0

[tkreuzer] 34750: add ExpChangePushlock macro for _WIN64
by tkreuzer＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: tkreuzer Date: Thu Jul 24 14:36:04 2008 New Revision: 34750 URL: http://svn.reactos.org/svn/reactos?rev=34750&view=rev Log: add ExpChangePushlock macro for _WIN64 Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ex.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Thu Jul 24 14:36:04 2008 @@ -465,6 +465,7 @@ #ifdef _WIN64 #define ExpChangeRundown(x, y, z) InterlockedCompareExchange64((PLONGLONG)x, y, z) +#define ExpChangePushlock(lock, new, old) InterlockedCompareExchangePointer((PVOID*)lock, (PVOID)new, (PVOID)old) #define ExpSetRundown(x, y) InterlockedExchange64((PLONGLONG)x, y) #else #define ExpChangeRundown(x, y, z) InterlockedCompareExchange((PLONG)x, PtrToLong(y), PtrToLong(z))

1 0

[tkreuzer] 34749: add _InterlockedExchange64 to intin_x86.h
by tkreuzer＠svn.reactos.org 24 Jul '08

24 Jul '08

Author: tkreuzer Date: Thu Jul 24 14:22:16 2008 New Revision: 34749 URL: http://svn.reactos.org/svn/reactos?rev=34749&view=rev Log: add _InterlockedExchange64 to intin_x86.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] Thu Jul 24 14:22:16 2008 @@ -121,6 +121,15 @@ return __sync_lock_test_and_set(Target, Value); } +#if defined(_M_AMD64) +static __inline__ __attribute__((always_inline)) long long _InterlockedExchange64(volatile long long * const Target, const long long Value) +{ + /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ + __sync_synchronize(); + return __sync_lock_test_and_set(Target, Value); +} +#endif + static __inline__ __attribute__((always_inline)) void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value) { /* NOTE: ditto */

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008