Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

[sedwards] 14432: bunch of w32api fixes. ascii.h is gonecd ..! coff.h was unused and quite a few others were redunant and could be moved. If you try to build a app in the ROS build system without using __USE_W32API or Unicode beware it won't build as it shouldn't. Also partinfo was really broken so someone needs to fix this. If not I will attempt to w32api'ise it in the morning.

by sedwards＠svn.reactos.com

bunch of w32api fixes. ascii.h is gonecd ..! coff.h was unused and quite a few others were redunant and could be moved. If you try to build a app in the ROS build system without using __USE_W32API or Unicode beware it won't build as it shouldn't. Also partinfo was really broken so someone needs to fix this. If not I will attempt to w32api'ise it in the morning. Modified: trunk/reactos/apps/testsets/loadlib/makefile Modified: trunk/reactos/apps/utils/Makefile Modified: trunk/reactos/apps/utils/net/ftp/makefile Modified: trunk/reactos/apps/utils/net/ping/makefile Modified: trunk/reactos/apps/utils/partinfo/makefile Modified: trunk/reactos/apps/utils/partinfo/partinfo.c Modified: trunk/reactos/apps/utils/pnpdump/makefile Modified: trunk/reactos/apps/utils/pnpdump/pnpdump.c Modified: trunk/reactos/apps/utils/ps/makefile Modified: trunk/reactos/apps/utils/sc/makefile Deleted: trunk/reactos/include/ascii.h Deleted: trunk/reactos/include/coff.h Modified: trunk/reactos/include/funcs.h Deleted: trunk/reactos/include/icmpapi.h Deleted: trunk/reactos/include/wine/cpl.h Deleted: trunk/reactos/include/wine/fci.h Deleted: trunk/reactos/include/wine/fdi.h Deleted: trunk/reactos/include/wine/heap.h Deleted: trunk/reactos/include/wine/ver.h Modified: trunk/reactos/lib/samlib/dllmain.c Modified: trunk/reactos/regtests/regtests/Makefile Modified: trunk/reactos/services/rpcss/makefile Modified: trunk/reactos/subsys/system/format/makefile Modified: trunk/reactos/subsys/system/services/makefile Modified: trunk/reactos/subsys/system/services/services.c Added: trunk/reactos/w32api/include/fci.h Added: trunk/reactos/w32api/include/fdi.h Added: trunk/reactos/w32api/include/icmpapi.h _____ Modified: trunk/reactos/apps/testsets/loadlib/makefile --- trunk/reactos/apps/testsets/loadlib/makefile 2005-04-02 00:49:10 UTC (rev 14431) +++ trunk/reactos/apps/testsets/loadlib/makefile 2005-04-02 05:37:20 UTC (rev 14432) @@ -11,7 +11,7 @@ TARGET_NAME = loadlib -TARGET_CFLAGS = -Wall -Werror -D_USE_W32API -DUNICODE -D_UNICODE +TARGET_CFLAGS = -Wall -Werror -D__USE_W32API -DUNICODE -D_UNICODE TARGET_SDKLIBS = kernel32.a ntdll.a _____ Modified: trunk/reactos/apps/utils/Makefile --- trunk/reactos/apps/utils/Makefile 2005-04-02 00:49:10 UTC (rev 14431) +++ trunk/reactos/apps/utils/Makefile 2005-04-02 05:37:20 UTC (rev 14432) @@ -9,7 +9,7 @@ # Console system utilities # cabman cat net objdir partinfo pice ps sc stats -UTIL_APPS = cat objdir partinfo pnpdump sc shutdown stats tickcount ps +UTIL_APPS = cat objdir pnpdump sc shutdown stats tickcount ps UTIL_NET_APPS = arp finger ftp ipconfig netstat ping route telnet whois _____ Modified: trunk/reactos/apps/utils/net/ftp/makefile --- trunk/reactos/apps/utils/net/ftp/makefile 2005-04-02 00:49:10 UTC (rev 14431) +++ trunk/reactos/apps/utils/net/ftp/makefile 2005-04-02 05:37:20 UTC (rev 14432) @@ -8,6 +8,8 @@ TARGET_INSTALLDIR = system32 +TARGET_CFLAGS = -D__USE_W32API + TARGET_SDKLIBS = ws2_32.a iphlpapi.a # ntdll.a _____ Modified: trunk/reactos/apps/utils/net/ping/makefile --- trunk/reactos/apps/utils/net/ping/makefile 2005-04-02 00:49:10 UTC (rev 14431) +++ trunk/reactos/apps/utils/net/ping/makefile 2005-04-02 05:37:20 UTC (rev 14432) @@ -8,7 +8,7 @@ TARGET_INSTALLDIR = system32 -TARGET_CFLAGS = -D__USE_W32_SOCKETS +TARGET_CFLAGS = -D__USE_W32API -D__USE_W32_SOCKETS TARGET_SDKLIBS = ws2_32.a _____ Modified: trunk/reactos/apps/utils/partinfo/makefile --- trunk/reactos/apps/utils/partinfo/makefile 2005-04-02 00:49:10 UTC (rev 14431) +++ trunk/reactos/apps/utils/partinfo/makefile 2005-04-02 05:37:20 UTC (rev 14432) @@ -10,7 +10,7 @@ TARGET_NAME = partinfo -TARGET_CFLAGS = -Wall -Werror -Wno-format +TARGET_CFLAGS = -D__USE_W32API -Wall -Werror -Wno-format TARGET_SDKLIBS = ntdll.a kernel32.a _____ Modified: trunk/reactos/apps/utils/partinfo/partinfo.c --- trunk/reactos/apps/utils/partinfo/partinfo.c 2005-04-02 00:49:10 UTC (rev 14431) +++ trunk/reactos/apps/utils/partinfo/partinfo.c 2005-04-02 05:37:20 UTC (rev 14432) @@ -8,10 +8,12 @@ #include <stdio.h> #include <stdlib.h> +#include <ddk/ntddk.h> + //#define DUMP_DATA #define DUMP_SIZE_INFO +#define UNICODE - #ifdef DUMP_DATA void HexDump(char *buffer, ULONG size) { _____ Modified: trunk/reactos/apps/utils/pnpdump/makefile --- trunk/reactos/apps/utils/pnpdump/makefile 2005-04-02 00:49:10 UTC (rev 14431) +++ trunk/reactos/apps/utils/pnpdump/makefile 2005-04-02 05:37:20 UTC (rev 14432) @@ -10,7 +10,7 @@ TARGET_NAME = pnpdump -TARGET_CFLAGS = -Wall -Werror +TARGET_CFLAGS = -D__USE_W32API -Wall -Werror TARGET_SDKLIBS = ntdll.a kernel32.a _____ Modified: trunk/reactos/apps/utils/pnpdump/pnpdump.c --- trunk/reactos/apps/utils/pnpdump/pnpdump.c 2005-04-02 00:49:10 UTC (rev 14431) +++ trunk/reactos/apps/utils/pnpdump/pnpdump.c 2005-04-02 05:37:20 UTC (rev 14432) @@ -8,6 +8,8 @@ #include <stdlib.h> #include <conio.h> +#include <ddk/ntddk.h> + #include <pshpack1.h> typedef struct _CM_PNP_BIOS_DEVICE_NODE _____ Modified: trunk/reactos/apps/utils/ps/makefile --- trunk/reactos/apps/utils/ps/makefile 2005-04-02 00:49:10 UTC (rev 14431) +++ trunk/reactos/apps/utils/ps/makefile 2005-04-02 05:37:20 UTC (rev 14432) @@ -10,7 +10,7 @@ TARGET_NAME = ps -TARGET_CFLAGS = -DANONYMOUSUNIONS -Werror -Wall +TARGET_CFLAGS = -D__USE_W32API -DANONYMOUSUNIONS -Werror -Wall TARGET_SDKLIBS = ntdll.a kernel32.a user32.a _____ Modified: trunk/reactos/apps/utils/sc/makefile --- trunk/reactos/apps/utils/sc/makefile 2005-04-02 00:49:10 UTC (rev 14431) +++ trunk/reactos/apps/utils/sc/makefile 2005-04-02 05:37:20 UTC (rev 14432) @@ -13,7 +13,7 @@ TARGET_NAME = sc -TARGET_CFLAGS = -DDBG -Werror -Wall +TARGET_CFLAGS = -D__USE_W32API -DDBG -Werror -Wall TARGET_SDKLIBS = kernel32.a ntdll.a advapi32.a _____ Deleted: trunk/reactos/include/ascii.h --- trunk/reactos/include/ascii.h 2005-04-02 00:49:10 UTC (rev 14431) +++ trunk/reactos/include/ascii.h 2005-04-02 05:37:20 UTC (rev 14432) @@ -1,3630 +0,0 @@ -/* - ASCIIFunctions.h - - Declarations for all the Win32 ASCII Functions - - Copyright (C) 1996 Free Software Foundation, Inc. - - Author: Scott Christley <scottc(a)net-community.com> - - This file is part of the Windows32 API Library. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - If you are interested in a warranty or support for this source code, - contact Scott Christley <scottc(a)net-community.com> for more information. - - You should have received a copy of the GNU Library General Public - License along with this library; see the file COPYING.LIB. - If not, write to the Free Software Foundation, - 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#ifndef _GNU_H_WINDOWS32_ASCIIFUNCTIONS -#define _GNU_H_WINDOWS32_ASCIIFUNCTIONS - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -WINBOOL -STDCALL -BackupEventLogA ( - HANDLE hEventLog, - LPCSTR lpBackupFileName - ); - -WINBOOL -STDCALL -ClearEventLogA ( - HANDLE hEventLog, - LPCSTR lpBackupFileName - ); - -WINBOOL -STDCALL -CreateProcessAsUserA ( - HANDLE hToken, - LPCSTR lpApplicationName, - LPSTR lpCommandLine, - LPSECURITY_ATTRIBUTES lpProcessAttributes, - LPSECURITY_ATTRIBUTES lpThreadAttributes, - WINBOOL bInheritHandles, - DWORD dwCreationFlags, - LPVOID lpEnvironment, - LPCSTR lpCurrentDirectory, - LPSTARTUPINFOA lpStartupInfo, - LPPROCESS_INFORMATION lpProcessInformation - ); - -WINBOOL -STDCALL -DecryptFileA( - LPCSTR lpFileName, - DWORD dwReserved - ); - -WINBOOL -STDCALL -EncryptFileA( - LPCSTR lpFileName - ); - -WINBOOL -STDCALL -FileEncryptionStatusA( - LPCSTR lpFileName, - LPDWORD lpStatus - ); - -WINBOOL -STDCALL -GetCurrentHwProfileA ( - LPHW_PROFILE_INFOA lpHwProfileInfo - ); - -WINBOOL -STDCALL -LogonUserA ( - LPSTR lpszUsername, - LPSTR lpszDomain, - LPSTR lpszPassword, - DWORD dwLogonType, - DWORD dwLogonProvider, - PHANDLE phToken - ); - -WINBOOL -STDCALL -LogonUserExA ( - LPCSTR lpszUsername, - LPCSTR lpszDomain, - LPCSTR lpszPassword, - DWORD dwLogonType, - DWORD dwLogonProvider, - PHANDLE phToken , - PSID *ppLogonSid , - PVOID *ppProfileBuffer , - LPDWORD pdwProfileLength , - PQUOTA_LIMITS pQuotaLimits - ); - -HANDLE -STDCALL -OpenBackupEventLogA ( - LPCSTR lpUNCServerName, - LPCSTR lpFileName - ); - -DWORD -STDCALL -OpenEncryptedFileRawA( - LPCSTR lpFileName, - ULONG ulFlags, - PVOID * pvContext - ); - -HANDLE -STDCALL -OpenEventLogA ( - LPCSTR lpUNCServerName, - LPCSTR lpSourceName - ); - -WINBOOL -STDCALL -ReadEventLogA ( - HANDLE hEventLog, - DWORD dwReadFlags, - DWORD dwRecordOffset, - LPVOID lpBuffer, - DWORD nNumberOfBytesToRead, - DWORD *pnBytesRead, - DWORD *pnMinNumberOfBytesNeeded - ); - -WINBOOL -STDCALL -ChangeServiceConfig2A( - SC_HANDLE hService, - DWORD dwInfoLevel, - LPVOID lpInfo - ); - -WINBOOL -STDCALL -EnumServicesStatusExA( - SC_HANDLE hSCManager, - SC_ENUM_TYPE InfoLevel, - DWORD dwServiceType, - DWORD dwServiceState, - LPBYTE lpServices, - DWORD cbBufSize, - LPDWORD pcbBytesNeeded, - LPDWORD lpServicesReturned, - LPDWORD lpResumeHandle, - LPCSTR pszGroupName - ); - -WINBOOL -STDCALL -QueryServiceConfig2A( - SC_HANDLE hService, - DWORD dwInfoLevel, - LPBYTE lpBuffer, - DWORD cbBufSize, - LPDWORD pcbBytesNeeded - ); - -SERVICE_STATUS_HANDLE -STDCALL -RegisterServiceCtrlHandlerExA( - LPCSTR lpServiceName, - LPHANDLER_FUNCTION_EX lpHandlerProc, - LPVOID lpContext - ); - -LRESULT -STDCALL -SendIMEMessageExA(HWND hwnd, LPARAM lparam); - -WINBOOL -STDCALL -IMPSetIMEA( HWND hwnd, LPIMEPROA ime); - -WINBOOL -STDCALL -IMPQueryIMEA( LPIMEPROA ime); - -WINBOOL -STDCALL -IMPGetIMEA( HWND hwnd, LPIMEPROA ime); - -WINBOOL -STDCALL -SetCalendarInfoA( - LCID Locale, - CALID Calendar, - CALTYPE CalType, - LPCSTR lpCalData); - -WINBOOL -STDCALL -EnumUILanguagesA( - UILANGUAGE_ENUMPROCA lpUILanguageEnumProc, - DWORD dwFlags, - LONG_PTR lParam); - -WINBOOL -STDCALL -EnumLanguageGroupLocalesA( - LANGGROUPLOCALE_ENUMPROCA lpLangGroupLocaleEnumProc, - LGRPID LanguageGroup, - DWORD dwFlags, - LONG_PTR lParam); - -WINBOOL -STDCALL -EnumSystemLanguageGroupsA( - LANGUAGEGROUP_ENUMPROCA lpLanguageGroupEnumProc, - DWORD dwFlags, - LONG_PTR lParam); - -int -STDCALL -GetGeoInfoA( - GEOID Location, - GEOTYPE GeoType, - LPSTR lpGeoData, - int cchData, - LANGID LangId); - -WINBOOL -STDCALL -EnumDateFormatsExA( - DATEFMT_ENUMPROCEXA lpDateFmtEnumProcEx, - LCID Locale, - DWORD dwFlags); - -WINBOOL -STDCALL -EnumCalendarInfoExA( - CALINFO_ENUMPROCEXA lpCalInfoEnumProcEx, - LCID Locale, - CALID Calendar, - CALTYPE CalType); - -int -STDCALL -GetCalendarInfoA( - LCID Locale, - CALID Calendar, - CALTYPE CalType, - LPSTR lpCalData, - int cchData, - LPDWORD lpValue); - -WINBOOL -STDCALL -GetCPInfoExA( - UINT CodePage, - DWORD dwFlags, - LPCPINFOEXA lpCPInfoEx); - -WINBOOL -STDCALL -CheckNameLegalDOS8Dot3A( - LPCSTR lpName, - LPSTR lpOemName OPTIONAL, - DWORD OemNameSize OPTIONAL, - PWINBOOL pbNameContainsSpaces OPTIONAL, - PWINBOOL pbNameLegal - ); - -WINBOOL -STDCALL -CreateHardLinkA( - LPCSTR lpFileName, - LPCSTR lpExistingFileName, - LPSECURITY_ATTRIBUTES lpSecurityAttributes - ); - -HANDLE -STDCALL -CreateJobObjectA( - LPSECURITY_ATTRIBUTES lpJobAttributes, - LPCSTR lpName - ); - -WINBOOL -STDCALL -DeleteVolumeMountPointA( - LPCSTR lpszVolumeMountPoint - ); - -WINBOOL -STDCALL -DnsHostnameToComputerNameA ( - LPCSTR Hostname, - LPSTR ComputerName, - LPDWORD nSize - ); - -WINBOOL -STDCALL -FindActCtxSectionStringA( - DWORD dwFlags, - const GUID *lpExtensionGuid, - ULONG ulSectionId, - LPCSTR lpStringToFind, - PACTCTX_SECTION_KEYED_DATA ReturnedData - ); - -HANDLE -STDCALL -FindFirstFileExA( - LPCSTR lpFileName, - FINDEX_INFO_LEVELS fInfoLevelId, - LPVOID lpFindFileData, - FINDEX_SEARCH_OPS fSearchOp, - LPVOID lpSearchFilter, - DWORD dwAdditionalFlags - ); - -HANDLE -STDCALL -FindFirstVolumeA( - LPSTR lpszVolumeName, - DWORD cchBufferLength - ); - -HANDLE -STDCALL -FindFirstVolumeMountPointA( - LPCSTR lpszRootPathName, - LPSTR lpszVolumeMountPoint, - DWORD cchBufferLength - ); - -WINBOOL -STDCALL -FindNextVolumeA( - HANDLE hFindVolume, - LPSTR lpszVolumeName, - DWORD cchBufferLength - ); - -WINBOOL -STDCALL -FindNextVolumeMountPointA( - HANDLE hFindVolumeMountPoint, - LPSTR lpszVolumeMountPoint, - DWORD cchBufferLength - ); - -WINBOOL -STDCALL -GetComputerNameExA ( - COMPUTER_NAME_FORMAT NameType, - LPSTR lpBuffer, - LPDWORD nSize - ); - -DWORD -STDCALL -GetDllDirectoryA( - DWORD nBufferLength, - LPSTR lpBuffer - ); - -DWORD -STDCALL -GetFirmwareEnvironmentVariableA( - LPCSTR lpName, - LPCSTR lpGuid, - PVOID pBuffer, - DWORD nSize - ); - -DWORD -STDCALL -GetLongPathNameA( - LPCSTR lpszShortPath, - LPSTR lpszLongPath, - DWORD cchBuffer - ); - -WINBOOL -STDCALL -GetModuleHandleExA( - DWORD dwFlags, - LPCSTR lpModuleName, - HMODULE* phModule - ); - -UINT -STDCALL -GetSystemWow64DirectoryA( - LPSTR lpBuffer, - UINT uSize - ); - -WINBOOL -STDCALL -GetVolumeNameForVolumeMountPointA( - LPCSTR lpszVolumeMountPoint, - LPSTR lpszVolumeName, - DWORD cchBufferLength - ); - -WINBOOL -STDCALL -GetVolumePathNameA( - LPCSTR lpszFileName, - LPSTR lpszVolumePathName, - DWORD cchBufferLength - ); - -WINBOOL -STDCALL -GetVolumePathNamesForVolumeNameA( - LPCSTR lpszVolumeName, - LPSTR lpszVolumePathNames, - DWORD cchBufferLength, - PDWORD lpcchReturnLength - ); - -HANDLE -STDCALL -OpenJobObjectA( - DWORD dwDesiredAccess, - WINBOOL bInheritHandle, - LPCSTR lpName - ); - -WINBOOL -STDCALL -ReplaceFileA( - LPCSTR lpReplacedFileName, - LPCSTR lpReplacementFileName, - LPCSTR lpBackupFileName, - DWORD dwReplaceFlags, - LPVOID lpExclude, - LPVOID lpReserved - ); - -WINBOOL -STDCALL -SetComputerNameExA ( - COMPUTER_NAME_FORMAT NameType, - LPCSTR lpBuffer - ); - -WINBOOL -STDCALL -SetDllDirectoryA( - LPCSTR lpPathName - ); - -WINBOOL -STDCALL -SetFileShortNameA( - HANDLE hFile, - LPCSTR lpShortName - ); - -WINBOOL -STDCALL -SetFirmwareEnvironmentVariableA( - LPCSTR lpName, - LPCSTR lpGuid, - PVOID pValue, - DWORD nSize - ); - -WINBOOL -STDCALL -SetVolumeMountPointA( - LPCSTR lpszVolumeMountPoint, - LPCSTR lpszVolumeName - ); - -WINBOOL -STDCALL -VerifyVersionInfoA( - LPOSVERSIONINFOEXA lpVersionInformation, - DWORD dwTypeMask, - DWORDLONG dwlConditionMask - ); - -HDEVNOTIFY -STDCALL -RegisterDeviceNotificationA( - HANDLE hRecipient, - LPVOID NotificationFilter, - DWORD Flags - ); - -UINT -STDCALL -GetRawInputDeviceInfoA( - HANDLE hDevice, - UINT uiCommand, - LPVOID pData, - PUINT pcbSize); - -LONG -STDCALL -BroadcastSystemMessageExA( - DWORD dwflags, - LPDWORD lpdwRecipients, - UINT uiMessage, - WPARAM wParam, - LPARAM lParam, - PBSMINFO pBSMInfo); - -HFONT -STDCALL -CreateFontIndirectExA(const ENUMLOGFONTEXDVA *elfexd); - -DWORD -STDCALL -GetGlyphIndicesA( - HDC hdc, - LPCSTR lpstr, - int c, - LPWORD pgi, - DWORD fl -); - -WINBOOL -STDCALL -RemoveFontResourceExA( - LPCSTR lpFileName, - DWORD fl, - PVOID pdv -); - -UINT -STDCALL -GetStringBitmapA(HDC hdc,LPSTR psz,WINBOOL unknown,UINT cj,BYTE *lpSB); - -WINBOOL -STDCALL -GetAltTabInfoA( - HWND hwnd, - int iItem, - PALTTABINFO pati, - LPSTR pszItemText, - UINT cchItemText - ); - -UINT -STDCALL -PrivateExtractIconsA( - LPCSTR szFileName, - int nIconIndex, - int cxIcon, - int cyIcon, - HICON *phicon, - UINT *piconid, - UINT nIcons, - UINT flags - ); - -UINT -STDCALL -RealGetWindowClassA( - HWND hwnd, - LPSTR pszType, - UINT cchType - ); - -LRESULT -STDCALL -MenuWindowProcA( - HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam - ); - -WINBOOL -STDCALL -DrawCaptionTempA( - HWND hwnd, - HDC hdc, - const RECT *rect, - HFONT hFont, - HICON hIcon, - LPCSTR str, - UINT uFlags - ); - -HHOOK -STDCALL -SetWindowsHookA( - int idHook, - HOOKPROC lpfn - ); - -HRESULT -STDCALL -PrivateExtractIconExA( - DWORD u, - DWORD v, - DWORD w, - DWORD x, - DWORD y - ); - -WINBOOL -STDCALL -GetBinaryTypeA( - LPCSTR lpApplicationName, - LPDWORD lpBinaryType - ); - -DWORD -STDCALL -GetShortPathNameA( - LPCSTR lpszLongPath, - LPSTR lpszShortPath, - DWORD cchBuffer - ); - -LPSTR -STDCALL -GetEnvironmentStringsA( - VOID - ); - -WINBOOL -STDCALL -FreeEnvironmentStringsA( - LPSTR - ); - -DWORD -STDCALL -FormatMessageA( - DWORD dwFlags, - LPCVOID lpSource, - DWORD dwMessageId, - DWORD dwLanguageId, - LPSTR lpBuffer, - DWORD nSize, - va_list *Arguments - ); - -HANDLE -STDCALL -CreateMailslotA( - LPCSTR lpName, - DWORD nMaxMessageSize, - DWORD lReadTimeout, - LPSECURITY_ATTRIBUTES lpSecurityAttributes - ); - -int -STDCALL -lstrcmpA( - LPCSTR lpString1, - LPCSTR lpString2 - ); - -int -STDCALL -lstrcmpiA( - LPCSTR lpString1, - LPCSTR lpString2 - ); - -LPSTR -STDCALL -lstrcpynA( - LPSTR lpString1, - LPCSTR lpString2, - int iMaxLength - ); - -LPSTR -STDCALL -lstrcpyA( - LPSTR lpString1, - LPCSTR lpString2 - ); - -LPSTR -STDCALL -lstrcatA( - LPSTR lpString1, - LPCSTR lpString2 - ); - -int -STDCALL -lstrlenA( - LPCSTR lpString - ); - -HANDLE -STDCALL -CreateMutexA( - LPSECURITY_ATTRIBUTES lpMutexAttributes, - WINBOOL bInitialOwner, - LPCSTR lpName - ); - -HANDLE -STDCALL -OpenMutexA( - DWORD dwDesiredAccess, - WINBOOL bInheritHandle, - LPCSTR lpName - ); - -HANDLE -STDCALL -CreateEventA( - LPSECURITY_ATTRIBUTES lpEventAttributes, - WINBOOL bManualReset, - WINBOOL bInitialState, - LPCSTR lpName - ); - -HANDLE -STDCALL -OpenEventA( - DWORD dwDesiredAccess, - WINBOOL bInheritHandle, - LPCSTR lpName - ); - -HANDLE -STDCALL -CreateSemaphoreA( - LPSECURITY_ATTRIBUTES lpSemaphoreAttributes, - LONG lInitialCount, - LONG lMaximumCount, - LPCSTR lpName - ); - -HANDLE -STDCALL -OpenSemaphoreA( - DWORD dwDesiredAccess, - WINBOOL bInheritHandle, - LPCSTR lpName - ); - -HANDLE -STDCALL -CreateFileMappingA( - HANDLE hFile, - LPSECURITY_ATTRIBUTES lpFileMappingAttributes, - DWORD flProtect, - DWORD dwMaximumSizeHigh, - DWORD dwMaximumSizeLow, - LPCSTR lpName - ); - -HANDLE -STDCALL -OpenFileMappingA( - DWORD dwDesiredAccess, - WINBOOL bInheritHandle, - LPCSTR lpName - ); - -DWORD -STDCALL -GetLogicalDriveStringsA( - DWORD nBufferLength, - LPSTR lpBuffer - ); - -HINSTANCE -STDCALL -LoadLibraryA( - LPCSTR lpLibFileName - ); - -HINSTANCE -STDCALL -LoadLibraryExA( - LPCSTR lpLibFileName, - HANDLE hFile, - DWORD dwFlags - ); - -DWORD -STDCALL -GetModuleFileNameA( - HINSTANCE hModule, - LPSTR lpFilename, - DWORD nSize - ); - -HMODULE -STDCALL -GetModuleHandleA( - LPCSTR lpModuleName - ); - -VOID -STDCALL -FatalAppExitA( - UINT uAction, - LPCSTR lpMessageText - ); - -LPSTR -STDCALL -GetCommandLineA( - VOID - ); - -DWORD -STDCALL -GetEnvironmentVariableA( - LPCSTR lpName, - LPSTR lpBuffer, - DWORD nSize - ); - -WINBOOL -STDCALL -SetEnvironmentVariableA( - LPCSTR lpName, - LPCSTR lpValue - ); - -DWORD -STDCALL -ExpandEnvironmentStringsA( - LPCSTR lpSrc, - LPSTR lpDst, - DWORD nSize - ); - -VOID -STDCALL [truncated at 1000 lines; 3963 more skipped]

19 years, 5 months

[sedwards] 14431: avoid the use of ver.h in favor of winver.h

by sedwards＠svn.reactos.com

avoid the use of ver.h in favor of winver.h Modified: trunk/reactos/lib/msi/action.c Modified: trunk/reactos/lib/msi/custom.c Modified: trunk/reactos/lib/msi/format.c _____ Modified: trunk/reactos/lib/msi/action.c --- trunk/reactos/lib/msi/action.c 2005-04-02 00:18:46 UTC (rev 14430) +++ trunk/reactos/lib/msi/action.c 2005-04-02 00:49:10 UTC (rev 14431) @@ -48,7 +48,7 @@ #include "winuser.h" #include "shlobj.h" #include "wine/unicode.h" -#include "ver.h" +#include "winver.h" #include "action.h" #define REG_PROGRESS_VALUE 13200 _____ Modified: trunk/reactos/lib/msi/custom.c --- trunk/reactos/lib/msi/custom.c 2005-04-02 00:18:46 UTC (rev 14430) +++ trunk/reactos/lib/msi/custom.c 2005-04-02 00:49:10 UTC (rev 14431) @@ -45,7 +45,7 @@ #include "winuser.h" #include "shlobj.h" #include "wine/unicode.h" -#include "ver.h" +#include "winver.h" #include "action.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); _____ Modified: trunk/reactos/lib/msi/format.c --- trunk/reactos/lib/msi/format.c 2005-04-02 00:18:46 UTC (rev 14430) +++ trunk/reactos/lib/msi/format.c 2005-04-02 00:49:10 UTC (rev 14431) @@ -44,7 +44,7 @@ #include "winuser.h" #include "shlobj.h" #include "wine/unicode.h" -#include "ver.h" +#include "winver.h" #include "action.h" WINE_DEFAULT_DEBUG_CHANNEL(msi);

19 years, 5 months

[gdalsnes] 14430: -move rtl thread/process stuff from ntdll to rtl and make ntoskrnl\ldr\init.c use those

by gdalsnes＠svn.reactos.com

-move rtl thread/process stuff from ntdll to rtl and make ntoskrnl\ldr\init.c use those -fix RtlCreateUserProcess to create the thread suspended and update all users of RtlCreateUserProcess to manually resume the thread Modified: trunk/reactos/include/ntos/rtl.h Modified: trunk/reactos/lib/ntdll/makefile Modified: trunk/reactos/lib/ntdll/rtl/process.c Modified: trunk/reactos/lib/ntdll/rtl/teb.c Deleted: trunk/reactos/lib/ntdll/rtl/thread.c Modified: trunk/reactos/lib/rtl/makefile Added: trunk/reactos/lib/rtl/process.c Added: trunk/reactos/lib/rtl/thread.c Modified: trunk/reactos/ntoskrnl/ldr/init.c Modified: trunk/reactos/subsys/csrss/init.c Modified: trunk/reactos/subsys/smss/smapiexec.c _____ Modified: trunk/reactos/include/ntos/rtl.h --- trunk/reactos/include/ntos/rtl.h 2005-04-02 00:11:50 UTC (rev 14429) +++ trunk/reactos/include/ntos/rtl.h 2005-04-02 00:18:46 UTC (rev 14430) @@ -379,6 +379,21 @@ NTSTATUS STDCALL +RtlCreateUserThread ( + IN HANDLE ProcessHandle, + IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN BOOLEAN CreateSuspended, + IN LONG StackZeroBits, + IN OUT PULONG StackReserve, + IN OUT PULONG StackCommit, + IN PTHREAD_START_ROUTINE StartAddress, + IN PVOID Parameter, + IN OUT PHANDLE ThreadHandle, + IN OUT PCLIENT_ID ClientId + ); + +NTSTATUS +STDCALL RtlAppendUnicodeToString ( PUNICODE_STRING Destination, PCWSTR Source _____ Modified: trunk/reactos/lib/ntdll/makefile --- trunk/reactos/lib/ntdll/makefile 2005-04-02 00:11:50 UTC (rev 14429) +++ trunk/reactos/lib/ntdll/makefile 2005-04-02 00:18:46 UTC (rev 14430) @@ -23,7 +23,7 @@ -Wl,--section-alignment,0x1000 \ -nostartfiles -nostdlib -TARGET_SDKLIBS = rosrtl.a rtl.a string.a +TARGET_SDKLIBS = rtl.a rosrtl.a string.a TARGET_GCCLIBS = gcc @@ -81,7 +81,6 @@ rtl/rangelist.o \ rtl/resource.o \ rtl/teb.o \ - rtl/thread.o \ rtl/timerqueue.o \ rtl/libsupp.o _____ Modified: trunk/reactos/lib/ntdll/rtl/process.c --- trunk/reactos/lib/ntdll/rtl/process.c 2005-04-02 00:11:50 UTC (rev 14429) +++ trunk/reactos/lib/ntdll/rtl/process.c 2005-04-02 00:18:46 UTC (rev 14430) @@ -23,30 +23,6 @@ /* FUNCTIONS ****************************************************************/ -static NTSTATUS RtlpCreateFirstThread -( - HANDLE ProcessHandle, - ULONG StackReserve, - ULONG StackCommit, - LPTHREAD_START_ROUTINE lpStartAddress, - PCLIENT_ID ClientId, - PHANDLE ThreadHandle -) -{ - return RtlCreateUserThread - ( - ProcessHandle, - NULL, - FALSE, - 0, - &StackReserve, - &StackCommit, - lpStartAddress, - (PVOID)PEB_BASE, - ThreadHandle, - ClientId - ); -} PPEB STDCALL @@ -55,273 +31,26 @@ return NtCurrentPeb(); } -static NTSTATUS -RtlpMapFile(PUNICODE_STRING ImageFileName, - PRTL_USER_PROCESS_PARAMETERS Ppb, - ULONG Attributes, - PHANDLE Section) -{ - HANDLE hFile; - IO_STATUS_BLOCK IoStatusBlock; - OBJECT_ATTRIBUTES ObjectAttributes; - PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; - NTSTATUS Status; - - hFile = NULL; - RtlDeNormalizeProcessParams (Ppb); - -// DbgPrint("ImagePathName %x\n", Ppb->ImagePathName.Buffer); - - InitializeObjectAttributes(&ObjectAttributes, - ImageFileName, - Attributes & (OBJ_CASE_INSENSITIVE | OBJ_INHERIT), - NULL, - SecurityDescriptor); - - RtlNormalizeProcessParams (Ppb); - - /* - * Try to open the executable - */ - - Status = NtOpenFile(&hFile, - SYNCHRONIZE|FILE_EXECUTE|FILE_READ_DATA, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_DELETE|FILE_SHARE_READ, - FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); - - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - Status = NtCreateSection(Section, - SECTION_ALL_ACCESS, - NULL, - NULL, - PAGE_EXECUTE, - SEC_IMAGE, - hFile); - NtClose(hFile); - - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - return(STATUS_SUCCESS); -} - -static NTSTATUS KlInitPeb (HANDLE ProcessHandle, - PRTL_USER_PROCESS_PARAMETERS Ppb, - PVOID* ImageBaseAddress) +/* + * @implemented + */ +VOID STDCALL +RtlAcquirePebLock(VOID) { - NTSTATUS Status; - PVOID PpbBase; - ULONG PpbSize; - ULONG BytesWritten; - ULONG Offset; - PVOID EnvPtr = NULL; - ULONG EnvSize = 0; - - /* create the Environment */ - if (Ppb->Environment != NULL) - { - MEMORY_BASIC_INFORMATION MemInfo; - - Status = NtQueryVirtualMemory (NtCurrentProcess (), - Ppb->Environment, - MemoryBasicInformation, - &MemInfo, - sizeof(MEMORY_BASIC_INFORMATION), - NULL); - if (!NT_SUCCESS(Status)) - { - return Status; - } - EnvSize = MemInfo.RegionSize; - } - DPRINT("EnvironmentSize %ld\n", EnvSize); - - /* allocate and initialize new environment block */ - if (EnvSize != 0) - { - Status = NtAllocateVirtualMemory(ProcessHandle, - &EnvPtr, - 0, - &EnvSize, - MEM_RESERVE | MEM_COMMIT, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - NtWriteVirtualMemory(ProcessHandle, - EnvPtr, - Ppb->Environment, - EnvSize, - &BytesWritten); - } - DPRINT("EnvironmentPointer %p\n", EnvPtr); - - /* create the PPB */ - PpbBase = NULL; - PpbSize = Ppb->AllocationSize; - - Status = NtAllocateVirtualMemory(ProcessHandle, - &PpbBase, - 0, - &PpbSize, - MEM_RESERVE | MEM_COMMIT, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - DPRINT("Ppb->MaximumLength %x\n", Ppb->AllocationSize); - - /* write process parameters block*/ - RtlDeNormalizeProcessParams (Ppb); - NtWriteVirtualMemory(ProcessHandle, - PpbBase, - Ppb, - Ppb->AllocationSize, - - &BytesWritten); - RtlNormalizeProcessParams (Ppb); - - /* write pointer to environment */ - Offset = FIELD_OFFSET(RTL_USER_PROCESS_PARAMETERS, Environment); - NtWriteVirtualMemory(ProcessHandle, - (PVOID)(PpbBase + Offset), - &EnvPtr, - sizeof(EnvPtr), - &BytesWritten); - - /* write pointer to process parameter block */ - Offset = FIELD_OFFSET(PEB, ProcessParameters); - NtWriteVirtualMemory(ProcessHandle, - (PVOID)(PEB_BASE + Offset), - &PpbBase, - sizeof(PpbBase), - &BytesWritten); - - /* Read image base address. */ - Offset = FIELD_OFFSET(PEB, ImageBaseAddress); - NtReadVirtualMemory(ProcessHandle, - (PVOID)(PEB_BASE + Offset), - ImageBaseAddress, - sizeof(PVOID), - &BytesWritten); - - return(STATUS_SUCCESS); + PPEB Peb = NtCurrentPeb (); + Peb->FastPebLockRoutine (Peb->FastPebLock); } + /* * @implemented */ -NTSTATUS STDCALL -RtlCreateUserProcess(PUNICODE_STRING ImageFileName, - ULONG Attributes, - PRTL_USER_PROCESS_PARAMETERS ProcessParameters, - PSECURITY_DESCRIPTOR ProcessSecurityDescriptor, - PSECURITY_DESCRIPTOR ThreadSecurityDescriptor, - HANDLE ParentProcess, - BOOLEAN CurrentDirectory, - HANDLE DebugPort, - HANDLE ExceptionPort, - PRTL_PROCESS_INFO ProcessInfo) +VOID STDCALL +RtlReleasePebLock(VOID) { - HANDLE hSection; - NTSTATUS Status; - PROCESS_BASIC_INFORMATION ProcessBasicInfo; - ULONG retlen; - SECTION_IMAGE_INFORMATION Sii; - ULONG ResultLength; - PVOID ImageBaseAddress; - - DPRINT("RtlCreateUserProcess\n"); - - Status = RtlpMapFile(ImageFileName, - ProcessParameters, - Attributes, - &hSection); - if( !NT_SUCCESS( Status ) ) - return Status; - - /* - * Create a new process - */ - if (ParentProcess == NULL) - ParentProcess = NtCurrentProcess(); - - Status = NtCreateProcess(&(ProcessInfo->ProcessHandle), - PROCESS_ALL_ACCESS, - NULL, - ParentProcess, - CurrentDirectory, - hSection, - DebugPort, - ExceptionPort); - if (!NT_SUCCESS(Status)) - { - NtClose(hSection); - return(Status); - } - - /* - * Get some information about the process - */ - NtQueryInformationProcess(ProcessInfo->ProcessHandle, - ProcessBasicInformation, - &ProcessBasicInfo, - sizeof(ProcessBasicInfo), - &retlen); - DPRINT("ProcessBasicInfo.UniqueProcessId %d\n", - ProcessBasicInfo.UniqueProcessId); - ProcessInfo->ClientId.UniqueProcess = (HANDLE)ProcessBasicInfo.UniqueProcessId; - - /* - * Create Process Environment Block - */ - DPRINT("Creating peb\n"); - KlInitPeb(ProcessInfo->ProcessHandle, - ProcessParameters, - &ImageBaseAddress); - - Status = NtQuerySection(hSection, - SectionImageInformation, - &Sii, - sizeof(Sii), - &ResultLength); - if (!NT_SUCCESS(Status) || ResultLength != sizeof(Sii)) - { - DPRINT("Failed to get section image information.\n"); - NtClose(hSection); - return(Status); - } - - DPRINT("Creating thread for process\n"); - Status = RtlpCreateFirstThread(ProcessInfo->ProcessHandle, - Sii.StackReserve, - Sii.StackCommit, - ImageBaseAddress + (ULONG)Sii.EntryPoint, - &ProcessInfo->ClientId, - &ProcessInfo->ThreadHandle); - - NtClose(hSection); - - if (!NT_SUCCESS(Status)) - { - DPRINT("Failed to create thread\n"); - return(Status); - } - - return(STATUS_SUCCESS); + PPEB Peb = NtCurrentPeb (); + Peb->FastPebUnlockRoutine (Peb->FastPebLock); } _____ Modified: trunk/reactos/lib/ntdll/rtl/teb.c --- trunk/reactos/lib/ntdll/rtl/teb.c 2005-04-02 00:11:50 UTC (rev 14429) +++ trunk/reactos/lib/ntdll/rtl/teb.c 2005-04-02 00:18:46 UTC (rev 14430) @@ -14,25 +14,5 @@ _NtCurrentTeb() { return NtCurrentTeb(); } -/* - * @implemented - */ -VOID STDCALL -RtlAcquirePebLock(VOID) -{ - PPEB Peb = NtCurrentPeb (); - Peb->FastPebLockRoutine (Peb->FastPebLock); -} - -/* - * @implemented - */ -VOID STDCALL -RtlReleasePebLock(VOID) -{ - PPEB Peb = NtCurrentPeb (); - Peb->FastPebUnlockRoutine (Peb->FastPebLock); -} - /* EOF */ _____ Deleted: trunk/reactos/lib/ntdll/rtl/thread.c --- trunk/reactos/lib/ntdll/rtl/thread.c 2005-04-02 00:11:50 UTC (rev 14429) +++ trunk/reactos/lib/ntdll/rtl/thread.c 2005-04-02 00:18:46 UTC (rev 14430) @@ -1,115 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Rtl user thread functions - * FILE: lib/ntdll/rtl/thread.c - * PROGRAMER: Eric Kohl - * REVISION HISTORY: - * 09/07/99: Created - * 09/10/99: Cleanup and full stack support. - * 25/04/03: Near rewrite. Made code more readable, replaced - * INITIAL_TEB with USER_STACK, added support for - * fixed-size stacks - * 28/04/03: Moved all code to a new statically linked - * library (ROSRTL) so it can be shared with - * kernel32.dll without exporting non-standard - * functions from ntdll.dll - */ - -/* INCLUDES *****************************************************************/ - -#define NTOS_MODE_USER -#include <ntos.h> - -#define NDEBUG -#include <ntdll/ntdll.h> - -/* FUNCTIONS ***************************************************************/ - -/* - @implemented -*/ -NTSTATUS STDCALL RtlCreateUserThread -( - HANDLE ProcessHandle, - PSECURITY_DESCRIPTOR SecurityDescriptor, - BOOLEAN CreateSuspended, - LONG StackZeroBits, - PULONG StackReserve, - PULONG StackCommit, - PTHREAD_START_ROUTINE StartAddress, - PVOID Parameter, - PHANDLE ThreadHandle, - PCLIENT_ID ClientId -) -{ - OBJECT_ATTRIBUTES oaThreadAttribs; - - InitializeObjectAttributes - ( - &oaThreadAttribs, - NULL, - 0, - NULL, - SecurityDescriptor - ); - - return RtlRosCreateUserThread - ( - ProcessHandle, - &oaThreadAttribs, - CreateSuspended, - StackZeroBits, - StackReserve, - StackCommit, - StartAddress, - ThreadHandle, - ClientId, - 1, - (ULONG_PTR *)&Parameter - ); -} - -/* - @implemented -*/ -NTSTATUS STDCALL -RtlInitializeContext( - IN HANDLE ProcessHandle, - OUT PCONTEXT ThreadContext, - IN PVOID ThreadStartParam OPTIONAL, - IN PTHREAD_START_ROUTINE ThreadStartAddress, - IN PINITIAL_TEB InitialTeb) -{ - return RtlRosInitializeContext - ( - ProcessHandle, - ThreadContext, - ThreadStartAddress, - InitialTeb, - 1, - (ULONG_PTR *)&ThreadStartParam - ); -} - -/* - @implemented -*/ -NTSTATUS STDCALL RtlFreeUserThreadStack -( - HANDLE ProcessHandle, - HANDLE ThreadHandle -) -{ - return RtlRosFreeUserThreadStack(ProcessHandle, ThreadHandle); -} - -/* - @implemented -*/ -NTSTATUS STDCALL RtlExitUserThread(NTSTATUS Status) -{ - RtlRosExitUserThread(Status); -} - -/* EOF */ _____ Modified: trunk/reactos/lib/rtl/makefile --- trunk/reactos/lib/rtl/makefile 2005-04-02 00:11:50 UTC (rev 14429) +++ trunk/reactos/lib/rtl/makefile 2005-04-02 00:18:46 UTC (rev 14430) @@ -20,6 +20,8 @@ acl.o \ ppb.o \ bit.o \ + thread.o \ + process.o \ bitmap.o \ bootdata.o \ compress.o \ _____ Copied: trunk/reactos/lib/rtl/process.c (from rev 14394, trunk/reactos/lib/ntdll/rtl/process.c) --- trunk/reactos/lib/ntdll/rtl/process.c 2005-03-31 19:54:03 UTC (rev 14394) +++ trunk/reactos/lib/rtl/process.c 2005-04-02 00:18:46 UTC (rev 14430) @@ -0,0 +1,318 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/ntdll/rtl/process.c + * PURPOSE: Process functions + * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) + * UPDATE HISTORY: + * Created 01/11/98 + */ + +/* INCLUDES ****************************************************************/ + +#include <ddk/ntddk.h> +#include <windows.h> +#include <napi/i386/segment.h> +#include <ntdll/ldr.h> +#include <ntdll/base.h> +#include <ntdll/rtl.h> + +#define NDEBUG +#include <ntdll/ntdll.h> + +/* FUNCTIONS ****************************************************************/ + + +static NTSTATUS +RtlpMapFile(PUNICODE_STRING ImageFileName, + PRTL_USER_PROCESS_PARAMETERS Ppb, + ULONG Attributes, + PHANDLE Section) +{ + HANDLE hFile; + IO_STATUS_BLOCK IoStatusBlock; + OBJECT_ATTRIBUTES ObjectAttributes; + PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; + NTSTATUS Status; + + hFile = NULL; + + RtlDeNormalizeProcessParams (Ppb); + +// DbgPrint("ImagePathName %x\n", Ppb->ImagePathName.Buffer); + + InitializeObjectAttributes(&ObjectAttributes, + ImageFileName, + Attributes & (OBJ_CASE_INSENSITIVE | OBJ_INHERIT), + NULL, + SecurityDescriptor); + + RtlNormalizeProcessParams (Ppb); + + /* + * Try to open the executable + */ + + Status = ZwOpenFile(&hFile, + SYNCHRONIZE|FILE_EXECUTE|FILE_READ_DATA, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_DELETE|FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); + + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + Status = ZwCreateSection(Section, + SECTION_ALL_ACCESS, + NULL, + NULL, + PAGE_EXECUTE, + SEC_IMAGE, + hFile); + ZwClose(hFile); + + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + return(STATUS_SUCCESS); +} + +static NTSTATUS KlInitPeb (HANDLE ProcessHandle, + PRTL_USER_PROCESS_PARAMETERS Ppb, + PVOID* ImageBaseAddress) +{ + NTSTATUS Status; + PVOID PpbBase; + ULONG PpbSize; + ULONG BytesWritten; + ULONG Offset; + PVOID EnvPtr = NULL; + ULONG EnvSize = 0; + + /* create the Environment */ + if (Ppb->Environment != NULL) + { + MEMORY_BASIC_INFORMATION MemInfo; + + Status = ZwQueryVirtualMemory (NtCurrentProcess (), + Ppb->Environment, + MemoryBasicInformation, + &MemInfo, + sizeof(MEMORY_BASIC_INFORMATION), + NULL); + if (!NT_SUCCESS(Status)) + { + return Status; + } + EnvSize = MemInfo.RegionSize; + } + DPRINT("EnvironmentSize %ld\n", EnvSize); + + /* allocate and initialize new environment block */ + if (EnvSize != 0) + { + Status = ZwAllocateVirtualMemory(ProcessHandle, + &EnvPtr, + 0, + &EnvSize, + MEM_RESERVE | MEM_COMMIT, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + ZwWriteVirtualMemory(ProcessHandle, + EnvPtr, + Ppb->Environment, + EnvSize, + &BytesWritten); + } + DPRINT("EnvironmentPointer %p\n", EnvPtr); + + /* create the PPB */ + PpbBase = NULL; + PpbSize = Ppb->AllocationSize; + + Status = ZwAllocateVirtualMemory(ProcessHandle, + &PpbBase, + 0, + &PpbSize, + MEM_RESERVE | MEM_COMMIT, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + DPRINT("Ppb->MaximumLength %x\n", Ppb->AllocationSize); + + /* write process parameters block*/ + RtlDeNormalizeProcessParams (Ppb); + ZwWriteVirtualMemory(ProcessHandle, + PpbBase, + Ppb, + Ppb->AllocationSize, + + &BytesWritten); + RtlNormalizeProcessParams (Ppb); + + /* write pointer to environment */ + Offset = FIELD_OFFSET(RTL_USER_PROCESS_PARAMETERS, Environment); + ZwWriteVirtualMemory(ProcessHandle, + (PVOID)(PpbBase + Offset), + &EnvPtr, + sizeof(EnvPtr), + &BytesWritten); + + /* write pointer to process parameter block */ + Offset = FIELD_OFFSET(PEB, ProcessParameters); + ZwWriteVirtualMemory(ProcessHandle, + (PVOID)(PEB_BASE + Offset), + &PpbBase, + sizeof(PpbBase), + &BytesWritten); + + /* Read image base address. */ + Offset = FIELD_OFFSET(PEB, ImageBaseAddress); + ZwReadVirtualMemory(ProcessHandle, + (PVOID)(PEB_BASE + Offset), + ImageBaseAddress, + sizeof(PVOID), + &BytesWritten); + + return(STATUS_SUCCESS); +} + + +/* + * @implemented + * + * Creates a process and its initial thread. + * + * NOTES: + * - The first thread is created suspended, so it needs a manual resume!!! + * - If ParentProcess is NULL, current process is used + * - ProcessParameters must be normalized + * - Attributes are object attribute flags used when opening the ImageFileName. + * Valid flags are OBJ_INHERIT and OBJ_CASE_INSENSITIVE. + * + * -Gunnar + */ +NTSTATUS STDCALL +RtlCreateUserProcess( + IN PUNICODE_STRING ImageFileName, + IN ULONG Attributes, + IN OUT PRTL_USER_PROCESS_PARAMETERS ProcessParameters, + IN PSECURITY_DESCRIPTOR ProcessSecurityDescriptor OPTIONAL, + IN PSECURITY_DESCRIPTOR ThreadSecurityDescriptor OPTIONAL, + IN HANDLE ParentProcess OPTIONAL, + IN BOOLEAN InheritHandles, + IN HANDLE DebugPort OPTIONAL, + IN HANDLE ExceptionPort OPTIONAL, + OUT PRTL_PROCESS_INFO ProcessInfo + ) +{ + HANDLE hSection; + NTSTATUS Status; + PROCESS_BASIC_INFORMATION ProcessBasicInfo; + ULONG retlen; + SECTION_IMAGE_INFORMATION Sii; + ULONG ResultLength; + PVOID ImageBaseAddress; + + DPRINT("RtlCreateUserProcess\n"); + + Status = RtlpMapFile(ImageFileName, + ProcessParameters, + Attributes, + &hSection); + if( !NT_SUCCESS( Status ) ) + return Status; + + /* + * Create a new process + */ + if (ParentProcess == NULL) + ParentProcess = NtCurrentProcess(); + + Status = ZwCreateProcess(&(ProcessInfo->ProcessHandle), + PROCESS_ALL_ACCESS, + NULL, + ParentProcess, + InheritHandles, + hSection, + DebugPort, + ExceptionPort); + if (!NT_SUCCESS(Status)) + { + ZwClose(hSection); + return(Status); + } + + /* + * Get some information about the process + */ + ZwQueryInformationProcess(ProcessInfo->ProcessHandle, + ProcessBasicInformation, + &ProcessBasicInfo, + sizeof(ProcessBasicInfo), + &retlen); + DPRINT("ProcessBasicInfo.UniqueProcessId %d\n", + ProcessBasicInfo.UniqueProcessId); + ProcessInfo->ClientId.UniqueProcess = (HANDLE)ProcessBasicInfo.UniqueProcessId; + + /* + * Create Process Environment Block + */ + DPRINT("Creating peb\n"); + KlInitPeb(ProcessInfo->ProcessHandle, + ProcessParameters, + &ImageBaseAddress); + + Status = ZwQuerySection(hSection, + SectionImageInformation, + &Sii, + sizeof(Sii), + &ResultLength); + if (!NT_SUCCESS(Status) || ResultLength != sizeof(Sii)) + { + DPRINT("Failed to get section image information.\n"); + ZwClose(hSection); + return(Status); + } + + DPRINT("Creating thread for process\n"); + Status = RtlCreateUserThread( + ProcessInfo->ProcessHandle, + NULL, + TRUE, /* CreateSuspended? */ + 0, + &Sii.StackReserve, + &Sii.StackCommit, + ImageBaseAddress + (ULONG)Sii.EntryPoint, + (PVOID)PEB_BASE, + &ProcessInfo->ThreadHandle, + &ProcessInfo->ClientId + ); + + ZwClose(hSection); + + if (!NT_SUCCESS(Status)) + { + DPRINT("Failed to create thread\n"); + return(Status); + } + + return(STATUS_SUCCESS); +} + + + +/* EOF */ _____ Copied: trunk/reactos/lib/rtl/thread.c (from rev 14394, trunk/reactos/lib/ntdll/rtl/thread.c) --- trunk/reactos/lib/ntdll/rtl/thread.c 2005-03-31 19:54:03 UTC (rev 14394) +++ trunk/reactos/lib/rtl/thread.c 2005-04-02 00:18:46 UTC (rev 14430) @@ -0,0 +1,114 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Rtl user thread functions + * FILE: lib/ntdll/rtl/thread.c + * PROGRAMER: Eric Kohl + * REVISION HISTORY: + * 09/07/99: Created + * 09/10/99: Cleanup and full stack support. + * 25/04/03: Near rewrite. Made code more readable, replaced + * INITIAL_TEB with USER_STACK, added support for + * fixed-size stacks + * 28/04/03: Moved all code to a new statically linked + * library (ROSRTL) so it can be shared with + * kernel32.dll without exporting non-standard + * functions from ntdll.dll + */ + +/* INCLUDES *****************************************************************/ + +#include <ntos.h> + +#define NDEBUG +#include <ntdll/ntdll.h> + +/* FUNCTIONS ***************************************************************/ + +/* + @implemented +*/ +NTSTATUS STDCALL RtlCreateUserThread +( + HANDLE ProcessHandle, + PSECURITY_DESCRIPTOR SecurityDescriptor, + BOOLEAN CreateSuspended, + LONG StackZeroBits, + PULONG StackReserve, + PULONG StackCommit, + PTHREAD_START_ROUTINE StartAddress, + PVOID Parameter, + PHANDLE ThreadHandle, + PCLIENT_ID ClientId +) +{ + OBJECT_ATTRIBUTES oaThreadAttribs; + + InitializeObjectAttributes + ( + &oaThreadAttribs, + NULL, + 0, + NULL, + SecurityDescriptor + ); + + return RtlRosCreateUserThread + ( + ProcessHandle, + &oaThreadAttribs, + CreateSuspended, + StackZeroBits, + StackReserve, + StackCommit, + StartAddress, + ThreadHandle, + ClientId, + 1, + (ULONG_PTR *)&Parameter + ); +} + +/* + @implemented +*/ +NTSTATUS STDCALL +RtlInitializeContext( + IN HANDLE ProcessHandle, + OUT PCONTEXT ThreadContext, + IN PVOID ThreadStartParam OPTIONAL, + IN PTHREAD_START_ROUTINE ThreadStartAddress, + IN PINITIAL_TEB InitialTeb) +{ + return RtlRosInitializeContext + ( + ProcessHandle, + ThreadContext, + ThreadStartAddress, + InitialTeb, + 1, + (ULONG_PTR *)&ThreadStartParam + ); +} + +/* + @implemented +*/ +NTSTATUS STDCALL RtlFreeUserThreadStack +( + HANDLE ProcessHandle, + HANDLE ThreadHandle +) +{ + return RtlRosFreeUserThreadStack(ProcessHandle, ThreadHandle); +} + +/* + @implemented +*/ +NTSTATUS STDCALL RtlExitUserThread(NTSTATUS Status) +{ + RtlRosExitUserThread(Status); +} + +/* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ldr/init.c --- trunk/reactos/ntoskrnl/ldr/init.c 2005-04-02 00:11:50 UTC (rev 14429) +++ trunk/reactos/ntoskrnl/ldr/init.c 2005-04-02 00:18:46 UTC (rev 14430) @@ -11,540 +11,152 @@ /* INCLUDES *****************************************************************/ + #include <ntoskrnl.h> + #define NDEBUG #include <internal/debug.h> -/* MACROS ******************************************************************/ - -#define DENORMALIZE(x,addr) {if(x) x=(VOID*)((ULONG)(x)-(ULONG)(addr));} -#define ALIGN(x,align) (((ULONG)(x)+(align)-1UL)&(~((align)-1UL))) - - -/* FUNCTIONS *****************************************************************/ - -static NTSTATUS -LdrpMapProcessImage(PHANDLE SectionHandle, - PUNICODE_STRING ImagePath) +/* [truncated at 1000 lines; 660 more skipped]

19 years, 5 months

[sedwards] 14429: nevermind. It helps to do a make bootcd in the terminal that has the value and /usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin:/usr/games:/opt/www/htdig/bin:/usr/lib/java/bin:/usr/lib/java/jre/bin:/opt/kde/bin:/usr/lib/qt/bin to mingw defined.

by sedwards＠svn.reactos.com

nevermind. It helps to do a make bootcd in the terminal that has the value and /usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin:/usr/X11R6/ bin:/usr/games:/opt/www/htdig/bin:/usr/lib/java/bin:/usr/lib/java/jre/bi n:/opt/kde/bin:/usr/lib/qt/bin to mingw defined. Modified: trunk/reactos/boot/freeldr/Makefile _____ Modified: trunk/reactos/boot/freeldr/Makefile --- trunk/reactos/boot/freeldr/Makefile 2005-04-02 00:05:16 UTC (rev 14428) +++ trunk/reactos/boot/freeldr/Makefile 2005-04-02 00:11:50 UTC (rev 14429) @@ -38,6 +38,7 @@ $(MAKE) -C tools clean bootcd: +ifeq ($(ARCH),i386) $(CP) bootsect/isoboot.bin ${BOOTCD_DIR}/../isoboot.bin $(CP) bootsect/dosmbr.bin ${BOOTCD_DIR}/loader/dosmbr.bin $(CP) bootsect/ext2.bin ${BOOTCD_DIR}/loader/ext2.bin @@ -46,5 +47,7 @@ $(CP) bootsect/isoboot.bin ${BOOTCD_DIR}/loader/isoboot.bin $(CP) freeldr/freeldr.sys ${BOOTCD_DIR}/loader/freeldr.sys $(CP) freeldr/setupldr.sys ${BOOTCD_DIR}/loader/setupldr.sys +endif .PHONY : clean +

19 years, 5 months

[sedwards] 14428: mingw32-linux is not setting ARCH=i386....this fixes the bootcd for now

by sedwards＠svn.reactos.com

mingw32-linux is not setting ARCH=i386....this fixes the bootcd for now Modified: trunk/reactos/boot/freeldr/Makefile _____ Modified: trunk/reactos/boot/freeldr/Makefile --- trunk/reactos/boot/freeldr/Makefile 2005-04-01 22:39:20 UTC (rev 14427) +++ trunk/reactos/boot/freeldr/Makefile 2005-04-02 00:05:16 UTC (rev 14428) @@ -38,7 +38,6 @@ $(MAKE) -C tools clean bootcd: -ifeq ($(ARCH),i386) $(CP) bootsect/isoboot.bin ${BOOTCD_DIR}/../isoboot.bin $(CP) bootsect/dosmbr.bin ${BOOTCD_DIR}/loader/dosmbr.bin $(CP) bootsect/ext2.bin ${BOOTCD_DIR}/loader/ext2.bin @@ -47,6 +46,5 @@ $(CP) bootsect/isoboot.bin ${BOOTCD_DIR}/loader/isoboot.bin $(CP) freeldr/freeldr.sys ${BOOTCD_DIR}/loader/freeldr.sys $(CP) freeldr/setupldr.sys ${BOOTCD_DIR}/loader/setupldr.sys -endif .PHONY : clean

19 years, 5 months

[gvg] 14427: - Add support for Xen 2.0

by gvg＠svn.reactos.com

- Add support for Xen 2.0 - Rearrange some code Modified: branches/xen/reactos/boot/freeldr/freeldr/Makefile Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.h Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xencons.c Added: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenctrlif.c Added: branches/xen/reactos/include/xen2/ Added: branches/xen/reactos/include/xen2/private/ Added: branches/xen/reactos/include/xen2/private/ctrl_if.h Added: branches/xen/reactos/include/xen2/private/evtchn.h Added: branches/xen/reactos/include/xen2/private/hypervisor.h Added: branches/xen/reactos/include/xen2/public/ Added: branches/xen/reactos/include/xen2/public/COPYING Added: branches/xen/reactos/include/xen2/public/arch-x86_32.h Added: branches/xen/reactos/include/xen2/public/arch-x86_64.h Added: branches/xen/reactos/include/xen2/public/dom0_ops.h Added: branches/xen/reactos/include/xen2/public/event_channel.h Added: branches/xen/reactos/include/xen2/public/grant_table.h Added: branches/xen/reactos/include/xen2/public/io/ Added: branches/xen/reactos/include/xen2/public/io/blkif.h Added: branches/xen/reactos/include/xen2/public/io/domain_controller.h Added: branches/xen/reactos/include/xen2/public/io/netif.h Added: branches/xen/reactos/include/xen2/public/physdev.h Added: branches/xen/reactos/include/xen2/public/sched_ctl.h Added: branches/xen/reactos/include/xen2/public/trace.h Added: branches/xen/reactos/include/xen2/public/xen.h Added: branches/xen/reactos/include/xen2/rosxen.h _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/Makefile --- branches/xen/reactos/boot/freeldr/freeldr/Makefile 2005-04-01 21:44:22 UTC (rev 14426) +++ branches/xen/reactos/boot/freeldr/freeldr/Makefile 2005-04-01 22:39:20 UTC (rev 14427) @@ -21,6 +21,8 @@ include ../rules.mak +include $(PATH_TO_TOP)/config + CC = gcc LD = ld @@ -99,17 +101,27 @@ COMPILER_DEFINES = -D__$(TARGET)__ $(COMPILER_DEBUG_DEFINES) +ifeq ($(XEN),2) +XEN_CFLAGS = -I$(PATH_TO_TOP)/include/xen2 \ + -I$(PATH_TO_TOP)/include/xen2/public \ + -I$(PATH_TO_TOP)/include/xen2/private \ + -DXEN_VER=2 +else +XEN_CFLAGS = -I$(PATH_TO_TOP)/include/xen3 \ + -I$(PATH_TO_TOP)/include/xen3/public \ + -I$(PATH_TO_TOP)/include/xen3/private \ + -DXEN_VER=3 +endif + COMPILER_INCLUDES = -I$(SRCDIR)/include \ -I$(PATH_TO_TOP)/w32api/include \ -I$(PATH_TO_TOP)/include \ - -I$(PATH_TO_TOP)/ntoskrnl/include \ - -I$(PATH_TO_TOP)/include/xen3 \ - -I$(PATH_TO_TOP)/include/xen3/public \ - -I$(PATH_TO_TOP)/include/xen3/private + -I$(PATH_TO_TOP)/ntoskrnl/include CFLAGS = $(COMPILER_OPTIONS) \ $(COMPILER_DEFINES) \ - $(COMPILER_INCLUDES) + $(COMPILER_INCLUDES) \ + $(XEN_CFLAGS) LINKER_OPTIONS = -N -Ttext=0x8000 @@ -160,6 +172,7 @@ xboxrtc.o \ xboxvideo.o \ xencons.o \ + xenctrlif.o \ xenmem.o \ _alloca.o # For Mingw32 builds _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c 2005-04-01 21:44:22 UTC (rev 14426) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c 2005-04-01 22:39:20 UTC (rev 14427) @@ -1,5 +1,4 @@ -/* $Id: machpc.c 12672 2005-01-01 00:42:18Z chorns $ - * +/* * FreeLoader * * This program is free software; you can redistribute it and/or modify @@ -28,8 +27,6 @@ #include <hypervisor.h> BOOL XenActive = FALSE; -ctrl_front_ring_t XenCtrlIfTxRing; -ctrl_back_ring_t XenCtrlIfRxRing; int XenCtrlIfEvtchn; VOID @@ -65,12 +62,10 @@ /* _start is the default name ld will use as the entry point. When xen * loads the domain, it will start execution at the elf entry point. */ -void *dummy; void _start() { extern void *start; /* Where is freeldr loaded? */ start_info_t *StartInfo; - control_if_t *CtrlIf; void *OldStackPtr, *NewStackPtr; void *OldStackPage, *NewStackPage; @@ -87,16 +82,8 @@ */ XenMemInit(StartInfo); - /* - * Setup control interface - */ - XenCtrlIfEvtchn = XenStartInfo->domain_controller_evtchn; - CtrlIf = ((control_if_t *)((char *)XenSharedInfo + 2048)); + XenCtrlIfInit(); - /* Sync up with shared indexes. */ - FRONT_RING_ATTACH(&XenCtrlIfTxRing, &CtrlIf->tx_ring); - BACK_RING_ATTACH(&XenCtrlIfRxRing, &CtrlIf->rx_ring); - /* Now move the stack to low mem */ /* Copy the stack page */ __asm__ __volatile__("mov %%esp,%%eax\n" : "=a" (OldStackPtr)); @@ -110,6 +97,7 @@ /* Start freeldr */ XenActive = TRUE; + BootDrive = 0x80; BootMain(XenStartInfo->cmd_line); /* Shouldn't get here */ @@ -258,8 +246,15 @@ XEN_UNIMPLEMENTED("XenHwDetect"); } -/* emit the elf segment Xen builder expects in kernel image */ asm(".section __xen_guest;" - ".ascii \"GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=3.0,VIRT_BASE=0x00008000\";" +/* emit the elf segment Xen builder expects in kernel image */ +asm(".section __xen_guest;" + ".ascii \"GUEST_OS=linux,GUEST_VER=2.6\";" +#if XEN_VER == 2 + ".ascii \",XEN_VER=2.0\";" +#else + ".ascii \",XEN_VER=3.0\";" +#endif + ".ascii \",VIRT_BASE=0x00008000\";" ".ascii \",LOADER=generic\";" ".ascii \",PT_MODE_WRITABLE\";" ".byte 0;" _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.h --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.h 2005-04-01 21:44:22 UTC (rev 14426) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.h 2005-04-01 22:39:20 UTC (rev 14427) @@ -27,18 +27,21 @@ #include <rosxen.h> #include <xen.h> +#include <ctrl_if.h> #include <io/domain_controller.h> extern BOOL XenActive; -extern ctrl_front_ring_t XenCtrlIfTxRing; -extern ctrl_back_ring_t XenCtrlIfRxRing; -extern int XenCtrlIfEvtchn; extern start_info_t *XenStartInfo; extern shared_info_t *XenSharedInfo; VOID XenMachInit(VOID); VOID XenMemInit(start_info_t *StartInfo); +VOID XenCtrlIfInit(); +BOOL XenCtrlIfSendMessageNoblock(ctrl_msg_t *Msg); +VOID XenCtrlIfDiscardResponses(); +BOOL XenCtrlIfTransmitterEmpty(); + VOID XenConsPutChar(int Ch); BOOL XenConsKbHit(); int XenConsGetCh(); @@ -68,6 +71,6 @@ VOID XenHwDetect(VOID); -#endif /* __I386_MACHPC_H_ */ +#endif /* __I386_MACHXEN_H_ */ /* EOF */ _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xencons.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xencons.c 2005-04-01 21:44:22 UTC (rev 14426) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xencons.c 2005-04-01 22:39:20 UTC (rev 14427) @@ -1,5 +1,4 @@ -/* $Id: machpc.c 12672 2005-01-01 00:42:18Z chorns $ - * +/* * FreeLoader * * This program is free software; you can redistribute it and/or modify @@ -34,37 +33,32 @@ (_r)->rsp_cons = (_r)->sring->rsp_prod; \ } while (0) -#define OUTPUT_BUFFER_SIZE 128 +#define OUTPUT_BUFFER_SIZE sizeof(((ctrl_msg_t *) NULL)->msg) static char OutputBuffer[OUTPUT_BUFFER_SIZE]; static unsigned OutputPtr = 0; static void FlushOutput() { - ctrl_msg_t *msg; + ctrl_msg_t Msg; - while (0 != OutputPtr) + while (0 != OutputPtr || ! XenCtrlIfTransmitterEmpty()) { - RING_DROP_PENDING_RESPONSES(&XenCtrlIfTxRing); + XenCtrlIfDiscardResponses(); - if (! RING_FULL(&XenCtrlIfTxRing)) + if (0 == OutputPtr) { - /* - * Put message on the control interface ring and trigger virtual - * console writer. - */ - msg = RING_GET_REQUEST(&XenCtrlIfTxRing, - XenCtrlIfTxRing.req_prod_pvt); + continue; + } - msg->type = CMSG_CONSOLE; - msg->subtype = CMSG_CONSOLE_DATA; - msg->length = OutputPtr; - memcpy(msg->msg, OutputBuffer, OutputPtr); - msg->id = 0xff; - XenCtrlIfTxRing.req_prod_pvt++; - RING_PUSH_REQUESTS(&XenCtrlIfTxRing); - notify_via_evtchn(XenCtrlIfEvtchn); + Msg.type = CMSG_CONSOLE; + Msg.subtype = CMSG_CONSOLE_DATA; + Msg.length = OutputPtr; + memcpy(Msg.msg, OutputBuffer, OutputPtr); + Msg.id = 0xff; + if (XenCtrlIfSendMessageNoblock(&Msg)) + { OutputPtr = 0; } } _____ Added: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenctrlif.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenctrlif.c 2005-04-01 21:44:22 UTC (rev 14426) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenctrlif.c 2005-04-01 22:39:20 UTC (rev 14427) @@ -0,0 +1,127 @@ +/* + * FreeLoader + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include "freeldr.h" +#include "machxen.h" + +#include <rosxen.h> +#include <xen.h> +#include <ctrl_if.h> +#include <evtchn.h> + +#if XEN_VER == 2 +#define TX_FULL(_c) \ + (((_c)->tx_req_prod - XenCtrlIfTxRespCons) == CONTROL_RING_SIZE) +static control_if_t *XenCtrlIf; +static CONTROL_RING_IDX XenCtrlIfTxRespCons; +static CONTROL_RING_IDX XenCtrlIfRxReqCons; +#else /* XEN_VER */ +/* + * Extra ring macros to sync a consumer index up to the public producer index. + * Generally UNSAFE, but we use it for recovery and shutdown in some cases. + */ +#define RING_DROP_PENDING_RESPONSES(_r) \ + do { \ + (_r)->rsp_cons = (_r)->sring->rsp_prod; \ + } while (0) + +static ctrl_front_ring_t XenCtrlIfTxRing; +static ctrl_back_ring_t XenCtrlIfRxRing; +#endif /* XEN_VER */ +static int XenCtrlIfEvtchn; + +void +XenCtrlIfInit() +{ +#if XEN_VER != 2 + control_if_t *CtrlIf; +#endif /* XEN_VER */ + + /* + * Setup control interface + */ + XenCtrlIfEvtchn = XenStartInfo->domain_controller_evtchn; + +#if XEN_VER == 2 + XenCtrlIf = ((control_if_t *)((char *)XenSharedInfo + 2048)); + + /* Sync up with shared indexes. */ + XenCtrlIfTxRespCons = XenCtrlIf->tx_resp_prod; + XenCtrlIfRxReqCons = XenCtrlIf->rx_resp_prod; +#else /* XEN_VER */ + CtrlIf = ((control_if_t *)((char *)XenSharedInfo + 2048)); + + /* Sync up with shared indexes. */ + FRONT_RING_ATTACH(&XenCtrlIfTxRing, &CtrlIf->tx_ring); + BACK_RING_ATTACH(&XenCtrlIfRxRing, &CtrlIf->rx_ring); +#endif /* XEN_VER */ +} + +BOOL +XenCtrlIfSendMessageNoblock(ctrl_msg_t *Msg) +{ + ctrl_msg_t *Dest; + +#if XEN_VER == 2 + if (TX_FULL(XenCtrlIf)) +#else /* XEN_VER */ + if (RING_FULL(&XenCtrlIfTxRing)) +#endif /* XEN_VER */ + { + return FALSE; + } + +#if XEN_VER == 2 + Dest = XenCtrlIf->tx_ring + MASK_CONTROL_IDX(XenCtrlIf->tx_req_prod); +#else /* XEN_VER */ + Dest = RING_GET_REQUEST(&XenCtrlIfTxRing, + XenCtrlIfTxRing.req_prod_pvt); +#endif /* XEN_VER */ + memcpy(Dest, Msg, sizeof(ctrl_msg_t)); +#if XEN_VER == 2 + XenCtrlIf->tx_req_prod++; +#else /* XEN_VER */ + XenCtrlIfTxRing.req_prod_pvt++; + RING_PUSH_REQUESTS(&XenCtrlIfTxRing); +#endif /* XEN_VER */ + notify_via_evtchn(XenCtrlIfEvtchn); + + return TRUE; +} + +VOID +XenCtrlIfDiscardResponses() +{ +#if XEN_VER == 2 + XenCtrlIfTxRespCons = XenCtrlIf->tx_resp_prod; +#else /* XEN_VER */ + RING_DROP_PENDING_RESPONSES(&XenCtrlIfTxRing); +#endif /* XEN_VER */ +} + +BOOL +XenCtrlIfTransmitterEmpty() +{ +#if XEN_VER == 2 + return (XenCtrlIf->tx_req_prod == XenCtrlIfTxRespCons); +#else /* XEN_VER */ + return XenCtrlIfTxRing.sring->req_prod == XenCtrlIfTxRing.rsp_cons; +#endif /* XEN_VER */ +} + +/* EOF */ Property changes on: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenctrlif.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: branches/xen/reactos/include/xen2/private/ctrl_if.h --- branches/xen/reactos/include/xen2/private/ctrl_if.h 2005-04-01 21:44:22 UTC (rev 14426) +++ branches/xen/reactos/include/xen2/private/ctrl_if.h 2005-04-01 22:39:20 UTC (rev 14427) @@ -0,0 +1,161 @@ +/********************************************************************** ******** + * ctrl_if.h + * + * Management functions for special interface to the domain controller. + * + * Copyright (c) 2004, K A Fraser + * + * This file may be distributed separately from the Linux kernel, or + * incorporated into other software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#ifndef __ASM_XEN__CTRL_IF_H__ +#define __ASM_XEN__CTRL_IF_H__ + +#include <hypervisor.h> + +typedef control_msg_t ctrl_msg_t; + +/* + * Callback function type. Called for asynchronous processing of received + * request messages, and responses to previously-transmitted request messages. + * The parameters are (@msg, @id). + * @msg: Original request/response message (not a copy). The message can be + * modified in-place by the handler (e.g., a response callback can + * turn a request message into a response message in place). The message + * is no longer accessible after the callback handler returns -- if the + * message is required to persist for longer then it must be copied. + * @id: (Response callbacks only) The 'id' that was specified when the + * original request message was queued for transmission. + */ +typedef void (*ctrl_msg_handler_t)(ctrl_msg_t *, unsigned long); + +/* + * Send @msg to the domain controller. Execute @hnd when a response is + * received, passing the response message and the specified @id. This + * operation will not block: it will return -EAGAIN if there is no space. + * Notes: + * 1. The @msg is copied if it is transmitted and so can be freed after this + * function returns. + * 2. If @hnd is NULL then no callback is executed. + */ +int +ctrl_if_send_message_noblock( + ctrl_msg_t *msg, + ctrl_msg_handler_t hnd, + unsigned long id); + +/* + * Send @msg to the domain controller. Execute @hnd when a response is + * received, passing the response message and the specified @id. This + * operation will block until the message is sent, or a signal is received + * for the calling process (unless @wait_state is TASK_UNINTERRUPTIBLE). + * Notes: + * 1. The @msg is copied if it is transmitted and so can be freed after this + * function returns. + * 2. If @hnd is NULL then no callback is executed. + */ +int +ctrl_if_send_message_block( + ctrl_msg_t *msg, + ctrl_msg_handler_t hnd, + unsigned long id, + long wait_state); + +/* + * Send @msg to the domain controller. Block until the response is received, + * and then copy it into the provided buffer, @rmsg. + */ +int +ctrl_if_send_message_and_get_response( + ctrl_msg_t *msg, + ctrl_msg_t *rmsg, + long wait_state); + +/* + * Request a callback when there is /possibly/ space to immediately send a + * message to the domain controller. This function returns 0 if there is + * already space to trasnmit a message --- in this case the callback task /may/ + * still be executed. If this function returns 1 then the callback /will/ be + * executed when space becomes available. + */ +#ifdef TODO +int +ctrl_if_enqueue_space_callback( + struct tq_struct *task); +#endif + +/* + * Send a response (@msg) to a message from the domain controller. This will + * never block. + * Notes: + * 1. The @msg is copied and so can be freed after this function returns. + * 2. The @msg may be the original request message, modified in-place. + */ +void +ctrl_if_send_response( + ctrl_msg_t *msg); + +/* + * Register a receiver for typed messages from the domain controller. The + * handler (@hnd) is called for every received message of specified @type. + * Returns TRUE (non-zero) if the handler was successfully registered. + * If CALLBACK_IN_BLOCKING CONTEXT is specified in @flags then callbacks will + * occur in a context in which it is safe to yield (i.e., process context). + */ +#define CALLBACK_IN_BLOCKING_CONTEXT 1 +int ctrl_if_register_receiver( + u8 type, + ctrl_msg_handler_t hnd, + unsigned int flags); + +/* + * Unregister a receiver for typed messages from the domain controller. The + * handler (@hnd) will not be executed after this function returns. + */ +void +ctrl_if_unregister_receiver( + u8 type, ctrl_msg_handler_t hnd); + +/* Suspend/resume notifications. */ +void ctrl_if_suspend(void); +void ctrl_if_resume(void); + +/* Start-of-day setup. */ +void ctrl_if_init(void); + +/* + * Returns TRUE if there are no outstanding message requests at the domain + * controller. This can be used to ensure that messages have really flushed + * through when it is not possible to use the response-callback interface. + * WARNING: If other subsystems are using the control interface then this + * function might never return TRUE! + */ +int ctrl_if_transmitter_empty(void); /* !! DANGEROUS FUNCTION !! */ + +/* + * Manually discard response messages from the domain controller. + * WARNING: This is usually done automatically -- this function should only + * be called when normal interrupt mechanisms are disabled! + */ +void ctrl_if_discard_responses(void); /* !! DANGEROUS FUNCTION !! */ + +#endif /* __ASM_XEN__CONTROL_IF_H__ */ Property changes on: branches/xen/reactos/include/xen2/private/ctrl_if.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: branches/xen/reactos/include/xen2/private/evtchn.h --- branches/xen/reactos/include/xen2/private/evtchn.h 2005-04-01 21:44:22 UTC (rev 14426) +++ branches/xen/reactos/include/xen2/private/evtchn.h 2005-04-01 22:39:20 UTC (rev 14427) @@ -0,0 +1,64 @@ +/********************************************************************** ******** + * evtchn.h + * + * Communication via Xen event channels. + * Also definitions for the device that demuxes notifications to userspace. + * + * Copyright (c) 2004, K A Fraser + * + * This file may be distributed separately from the Linux kernel, or + * incorporated into other software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#ifndef __ASM_EVTCHN_H__ +#define __ASM_EVTCHN_H__ + +#include <hypervisor.h> +#include <event_channel.h> + +/* + * LOW-LEVEL DEFINITIONS + */ + +static inline void notify_via_evtchn(int port) +{ + evtchn_op_t op; + op.cmd = EVTCHNOP_send; + op.u.send.local_port = port; + (void)HYPERVISOR_event_channel_op(&op); +} + +/* + * CHARACTER-DEVICE DEFINITIONS + */ + +/* /dev/xen/evtchn resides at device number major=10, minor=201 */ +#define EVTCHN_MINOR 201 + +/* /dev/xen/evtchn ioctls: */ +/* EVTCHN_RESET: Clear and reinit the event buffer. Clear error condition. */ +#define EVTCHN_RESET _IO('E', 1) +/* EVTCHN_BIND: Bind to teh specified event-channel port. */ +#define EVTCHN_BIND _IO('E', 2) +/* EVTCHN_UNBIND: Unbind from the specified event-channel port. */ +#define EVTCHN_UNBIND _IO('E', 3) + +#endif /* __ASM_EVTCHN_H__ */ Property changes on: branches/xen/reactos/include/xen2/private/evtchn.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: branches/xen/reactos/include/xen2/private/hypervisor.h --- branches/xen/reactos/include/xen2/private/hypervisor.h 2005-04-01 21:44:22 UTC (rev 14426) +++ branches/xen/reactos/include/xen2/private/hypervisor.h 2005-04-01 22:39:20 UTC (rev 14427) @@ -0,0 +1,492 @@ +/********************************************************************** ******** + * hypervisor.h + * + * Linux-specific hypervisor handling. + * + * Copyright (c) 2002-2004, K A Fraser + * + * This file may be distributed separately from the Linux kernel, or + * incorporated into other software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#ifndef __HYPERVISOR_H__ +#define __HYPERVISOR_H__ + +#include <xen.h> +#include <dom0_ops.h> +#include <io/domain_controller.h> + +/* + * Assembler stubs for hyper-calls. + */ + +static inline int +HYPERVISOR_set_trap_table( + trap_info_t *table) +{ + int ret; + unsigned long ignore; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ignore) + : "0" (__HYPERVISOR_set_trap_table), "1" (table) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_mmu_update( + mmu_update_t *req, int count, int *success_count) +{ + int ret; + unsigned long ign1, ign2, ign3; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2), "=d" (ign3) + : "0" (__HYPERVISOR_mmu_update), "1" (req), "2" (count), + "3" (success_count) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_set_gdt( + unsigned long *frame_list, int entries) +{ + int ret; + unsigned long ign1, ign2; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2) + : "0" (__HYPERVISOR_set_gdt), "1" (frame_list), "2" (entries) + : "memory" ); + + + return ret; +} + +static inline int +HYPERVISOR_stack_switch( + unsigned long ss, unsigned long esp) +{ + int ret; + unsigned long ign1, ign2; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2) + : "0" (__HYPERVISOR_stack_switch), "1" (ss), "2" (esp) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_set_callbacks( + unsigned long event_selector, unsigned long event_address, + unsigned long failsafe_selector, unsigned long failsafe_address) +{ + int ret; + unsigned long ign1, ign2, ign3, ign4; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2), "=d" (ign3), "=S" (ign4) + : "0" (__HYPERVISOR_set_callbacks), "1" (event_selector), + "2" (event_address), "3" (failsafe_selector), "4" (failsafe_address) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_fpu_taskswitch( + int set) +{ + int ret; + unsigned long ign; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign) + : "0" (__HYPERVISOR_fpu_taskswitch), "1" (set) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_yield( + void) +{ + int ret; + unsigned long ign; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign) + : "0" (__HYPERVISOR_sched_op), "1" (SCHEDOP_yield) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_block( + void) +{ + int ret; + unsigned long ign1; + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1) + : "0" (__HYPERVISOR_sched_op), "1" (SCHEDOP_block) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_shutdown( + void) +{ + int ret; + unsigned long ign1; + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1) + : "0" (__HYPERVISOR_sched_op), + "1" (SCHEDOP_shutdown | (SHUTDOWN_poweroff << SCHEDOP_reasonshift)) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_reboot( + void) +{ + int ret; + unsigned long ign1; + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1) + : "0" (__HYPERVISOR_sched_op), + "1" (SCHEDOP_shutdown | (SHUTDOWN_reboot << SCHEDOP_reasonshift)) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_suspend( + unsigned long srec) +{ + int ret; + unsigned long ign1, ign2; + + /* NB. On suspend, control software expects a suspend record in %esi. */ + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=S" (ign2) + : "0" (__HYPERVISOR_sched_op), + "b" (SCHEDOP_shutdown | (SHUTDOWN_suspend << SCHEDOP_reasonshift)), + "S" (srec) : "memory"); + + return ret; +} + +static inline long +HYPERVISOR_set_timer_op( + u64 timeout) +{ + int ret; + unsigned long timeout_hi = (unsigned long)(timeout>>32); + unsigned long timeout_lo = (unsigned long)timeout; + unsigned long ign1, ign2; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2) + : "0" (__HYPERVISOR_set_timer_op), "b" (timeout_hi), "c" (timeout_lo) + : "memory"); + + return ret; +} + +static inline int +HYPERVISOR_dom0_op( + dom0_op_t *dom0_op) +{ + int ret; + unsigned long ign1; + + dom0_op->interface_version = DOM0_INTERFACE_VERSION; + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1) + : "0" (__HYPERVISOR_dom0_op), "1" (dom0_op) + : "memory"); + + return ret; +} + +static inline int +HYPERVISOR_set_debugreg( + int reg, unsigned long value) +{ + int ret; + unsigned long ign1, ign2; + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2) + : "0" (__HYPERVISOR_set_debugreg), "1" (reg), "2" (value) + : "memory" ); + + return ret; +} + +static inline unsigned long +HYPERVISOR_get_debugreg( + int reg) +{ + unsigned long ret; + unsigned long ign; + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign) + : "0" (__HYPERVISOR_get_debugreg), "1" (reg) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_update_descriptor( + unsigned long ma, unsigned long word1, unsigned long word2) +{ + int ret; + unsigned long ign1, ign2, ign3; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2), "=d" (ign3) + : "0" (__HYPERVISOR_update_descriptor), "1" (ma), "2" (word1), + "3" (word2) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_set_fast_trap( + int idx) +{ + int ret; + unsigned long ign; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign) + : "0" (__HYPERVISOR_set_fast_trap), "1" (idx) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_dom_mem_op( + unsigned int op, unsigned long *extent_list, + unsigned long nr_extents, unsigned int extent_order) +{ + int ret; + unsigned long ign1, ign2, ign3, ign4, ign5; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2), "=d" (ign3), "=S" (ign4), + "=D" (ign5) + : "0" (__HYPERVISOR_dom_mem_op), "1" (op), "2" (extent_list), + "3" (nr_extents), "4" (extent_order), "5" (DOMID_SELF) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_multicall( + void *call_list, int nr_calls) +{ + int ret; + unsigned long ign1, ign2; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2) + : "0" (__HYPERVISOR_multicall), "1" (call_list), "2" (nr_calls) + : "memory" ); + + return ret; +} + +static inline int +HYPERVISOR_update_va_mapping( + unsigned long va, pte_t new_val, unsigned long flags) +{ + int ret; + unsigned long ign1, ign2, ign3; + + __asm__ __volatile__ ( + TRAP_INSTR + : "=a" (ret), "=b" (ign1), "=c" (ign2), "=d" (ign3) + : "0" (__HYPERVISOR_update_va_mapping), + "1" (va), "2" ((new_val).pte_low), "3" (flags) + : "memory" ); + +#ifdef TODO + if ( unlikely(ret < 0) ) + { + printk(KERN_ALERT "Failed update VA mapping: %08lx, %08lx, %08lx\n", + va, (new_val).pte_low, flags); + BUG(); + } +#endif + + return ret; +} [truncated at 1000 lines; 2890 more skipped]

19 years, 5 months

[sedwards] 14426: use the w32api headers

by sedwards＠svn.reactos.com

use the w32api headers Deleted: trunk/reactos/include/WinDNS.h Deleted: trunk/reactos/include/WinError.h Modified: trunk/reactos/lib/dnsapi/dnsapi/adns.c Modified: trunk/reactos/lib/dnsapi/dnsapi/context.c Modified: trunk/reactos/lib/dnsapi/dnsapi/free.c Modified: trunk/reactos/lib/dnsapi/dnsapi/names.c Modified: trunk/reactos/lib/dnsapi/dnsapi/query.c Modified: trunk/reactos/lib/dnsapi/dnsapi/stubs.c Modified: trunk/reactos/lib/ws2_32/include/ws2_32.h _____ Deleted: trunk/reactos/include/WinDNS.h --- trunk/reactos/include/WinDNS.h 2005-04-01 21:19:23 UTC (rev 14425) +++ trunk/reactos/include/WinDNS.h 2005-04-01 21:44:22 UTC (rev 14426) @@ -1,449 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: include/WinDNS.h - * PURPOSE: Structures and definitions needed for DNSAPI compatibility. - * PROGRAMER: Art Yerkes - * UPDATE HISTORY: - * 12/15/03 -- Created - */ - -#ifndef WINDNS_H -#define WINDNS_H - -/* The WinDNS Header */ -#ifdef __USE_W32API -#include_next <windns.h> -#else - -/* Constants provided by DNSAPI */ -#define DNS_CONFIG_FLAG_ALLOC TRUE - -#define BIT(n) (1<<(n)) -#define DNS_QUERY_STANDARD 0 -#define DNS_QUERY_ACCEPT_TRUNCATED_RESPONSE BIT(0) -#define DNS_QUERY_USE_TCP_ONLY BIT(1) -#define DNS_QUERY_NO_RECURSION BIT(2) -#define DNS_QUERY_BYPASS_CACHE BIT(3) -#define DNS_QUERY_NO_WIRE_QUERY BIT(4) -#define DNS_QUERY_NO_LOCAL_NAME BIT(5) -#define DNS_QUERY_NO_HOSTS_FILE BIT(6) -#define DNS_QUERY_NO_NETBT BIT(7) -#define DNS_QUERY_WIRE_ONLY BIT(8) -#define DNS_QUERY_RETURN_MESSAGE BIT(9) -#define DNS_QUERY_TREAT_AS_FQDN BIT(12) -#define DNS_QUERY_DONT_RESET_TTL_VALUES BIT(23) -#define DNS_QUERY_RESERVED (0xff << 24) -#define DNS_QUERY_CACHE_ONLY BIT(4) - -#define DNS_TYPE_ZERO 0 -#define DNS_TYPE_A 1 -#define DNS_TYPE_NS 2 -#define DNS_TYPE_MD 3 -#define DNS_TYPE_MF 4 -#define DNS_TYPE_CNAME 5 -#define DNS_TYPE_SOA 6 -#define DNS_TYPE_MB 7 -#define DNS_TYPE_MG 8 -#define DNS_TYPE_MR 9 -#define DNS_TYPE_NULL 10 -#define DNS_TYPE_WKS 11 -#define DNS_TYPE_PTR 12 -#define DNS_TYPE_HINFO 13 -#define DNS_TYPE_MINFO 14 -#define DNS_TYPE_MX 15 -#define DNS_TYPE_TXT 16 -#define DNS_TYPE_RP 17 -#define DNS_TYPE_AFSDB 18 -#define DNS_TYPE_X25 19 -#define DNS_TYPE_ISDN 20 -#define DNS_TYPE_RT 21 -#define DNS_TYPE_NSAP 22 -#define DNS_TYPE_NSAPPTR 23 -#define DNS_TYPE_SIG 24 -#define DNS_TYPE_KEY 25 -#define DNS_TYPE_PX 26 -#define DNS_TYPE_GPOS 27 -#define DNS_TYPE_AAAA 28 -#define DNS_TYPE_LOC 29 -#define DNS_TYPE_NXT 30 -#define DNS_TYPE_EID 31 /* I've never heard of nimrod before. */ -#define DNS_TYPE_NIMLOC 32 /* But it does exist. */ -#define DNS_TYPE_SRV 33 -#define DNS_TYPE_ATMA 34 -#define DNS_TYPE_NAPTR 35 -#define DNS_TYPE_KX 36 -#define DNS_TYPE_CERT 37 -#define DNS_TYPE_A6 38 -#define DNS_TYPE_DNAME 39 -#define DNS_TYPE_SINK 40 -#define DNS_TYPE_OPT 41 - -#define DNS_TYPE_UINFO 100 -#define DNS_TYPE_UID 101 -#define DNS_TYPE_GID 102 -#define DNS_TYPE_UNSPEC 103 - -#define DNS_TYPE_ADDRS 248 -#define DNS_TYPE_TKEY 249 -#define DNS_TYPE_TSIG 250 -#define DNS_TYPE_IXFR 251 -#define DNS_TYPE_AXFR 252 -#define DNS_TYPE_MAILB 253 -#define DNS_TYPE_MAILA 254 -#define DNS_TYPE_ANY 255 - -#define DNS_SWAPX(x) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)) - -#define DNS_RTYPE_ZERO DNS_SWAPX(DNS_TYPE_ZERO) -#define DNS_RTYPE_A DNS_SWAPX(DNS_TYPE_A) -#define DNS_RTYPE_NS DNS_SWAPX(DNS_TYPE_NS) -#define DNS_RTYPE_MD DNS_SWAPX(DNS_TYPE_MD) -#define DNS_RTYPE_MF DNS_SWAPX(DNS_TYPE_MF) -#define DNS_RTYPE_CNAME DNS_SWAPX(DNS_TYPE_CNAME) -#define DNS_RTYPE_SOA DNS_SWAPX(DNS_TYPE_SOA) -#define DNS_RTYPE_MB DNS_SWAPX(DNS_TYPE_MB) -#define DNS_RTYPE_MG DNS_SWAPX(DNS_TYPE_MG) -#define DNS_RTYPE_MR DNS_SWAPX(DNS_TYPE_MR) -#define DNS_RTYPE_NULL DNS_SWAPX(DNS_TYPE_NULL) -#define DNS_RTYPE_WKS DNS_SWAPX(DNS_TYPE_WKS) -#define DNS_RTYPE_PTR DNS_SWAPX(DNS_TYPE_PTR) -#define DNS_RTYPE_HINFO DNS_SWAPX(DNS_TYPE_HINFO) -#define DNS_RTYPE_MINFO DNS_SWAPX(DNS_TYPE_MINFO) -#define DNS_RTYPE_MX DNS_SWAPX(DNS_TYPE_MX) -#define DNS_RTYPE_TEXT DNS_SWAPX(DNS_TYPE_TEXT) -#define DNS_RTYPE_RP DNS_SWAPX(DNS_TYPE_RP) -#define DNS_RTYPE_AFSDB DNS_SWAPX(DNS_TYPE_AFSDB) -#define DNS_RTYPE_X25 DNS_SWAPX(DNS_TYPE_X25) -#define DNS_RTYPE_ISDN DNS_SWAPX(DNS_TYPE_ISDN) -#define DNS_RTYPE_RT DNS_SWAPX(DNS_TYPE_RT) -#define DNS_RTYPE_NSAP DNS_SWAPX(DNS_TYPE_NSAP) -#define DNS_RTYPE_NSAPPTR DNS_SWAPX(DNS_TYPE_NSAPPTR) -#define DNS_RTYPE_SIG DNS_SWAPX(DNS_TYPE_SIG) -#define DNS_RTYPE_KEY DNS_SWAPX(DNS_TYPE_KEY) -#define DNS_RTYPE_PX DNS_SWAPX(DNS_TYPE_PX) -#define DNS_RTYPE_GPOS DNS_SWAPX(DNS_TYPE_GPOS) -#define DNS_RTYPE_AAAA DNS_SWAPX(DNS_TYPE_AAAA) -#define DNS_RTYPE_LOC DNS_SWAPX(DNS_TYPE_LOC) -#define DNS_RTYPE_NXT DNS_SWAPX(DNS_TYPE_NXT) -#define DNS_RTYPE_EID DNS_SWAPX(DNS_TYPE_EID) -#define DNS_RTYPE_NIMLOC DNS_SWAPX(DNS_TYPE_NIMLOC) -#define DNS_RTYPE_SRV DNS_SWAPX(DNS_TYPE_SRV) -#define DNS_RTYPE_ATMA DNS_SWAPX(DNS_TYPE_ATMA) -#define DNS_RTYPE_NAPTR DNS_SWAPX(DNS_TYPE_NAPTR) -#define DNS_RTYPE_KX DNS_SWAPX(DNS_TYPE_KX) -#define DNS_RTYPE_CERT DNS_SWAPX(DNS_TYPE_CERT) -#define DNS_RTYPE_A6 DNS_SWAPX(DNS_TYPE_A6) -#define DNS_RTYPE_DNAME DNS_SWAPX(DNS_TYPE_DNAME) -#define DNS_RTYPE_SINK DNS_SWAPX(DNS_TYPE_SINK) -#define DNS_RTYPE_OPT DNS_SWAPX(DNS_TYPE_OPT) -#define DNS_RTYPE_UINFO DNS_SWAPX(DNS_TYPE_UINFO) -#define DNS_RTYPE_UID DNS_SWAPX(DNS_TYPE_UID) -#define DNS_RTYPE_GID DNS_SWAPX(DNS_TYPE_GID) -#define DNS_RTYPE_UNSPEC DNS_SWAPX(DNS_TYPE_UNSPEC) -#define DNS_RTYPE_ADDRS DNS_SWAPX(DNS_TYPE_ADDRS) -#define DNS_RTYPE_TKEY DNS_SWAPX(DNS_TYPE_TKEY) -#define DNS_RTYPE_TSIG DNS_SWAPX(DNS_TYPE_TSIG) -#define DNS_RTYPE_IXFR DNS_SWAPX(DNS_TYPE_IXFR) -#define DNS_RTYPE_AXFR DNS_SWAPX(DNS_TYPE_AXFR) -#define DNS_RTYPE_MAILB DNS_SWAPX(DNS_TYPE_MAILB) -#define DNS_RTYPE_MAILA DNS_SWAPX(DNS_TYPE_MAILA) -#define DNS_RTYPE_ANY DNS_SWAPX(DNS_TYPE_ANY) - -/* Simple types */ -typedef LONG DNS_STATUS; -typedef DNS_STATUS *PDNS_STATUS; -typedef DWORD IP4_ADDRESS; -typedef IP4_ADDRESS *PIP4_ADDRESS; -typedef struct { - DWORD IP6Dword[4]; -} IP6_ADDRESS, *PIP6_ADDRESS; - -typedef enum { - DnsFreeFlat, - DnsFreeRecordList, - DnsFreeParsedMessageFields -} DNS_FREE_TYPE; - -typedef enum { - DnsNameDomain, - DnsNameDomainLabel, - DnsNameHostnameFull, - DnsNameHostnameLabel, - DnsNameWildcard, - DnsNameSrvRecord -} DNS_NAME_FORMAT; - -/* The below is for repetitive names that distinguish character coding */ -#define DNS_PASTE(x,y) x ## y -#define DNSCT_TRIPLET(x) DNS_PASTE(x,_W), DNS_PASTE(x,_A), DNS_PASTE(x,_UTF8) - -typedef enum { - DNSCT_TRIPLET(DnsConfigPrimaryDomainName), - DNSCT_TRIPLET(DnsConfigAdapterDomainName), - DnsConfigDnsServerList, - DnsConfigSearchList, - DnsConfigAdapterInfo, - DnsConfigPrimaryHostNameRegistrationEnabled, - DnsConfigAdapterHostNameRegistrationEnabled, - DnsConfigAddressRegistrationMaxCount, - DNSCT_TRIPLET(DnsConfigHostName), - DNSCT_TRIPLET(DnsConfigFullHostName) -} DNS_CONFIG_TYPE; - -/* Aggregates provided by DNSAPI */ - -typedef struct { - DWORD Section : 2; - DWORD Delete : 1; - DWORD CharSet : 2; - DWORD Unused : 3; - DWORD Reserved : 24; -} DNS_RECORD_FLAGS; - -typedef struct _IP4_ARRAY { - DWORD AddrCount; - IP4_ADDRESS AddrArray[1]; /* Avoid zero-length array warning */ -} IP4_ARRAY, *PIP4_ARRAY; - -typedef struct _DNS_HEADER { - WORD Xid; - BYTE RecursionDesired; - BYTE Truncation; - BYTE Authoritative; - BYTE Opcode; - BYTE IsResponse; - BYTE ResponseCode; - BYTE Reserved; - BYTE RecursionAvailable; - WORD QuestionCount; - WORD NameServerCount; - WORD AdditionalCount; -} DNS_HEADER, *PDNS_HEADER; - -typedef struct _DNS_MESSAGE_BUFFER { - DNS_HEADER MessageHead; - CHAR MessageBody[1]; -} DNS_MESSAGE_BUFFER, *PDNS_MESSAGE_BUFFER; - -/* Some DNSAPI structs are sensitive to character coding. This will allow - * us to define them once. - * - * the XNAME(n) macro turns the name into either nA or nW - * the PSTR type expands to either LPWSTR or LPSTR. - */ - -/* A record, indicates an IPv4 address. */ -typedef struct { - IP4_ADDRESS IpAddress; -} DNS_A_DATA, *PDNS_A_DATA; - -typedef struct { - DWORD dwByteCount; - BYTE Data[1]; -} DNS_NULL_DATA, *PDNS_NULL_DATA; - -typedef struct { - IP4_ADDRESS IpAddress; - UCHAR chProtocol; - BYTE BitMask[1]; -} DNS_WKS_DATA, *PDNS_WKS_DATA; - -typedef struct { - IP6_ADDRESS Ip6Address; -} DNS_AAAA_DATA, *PDNS_AAAA_DATA; - -typedef struct { - WORD wFlags; - BYTE chProtocol; - BYTE chAlgorithm; - BYTE Key[1]; -} DNS_KEY_DATA, *PDNS_KEY_DATA; - -typedef struct { - WORD wVersion; - WORD wSize; - WORD wHorPrec; - WORD wVerPrec; - DWORD dwLatitude; - DWORD dwLongitude; - DWORD dwAltitude; -} DNS_LOC_DATA, *PDNS_LOC_DATA; - -/* Here's the ugly bit, we import twice; once for wchar and once for char. */ -#define XNAME(a) a ## A -#define PSTR LPSTR -#define _WINDNS_STRUCT_DEFINITIONS -#include "WinDNS.h" -#undef XNAME -#undef PSTR -#define XNAME(a) a ## W -#define PSTR LPWSTR -#include "WinDNS.h" -#undef XNAME -#undef PSTR -#undef _WINDNS_STRUCT_DEFINITIONS - -#ifndef _DISABLE_TIDENTS -#ifdef _UNICODE -#define DECLARE_STRUCT(x) typedef DNS_PASTE(x,W) x , *DNS_PASTE(P,x) -#define DECLARE_FUNC(x) DNS_PASTE(x,_W) -#else /* _UNICODE */ -#define DECLARE_STRUCT(x) typedef DNS_PASTE(x,A) x , *DNS_PASTE(P,x) -#define DECLARE_FUNC(x) DNS_PASTE(x,_A) -#endif /* _UNICODE */ - -/* Now, all the declarations go off. */ - -DECLARE_STRUCT(DNS_PTR_DATA); -DECLARE_STRUCT(DNS_SOA_DATA); -DECLARE_STRUCT(DNS_MINFO_DATA); -DECLARE_STRUCT(DNS_MX_DATA); -DECLARE_STRUCT(DNS_TXT_DATA); -DECLARE_STRUCT(DNS_SIG_DATA); -DECLARE_STRUCT(DNS_NXT_DATA); -DECLARE_STRUCT(DNS_SRV_DATA); -DECLARE_STRUCT(DNS_RECORD); - -#define DnsAcquireContextHandle DECLARE_FUNC(DnsAcquireContextHandle) -#define DnsValidateName DECLARE_FUNC(DnsValidateName) -#define DnsQuery DECLARE_FUNC(DnsQuery) - -#endif /* _DISABLE_TIDENTS */ - -/* Prototypes */ - -void WINAPI DnsReleaseContextHandle( HANDLE ContextHandle ); - -DNS_STATUS WINAPI DnsAcquireContextHandle_W -( DWORD CredentialsFlags, - PVOID Credentials, - HANDLE *ContextHandle ); -DNS_STATUS WINAPI DnsAcquireContextHandle_UTF8 -( DWORD CredentialsFlags, - PVOID Credentials, - HANDLE *ContextHandle ); -DNS_STATUS WINAPI DnsAcquireContextHandle_A -( DWORD CredentialsFlags, - PVOID Credentials, - HANDLE *ContextHandle ); - -DNS_STATUS WINAPI DnsValidateName_W -( LPCWSTR Name, DNS_NAME_FORMAT Format ); -DNS_STATUS WINAPI DnsValidateName_UTF8 -( LPCSTR Name, DNS_NAME_FORMAT Format ); -DNS_STATUS WINAPI DnsValidateName_A -( LPCSTR Name, DNS_NAME_FORMAT Format ); - -DNS_STATUS WINAPI DnsQuery_W -( LPCWSTR Name, WORD Type, DWORD Options, PIP4_ARRAY Servers, - PDNS_RECORDW *Result, PVOID *Reserved ); -DNS_STATUS WINAPI DnsQuery_UTF8 -( LPCSTR Name, WORD Type, DWORD Options, PIP4_ARRAY Servers, - PDNS_RECORDA *Result, PVOID *Reserved ); -DNS_STATUS WINAPI DnsQuery_A -( LPCSTR Name, WORD Type, DWORD Options, PIP4_ARRAY Servers, - PDNS_RECORDA *Result, PVOID *Reserved ); -VOID WINAPI DnsFree( PVOID Data, DNS_FREE_TYPE FreeType ); -VOID WINAPI DnsRecordListFree( PVOID RecordList, - DNS_FREE_TYPE FreeType ); - -#endif//WINDNS_H - -#ifdef _WINDNS_STRUCT_DEFINITIONS - -/* PTR record, indicates an additional lookup for the given name is needed. */ -typedef struct { - PSTR pNameHost; -} XNAME(DNS_PTR_DATA), *XNAME(PDNS_PTR_DATA); - -typedef struct { - PSTR pNamePrimaryServer; - PSTR pNameAdministrator; - DWORD dwSerialNo; - DWORD dwRefresh; - DWORD dwRetry; - DWORD dwExpire; - DWORD dwDefaultTtl; -} XNAME(DNS_SOA_DATA), *XNAME(PDNS_SOA_DATA); - -/* MINFO record, who to mail about questions or problems. */ -typedef struct { - PSTR pNameMailbox; - PSTR pNameErrorsMailbox; -} XNAME(DNS_MINFO_DATA), *XNAME(PNDS_MINFO_DATA); - -/* MX record, who processes the mail for this domain? */ -typedef struct { - PSTR pNameExchange; - WORD wPreference; - WORD Pad; -} XNAME(DNS_MX_DATA), *XNAME(PDNS_MX_DATA); - -/* TXT record, miscellaneous information. */ -typedef struct { - DWORD dwStringCount; - PSTR pStringArray[1]; -} XNAME(DNS_TXT_DATA), *XNAME(PDNS_TXT_DATA); - -typedef struct { - PSTR pNameSigner; - WORD wTypeCovered; - BYTE cbAlgorithm; - BYTE cbLabelCount; - DWORD dwOriginalTtl; - DWORD dwExpiration; - DWORD dwTimeSigned; - WORD wKeyTag; - WORD Pad; - BYTE Signature[1]; -} XNAME(DNS_SIG_DATA), *XNAME(PDNS_SIG_DATA); - -typedef struct { - PSTR pNameNext; - WORD wNumTypes; - WORD wTypes[1]; -} XNAME(DNS_NXT_DATA), *XNAME(PDNS_NXT_DATA); - -typedef struct { - PSTR pNameTarget; - WORD wPriority; - WORD wWeight; - WORD wPort; - WORD Pad; -} XNAME(DNS_SRV_DATA), *XNAME(PDNS_SRV_DATA); - -typedef struct XNAME(_DNS_RECORD_) { - struct XNAME(_DNS_RECORD_) *pNext; - PSTR pName; - WORD wType; - WORD wDataLength; - - union { - DWORD DW; - DNS_RECORD_FLAGS S; - } Flags; - - DWORD dwTtl; - DWORD dwReserved; - - union { - DNS_A_DATA A; - XNAME(DNS_SOA_DATA) SOA, Soa; - XNAME(DNS_PTR_DATA) PTR, Ptr, NS, Ns, CNAME, Cname, MB, Mb, MD, Md, MF, Mf, MG, Mg, MR, Mr; - XNAME(DNS_MINFO_DATA) MINFO, Minfo, RP, Rp; - XNAME(DNS_MX_DATA) MX, Mx, AFSDB, Afsdb, RT, Rt; - XNAME(DNS_TXT_DATA) HINFO, Hinfo, ISDN, Isdn, TXT, Txt; - DNS_NULL_DATA Null; - DNS_WKS_DATA WKS, Wks; - DNS_AAAA_DATA AAAA; - DNS_KEY_DATA KEY, Key; - XNAME(DNS_SIG_DATA) SIG, Sig; - XNAME(DNS_NXT_DATA) NXT, Nxt; - XNAME(DNS_SRV_DATA) SRV, Srv; - } Data; -} XNAME(DNS_RECORD), *XNAME(PDNS_RECORD); - -#endif /* __USE_W32API */ -#endif /* _WINDNS_STRUCT_DEFINITIONS */ - _____ Deleted: trunk/reactos/include/WinError.h --- trunk/reactos/include/WinError.h 2005-04-01 21:19:23 UTC (rev 14425) +++ trunk/reactos/include/WinError.h 2005-04-01 21:44:22 UTC (rev 14426) @@ -1,41 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: include/WinError.h - * PURPOSE: Miscellaneous error codes. - * PROGRAMER: Art Yerkes - * UPDATE HISTORY: - * 12/15/03 -- Created - */ - -#ifndef WINERROR_H -#define WINERROR_H - -#ifdef __USE_W32API - -#include_next <winerror.h> - -#else - -#include <errors.h> /* Current locations of reactos errors */ - -/* Used generally */ -#define DNS_ERROR_NO_MEMORY 14 /* ERROR_OUTOFMEMORY */ - -/* Used by DnsValidateName */ -/* Returned by DnsValidateName to indicate that the name is too long or - doesn't fit some other obvious constraint. */ -#define DNS_ERROR_INVALID_NAME 123 /* ERROR_INVALID_NAME */ -/* Returned by DnsValidateName to indicate a name that contains a non-special - * and non-ascii character. */ -#define DNS_ERROR_NON_RFC_NAME 9556 -/* Returned by DnsValidateName to indicate that a 'special' char was used - * in the name. These are the punctuation " {|}~[\]^':;<=>?@!"#$%^`()+/," */ -#define DNS_ERROR_INVALID_NAME_CHAR 9560 -/* Returned by DnsValidateName to indicate that the name consisted entirely - * of digits, and so collides with the network numbers. */ -#define DNS_ERROR_NUMERIC_NAME 9561 - -#endif /* __USE_W32API */ - -#endif//WINERROR_H _____ Modified: trunk/reactos/lib/dnsapi/dnsapi/adns.c --- trunk/reactos/lib/dnsapi/dnsapi/adns.c 2005-04-01 21:19:23 UTC (rev 14425) +++ trunk/reactos/lib/dnsapi/dnsapi/adns.c 2005-04-01 21:44:22 UTC (rev 14426) @@ -9,7 +9,7 @@ */ #include <windows.h> -#include <WinError.h> +#include <winerror.h> #include <windns.h> #include <internal/windns.h> _____ Modified: trunk/reactos/lib/dnsapi/dnsapi/context.c --- trunk/reactos/lib/dnsapi/dnsapi/context.c 2005-04-01 21:19:23 UTC (rev 14425) +++ trunk/reactos/lib/dnsapi/dnsapi/context.c 2005-04-01 21:44:22 UTC (rev 14426) @@ -9,7 +9,7 @@ */ #include <windows.h> -#include <WinError.h> +#include <winerror.h> #include <windns.h> #define NTOS_MODE_USER #include <ntos.h> _____ Modified: trunk/reactos/lib/dnsapi/dnsapi/free.c --- trunk/reactos/lib/dnsapi/dnsapi/free.c 2005-04-01 21:19:23 UTC (rev 14425) +++ trunk/reactos/lib/dnsapi/dnsapi/free.c 2005-04-01 21:44:22 UTC (rev 14426) @@ -9,7 +9,7 @@ */ #include <windows.h> -#include <WinError.h> +#include <winerror.h> #include <windns.h> #include <internal/windns.h> #define NTOS_MODE_USER _____ Modified: trunk/reactos/lib/dnsapi/dnsapi/names.c --- trunk/reactos/lib/dnsapi/dnsapi/names.c 2005-04-01 21:19:23 UTC (rev 14425) +++ trunk/reactos/lib/dnsapi/dnsapi/names.c 2005-04-01 21:44:22 UTC (rev 14426) @@ -1,5 +1,5 @@ #include <windows.h> -#include <WinError.h> +#include <winerror.h> #include <windns.h> #include <internal/windns.h> #define NTOS_MODE_USER _____ Modified: trunk/reactos/lib/dnsapi/dnsapi/query.c --- trunk/reactos/lib/dnsapi/dnsapi/query.c 2005-04-01 21:19:23 UTC (rev 14425) +++ trunk/reactos/lib/dnsapi/dnsapi/query.c 2005-04-01 21:44:22 UTC (rev 14426) @@ -9,7 +9,7 @@ */ #include <windows.h> -#include <WinError.h> +#include <winerror.h> #include <windns.h> #include <internal/windns.h> #include <string.h> _____ Modified: trunk/reactos/lib/dnsapi/dnsapi/stubs.c --- trunk/reactos/lib/dnsapi/dnsapi/stubs.c 2005-04-01 21:19:23 UTC (rev 14425) +++ trunk/reactos/lib/dnsapi/dnsapi/stubs.c 2005-04-01 21:44:22 UTC (rev 14426) @@ -1,6 +1,6 @@ #include <windows.h> /*#include <windns.h>*/ -#include <WinError.h> +#include <winerror.h> #define NTOS_MODE_USER #include <ntos.h> #include <debug.h> _____ Modified: trunk/reactos/lib/ws2_32/include/ws2_32.h --- trunk/reactos/lib/ws2_32/include/ws2_32.h 2005-04-01 21:19:23 UTC (rev 14425) +++ trunk/reactos/lib/ws2_32/include/ws2_32.h 2005-04-01 21:44:22 UTC (rev 14426) @@ -18,7 +18,7 @@ #include <windows.h> #undef assert #include <debug.h> -#include <WinDNS.h> // DNS_A_DATA +#include <windns.h> // DNS_A_DATA /* Exported by ntdll.dll, but where is the prototype? */ unsigned long strtoul(const char *nptr, char **endptr, int base);

19 years, 5 months

[sedwards] 14425: remove my WinCE support attempt

by sedwards＠svn.reactos.com

remove my WinCE support attempt Deleted: trunk/reactos/lib/coredll/

19 years, 5 months

[sedwards] 14424: remove my WinCE support attempt

by sedwards＠svn.reactos.com

remove my WinCE support attempt Deleted: trunk/reactos/lib/commctrl/

19 years, 5 months

[chorns] 14423: Put winebuild output in intermediate directory

by chorns＠svn.reactos.com

Put winebuild output in intermediate directory Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-01 18:35:34 UTC (rev 14422) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-01 19:31:52 UTC (rev 14423) @@ -848,7 +848,7 @@ def_file.c_str () ); fprintf ( fMakefile, - "%s: %s\n", + "%s: %s $(WINEBUILD_TARGET)\n", stub_file.c_str (), sourceFilename.c_str () ); fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" ); @@ -946,7 +946,7 @@ CLEAN_FILE ( junk_tmp ); string temp_exp = ros_temp + module.name + ".temp.exp"; CLEAN_FILE ( temp_exp ); - string def_file = module.GetBasePath () + SSEP + module.importLibrary->definition; + string def_file = GetDefinitionFilename (); fprintf ( fMakefile, "\t%s %s -Wl,--base-file,%s -o %s %s %s %s\n", @@ -1420,6 +1420,26 @@ fprintf ( fMakefile, "\n" ); } +bool +MingwModuleHandler::IsWineModule () const +{ + if ( module.importLibrary == NULL) + return false; + + size_t index = module.importLibrary->definition.rfind ( ".spec.def" ); + return ( index != string::npos ); +} + +string +MingwModuleHandler::GetDefinitionFilename () const +{ + string defFilename = module.GetBasePath () + SSEP + module.importLibrary->definition; + if ( IsWineModule () ) + return PassThruCacheDirectory ( defFilename, false ); + else + return defFilename; +} + void MingwModuleHandler::GenerateImportLibraryTargetIfNeeded () { @@ -1442,7 +1462,7 @@ deps[i].c_str () ); fprintf ( fMakefile, " %s\n", - GetDirectory(GetTargetFilename(module,NULL)).c_str () ); + GetDirectory ( GetTargetFilename ( module, NULL ) ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" ); @@ -1450,7 +1470,7 @@ fprintf ( fMakefile, "\t${dlltool} --dllname %s --def %s --output-lib %s %s\n\n", module.GetTargetName ().c_str (), - ( module.GetBasePath () + SSEP + module.importLibrary->definition ).c_str (), + GetDefinitionFilename ().c_str (), library_target.c_str (), killAt.c_str () ); } @@ -1462,8 +1482,10 @@ const string& filename ) const { string basename = GetBasename ( filename ); - dependencies.push_back ( basename + ".spec.def" ); - dependencies.push_back ( basename + ".stubs.c" ); + string defDependency = PassThruCacheDirectory ( FixupTargetFilename ( basename + ".spec.def" ), false ); + dependencies.push_back ( defDependency ); + string stubsDependency = PassThruCacheDirectory ( FixupTargetFilename ( basename + ".stubs.c" ), false ); + dependencies.push_back ( stubsDependency ); } void _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-04-01 18:35:34 UTC (rev 14422) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-04-01 19:31:52 UTC (rev 14423) @@ -144,7 +144,8 @@ const std::string& filename ) const; void GetDefaultDependencies ( string_list& dependencies ) const; void GetInvocationDependencies ( const Module& module, string_list& dependencies ); - + bool IsWineModule () const; + std::string GetDefinitionFilename () const; public: const Module& module; string_list clean_files; _____ Modified: branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak --- branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak 2005-04-01 18:35:34 UTC (rev 14422) +++ branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak 2005-04-01 19:31:52 UTC (rev 14423) @@ -30,7 +30,7 @@ ) WINEBUILD_OBJECTS = \ - $(addprefix $(INTERMEDIATE), $(WINEBUILD_SOURCES:.c=.o)) + $(addprefix $(INTERMEDIATE_), $(WINEBUILD_SOURCES:.c=.o)) WINEBUILD_HOST_CFLAGS = -D__USE_W32API -Iinclude/wine

19 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2005