Ros-diffs February 2005

ros-diffs@reactos.org

23 participants
411 discussions

[fireball] 13405: Include usbd.sys in build of usb drivers
by fireball＠svn.reactos.com 04 Feb '05

04 Feb '05

Include usbd.sys in build of usb drivers Modified: trunk/reactos/drivers/usb/Makefile _____ Modified: trunk/reactos/drivers/usb/Makefile --- trunk/reactos/drivers/usb/Makefile 2005-02-04 16:49:17 UTC (rev 13404) +++ trunk/reactos/drivers/usb/Makefile 2005-02-04 16:51:11 UTC (rev 13405) @@ -6,7 +6,7 @@ include $(PATH_TO_TOP)/rules.mak -DRIVERS = usbport miniport/usbuhci miniport/usbehci miniport/usbohci usbhub +DRIVERS = usbport miniport/usbuhci miniport/usbehci miniport/usbohci usbhub usbd all: $(DRIVERS)

1 0

[fireball] 13404: usbd.sys implementation - done long time ago by Filip, I just added .def and changed .rc (I think he doesn't mind it :))
by fireball＠svn.reactos.com 04 Feb '05

04 Feb '05

usbd.sys implementation - done long time ago by Filip, I just added .def and changed .rc (I think he doesn't mind it :)) Added: trunk/reactos/drivers/usb/usbd/ Added: trunk/reactos/drivers/usb/usbd/makefile Added: trunk/reactos/drivers/usb/usbd/test.c Added: trunk/reactos/drivers/usb/usbd/usbd.c Added: trunk/reactos/drivers/usb/usbd/usbd.def Added: trunk/reactos/drivers/usb/usbd/usbd.rc _____ Added: trunk/reactos/drivers/usb/usbd/makefile --- trunk/reactos/drivers/usb/usbd/makefile 2005-02-04 12:27:34 UTC (rev 13403) +++ trunk/reactos/drivers/usb/usbd/makefile 2005-02-04 16:49:17 UTC (rev 13404) @@ -0,0 +1,17 @@ +# $Id: $ + +PATH_TO_TOP = ../../.. + +TARGET_TYPE = export_driver + +TARGET_NAME = usbd + +TARGET_OBJECTS = usbd.o + +TARGET_GCCLIBS = gcc + +TARGET_CFLAGS = -D__USE_W32API -O3 -s + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk _____ Added: trunk/reactos/drivers/usb/usbd/test.c --- trunk/reactos/drivers/usb/usbd/test.c 2005-02-04 12:27:34 UTC (rev 13403) +++ trunk/reactos/drivers/usb/usbd/test.c 2005-02-04 16:49:17 UTC (rev 13404) @@ -0,0 +1,33 @@ +#include <stdio.h> +#include <windows.h> +#include <ddk/usbdi.h> + +typedef ULONG STDCALL +(*USBD_GetInterfaceLengthTYPE)( + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor, + PUCHAR BufferEnd + ); + +int main() +{ + HMODULE Lib; + USB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + USBD_GetInterfaceLengthTYPE USBD_GetInterfaceLength; + + InterfaceDescriptor.bLength = 10; + InterfaceDescriptor.bNumEndpoints = 2; + InterfaceDescriptor.bDescriptorType = /*USB_INTERFACE_DESCRIPTOR_TYPE*/2; + InterfaceDescriptor.iInterface = 0x1; + + Lib = LoadLibraryEx("usbd.sys", NULL, DONT_RESOLVE_DLL_REFERENCES); + USBD_GetInterfaceLength = (USBD_GetInterfaceLengthTYPE)GetProcAddress(Lib, "USBD_GetInterfaceLength"); + printf("%X\n", USBD_GetInterfaceLength(&InterfaceDescriptor, (PUCHAR)((DWORD)&InterfaceDescriptor + sizeof(InterfaceDescriptor)))); + FreeLibrary(Lib); + + Lib = LoadLibraryEx("usbd.ms", NULL, DONT_RESOLVE_DLL_REFERENCES); + USBD_GetInterfaceLength = (USBD_GetInterfaceLengthTYPE)GetProcAddress(Lib, "USBD_GetInterfaceLength"); + printf("%X\n", USBD_GetInterfaceLength(&InterfaceDescriptor, (PUCHAR)((DWORD)&InterfaceDescriptor + sizeof(InterfaceDescriptor)))); + FreeLibrary(Lib); + return 0; +} + _____ Added: trunk/reactos/drivers/usb/usbd/usbd.c --- trunk/reactos/drivers/usb/usbd/usbd.c 2005-02-04 12:27:34 UTC (rev 13403) +++ trunk/reactos/drivers/usb/usbd/usbd.c 2005-02-04 16:49:17 UTC (rev 13404) @@ -0,0 +1,457 @@ +/* + * Universal Serial Bus Driver/Helper Library + * + * Written by Filip Navara <xnavara(a)volny.cz> + * + * Notes: + * This driver was obsoleted in Windows XP and most functions + * became pure stubs. But some of them were retained for backward + * compatibilty with existing drivers. + * + * Preserved functions: + * + * USBD_Debug_GetHeap (implemented) + * USBD_Debug_RetHeap (implemented) + * USBD_CalculateUsbBandwidth (implemented, tested) + * USBD_CreateConfigurationRequestEx (implemented) + * USBD_CreateConfigurationRequest + * USBD_GetInterfaceLength (implemented) + * USBD_ParseConfigurationDescriptorEx + * USBD_ParseDescriptors + * USBD_GetPdoRegistryParameters (implemented) + */ + +#include <windows.h> +#include <ddk/usbdi.h> +#ifndef PLUGPLAY_REGKEY_DRIVER +#define PLUGPLAY_REGKEY_DRIVER 2 +#endif +typedef struct _USBD_INTERFACE_LIST_ENTRY { + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + PUSBD_INTERFACE_INFORMATION Interface; +} USBD_INTERFACE_LIST_ENTRY, *PUSBD_INTERFACE_LIST_ENTRY; + +NTSTATUS STDCALL +DriverEntry(PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) +{ + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +DWORD STDCALL +DllInitialize(DWORD Unknown) +{ + return 0; +} + +/* + * @implemented + */ +DWORD STDCALL +DllUnload(VOID) +{ + return 0; +} + +/* + * @implemented + */ +PVOID STDCALL +USBD_Debug_GetHeap(DWORD Unknown1, POOL_TYPE PoolType, ULONG NumberOfBytes, + ULONG Tag) +{ + return ExAllocatePoolWithTag(PoolType, NumberOfBytes, Tag); +} + +/* + * @implemented + */ +VOID STDCALL +USBD_Debug_RetHeap(PVOID Heap, DWORD Unknown2, DWORD Unknown3) +{ + ExFreePool(Heap); +} + +/* + * @implemented + */ +VOID STDCALL +USBD_Debug_LogEntry(PCHAR Name, ULONG_PTR Info1, ULONG_PTR Info2, + ULONG_PTR Info3) +{ +} + +/* + * @implemented + */ +PVOID STDCALL +USBD_AllocateDeviceName(DWORD Unknown) +{ + return NULL; +} + +/* + * @implemented + */ +DWORD STDCALL +USBD_CalculateUsbBandwidth( + ULONG MaxPacketSize, + UCHAR EndpointType, + BOOLEAN LowSpeed + ) +{ + DWORD OverheadTable[] = { + 0x00, /* UsbdPipeTypeControl */ + 0x09, /* UsbdPipeTypeIsochronous */ + 0x00, /* UsbdPipeTypeBulk */ + 0x0d /* UsbdPipeTypeInterrupt */ + }; + DWORD Result; + + if (OverheadTable[EndpointType] != 0) + { + Result = ((MaxPacketSize + OverheadTable[EndpointType]) * 8 * 7) / 6; + if (LowSpeed) + return Result << 3; + return Result; + } + return 0; +} + +/* + * @implemented + */ +DWORD STDCALL +USBD_Dispatch(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3, DWORD Unknown4) +{ + return 1; +} + +/* + * @implemented + */ +VOID STDCALL +USBD_FreeDeviceMutex(PVOID Unknown) +{ +} + +/* + * @implemented + */ +VOID STDCALL +USBD_FreeDeviceName(PVOID Unknown) +{ +} + +/* + * @implemented + */ +VOID STDCALL +USBD_WaitDeviceMutex(PVOID Unknown) +{ +} + +/* + * @implemented + */ +DWORD STDCALL +USBD_GetSuspendPowerState(DWORD Unknown1) +{ + return 0; +} + +/* + * @implemented + */ +NTSTATUS STDCALL +USBD_InitializeDevice(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3, + DWORD Unknown4, DWORD Unknown5, DWORD Unknown6) +{ + return STATUS_NOT_SUPPORTED; +} + +/* + * @implemented + */ +NTSTATUS STDCALL +USBD_RegisterHostController(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3, + DWORD Unknown4, DWORD Unknown5, DWORD Unknown6, DWORD Unknown7, + DWORD Unknown8, DWORD Unknown9, DWORD Unknown10) +{ + return STATUS_NOT_SUPPORTED; +} + +/* + * @implemented + */ +NTSTATUS STDCALL +USBD_GetDeviceInformation(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3) +{ + return STATUS_NOT_SUPPORTED; +} + +/* + * @implemented + */ +NTSTATUS STDCALL +USBD_CreateDevice(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3, + DWORD Unknown4, DWORD Unknown5) +{ + return STATUS_NOT_SUPPORTED; +} + +/* + * @implemented + */ +NTSTATUS STDCALL +USBD_RemoveDevice(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3) +{ + return STATUS_NOT_SUPPORTED; +} + +/* + * @implemented + */ +VOID STDCALL +USBD_CompleteRequest(DWORD Unknown1, DWORD Unknown2) +{ +} + +/* + * @implemented + */ +VOID STDCALL +USBD_RegisterHcFilter( + PDEVICE_OBJECT DeviceObject, + PDEVICE_OBJECT FilterDeviceObject + ) +{ +} + +/* + * @implemented + */ +VOID STDCALL +USBD_SetSuspendPowerState(DWORD Unknown1, DWORD Unknown2) +{ +} + +/* + * @implemented + */ +NTSTATUS STDCALL +USBD_MakePdoName(DWORD Unknown1, DWORD Unknown2) +{ + return STATUS_NOT_SUPPORTED; +} + +/* + * @implemented + */ +NTSTATUS STDCALL +USBD_QueryBusTime( + PDEVICE_OBJECT RootHubPdo, + PULONG CurrentFrame + ) +{ + return STATUS_NOT_SUPPORTED; +} + +/* + * @implemented + */ +VOID STDCALL +USBD_GetUSBDIVersion( + PUSBD_VERSION_INFORMATION Version + ) +{ + if (Version != NULL) + { + Version->USBDI_Version = USBDI_VERSION; + Version->Supported_USB_Version = 0x100; + } +} + +/* + * @implemented + */ +NTSTATUS STDCALL +USBD_RestoreDevice(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3) +{ + return STATUS_NOT_SUPPORTED; +} + +/* + * @implemented + */ +VOID STDCALL +USBD_RegisterHcDeviceCapabilities(DWORD Unknown1, DWORD Unknown2, + DWORD Unknown3) +{ +} + +/* + * @implemented + * FIXME: Test + */ +PURB +STDCALL +USBD_CreateConfigurationRequestEx( + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, + PUSBD_INTERFACE_LIST_ENTRY InterfaceList + ) +{ + PURB Urb; + DWORD UrbSize; + DWORD InterfaceCount; + + for (InterfaceCount = 0; + InterfaceList[InterfaceCount].InterfaceDescriptor != NULL; + ++InterfaceCount) + ; + /* Include the NULL entry */ + ++InterfaceCount; + + UrbSize = sizeof(Urb->UrbSelectConfiguration) + + (InterfaceCount * sizeof(PUSBD_INTERFACE_LIST_ENTRY)); + Urb = ExAllocatePool(NonPagedPool, UrbSize); + Urb->UrbSelectConfiguration.Hdr.Function = + URB_FUNCTION_SELECT_CONFIGURATION; + Urb->UrbSelectConfiguration.Hdr.Length = + sizeof(Urb->UrbSelectConfiguration); + Urb->UrbSelectConfiguration.ConfigurationDescriptor = + ConfigurationDescriptor; + memcpy((PVOID)&Urb->UrbSelectConfiguration.Interface, (PVOID)InterfaceList, + InterfaceCount * sizeof(PUSBD_INTERFACE_LIST_ENTRY)); + + return Urb; +} + +/* + * @unimplemented + */ +PURB STDCALL +USBD_CreateConfigurationRequest( + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, + PUSHORT Size + ) +{ + return NULL; +} + +/* + * @unimplemented + */ +ULONG STDCALL +USBD_GetInterfaceLength( + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor, + PUCHAR BufferEnd + ) +{ + PUSB_INTERFACE_DESCRIPTOR CurrentDescriptor = InterfaceDescriptor; + DWORD Length = CurrentDescriptor->bLength; + + // USB_ENDPOINT_DESCRIPTOR_TYPE + if (CurrentDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE) + { + for (; + (PUCHAR)CurrentDescriptor < BufferEnd; + (PVOID)CurrentDescriptor += CurrentDescriptor->bLength) + Length += CurrentDescriptor->bLength; + + } + return Length; +} + +/* + * @unimplemented + */ +PUSB_INTERFACE_DESCRIPTOR STDCALL +USBD_ParseConfigurationDescriptorEx( + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, + PVOID StartPosition, + LONG InterfaceNumber, + LONG AlternateSetting, + LONG InterfaceClass, + LONG InterfaceSubClass, + LONG InterfaceProtocol + ) +{ + return NULL; +} + +/* + * @implemented + */ +PUSB_INTERFACE_DESCRIPTOR STDCALL +USBD_ParseConfigurationDescriptor( + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, + UCHAR InterfaceNumber, + UCHAR AlternateSetting + ) +{ + return USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, + (PVOID)ConfigurationDescriptor, InterfaceNumber, AlternateSetting, + -1, -1, -1); +} + +/* + * @unimplemented + */ +PUSB_COMMON_DESCRIPTOR STDCALL +USBD_ParseDescriptors( + PVOID DescriptorBuffer, + ULONG TotalLength, + PVOID StartPosition, + LONG DescriptorType + ) +{ + return NULL; +} + +/* + * @implemented + */ +DWORD STDCALL +USBD_GetPdoRegistryParameter( + PDEVICE_OBJECT PhysicalDeviceObject, + PVOID Parameter, + ULONG ParameterLength, + PWCHAR KeyName, + ULONG KeyNameLength + ) +{ + NTSTATUS Status; + HANDLE DevInstRegKey; + + Status = IoOpenDeviceRegistryKey(PhysicalDeviceObject, + PLUGPLAY_REGKEY_DRIVER, STANDARD_RIGHTS_ALL, &DevInstRegKey); + if (NT_SUCCESS(Status)) + { + PKEY_VALUE_FULL_INFORMATION FullInfo; + UNICODE_STRING ValueName; + ULONG Length; + + RtlInitUnicodeString(&ValueName, KeyName); + Length = ParameterLength + KeyNameLength + sizeof(KEY_VALUE_FULL_INFORMATION); + FullInfo = ExAllocatePool(PagedPool, Length); + if (FullInfo) + { + Status = ZwQueryValueKey(DevInstRegKey, &ValueName, + KeyValueFullInformation, FullInfo, Length, &Length); + if (NT_SUCCESS(Status)) + { + RtlCopyMemory(Parameter, + ((PUCHAR)FullInfo) + FullInfo->DataOffset, + ParameterLength /*FullInfo->DataLength*/); + } + ExFreePool(FullInfo); + } else + Status = STATUS_NO_MEMORY; + ZwClose(DevInstRegKey); + } + return Status; +} _____ Added: trunk/reactos/drivers/usb/usbd/usbd.def --- trunk/reactos/drivers/usb/usbd/usbd.def 2005-02-04 12:27:34 UTC (rev 13403) +++ trunk/reactos/drivers/usb/usbd/usbd.def 2005-02-04 16:49:17 UTC (rev 13404) @@ -0,0 +1,13 @@ +; +; Exports definition file for usbd.sys +; +EXPORTS +USBD_Debug_GetHeap@16 +USBD_Debug_RetHeap@12 +USBD_CalculateUsbBandwidth@12 +USBD_CreateConfigurationRequestEx@8 +USBD_CreateConfigurationRequest@8 +USBD_GetInterfaceLength@8 +USBD_ParseConfigurationDescriptorEx@28 +USBD_ParseDescriptors@16 +;USBD_GetPdoRegistryParameters _____ Added: trunk/reactos/drivers/usb/usbd/usbd.rc --- trunk/reactos/drivers/usb/usbd/usbd.rc 2005-02-04 12:27:34 UTC (rev 13403) +++ trunk/reactos/drivers/usb/usbd/usbd.rc 2005-02-04 16:49:17 UTC (rev 13404) @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "USBD Legacy Driver\0" +#define REACTOS_STR_INTERNAL_NAME "usbd\0" +#define REACTOS_STR_ORIGINAL_FILENAME "usbd.sys\0" +#include <reactos/version.rc>

1 0

[ekohl] 13403: Implement DelayedMove and FileExists.
by ekohl＠svn.reactos.com 04 Feb '05

04 Feb '05

Implement DelayedMove and FileExists. Modified: trunk/reactos/include/wine/setupapi.h Modified: trunk/reactos/lib/setupapi/misc.c Modified: trunk/reactos/lib/setupapi/setupapi.spec _____ Modified: trunk/reactos/include/wine/setupapi.h --- trunk/reactos/include/wine/setupapi.h 2005-02-04 03:21:46 UTC (rev 13402) +++ trunk/reactos/include/wine/setupapi.h 2005-02-04 12:27:34 UTC (rev 13403) @@ -666,9 +666,11 @@ LONG WINAPI AddTagToGroupOrderList(PCWSTR lpGroupName, DWORD dwUnknown2, DWORD dwUnknown3); +BOOL WINAPI DelayedMove(PCWSTR lpExistingFileName, PCWSTR lpNewFileName); BOOL WINAPI DoesUserHavePrivilege(PCWSTR lpPrivilegeName); PWSTR WINAPI DuplicateString(PCWSTR lpSrc); BOOL WINAPI EnablePrivilege(PCWSTR lpPrivilegeName, BOOL bEnable); +BOOL WINAPI FileExists(PCWSTR lpFileName, PWIN32_FIND_DATAW lpFileFindData); void WINAPI InstallHinfSectionA( HWND hwnd, HINSTANCE handle, PCSTR cmdline, INT show ); void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, PCWSTR cmdline, INT show ); #define InstallHinfSection WINELIB_NAME_AW(InstallHinfSection) _____ Modified: trunk/reactos/lib/setupapi/misc.c --- trunk/reactos/lib/setupapi/misc.c 2005-02-04 03:21:46 UTC (rev 13402) +++ trunk/reactos/lib/setupapi/misc.c 2005-02-04 12:27:34 UTC (rev 13403) @@ -30,6 +30,9 @@ #include "wine/unicode.h" #include "wine/debug.h" +#include "setupapi_private.h" + + WINE_DEFAULT_DEBUG_CHANNEL(setupapi); @@ -458,3 +461,43 @@ return bResult; } + + +BOOL WINAPI DelayedMove(LPCWSTR lpExistingFileName, LPCWSTR lpNewFileName) +{ + if (OsVersionInfo.dwPlatformId != VER_PLATFORM_WIN32_NT) + { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + + return MoveFileExW(lpExistingFileName, lpNewFileName, + MOVEFILE_REPLACE_EXISTING | MOVEFILE_DELAY_UNTIL_REBOOT); +} + + +BOOL WINAPI FileExists(LPCWSTR lpFileName, LPWIN32_FIND_DATAW lpFileFindData) +{ + WIN32_FIND_DATAW FindData; + HANDLE hFind; + UINT uErrorMode; + DWORD dwError; + + uErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS); + + hFind = FindFirstFileW(lpFileName, &FindData); + if (hFind == INVALID_HANDLE_VALUE) + { + dwError = GetLastError(); + SetErrorMode(uErrorMode); + SetLastError(dwError); + return FALSE; + } + + FindClose(hFind); + + if (lpFileFindData) + memcpy(lpFileFindData, &FindData, sizeof(WIN32_FIND_DATAW)); + + return TRUE; +} _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-02-04 03:21:46 UTC (rev 13402) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-02-04 12:27:34 UTC (rev 13403) @@ -194,14 +194,14 @@ @ stub CaptureStringArg @ stub CenterWindowRelativeToParent @ stub ConcatenatePaths -@ stub DelayedMove +@ stdcall DelayedMove(wstr wstr) @ stub DelimStringToMultiSz @ stub DestroyTextFileReadBuffer @ stdcall DoesUserHavePrivilege(wstr) @ stdcall DuplicateString(wstr) @ stdcall EnablePrivilege(wstr long) @ stub ExtensionPropSheetPageProc -@ stub FileExists +@ stdcall FileExists(wstr ptr) @ stub FreeStringArray @ stub GetCurrentDriverSigningPolicy @ stub GetNewInfName

1 0

[tamlin] 13402: Fix broken year handling.
by tamlin＠svn.reactos.com 04 Feb '05

04 Feb '05

Fix broken year handling. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c 2005-02-03 23:54:02 UTC (rev 13401) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c 2005-02-04 03:21:46 UTC (rev 13402) @@ -55,7 +55,7 @@ if (NULL != Year) { - *Year = 100 * BCD_INT(Regs.b.cl) + BCD_INT(Regs.b.ch); + *Year = 100 * BCD_INT(Regs.b.ch) + BCD_INT(Regs.b.cl); } if (NULL != Month) {

1 0

[royce] 13401: compatibility fixes
by royce＠svn.reactos.com 03 Feb '05

03 Feb '05

compatibility fixes Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/pch.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/sourcefiletest.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-02-03 22:01:00 UTC (rev 13400) +++ branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-02-03 23:54:02 UTC (rev 13401) @@ -2,12 +2,16 @@ #include "pch.h" +#ifdef _MSC_VER +#define MAX_PATH _MAX_PATH +#endif + #ifdef WIN32 -#include <direct.h> -#include <io.h> +# include <direct.h> +# include <io.h> #else -#include <sys/stat.h> -#define _MAX_PATH 255 +# include <sys/stat.h> +# define MAX_PATH PATH_MAX #endif #include <assert.h> @@ -180,16 +184,10 @@ vout.push_back ( vpath[i++] ); // now merge vout into a string again - string out; + string out = "."; for ( i = 0; i < vout.size(); i++ ) { - // this squirreliness is b/c win32 has drive letters and *nix doesn't... -#ifdef WIN32 - if ( i ) out += "/"; -#else - out += out.size() ? "/" : "./"; -#endif - out += vout[i]; + out += "/" + vout[i]; } return out; } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/pch.h --- branches/xmlbuildsystem/reactos/tools/rbuild/pch.h 2005-02-03 22:01:00 UTC (rev 13400) +++ branches/xmlbuildsystem/reactos/tools/rbuild/pch.h 2005-02-03 23:54:02 UTC (rev 13401) @@ -14,6 +14,10 @@ #include <stdarg.h> +#ifdef _MSC_VER +#define MAX_PATH _MAX_PATH +#endif + #ifndef WIN32 #include <wctype.h> #include <math.h> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-02-03 22:01:00 UTC (rev 13400) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-02-03 23:54:02 UTC (rev 13401) @@ -6,12 +6,14 @@ #ifdef WIN32 #include <direct.h> #include <io.h> -#else -#define _MAX_PATH 255 #endif #include <sys/stat.h> #include <time.h> +#ifdef _MSC_VER +#include <sys/utime.h> +#else #include <utime.h> +#endif #include "ssprintf.h" #include "exception.h" _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp 2005-02-03 22:01:00 UTC (rev 13400) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp 2005-02-03 23:54:02 UTC (rev 13401) @@ -5,5 +5,5 @@ void FunctionTest::Run () { string fixedupFilename = FixupTargetFilename ( "." SSEP "dir1" SSEP "dir2" SSEP ".." SSEP "filename.txt" ); - ARE_EQUAL ( "$(ROS_INTERMEDIATE)dir1" SSEP "filename.txt", fixedupFilename ); + ARE_EQUAL ( "$(ROS_INTERMEDIATE)." SSEP "dir1" SSEP "filename.txt", fixedupFilename ); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/sourcefiletest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/sourcefiletest.cpp 2005-02-03 22:01:00 UTC (rev 13400) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/sourcefiletest.cpp 2005-02-03 23:54:02 UTC (rev 13401) @@ -38,9 +38,9 @@ AutomaticDependency automaticDependency ( project ); automaticDependency.Process (); ARE_EQUAL( 4, automaticDependency.sourcefile_map.size () ); - const SourceFile* include = automaticDependency.RetrieveFromCache ( "tests" SSEP "data" SSEP "sourcefile_include.h" ); + const SourceFile* include = automaticDependency.RetrieveFromCache ( "." SSEP "tests" SSEP "data" SSEP "sourcefile_include.h" ); IS_NOT_NULL( include ); - const SourceFile* includenext = automaticDependency.RetrieveFromCache ( "tests" SSEP "data" SSEP "sourcefile1" SSEP "sourcefile_includenext.h" ); + const SourceFile* includenext = automaticDependency.RetrieveFromCache ( "." SSEP "tests" SSEP "data" SSEP "sourcefile1" SSEP "sourcefile_includenext.h" ); IS_NOT_NULL( includenext ); } @@ -51,9 +51,9 @@ AutomaticDependency automaticDependency ( project ); automaticDependency.Process (); ARE_EQUAL( 5, automaticDependency.sourcefile_map.size () ); - const SourceFile* header1 = automaticDependency.RetrieveFromCache ( "tests" SSEP "data" SSEP "sourcefile1_header1.h" ); + const SourceFile* header1 = automaticDependency.RetrieveFromCache ( "." SSEP "tests" SSEP "data" SSEP "sourcefile1_header1.h" ); IS_NOT_NULL( header1 ); - const SourceFile* recurse = automaticDependency.RetrieveFromCache ( "tests" SSEP "data" SSEP "sourcefile1_recurse.h" ); + const SourceFile* recurse = automaticDependency.RetrieveFromCache ( "." SSEP "tests" SSEP "data" SSEP "sourcefile1_recurse.h" ); IS_NOT_NULL( recurse ); IS_TRUE( IsParentOf ( header1, recurse ) );

1 0

[gvg] 13400: Always create debug info (-g)
by gvg＠svn.reactos.com 03 Feb '05

03 Feb '05

Always create debug info (-g) Modified: trunk/reactos/tools/helper.mk _____ Modified: trunk/reactos/tools/helper.mk --- trunk/reactos/tools/helper.mk 2005-02-03 21:55:43 UTC (rev 13399) +++ trunk/reactos/tools/helper.mk 2005-02-03 22:01:00 UTC (rev 13400) @@ -642,22 +642,17 @@ include $(PATH_TO_TOP)/config -TARGET_CFLAGS += $(MK_CFLAGS) $(STD_CFLAGS) -ifeq ($(DBG),1) - TARGET_ASFLAGS += -g - TARGET_CFLAGS += -g - TARGET_LFLAGS += -g -endif +TARGET_CFLAGS += $(MK_CFLAGS) $(STD_CFLAGS) -g -TARGET_CPPFLAGS += $(MK_CPPFLAGS) $(STD_CPPFLAGS) +TARGET_CPPFLAGS += $(MK_CPPFLAGS) $(STD_CPPFLAGS) -g TARGET_RCFLAGS += $(MK_RCFLAGS) $(STD_RCFLAGS) -TARGET_ASFLAGS += $(MK_ASFLAGS) $(STD_ASFLAGS) +TARGET_ASFLAGS += $(MK_ASFLAGS) $(STD_ASFLAGS) -g TARGET_NFLAGS += $(MK_NFLAGS) $(STD_NFLAGS) -TARGET_LFLAGS += $(MK_LFLAGS) $(STD_LFLAGS) +TARGET_LFLAGS += $(MK_LFLAGS) $(STD_LFLAGS) -g MK_GCCLIBS := $(addprefix -l, $(TARGET_GCCLIBS))

1 0

[chorns] 13399: * Build midimap, netapi32, lz32, setupapi, mpr, olepro32, msimg32, secur32
by chorns＠svn.reactos.com 03 Feb '05

03 Feb '05

* Build midimap, netapi32, lz32, setupapi, mpr, olepro32, msimg32, secur32 * Build msafd, riched32, msgina, mmdrv, samlib, msvcrt20, mesa32 Modified: branches/xmlbuildsystem/reactos/lib/directory.xml Added: branches/xmlbuildsystem/reactos/lib/lzexpand/lz32.xml Added: branches/xmlbuildsystem/reactos/lib/mesa32/mesa32.xml Added: branches/xmlbuildsystem/reactos/lib/midimap/midimap.xml Added: branches/xmlbuildsystem/reactos/lib/mmdrv/mmdrv.xml Added: branches/xmlbuildsystem/reactos/lib/mpr/mpr.xml Added: branches/xmlbuildsystem/reactos/lib/msafd/msafd.xml Added: branches/xmlbuildsystem/reactos/lib/msgina/msgina.xml Added: branches/xmlbuildsystem/reactos/lib/msimg32/msimg32.xml Added: branches/xmlbuildsystem/reactos/lib/msvcrt20/msvcrt20.xml Added: branches/xmlbuildsystem/reactos/lib/netapi32/netapi32.xml Added: branches/xmlbuildsystem/reactos/lib/olepro32/olepro32.xml Added: branches/xmlbuildsystem/reactos/lib/richedit/riched32.xml Added: branches/xmlbuildsystem/reactos/lib/samlib/samlib.xml Added: branches/xmlbuildsystem/reactos/lib/secur32/secur32.xml Added: branches/xmlbuildsystem/reactos/lib/setupapi/setupapi.xml Modified: branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml _____ Modified: branches/xmlbuildsystem/reactos/lib/directory.xml --- branches/xmlbuildsystem/reactos/lib/directory.xml 2005-02-03 21:31:57 UTC (rev 13398) +++ branches/xmlbuildsystem/reactos/lib/directory.xml 2005-02-03 21:55:43 UTC (rev 13399) @@ -118,10 +118,40 @@ <directory name="libwine"> <xi:include href="libwine/libwine.xml" /> </directory> +<directory name="lzexpand"> + <xi:include href="lzexpand/lz32.xml" /> +</directory> +<directory name="mesa32"> + <xi:include href="mesa32/mesa32.xml" /> +</directory> +<directory name="midimap"> + <xi:include href="midimap/midimap.xml" /> +</directory> +<directory name="mmdrv"> + <xi:include href="mmdrv/mmdrv.xml" /> +</directory> +<directory name="mpr"> + <xi:include href="mpr/mpr.xml" /> +</directory> +<directory name="msafd"> + <xi:include href="msafd/msafd.xml" /> +</directory> +<directory name="msgina"> + <xi:include href="msgina/msgina.xml" /> +</directory> +<directory name="msimg32"> + <xi:include href="msimg32/msimg32.xml" /> +</directory> <directory name="msvcrt"> <xi:include href="msvcrt/crt.xml" /> <xi:include href="msvcrt/msvcrt.xml" /> </directory> +<directory name="msvcrt20"> + <xi:include href="msvcrt20/msvcrt20.xml" /> +</directory> +<directory name="netapi32"> + <xi:include href="netapi32/netapi32.xml" /> +</directory> <directory name="ntdll"> <xi:include href="ntdll/ntdll.xml" /> </directory> @@ -131,12 +161,18 @@ <directory name="oleaut32"> <xi:include href="oleaut32/oleaut32.xml" /> </directory> +<directory name="olepro32"> + <xi:include href="olepro32/olepro32.xml" /> +</directory> <directory name="psapi"> <xi:include href="psapi/psapi.xml" /> </directory> <directory name="pseh"> <xi:include href="pseh/pseh.xml" /> </directory> +<directory name="richedit"> + <xi:include href="richedit/riched32.xml" /> +</directory> <directory name="rosrtl"> <xi:include href="rosrtl/rosrtl.xml" /> </directory> @@ -146,6 +182,15 @@ <directory name="rtl"> <xi:include href="rtl/rtl.xml" /> </directory> +<directory name="samlib"> + <xi:include href="samlib/samlib.xml" /> +</directory> +<directory name="secur32"> + <xi:include href="secur32/secur32.xml" /> +</directory> +<directory name="setupapi"> + <xi:include href="setupapi/setupapi.xml" /> +</directory> <directory name="shell32"> <xi:include href="shell32/shell32.xml" /> </directory> _____ Added: branches/xmlbuildsystem/reactos/lib/lzexpand/lz32.xml --- branches/xmlbuildsystem/reactos/lib/lzexpand/lz32.xml 2005-02-03 21:31:57 UTC (rev 13398) +++ branches/xmlbuildsystem/reactos/lib/lzexpand/lz32.xml 2005-02-03 21:55:43 UTC (rev 13399) @@ -0,0 +1,9 @@ +<module name="lz32" type="win32dll"> + <importlibrary definition="lz32.def" /> + <include base="lz32">.</include> + <define name="_DISABLE_TIDENTS" /> + <library>ntdll</library> + <library>kernel32</library> + <file>lzexpand_main.c</file> + <file>lz32.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/mesa32/mesa32.xml --- branches/xmlbuildsystem/reactos/lib/mesa32/mesa32.xml 2005-02-03 21:31:57 UTC (rev 13398) +++ branches/xmlbuildsystem/reactos/lib/mesa32/mesa32.xml 2005-02-03 21:55:43 UTC (rev 13399) @@ -0,0 +1,209 @@ +<module name="mesa32" type="win32dll"> + <importlibrary definition="mesa32.def" /> + <linkerflag>-Wl,--enable-stdcall-fixup</linkerflag> + <include base="mesa32">include</include> + <include base="mesa32">src</include> + <include base="mesa32">src/main</include> + <include base="mesa32">src/glapi</include> + <include base="mesa32">src/math</include> + <include base="mesa32">src/tnl</include> + <include base="mesa32">src/shader</include> + <include base="mesa32">src/swrast</include> + <include base="mesa32">src/swrast_setup</include> + <define name="BUILD_GL32" /> + <define name="_OPENGL32_" /> + <define name="STDCALL_API" /> + <define name="USE_MGL_NAMESPACE" /> + <define name="USE_X86_ASM" /> + <define name="USE_MMX_ASM" /> + <define name="USE_SSE_ASM" /> + <define name="USE_3DNOW_ASM" /> + <define name="__USE_W32API" /> + <library>ntdll</library> + <library>kernel32</library> + <library>gdi32</library> + <directory name="src"> + <directory name="array_cache"> + <file>ac_context.c</file> + <file>ac_import.c</file> + </directory> + <directory name="drivers"> + <directory name="common"> + <file>driverfuncs.c</file> + </directory> + <directory name="windows"> + <directory name="gdi"> + <file>wmesa.c</file> + </directory> + <directory name="icd"> + <file>icd.c</file> + </directory> + </directory> + </directory> + <directory name="glapi"> + <file>glapi.c</file> + <file>glthread.c</file> + </directory> + <directory name="main"> + <file>api_arrayelt.c</file> + <file>api_loopback.c</file> + <file>api_noop.c</file> + <file>api_validate.c</file> + <file>accum.c</file> + <file>attrib.c</file> + <file>blend.c</file> + <file>bufferobj.c</file> + <file>buffers.c</file> + <file>clip.c</file> + <file>colortab.c</file> + <file>context.c</file> + <file>convolve.c</file> + <file>debug.c</file> + <file>depth.c</file> + <file>dispatch.c</file> + <file>dlist.c</file> + <file>drawpix.c</file> + <file>enable.c</file> + <file>enums.c</file> + <file>eval.c</file> + <file>extensions.c</file> + <file>feedback.c</file> + <file>fog.c</file> + <file>get.c</file> + <file>hash.c</file> + <file>hint.c</file> + <file>histogram.c</file> + <file>image.c</file> + <file>imports.c</file> + <file>light.c</file> + <file>lines.c</file> + <file>matrix.c</file> + <file>occlude.c</file> + <file>pixel.c</file> + <file>points.c</file> + <file>polygon.c</file> + <file>rastpos.c</file> + <file>state.c</file> + <file>stencil.c</file> + <file>texcompress.c</file> + <file>texcompress_s3tc.c</file> + <file>texcompress_fxt1.c</file> + <file>texformat.c</file> + <file>teximage.c</file> + <file>texobj.c</file> + <file>texstate.c</file> + <file>texstore.c</file> + <file>varray.c</file> + <file>vtxfmt.c</file> + </directory> + <directory name="math"> + <file>m_debug_clip.c</file> + <file>m_debug_norm.c</file> + <file>m_debug_xform.c</file> + <file>m_eval.c</file> + <file>m_matrix.c</file> + <file>m_translate.c</file> + <file>m_vector.c</file> + <file>m_xform.c</file> + </directory> + <directory name="swrast"> + <file>s_fragprog_to_c.c</file> + <file>s_aaline.c</file> + <file>s_aatriangle.c</file> + <file>s_accum.c</file> + <file>s_alpha.c</file> + <file>s_alphabuf.c</file> + <file>s_auxbuffer.c</file> + <file>s_bitmap.c</file> + <file>s_blend.c</file> + <file>s_buffers.c</file> + <file>s_copypix.c</file> + <file>s_context.c</file> + <file>s_depth.c</file> + <file>s_drawpix.c</file> + <file>s_feedback.c</file> + <file>s_fog.c</file> + <file>s_imaging.c</file> + <file>s_lines.c</file> + <file>s_logic.c</file> + <file>s_masking.c</file> + <file>s_nvfragprog.c</file> + <file>s_pixeltex.c</file> + <file>s_points.c</file> + <file>s_readpix.c</file> + <file>s_span.c</file> + <file>s_stencil.c</file> + <file>s_tcc.c</file> + <file>s_texture.c</file> + <file>s_texstore.c</file> + <file>s_triangle.c</file> + <file>s_zoom.c</file> + </directory> + <directory name="swrast_setup"> + <file>ss_context.c</file> + <file>ss_triangle.c</file> + </directory> + <directory name="shader"> + <file>arbfragparse.c</file> + <file>arbprogparse.c</file> + <file>arbprogram.c</file> + <file>arbvertparse.c</file> + <file>grammar_mesa.c</file> + <file>nvfragparse.c</file> + <file>nvprogram.c</file> + <file>nvvertexec.c</file> + <file>nvvertparse.c</file> + <file>program.c</file> + </directory> + <directory name="tnl"> + <file>t_array_api.c</file> + <file>t_array_import.c</file> + <file>t_context.c</file> + <file>t_pipeline.c</file> + <file>t_save_api.c</file> + <file>t_save_loopback.c</file> + <file>t_save_playback.c</file> + <file>t_vb_fog.c</file> + <file>t_vb_light.c</file> + <file>t_vb_normals.c</file> + <file>t_vb_points.c</file> + <file>t_vb_program.c</file> + <file>t_vb_render.c</file> + <file>t_vb_texgen.c</file> + <file>t_vb_texmat.c</file> + <file>t_vb_vertex.c</file> + <file>t_vertex.c</file> + <file>t_vertex_c.c</file> + <file>t_vertex_codegen.c</file> + <file>t_vtx_api.c</file> + <file>t_vtx_generic.c</file> + <file>t_vtx_eval.c</file> + <file>t_vtx_exec.c</file> + <file>t_vtx_x86.c</file> + <file>t_vtx_x86_gcc.S</file> + </directory> + <directory name="x86"> + <file>3dnow.c</file> + <file>3dnow_normal.S</file> + <file>3dnow_xform1.S</file> + <file>3dnow_xform2.S</file> + <file>3dnow_xform3.S</file> + <file>3dnow_xform4.S</file> + <file>common_x86.c</file> + <file>common_x86_asm.S</file> + <file>glapi_x86.S</file> + <file>mmx_blend.S</file> + <file>sse.c</file> + <file>sse_normal.S</file> + <file>sse_xform1.S</file> + <file>sse_xform2.S</file> + <file>sse_xform3.S</file> + <file>sse_xform4.S</file> + <file>x86.c</file> + <file>x86_xform2.S</file> + <file>x86_xform3.S</file> + <file>x86_xform4.S</file> + <file>x86_cliptest.S</file> + </directory> + </directory> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/midimap/midimap.xml --- branches/xmlbuildsystem/reactos/lib/midimap/midimap.xml 2005-02-03 21:31:57 UTC (rev 13398) +++ branches/xmlbuildsystem/reactos/lib/midimap/midimap.xml 2005-02-03 21:55:43 UTC (rev 13399) @@ -0,0 +1,23 @@ +<module name="midimap" type="win32dll"> + <dependency>winebuild</dependency> + <importlibrary definition="midimap.spec.def" /> + <include base="midimap">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>user32</library> + <library>winmm</library> + <file>midimap.c</file> + <file>midimap.rc</file> + <file>midimap.spec</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/mmdrv/mmdrv.xml --- branches/xmlbuildsystem/reactos/lib/mmdrv/mmdrv.xml 2005-02-03 21:31:57 UTC (rev 13398) +++ branches/xmlbuildsystem/reactos/lib/mmdrv/mmdrv.xml 2005-02-03 21:55:43 UTC (rev 13399) @@ -0,0 +1,15 @@ +<module name="mmdrv" type="win32dll"> + <importlibrary definition="mmdrv.def" /> + <include base="mmdrv">.</include> + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <library>ntdll</library> + <library>kernel32</library> + <library>winmm</library> + <file>auxil.c</file> + <file>entry.c</file> + <file>midi.c</file> + <file>utils.c</file> + <file>wave.c</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/mpr/mpr.xml --- branches/xmlbuildsystem/reactos/lib/mpr/mpr.xml 2005-02-03 21:31:57 UTC (rev 13398) +++ branches/xmlbuildsystem/reactos/lib/mpr/mpr.xml 2005-02-03 21:55:43 UTC (rev 13399) @@ -0,0 +1,26 @@ +<module name="mpr" type="win32dll"> + <dependency>winebuild</dependency> + <importlibrary definition="mpr.spec.def" /> + <include base="mpr">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>user32</library> + <file>auth.c</file> + <file>mpr_main.c</file> + <file>multinet.c</file> + <file>nps.c</file> + <file>pwcache.c</file> + <file>wnet.c</file> + <file>mpr.rc</file> + <file>mpr.spec</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/msafd/msafd.xml --- branches/xmlbuildsystem/reactos/lib/msafd/msafd.xml 2005-02-03 21:31:57 UTC (rev 13398) +++ branches/xmlbuildsystem/reactos/lib/msafd/msafd.xml 2005-02-03 21:55:43 UTC (rev 13399) @@ -0,0 +1,19 @@ +<module name="msafd" type="win32dll"> + <importlibrary definition="msafd.def" /> + <include base="msafd">include</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <directory name="misc"> + <file>dllmain.c</file> + <file>event.c</file> + <file>helpers.c</file> + <file>sndrcv.c</file> + <file>stubs.c</file> + </directory> + <file>msafd.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/msgina/msgina.xml --- branches/xmlbuildsystem/reactos/lib/msgina/msgina.xml 2005-02-03 21:31:57 UTC (rev 13398) +++ branches/xmlbuildsystem/reactos/lib/msgina/msgina.xml 2005-02-03 21:55:43 UTC (rev 13399) @@ -0,0 +1,16 @@ +<module name="msgina" type="win32dll"> + <importlibrary definition="msgina.def" /> + <include base="msgina">.</include> + <include base="msgina">include</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>user32</library> + <file>msgina.c</file> + <file>stubs.c</file> + <file>msgina.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/msimg32/msimg32.xml --- branches/xmlbuildsystem/reactos/lib/msimg32/msimg32.xml 2005-02-03 21:31:57 UTC (rev 13398) +++ branches/xmlbuildsystem/reactos/lib/msimg32/msimg32.xml 2005-02-03 21:55:43 UTC (rev 13399) @@ -0,0 +1,11 @@ +<module name="msimg32" type="win32dll"> + <importlibrary definition="msimg32.def" /> + <include base="msimg32">.</include> + <include base="msimg32">include</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>msimg32.c</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/msvcrt20/msvcrt20.xml --- branches/xmlbuildsystem/reactos/lib/msvcrt20/msvcrt20.xml 2005-02-03 21:31:57 UTC (rev 13398) +++ branches/xmlbuildsystem/reactos/lib/msvcrt20/msvcrt20.xml 2005-02-03 21:55:43 UTC (rev 13399) @@ -0,0 +1,17 @@ +<module name="msvcrt20" type="win32dll" mangledsymbols="yes"> + <importlibrary definition="msvcrt20.def" /> + <include base="msvcrt20">.</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="__REACTOS__" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="USE_MSVCRT_PREFIX" /> + <define name="_MT" /> + <library>wine</library> + <library>string</library> + <library>ntdll</library> + <library>kernel32</library> + <file>msvcrt20.c</file> + <file>msvcrt20.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/netapi32/netapi32.xml --- branches/xmlbuildsystem/reactos/lib/netapi32/netapi32.xml 2005-02-03 21:31:57 UTC (rev 13398) +++ branches/xmlbuildsystem/reactos/lib/netapi32/netapi32.xml 2005-02-03 21:55:43 UTC (rev 13399) @@ -0,0 +1,31 @@ +<module name="netapi32" type="win32dll"> + <dependency>winebuild</dependency> + <importlibrary definition="netapi32.spec.def" /> + <include base="netapi32">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="_SVRAPI_" /> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>ws2_32</library> + <library>iphlpapi</library> + <file>access.c</file> + <file>apibuf.c</file> + <file>browsr.c</file> + <file>nbcmdqueue.c</file> + <file>nbnamecache.c</file> + <file>nbt.c</file> + <file>netapi32.c</file> + <file>netbios.c</file> + <file>wksta.c</file> + <file>netapi32.rc</file> + <file>netapi32.spec</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/olepro32/olepro32.xml --- branches/xmlbuildsystem/reactos/lib/olepro32/olepro32.xml 2005-02-03 21:31:57 UTC (rev 13398) +++ branches/xmlbuildsystem/reactos/lib/olepro32/olepro32.xml 2005-02-03 21:55:43 UTC (rev 13399) @@ -0,0 +1,20 @@ +<module name="olepro32" type="win32dll"> + <dependency>winebuild</dependency> + <importlibrary definition="olepro32.spec.def" /> + <include base="olepro32">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>oleaut32</library> + <file>olepro32stubs.c</file> + <file>olepro32.rc</file> + <file>olepro32.spec</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/richedit/riched32.xml --- branches/xmlbuildsystem/reactos/lib/richedit/riched32.xml 2005-02-03 21:31:57 UTC (rev 13398) +++ branches/xmlbuildsystem/reactos/lib/richedit/riched32.xml 2005-02-03 21:55:43 UTC (rev 13399) @@ -0,0 +1,21 @@ +<module name="riched32" type="win32dll"> + <dependency>winebuild</dependency> + <importlibrary definition="riched32.spec.def" /> + <include base="riched32">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <file>reader.c</file> + <file>richedit.c</file> + <file>text-writer.c</file> + <file>riched32.spec</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/samlib/samlib.xml --- branches/xmlbuildsystem/reactos/lib/samlib/samlib.xml 2005-02-03 21:31:57 UTC (rev 13398) +++ branches/xmlbuildsystem/reactos/lib/samlib/samlib.xml 2005-02-03 21:55:43 UTC (rev 13399) @@ -0,0 +1,11 @@ +<module name="samlib" type="win32dll"> + <importlibrary definition="samlib.def" /> + <include base="samlib">.</include> + <define name="_DISABLE_TIDENTS" /> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <file>dllmain.c</file> + <file>samlib.c</file> + <file>samlib.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/secur32/secur32.xml --- branches/xmlbuildsystem/reactos/lib/secur32/secur32.xml 2005-02-03 21:31:57 UTC (rev 13398) +++ branches/xmlbuildsystem/reactos/lib/secur32/secur32.xml 2005-02-03 21:55:43 UTC (rev 13399) @@ -0,0 +1,11 @@ +<module name="secur32" type="win32dll"> + <importlibrary definition="secur32.def" /> + <include base="secur32">.</include> + <define name="__SECUR32__" /> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <file>dllmain.c</file> + <file>lsa.c</file> + <file>secur32.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/setupapi/setupapi.xml --- branches/xmlbuildsystem/reactos/lib/setupapi/setupapi.xml 2005-02-03 21:31:57 UTC (rev 13398) +++ branches/xmlbuildsystem/reactos/lib/setupapi/setupapi.xml 2005-02-03 21:55:43 UTC (rev 13399) @@ -0,0 +1,33 @@ +<module name="setupapi" type="win32dll"> + <dependency>winebuild</dependency> + <importlibrary definition="setupapi.spec.def" /> + <include base="setupapi">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="__WINESRC__" /> + <define name="_SETUPAPI_" /> + <library>wine</library> + <library>wine_unicode</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>user32</library> + <library>rpcrt4</library> + <library>version</library> + <file>devinst.c</file> + <file>dirid.c</file> + <file>diskspace.c</file> + <file>install.c</file> + <file>parser.c</file> + <file>queue.c</file> + <file>setupcab.c</file> + <file>stubs.c</file> + <file>setupapi.rc</file> + <file>setupapi.spec</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml --- branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml 2005-02-03 21:31:57 UTC (rev 13398) +++ branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml 2005-02-03 21:55:43 UTC (rev 13399) @@ -12,7 +12,6 @@ <define name="WINVER">0x501</define> <define name="_SHELL32_" /> <define name="COM_NO_WINDOWS_H" /> - <define name="WINVER">0x501</define> <library>wine</library> <library>uuid</library> <library>ntdll</library>

1 0

[gvg] 13398: Always clean the .gch file, even if ROS_USE_PCH is not active. This prevents
by gvg＠svn.reactos.com 03 Feb '05

03 Feb '05

Always clean the .gch file, even if ROS_USE_PCH is not active. This prevents problems when switching between PCH and non-PCH builds. Modified: trunk/reactos/tools/helper.mk _____ Modified: trunk/reactos/tools/helper.mk --- trunk/reactos/tools/helper.mk 2005-02-03 20:38:38 UTC (rev 13397) +++ trunk/reactos/tools/helper.mk 2005-02-03 21:31:57 UTC (rev 13398) @@ -905,23 +905,26 @@ # Precompiled header support # When using PCHs, use dependency tracking to keep the .gch files up-to-date. +# When TARGET_PCH is defined, we always want to clean the .gch file, even if +# ROS_USE_PCH is not active. This prevents problems when switching between +# PCH and non-PCH builds. -MK_PCHNAME = +ifneq ($(TARGET_PCH),) +MK_PCHCLEAN = $(TARGET_PCH).gch ifeq ($(ROS_USE_PCH),yes) -ifneq ($(TARGET_PCH),) MK_PCHNAME = $(TARGET_PCH).gch - ifeq ($(TARGET_CPPAPP),yes) PCH_CC := $(CXX) -else +else # TARGET_CPPAPP PCH_CC := $(CC) -endif - - -endif # TARGET_PCH -else # +endif # TARGET_CPPAPP +else # ROS_USE_PCH MK_PCHNAME = endif # ROS_USE_PCH +else # TARGET_PCH +MK_PCHCLEAN = +MK_PCHNAME = +endif # TARGET_PCH # Be carefull not to clean non-object files MK_CLEANFILES := $(filter %.o,$(MK_OBJECTS)) @@ -931,7 +934,7 @@ # FIXME: The $(MK_BASENAME).sym can be removed around 15 Feb 2005 clean: $(MK_REGTESTS_CLEAN) $(SUBDIRS:%=%_clean) $(HALFVERBOSEECHO) [CLEAN] - - $(RM) *.o $(MK_PCHNAME) $(MK_BASENAME).sym $(MK_BASENAME).a $(MK_RESOURCE) \ + - $(RM) *.o $(MK_PCHCLEAN) $(MK_BASENAME).sym $(MK_BASENAME).a $(MK_RESOURCE) \ $(MK_FULLNAME) $(MK_NOSTRIPNAME) $(MK_CLEANFILES) $(MK_CLEANDEPS) $(MK_BASENAME).map \ junk.tmp base.tmp temp.exp $(MK_RC_BINARIES) $(MK_SPECDEF) $(MK_STUBS_SRC) \ $(MK_GENERATED_MAKEFILE) $(TARGET_CLEAN)

1 0

[fireball] 13397: Cromwell <-> PCI interface (stubs now) is taken to another file. In the long run I'm gonna change the file structure, but for now it's ok.
by fireball＠svn.reactos.com 03 Feb '05

03 Feb '05

Cromwell <-> PCI interface (stubs now) is taken to another file. In the long run I'm gonna change the file structure, but for now it's ok. Modified: trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h Added: trunk/reactos/drivers/usb/cromwell/linux/pci_hal.c _____ Modified: trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h --- trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h 2005-02-03 19:15:43 UTC (rev 13396) +++ trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h 2005-02-03 20:38:38 UTC (rev 13397) @@ -686,48 +686,8 @@ /*---------------------------------------------------------------------- --*/ /* PCI, simple and inlined... */ /*---------------------------------------------------------------------- --*/ -static int __inline__ pci_enable_device(struct pci_dev *dev) {return 0;} +#include "pci_hal.c" -static unsigned long __inline__ pci_resource_start (struct pci_dev *dev, int x) -{ - return dev->base[x]; -} - -static unsigned long __inline__ pci_resource_len (struct pci_dev *dev, int x){return 0;} - -static int __inline__ request_mem_region(unsigned long addr, unsigned long len, const char * d){return 1;} - -static void __inline__ *ioremap_nocache(unsigned long addr, unsigned long len) -{ - return (void*)addr; -} - -static int __inline__ release_mem_region(unsigned long addr, unsigned long len){return 0;} - -static int __inline__ pci_resource_flags(struct pci_dev *dev, int x) -{ - return dev->flags[x]; -} - -static int __inline__ request_region(unsigned long addr, unsigned long len, const char * d){return 0;} - -static int __inline__ pci_set_master(struct pci_dev *dev){return 0;} - -static int __inline__ iounmap(void* p){return 0;} - -static int __inline__ release_region(unsigned long addr, unsigned long len){return 0;} - -static int __inline__ pci_set_drvdata(struct pci_dev *dev, void* d) -{ - dev->data=(void*)d; - return 0; -} - -static void __inline__ *pci_get_drvdata(struct pci_dev *dev) -{ - return dev->data; -} - /*---------------------------------------------------------------------- --*/ /* IRQ handling */ /*---------------------------------------------------------------------- --*/ _____ Added: trunk/reactos/drivers/usb/cromwell/linux/pci_hal.c --- trunk/reactos/drivers/usb/cromwell/linux/pci_hal.c 2005-02-03 19:15:43 UTC (rev 13396) +++ trunk/reactos/drivers/usb/cromwell/linux/pci_hal.c 2005-02-03 20:38:38 UTC (rev 13397) @@ -0,0 +1,123 @@ +// PCI -> HAL interface +// this file is part of linux_wrapper.h + +/* + Initialize device before it's used by a driver. Ask low-level code to enable I/O and memory. + Wake up the device if it was suspended. Beware, this function can fail. + */ +static int __inline__ pci_enable_device(struct pci_dev *dev) +{ + return 0; +} + +// Get physical address where resource x resides +static unsigned long __inline__ pci_resource_start (struct pci_dev *dev, int x) +{ + // HalGetBusData... + // HalAssignSlotResources ? + return dev->base[x]; +} + +// ??? +static unsigned long __inline__ pci_resource_len (struct pci_dev *dev, int x){return 0;} + +// ??? +static int __inline__ pci_resource_flags(struct pci_dev *dev, int x) +{ + return dev->flags[x]; +} + +/* + Enables bus-mastering for device dev +*/ +static int __inline__ pci_set_master(struct pci_dev *dev) {return 0;} + +// Store pointer to data for this device +static int __inline__ pci_set_drvdata(struct pci_dev *dev, void* d) +{ + dev->data=(void*)d; + return 0; +} + +// Get pointer to previously saved data +static void __inline__ *pci_get_drvdata(struct pci_dev *dev) +{ + return dev->data; +} + + +/* + ======================================================================== === + I/O mem related stuff below +*/ + +/* +Allocate I/O memory region. + +Parameters: +start begin of region +n length of region +name name of requester +*/ +static int __inline__ request_region(unsigned long addr, unsigned long len, const char * d){return 0;} + +/* +Unmap I/O memory from kernel address space. + +Parameters: +addr virtual start address +*/ +static int __inline__ iounmap(void* p) +{ + return 0; +} + +/* +Release I/O port region. + +Parameters: +start begin of region +n length of region +*/ +static int __inline__ release_region(unsigned long addr, unsigned long len){return 0;} + +/* +Allocate I/O memory region. + +Parameters: +start begin of region +n length of region +name name of requester +*/ +static int __inline__ request_mem_region(unsigned long addr, unsigned long len, const char * d) +{ + return 1; +} + +/* +Remap I/O memory into kernel address space (no cache). + +Parameters: +phys_addr begin of physical address range +size size of physical address range + +Returns: +virtual start address of mapped range +*/ +static void __inline__ *ioremap_nocache(unsigned long addr, unsigned long len) +{ + // MmMapIoSpace ? + return (void*)addr; +} + +/* +Release I/O memory region. + +Parameters: +start begin of region +n length of region +*/ +static int __inline__ release_mem_region(unsigned long addr, unsigned long len) +{ + return 0; +}

1 0

[navaraf] 13396: Correct the library order.
by navaraf＠svn.reactos.com 03 Feb '05

03 Feb '05

Correct the library order. Modified: trunk/reactos/ntoskrnl/Makefile _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-02-03 19:14:46 UTC (rev 13395) +++ trunk/reactos/ntoskrnl/Makefile 2005-02-03 19:15:43 UTC (rev 13396) @@ -512,10 +512,10 @@ TARGET_LIBS = \ $(DDK_PATH_LIB)/libhal.a \ $(SDK_PATH_LIB)/librtl.a \ + $(SDK_PATH_LIB)/librossym.a \ $(SDK_PATH_LIB)/libstring.a \ $(SDK_PATH_LIB)/librosrtl.a \ $(SDK_PATH_LIB)/libpseh.a \ - $(SDK_PATH_LIB)/librossym.a \ $(PATH_TO_TOP)/drivers/lib/csq/csq.o TARGET_LFLAGS = \

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2005