Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 53349: [PCI] - Fix handling of IRP_MN_QUERY_DEVICE_TEXT [PNPROOT] - Fix registry query and returning of device description [ACPI] - Fix handling of IRP_MN_QUERY_DEVICE_TEXT
by cgutman＠svn.reactos.org 21 Aug '11

21 Aug '11

Author: cgutman Date: Sun Aug 21 00:27:58 2011 New Revision: 53349 URL: http://svn.reactos.org/svn/reactos?rev=53349&view=rev Log: [PCI] - Fix handling of IRP_MN_QUERY_DEVICE_TEXT [PNPROOT] - Fix registry query and returning of device description [ACPI] - Fix handling of IRP_MN_QUERY_DEVICE_TEXT Modified: trunk/reactos/drivers/bus/acpi/buspdo.c trunk/reactos/drivers/bus/pci/pdo.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/buspdo.c?… ============================================================================== --- trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] Sun Aug 21 00:27:58 2011 @@ -539,9 +539,9 @@ PPDO_DEVICE_DATA DeviceData, PIRP Irp ) { - PWCHAR Buffer; + PWCHAR Buffer, Temp; PIO_STACK_LOCATION stack; - NTSTATUS status; + NTSTATUS status = Irp->IoStatus.Status; PAGED_CODE (); stack = IoGetCurrentIrpStackLocation (Irp); @@ -552,80 +552,88 @@ if (!Irp->IoStatus.Information) { if (wcsstr (DeviceData->HardwareIDs, L"PNP000") != 0) - Buffer = L"Programmable interrupt controller"; + Temp = L"Programmable interrupt controller"; else if (wcsstr(DeviceData->HardwareIDs, L"PNP010") != 0) - Buffer = L"System timer"; + Temp = L"System timer"; else if (wcsstr(DeviceData->HardwareIDs, L"PNP020") != 0) - Buffer = L"DMA controller"; + Temp = L"DMA controller"; else if (wcsstr(DeviceData->HardwareIDs, L"PNP03") != 0) - Buffer = L"Keyboard"; + Temp = L"Keyboard"; else if (wcsstr(DeviceData->HardwareIDs, L"PNP040") != 0) - Buffer = L"Parallel port"; + Temp = L"Parallel port"; else if (wcsstr(DeviceData->HardwareIDs, L"PNP05") != 0) - Buffer = L"Serial port"; + Temp = L"Serial port"; else if (wcsstr(DeviceData->HardwareIDs, L"PNP06") != 0) - Buffer = L"Disk controller"; + Temp = L"Disk controller"; else if (wcsstr(DeviceData->HardwareIDs, L"PNP07") != 0) - Buffer = L"Disk controller"; + Temp = L"Disk controller"; else if (wcsstr(DeviceData->HardwareIDs, L"PNP09") != 0) - Buffer = L"Display adapter"; + Temp = L"Display adapter"; else if (wcsstr(DeviceData->HardwareIDs, L"PNP0A0") != 0) - Buffer = L"Bus controller"; + Temp = L"Bus controller"; else if (wcsstr(DeviceData->HardwareIDs, L"PNP0E0") != 0) - Buffer = L"PCMCIA controller"; + Temp = L"PCMCIA controller"; else if (wcsstr(DeviceData->HardwareIDs, L"PNP0F") != 0) - Buffer = L"Mouse device"; + Temp = L"Mouse device"; else if (wcsstr(DeviceData->HardwareIDs, L"PNP8") != 0) - Buffer = L"Network adapter"; + Temp = L"Network adapter"; else if (wcsstr(DeviceData->HardwareIDs, L"PNPA0") != 0) - Buffer = L"SCSI controller"; + Temp = L"SCSI controller"; else if (wcsstr(DeviceData->HardwareIDs, L"PNPB0") != 0) - Buffer = L"Multimedia device"; + Temp = L"Multimedia device"; else if (wcsstr(DeviceData->HardwareIDs, L"PNPC00") != 0) - Buffer = L"Modem"; + Temp = L"Modem"; else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0C") != 0) - Buffer = L"Power Button"; + Temp = L"Power Button"; else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0E") != 0) - Buffer = L"Sleep Button"; + Temp = L"Sleep Button"; else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0D") != 0) - Buffer = L"Lid Switch"; + Temp = L"Lid Switch"; else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C09") != 0) - Buffer = L"ACPI Embedded Controller"; + Temp = L"ACPI Embedded Controller"; else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0B") != 0) - Buffer = L"ACPI Fan"; + Temp = L"ACPI Fan"; else if (wcsstr(DeviceData->HardwareIDs, L"PNP0A03") != 0) - Buffer = L"PCI Root Bridge"; + Temp = L"PCI Root Bridge"; else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0A") != 0) - Buffer = L"ACPI Battery"; + Temp = L"ACPI Battery"; else if (wcsstr(DeviceData->HardwareIDs, L"PNP0C0F") != 0) - Buffer = L"PCI Interrupt Link"; + Temp = L"PCI Interrupt Link"; else if (wcsstr(DeviceData->HardwareIDs, L"ACPI_PWR") != 0) - Buffer = L"ACPI Power Resource"; + Temp = L"ACPI Power Resource"; else if (wcsstr(DeviceData->HardwareIDs, L"Processor") != 0) - Buffer = L"Processor"; + Temp = L"Processor"; else if (wcsstr(DeviceData->HardwareIDs, L"ThermalZone") != 0) - Buffer = L"ACPI Thermal Zone"; + Temp = L"ACPI Thermal Zone"; else if (wcsstr(DeviceData->HardwareIDs, L"ACPI0002") != 0) - Buffer = L"Smart Battery"; + Temp = L"Smart Battery"; else if (wcsstr(DeviceData->HardwareIDs, L"ACPI0003") != 0) - Buffer = L"AC Adapter"; + Temp = L"AC Adapter"; /* Simply checking if AcpiHandle is NULL eliminates the need to check * for the 4 different names that ACPI knows the fixed feature button as internally */ else if (!DeviceData->AcpiHandle) - Buffer = L"ACPI Fixed Feature Button"; + Temp = L"ACPI Fixed Feature Button"; else - Buffer = L"Other ACPI device"; + Temp = L"Other ACPI device"; + + Buffer = ExAllocatePoolWithTag (PagedPool, (wcslen(Temp) + 1) * sizeof(WCHAR), 'IPCA'); + + if (!Buffer) { + status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + RtlCopyMemory (Buffer, Temp, (wcslen(Temp) + 1) * sizeof(WCHAR)); DPRINT("\tDeviceTextDescription :%ws\n", Buffer); Irp->IoStatus.Information = (ULONG_PTR) Buffer; + status = STATUS_SUCCESS; } - status = STATUS_SUCCESS; break; default: - status = Irp->IoStatus.Status; break; } Modified: trunk/reactos/drivers/bus/pci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] Sun Aug 21 00:27:58 2011 @@ -23,29 +23,37 @@ PIO_STACK_LOCATION IrpSp) { PPDO_DEVICE_EXTENSION DeviceExtension; + UNICODE_STRING String; NTSTATUS Status; DPRINT("Called\n"); DeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - Status = STATUS_SUCCESS; - switch (IrpSp->Parameters.QueryDeviceText.DeviceTextType) { case DeviceTextDescription: + Status = PciDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &DeviceExtension->DeviceDescription, + &String); + DPRINT("DeviceTextDescription\n"); - Irp->IoStatus.Information = (ULONG_PTR)DeviceExtension->DeviceDescription.Buffer; + Irp->IoStatus.Information = (ULONG_PTR)String.Buffer; break; case DeviceTextLocationInformation: + Status = PciDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &DeviceExtension->DeviceLocation, + &String); + DPRINT("DeviceTextLocationInformation\n"); - Irp->IoStatus.Information = (ULONG_PTR)DeviceExtension->DeviceLocation.Buffer; + Irp->IoStatus.Information = (ULONG_PTR)String.Buffer; break; default: Irp->IoStatus.Information = 0; Status = STATUS_INVALID_PARAMETER; + break; } return Status; Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Sun Aug 21 00:27:58 2011 @@ -331,12 +331,16 @@ UNICODE_STRING Source; if (ValueType != REG_SZ || ValueLength == 0 || ValueLength % sizeof(WCHAR) != 0) + { + Destination->Length = 0; + Destination->MaximumLength = 0; + Destination->Buffer = NULL; return STATUS_SUCCESS; + } Source.MaximumLength = Source.Length = ValueLength; Source.Buffer = ValueData; - if (Source.Length > 0 && Source.Buffer[Source.Length / sizeof(WCHAR) - 1] == UNICODE_NULL) - Source.Length -= sizeof(WCHAR); + return RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &Source, Destination); } @@ -914,18 +918,19 @@ UNICODE_STRING String; DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); - Status = RtlDuplicateUnicodeString( - RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, - &DeviceExtension->DeviceInfo->DeviceDescription, - &String); - Irp->IoStatus.Information = (ULONG_PTR)String.Buffer; + if (DeviceExtension->DeviceInfo->DeviceDescription.Buffer != NULL) + { + Status = RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &DeviceExtension->DeviceInfo->DeviceDescription, + &String); + Irp->IoStatus.Information = (ULONG_PTR)String.Buffer; + } break; } case DeviceTextLocationInformation: { DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextLocationInformation\n"); - Status = STATUS_NOT_SUPPORTED; break; }

1 0

[tkreuzer] 53348: [VFATLIB] Fix completely non-standard, broken and retarded definition of GET_UNALIGNED_W for 64 bit architectures The function is supposed to read an unaligned little endian USHOR...
by tkreuzer＠svn.reactos.org 20 Aug '11

20 Aug '11

Author: tkreuzer Date: Sat Aug 20 21:20:33 2011 New Revision: 53348 URL: http://svn.reactos.org/svn/reactos?rev=53348&view=rev Log: [VFATLIB] Fix completely non-standard, broken and retarded definition of GET_UNALIGNED_W for 64 bit architectures The function is supposed to read an unaligned little endian USHORT value. The old version copied the 2 bytes with memcpy to an aligned stack variable and then (bug bug) read the unaligned value directly (discarding the result of the previous operation) and passed it to bswap if neccessary. The new function simply reads the 2 bytes and combines them using << and |. Modified: trunk/reactos/lib/fslib/vfatlib/check/boot.c Modified: trunk/reactos/lib/fslib/vfatlib/check/boot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/bo… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/boot.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/boot.c [iso-8859-1] Sat Aug 20 21:20:33 2011 @@ -30,18 +30,17 @@ { 0xff, "5.25\" 320k floppy 2s/40tr/8sec" }, }; -#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__ -/* Unaligned fields must first be copied byte-wise */ -#define GET_UNALIGNED_W(f) \ - ({ \ - unsigned short __v; \ - memcpy( &__v, &f, sizeof(__v) ); \ - CF_LE_W( *(unsigned short *)&f ); \ - }) +#if defined __alpha || defined __ia64__ || defined __x86_64__ || defined __ppc64__ +/* Unaligned fields must first be copied byte-wise (little endian) */ +#define GET_UNALIGNED_W(u) \ + (((unsigned char*)(&u))[0] | (((unsigned char*)&(u))[1] << 8)) +#elif defined __s390x__ +/* Unaligned fields must first be copied byte-wise (big endian) */ +#define GET_UNALIGNED_W(pu) \ + (((unsigned char*)&(u))[1] | (((unsigned char*)&(u))[0] << 8)) #else #define GET_UNALIGNED_W(f) CF_LE_W( *(unsigned short *)&f ) #endif - static char *get_media_descr( unsigned char media ) {

1 0

[tkreuzer] 53347: [MSVCRT] Add 64bit exports of operator new and operator delete
by tkreuzer＠svn.reactos.org 20 Aug '11

20 Aug '11

Author: tkreuzer Date: Sat Aug 20 20:25:18 2011 New Revision: 53347 URL: http://svn.reactos.org/svn/reactos?rev=53347&view=rev Log: [MSVCRT] Add 64bit exports of operator new and operator delete Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Sat Aug 20 20:25:18 2011 @@ -18,9 +18,11 @@ @ cdecl -i386 -norelay ??1bad_typeid@@UAE@XZ() __thiscall_MSVCRT_bad_typeid_dtor @ cdecl -i386 -norelay ??1exception@@UAE@XZ() __thiscall_MSVCRT_exception_dtor @ cdecl -i386 -norelay ??1type_info@@UAE@XZ() __thiscall_MSVCRT_type_info_dtor -@ cdecl ??2@YAPAXI@Z(long) MSVCRT_operator_new +@ cdecl -arch=win32 ??2@YAPAXI@Z(long) MSVCRT_operator_new +@ cdecl -arch=win64 ??2@YAPEAX_K@Z(double) MSVCRT_operator_new # @ cdecl ??2@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg -@ cdecl ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete +@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete +@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) MSVCRT_operator_delete @ cdecl -i386 -norelay ??4__non_rtti_object@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT___non_rtti_object_opequals @ cdecl -i386 -norelay ??4bad_cast@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_cast_opequals @ cdecl -i386 -norelay ??4bad_typeid@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_typeid_opequals

1 0

[tkreuzer] 53346: [CRT] Make .CRT sections always read only.
by tkreuzer＠svn.reactos.org 20 Aug '11

20 Aug '11

Author: tkreuzer Date: Sat Aug 20 20:22:04 2011 New Revision: 53346 URL: http://svn.reactos.org/svn/reactos?rev=53346&view=rev Log: [CRT] Make .CRT sections always read only. Modified: trunk/reactos/lib/sdk/crt/include/internal/mingw-w64/sect_attribs.h trunk/reactos/lib/sdk/crt/startup/cinitexe.c Modified: trunk/reactos/lib/sdk/crt/include/internal/mingw-w64/sect_attribs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/mingw-w64/sect_attribs.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/mingw-w64/sect_attribs.h [iso-8859-1] Sat Aug 20 20:22:04 2011 @@ -7,7 +7,7 @@ #if defined(_MSC_VER) #if defined(_M_IA64) || defined(_M_AMD64) -#define _ATTRIBUTES +#define _ATTRIBUTES read #else #define _ATTRIBUTES read #endif Modified: trunk/reactos/lib/sdk/crt/startup/cinitexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/cinite… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/cinitexe.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/cinitexe.c [iso-8859-1] Sat Aug 20 20:22:04 2011 @@ -2,11 +2,7 @@ #include <sect_attribs.h> #ifdef _MSC_VER -#ifdef _M_AMD64 -#pragma comment(linker, "/merge:.CRT=.data") -#else #pragma comment(linker, "/merge:.CRT=.rdata") -#endif #endif typedef void (__cdecl *_PVFV)(void);

1 0

[tkreuzer] 53345: [RTL] Fix a typo
by tkreuzer＠svn.reactos.org 20 Aug '11

20 Aug '11

Author: tkreuzer Date: Sat Aug 20 19:46:51 2011 New Revision: 53345 URL: http://svn.reactos.org/svn/reactos?rev=53345&view=rev Log: [RTL] Fix a typo Modified: trunk/reactos/lib/rtl/amd64/stubs.c Modified: trunk/reactos/lib/rtl/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/amd64/stubs.c?rev=… ============================================================================== --- trunk/reactos/lib/rtl/amd64/stubs.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/amd64/stubs.c [iso-8859-1] Sat Aug 20 19:46:51 2011 @@ -71,7 +71,7 @@ PVOID Context, PCWSTR OutOfProcessCallbackDll) { - UNIMPLREMENTED; + UNIMPLEMENTED; return FALSE; }

1 0

[ekohl] 53344: [ADVAPI32] QueryServiceConfig2A/W: Handle small or null buffer properly.
by ekohl＠svn.reactos.org 20 Aug '11

20 Aug '11

Author: ekohl Date: Sat Aug 20 19:08:21 2011 New Revision: 53344 URL: http://svn.reactos.org/svn/reactos?rev=53344&view=rev Log: [ADVAPI32] QueryServiceConfig2A/W: Handle small or null buffer properly. Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sat Aug 20 19:08:21 2011 @@ -2076,23 +2076,43 @@ DWORD cbBufSize, LPDWORD pcbBytesNeeded) { + SERVICE_DESCRIPTIONA ServiceDescription; + SERVICE_FAILURE_ACTIONSA ServiceFailureActions; + LPBYTE lpTempBuffer; + BOOL bUseTempBuffer = FALSE; + DWORD dwBufferSize; DWORD dwError; TRACE("QueryServiceConfig2A(hService %p, dwInfoLevel %lu, lpBuffer %p, cbBufSize %lu, pcbBytesNeeded %p)\n", hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); - if (dwInfoLevel != SERVICE_CONFIG_DESCRIPTION && - dwInfoLevel != SERVICE_CONFIG_FAILURE_ACTIONS) - { - SetLastError(ERROR_INVALID_LEVEL); - return FALSE; - } - - if ((lpBuffer == NULL && cbBufSize != 0) || - pcbBytesNeeded == NULL) - { - SetLastError(ERROR_INVALID_ADDRESS); - return FALSE; + lpTempBuffer = lpBuffer; + dwBufferSize = cbBufSize; + + switch (dwInfoLevel) + { + case SERVICE_CONFIG_DESCRIPTION: + if ((lpBuffer == NULL) || (cbBufSize < sizeof(SERVICE_DESCRIPTIONA))) + { + lpTempBuffer = (LPBYTE)&ServiceDescription; + dwBufferSize = sizeof(SERVICE_DESCRIPTIONA); + bUseTempBuffer = TRUE; + } + break; + + case SERVICE_CONFIG_FAILURE_ACTIONS: + if ((lpBuffer == NULL) || (cbBufSize < sizeof(SERVICE_FAILURE_ACTIONSA))) + { + lpTempBuffer = (LPBYTE)&ServiceFailureActions; + dwBufferSize = sizeof(SERVICE_FAILURE_ACTIONSA); + bUseTempBuffer = TRUE; + } + break; + + default: + WARN("Unknown info level 0x%lx\n", dwInfoLevel); + SetLastError(ERROR_INVALID_LEVEL); + return FALSE; } RpcTryExcept @@ -2100,8 +2120,8 @@ /* Call to services.exe using RPC */ dwError = RQueryServiceConfig2A((SC_RPC_HANDLE)hService, dwInfoLevel, - lpBuffer, - cbBufSize, + lpTempBuffer, + dwBufferSize, pcbBytesNeeded); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -2114,6 +2134,13 @@ { TRACE("RQueryServiceConfig2A() failed (Error %lu)\n", dwError); SetLastError(dwError); + return FALSE; + } + + if (bUseTempBuffer == TRUE) + { + TRACE("RQueryServiceConfig2A() returns ERROR_INSUFFICIENT_BUFFER\n"); + SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; } @@ -2121,7 +2148,7 @@ { case SERVICE_CONFIG_DESCRIPTION: { - LPSERVICE_DESCRIPTIONA lpPtr = (LPSERVICE_DESCRIPTIONA)lpBuffer; + LPSERVICE_DESCRIPTIONA lpPtr = (LPSERVICE_DESCRIPTIONA)lpTempBuffer; if (lpPtr->lpDescription != NULL) lpPtr->lpDescription = @@ -2131,7 +2158,7 @@ case SERVICE_CONFIG_FAILURE_ACTIONS: { - LPSERVICE_FAILURE_ACTIONSA lpPtr = (LPSERVICE_FAILURE_ACTIONSA)lpBuffer; + LPSERVICE_FAILURE_ACTIONSA lpPtr = (LPSERVICE_FAILURE_ACTIONSA)lpTempBuffer; if (lpPtr->lpRebootMsg != NULL) lpPtr->lpRebootMsg = @@ -2146,11 +2173,6 @@ (SC_ACTION*)((UINT_PTR)lpPtr + (UINT_PTR)lpPtr->lpsaActions); } break; - - default: - ERR("Unknown info level 0x%lx\n", dwInfoLevel); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; } TRACE("QueryServiceConfig2A() done\n"); @@ -2171,23 +2193,43 @@ DWORD cbBufSize, LPDWORD pcbBytesNeeded) { + SERVICE_DESCRIPTIONW ServiceDescription; + SERVICE_FAILURE_ACTIONSW ServiceFailureActions; + LPBYTE lpTempBuffer; + BOOL bUseTempBuffer = FALSE; + DWORD dwBufferSize; DWORD dwError; TRACE("QueryServiceConfig2W(%p, %lu, %p, %lu, %p)\n", hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); - if (dwInfoLevel != SERVICE_CONFIG_DESCRIPTION && - dwInfoLevel != SERVICE_CONFIG_FAILURE_ACTIONS) - { - SetLastError(ERROR_INVALID_LEVEL); - return FALSE; - } - - if ((lpBuffer == NULL && cbBufSize != 0) || - pcbBytesNeeded == NULL) - { - SetLastError(ERROR_INVALID_ADDRESS); - return FALSE; + lpTempBuffer = lpBuffer; + dwBufferSize = cbBufSize; + + switch (dwInfoLevel) + { + case SERVICE_CONFIG_DESCRIPTION: + if ((lpBuffer == NULL) || (cbBufSize < sizeof(SERVICE_DESCRIPTIONW))) + { + lpTempBuffer = (LPBYTE)&ServiceDescription; + dwBufferSize = sizeof(SERVICE_DESCRIPTIONW); + bUseTempBuffer = TRUE; + } + break; + + case SERVICE_CONFIG_FAILURE_ACTIONS: + if ((lpBuffer == NULL) || (cbBufSize < sizeof(SERVICE_FAILURE_ACTIONSW))) + { + lpTempBuffer = (LPBYTE)&ServiceFailureActions; + dwBufferSize = sizeof(SERVICE_FAILURE_ACTIONSW); + bUseTempBuffer = TRUE; + } + break; + + default: + WARN("Unknown info level 0x%lx\n", dwInfoLevel); + SetLastError(ERROR_INVALID_LEVEL); + return FALSE; } RpcTryExcept @@ -2195,8 +2237,8 @@ /* Call to services.exe using RPC */ dwError = RQueryServiceConfig2W((SC_RPC_HANDLE)hService, dwInfoLevel, - lpBuffer, - cbBufSize, + lpTempBuffer, + dwBufferSize, pcbBytesNeeded); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -2209,6 +2251,13 @@ { TRACE("RQueryServiceConfig2W() failed (Error %lu)\n", dwError); SetLastError(dwError); + return FALSE; + } + + if (bUseTempBuffer == TRUE) + { + TRACE("RQueryServiceConfig2W() returns ERROR_INSUFFICIENT_BUFFER\n"); + SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; } @@ -2216,7 +2265,7 @@ { case SERVICE_CONFIG_DESCRIPTION: { - LPSERVICE_DESCRIPTIONW lpPtr = (LPSERVICE_DESCRIPTIONW)lpBuffer; + LPSERVICE_DESCRIPTIONW lpPtr = (LPSERVICE_DESCRIPTIONW)lpTempBuffer; if (lpPtr->lpDescription != NULL) lpPtr->lpDescription = @@ -2226,7 +2275,7 @@ case SERVICE_CONFIG_FAILURE_ACTIONS: { - LPSERVICE_FAILURE_ACTIONSW lpPtr = (LPSERVICE_FAILURE_ACTIONSW)lpBuffer; + LPSERVICE_FAILURE_ACTIONSW lpPtr = (LPSERVICE_FAILURE_ACTIONSW)lpTempBuffer; if (lpPtr->lpRebootMsg != NULL) lpPtr->lpRebootMsg = @@ -2241,11 +2290,6 @@ (SC_ACTION*)((UINT_PTR)lpPtr + (UINT_PTR)lpPtr->lpsaActions); } break; - - default: - WARN("Unknown info level 0x%lx\n", dwInfoLevel); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; } TRACE("QueryServiceConfig2W() done\n");

1 0

[tkreuzer] 53343: [NTDLL] - Add exports for RtlInstallFunctionTableCallback and RtlRestoreContext (amd64 only) [KERNEL32] - Forward RtlCompareMemory, RtlCopyMemory, RtlDeleteFunctionTable and RtlIn...
by tkreuzer＠svn.reactos.org 20 Aug '11

20 Aug '11

Author: tkreuzer Date: Sat Aug 20 19:04:55 2011 New Revision: 53343 URL: http://svn.reactos.org/svn/reactos?rev=53343&view=rev Log: [NTDLL] - Add exports for RtlInstallFunctionTableCallback and RtlRestoreContext (amd64 only) [KERNEL32] - Forward RtlCompareMemory, RtlCopyMemory, RtlDeleteFunctionTable and RtlInstallFunctionTableCallback to ntdll - Fix build with MSVC amd64 Modified: trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/dll/win32/kernel32/client/amd64/fiber.S trunk/reactos/dll/win32/kernel32/client/amd64/thread.S trunk/reactos/dll/win32/kernel32/kernel32.spec trunk/reactos/lib/rtl/amd64/stubs.c Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Sat Aug 20 19:04:55 2011 @@ -721,6 +721,7 @@ ;@ stdcall RtlInitializeStackTraceDataBase ; 5.1 SP2 and SP3, and 5.2 only @ stdcall RtlInsertElementGenericTable(ptr ptr long ptr) @ stdcall RtlInsertElementGenericTableAvl(ptr ptr long ptr) +@ stdcall -arch=x86_64 RtlInstallFunctionTableCallback(double double long ptr ptr ptr) @ stdcall RtlInt64ToUnicodeString(double long ptr) @ stdcall RtlIntegerToChar(long long long ptr) @ stdcall RtlIntegerToUnicodeString(long long ptr) @@ -855,6 +856,7 @@ @ stdcall RtlRemoveVectoredContinueHandler(ptr) @ stdcall RtlRemoveVectoredExceptionHandler(ptr) @ stdcall RtlResetRtlTranslations(ptr) +@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) @ stdcall RtlRestoreLastWin32Error(long) RtlSetLastWin32Error ;@ stdcall RtlRevertMemoryStream @ stdcall RtlRunDecodeUnicodeString(long ptr) Modified: trunk/reactos/dll/win32/kernel32/client/amd64/fiber.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/amd64/fiber.S [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/amd64/fiber.S [iso-8859-1] Sat Aug 20 19:04:55 2011 @@ -8,20 +8,25 @@ #include <asm.inc> +.code64 + PUBLIC BaseFiberStartup -.PROC BaseFiberStartup +FUNC BaseFiberStartup + .ENDPROLOG UNIMPLEMENTED BaseFiberStartup /* FIXME: TODO */ ret -.ENDP BaseFiberStartup +ENDFUNC BaseFiberStartup PUBLIC SwitchToFiber -SwitchToFiber: +FUNC SwitchToFiber + .ENDPROLOG UNIMPLEMENTED BaseFiberStartup /* FIXME: TODO */ ret +ENDFUNC SwitchToFiber END Modified: trunk/reactos/dll/win32/kernel32/client/amd64/thread.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/amd64/thread.S [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/amd64/thread.S [iso-8859-1] Sat Aug 20 19:04:55 2011 @@ -7,16 +7,19 @@ */ #include <asm.inc> +.code64 +EXTERN BaseThreadStartup:PROC +EXTERN BaseProcessStartup:PROC PUBLIC BaseThreadStartupThunk PUBLIC BaseProcessStartThunk BaseThreadStartupThunk: - + /* Start out fresh */ xor rbp, rbp - + push rbx /* lpParameter */ push rax /* lpStartAddress */ push 0 /* Return RIP */ @@ -26,7 +29,7 @@ /* Start out fresh */ xor rbp, rbp - + push rax /* lpStartAddress */ push 0 /* Return RIP */ jmp BaseProcessStartup Modified: trunk/reactos/dll/win32/kernel32/kernel32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] Sat Aug 20 19:04:55 2011 @@ -974,11 +974,11 @@ @ stdcall lstrlenA(str) @ stdcall lstrlenW(wstr) -@ cdecl -arch=x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable -@ stdcall -arch=x86_64 RtlCompareMemory(ptr ptr ptr) -@ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr ptr) -@ stdcall -arch=x86_64 RtlDeleteFunctionTable(ptr) -@ stdcall -arch=x86_64 RtlInstallFunctionTableCallback(double double long ptr ptr ptr) +@ stdcall -arch=x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable +@ stdcall -arch=x86_64 RtlCompareMemory(ptr ptr ptr) ntdll.RtlCompareMemory +@ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr ptr) ntdll.memcpy +@ stdcall -arch=x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable +@ stdcall -arch=x86_64 RtlInstallFunctionTableCallback(double double long ptr ptr ptr) ntdll.RtlInstallFunctionTableCallback @ stdcall -arch=x86_64 RtlLookupFunctionEntry(ptr ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall -arch=x86_64 RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall -arch=x86_64 RtlRaiseException(ptr) ntdll.RtlRaiseException Modified: trunk/reactos/lib/rtl/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/amd64/stubs.c?rev=… ============================================================================== --- trunk/reactos/lib/rtl/amd64/stubs.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/amd64/stubs.c [iso-8859-1] Sat Aug 20 19:04:55 2011 @@ -51,3 +51,27 @@ UNIMPLEMENTED; return FALSE; } + +NTSYSAPI +VOID +RtlRestoreContext( + PCONTEXT ContextRecord, + PEXCEPTION_RECORD ExceptionRecord) +{ + UNIMPLEMENTED; +} + +NTSYSAPI +BOOLEAN +RtlInstallFunctionTableCallback( + DWORD64 TableIdentifier, + DWORD64 BaseAddress, + DWORD Length, + PGET_RUNTIME_FUNCTION_CALLBACK Callback, + PVOID Context, + PCWSTR OutOfProcessCallbackDll) +{ + UNIMPLREMENTED; + return FALSE; +} +

1 0

[tkreuzer] 53342: [CRT] - Add __C_specific_handler stub - Add aliases for C++ code on amd64 builds - Fix fmod symbol - Merge .CRT section into .data on amd64 - remove an old hack
by tkreuzer＠svn.reactos.org 20 Aug '11

20 Aug '11

Author: tkreuzer Date: Sat Aug 20 17:11:16 2011 New Revision: 53342 URL: http://svn.reactos.org/svn/reactos?rev=53342&view=rev Log: [CRT] - Add __C_specific_handler stub - Add aliases for C++ code on amd64 builds - Fix fmod symbol - Merge .CRT section into .data on amd64 - remove an old hack Added: trunk/reactos/lib/sdk/crt/except/amd64/cpp.s - copied, changed from r53298, trunk/reactos/lib/sdk/crt/except/i386/cpp.s trunk/reactos/lib/sdk/crt/except/amd64/ehandler.c (with props) Modified: trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/math/amd64/fmod.S trunk/reactos/lib/sdk/crt/startup/cinitexe.c trunk/reactos/lib/sdk/crt/startup/mscmain.c trunk/reactos/lib/sdk/crt/startup/tlsmcrt.c Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Sat Aug 20 17:11:16 2011 @@ -377,6 +377,7 @@ elseif(ARCH MATCHES amd64) list(APPEND CRT_SOURCE except/amd64/seh.s + except/amd64/ehandler.c float/amd64/clearfp.S float/i386/cntrlfp.c float/amd64/fpreset.S @@ -401,6 +402,10 @@ math/amd64/sqrtf.S math/amd64/tan.S setjmp/amd64/setjmp.s) + if(MSVC) + list(APPEND CRT_SOURCE + except/amd64/cpp.s) + endif() endif() if(NOT ARCH MATCHES i386) Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Sat Aug 20 17:11:16 2011 @@ -98,6 +98,7 @@ <directory name="amd64"> <file>seh.s</file> <file>chkstk_asm.s</file> + <file>ehandler.c</file> </directory> </if> <file>xcptfil.c</file> @@ -157,7 +158,7 @@ <file>sinh.c</file> <file>tanh.c</file> <file>powl.c</file> - + <directory name="ieee754"> <file>j0_y0.c</file> <file>j1_y1.c</file> Copied: trunk/reactos/lib/sdk/crt/except/amd64/cpp.s (from r53298, trunk/reactos/lib/sdk/crt/except/i386/cpp.s) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/amd64/c… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/i386/cpp.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/amd64/cpp.s [iso-8859-1] Sat Aug 20 17:11:16 2011 @@ -2,74 +2,24 @@ #include <asm.inc> -.code +.code64 .align 4 -MACRO(DEFINE_THISCALL_WRAPPER, cxxname, stdcallname) -EXTERN &stdcallname:PROC +MACRO(START_VTABLE, shortname, cxxname) +EXTERN shortname&_rtti:PROC +EXTERN MSVCRT_&shortname&_vector_dtor:PROC + .double shortname&_rtti +PUBLIC MSVCRT_&shortname&_vtable +MSVCRT_&shortname&_vtable: PUBLIC &cxxname &cxxname: - pop eax - push ecx - push eax - jmp &stdcallname -ENDM - -DEFINE_THISCALL_WRAPPER ??0exception@@QAE@ABQBD@Z, _MSVCRT_exception_ctor@8 -DEFINE_THISCALL_WRAPPER ??0exception@@QAE@ABQBDH@Z, _MSVCRT_exception_ctor_noalloc@12 -DEFINE_THISCALL_WRAPPER ??0exception@@QAE@ABV0@@Z, _MSVCRT_exception_copy_ctor@8 -DEFINE_THISCALL_WRAPPER ??0exception@@QAE@XZ, _MSVCRT_exception_default_ctor@4 -DEFINE_THISCALL_WRAPPER ??1exception@@UAE@XZ, _MSVCRT_exception_dtor@4 -DEFINE_THISCALL_WRAPPER ??4exception@@QAEAAV0@ABV0@@Z, _MSVCRT_exception_opequals@8 -DEFINE_THISCALL_WRAPPER ??_Eexception@@UAEPAXI@Z, _MSVCRT_exception_vector_dtor@8 -DEFINE_THISCALL_WRAPPER ??_Gexception@@UAEPAXI@Z, _MSVCRT_exception_scalar_dtor@8 -DEFINE_THISCALL_WRAPPER ?what@exception@@UBEPBDXZ, _MSVCRT_what_exception@4 -DEFINE_THISCALL_WRAPPER ??0bad_typeid@@QAE@ABV0@@Z, _MSVCRT_bad_typeid_copy_ctor@8 -DEFINE_THISCALL_WRAPPER ??0bad_typeid@@QAE@PBD@Z, _MSVCRT_bad_typeid_ctor@8 -DEFINE_THISCALL_WRAPPER ??_Fbad_typeid@@QAEXXZ, _MSVCRT_bad_typeid_default_ctor@4 -DEFINE_THISCALL_WRAPPER ??1bad_typeid@@UAE@XZ, _MSVCRT_bad_typeid_dtor@4 -DEFINE_THISCALL_WRAPPER ??4bad_typeid@@QAEAAV0@ABV0@@Z, _MSVCRT_bad_typeid_opequals@8 -DEFINE_THISCALL_WRAPPER ??_Ebad_typeid@@UAEPAXI@Z, _MSVCRT_bad_typeid_vector_dtor@8 -DEFINE_THISCALL_WRAPPER ??_Gbad_typeid@@UAEPAXI@Z, _MSVCRT_bad_typeid_scalar_dtor@8 -DEFINE_THISCALL_WRAPPER ??0__non_rtti_object@@QAE@ABV0@@Z, _MSVCRT___non_rtti_object_copy_ctor@8 -DEFINE_THISCALL_WRAPPER ??0__non_rtti_object@@QAE@PBD@Z, _MSVCRT___non_rtti_object_ctor@8 -DEFINE_THISCALL_WRAPPER ??1__non_rtti_object@@UAE@XZ, _MSVCRT___non_rtti_object_dtor@4 -DEFINE_THISCALL_WRAPPER ??4__non_rtti_object@@QAEAAV0@ABV0@@Z, _MSVCRT___non_rtti_object_opequals@8 -DEFINE_THISCALL_WRAPPER ??_E__non_rtti_object@@UAEPAXI@Z, _MSVCRT___non_rtti_object_vector_dtor@8 -DEFINE_THISCALL_WRAPPER ??_G__non_rtti_object@@UAEPAXI@Z, _MSVCRT___non_rtti_object_scalar_dtor@8 -DEFINE_THISCALL_WRAPPER ??0bad_cast@@AAE@PBQBD@Z, _MSVCRT_bad_cast_ctor@8 -DEFINE_THISCALL_WRAPPER ??0bad_cast@@QAE@ABQBD@Z, _MSVCRT_bad_cast_ctor@8 -DEFINE_THISCALL_WRAPPER ??0bad_cast@@QAE@ABV0@@Z, _MSVCRT_bad_cast_copy_ctor@8 -DEFINE_THISCALL_WRAPPER ??0bad_cast@@QAE@PBD@Z, _MSVCRT_bad_cast_ctor_charptr@8 -DEFINE_THISCALL_WRAPPER ??_Fbad_cast@@QAEXXZ, _MSVCRT_bad_cast_default_ctor@4 -DEFINE_THISCALL_WRAPPER ??1bad_cast@@UAE@XZ, _MSVCRT_bad_cast_dtor@4 -DEFINE_THISCALL_WRAPPER ??4bad_cast@@QAEAAV0@ABV0@@Z, _MSVCRT_bad_cast_opequals@8 -DEFINE_THISCALL_WRAPPER ??_Ebad_cast@@UAEPAXI@Z, _MSVCRT_bad_cast_vector_dtor@8 -DEFINE_THISCALL_WRAPPER ??_Gbad_cast@@UAEPAXI@Z, _MSVCRT_bad_cast_scalar_dtor@8 -DEFINE_THISCALL_WRAPPER ??8type_info@@QBEHABV0@@Z, _MSVCRT_type_info_opequals_equals@8 -DEFINE_THISCALL_WRAPPER ??9type_info@@QBEHABV0@@Z, _MSVCRT_type_info_opnot_equals@8 -DEFINE_THISCALL_WRAPPER ?before@type_info@@QBEHABV1@@Z, _MSVCRT_type_info_before@8 -DEFINE_THISCALL_WRAPPER ??1type_info@@UAE@XZ, _MSVCRT_type_info_dtor@4 -DEFINE_THISCALL_WRAPPER ?name@type_info@@QBEPBDXZ, _MSVCRT_type_info_name@4 -DEFINE_THISCALL_WRAPPER ?raw_name@type_info@@QBEPBDXZ, _MSVCRT_type_info_raw_name@4 - - -#undef _MSVCRT_ -MACRO(START_VTABLE, shortname, cxxname) -EXTERN _&shortname&_rtti:PROC -EXTERN ___thiscall_MSVCRT_&shortname&_vector_dtor:PROC - .long _&shortname&_rtti -PUBLIC _MSVCRT_&shortname&_vtable -_MSVCRT_&shortname&_vtable: -PUBLIC &cxxname -&cxxname: - .long ___thiscall_MSVCRT_&shortname&_vector_dtor + .double MSVCRT_&shortname&_vector_dtor ENDM MACRO(DEFINE_EXCEPTION_VTABLE, shortname, cxxname) START_VTABLE shortname, cxxname - EXTERN ___thiscall_MSVCRT_what_exception:PROC - .long ___thiscall_MSVCRT_what_exception + EXTERN MSVCRT_what_exception:PROC + .double MSVCRT_what_exception ENDM START_VTABLE type_info, __dummyname_type_info @@ -78,35 +28,26 @@ DEFINE_EXCEPTION_VTABLE bad_cast, ??_7bad_cast@@6B@ DEFINE_EXCEPTION_VTABLE __non_rtti_object, ??_7__non_rtti_object@@6B@ -EXTERN _MSVCRT_operator_delete:PROC -PUBLIC ??3@YAXPAX@Z -??3@YAXPAX@Z: - jmp _MSVCRT_operator_delete -EXTERN _MSVCRT_operator_new:PROC -PUBLIC ??_U@YAPAXI@Z -??_U@YAPAXI@Z: - jmp _MSVCRT_operator_new - - -MACRO(DEFINE_ALIAS, alias, orig, type) -EXTERN &orig:&type +MACRO(DEFINE_ALIAS, alias, orig) +EXTERN &orig:ABS ALIAS <&alias> = <&orig> ENDM -DEFINE_ALIAS ??_V@YAXPAX@Z, _MSVCRT_operator_delete, PROC -DEFINE_ALIAS ??2@YAPAXI@Z, _MSVCRT_operator_new, PROC -DEFINE_ALIAS ?_query_new_handler@@YAP6AHI@ZXZ, _MSVCRT__query_new_handler, PROC -DEFINE_ALIAS ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z, _MSVCRT__set_new_handler, PROC -DEFINE_ALIAS ?set_new_handler@@YAP6AXXZP6AXXZ@Z, _MSVCRT_set_new_handler, PROC -DEFINE_ALIAS ?_query_new_mode@@YAHXZ, _MSVCRT__query_new_mode, PROC -DEFINE_ALIAS ?_set_new_mode@@YAHH@Z, _MSVCRT__set_new_mode, PROC -DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, _MSVCRT__set_se_translator, PROC -DEFINE_ALIAS ?set_terminate@@YAP6AXXZP6AXXZ@Z, _MSVCRT_set_terminate, PROC -DEFINE_ALIAS ?set_unexpected@@YAP6AXXZP6AXXZ@Z, _MSVCRT_set_unexpected, PROC -DEFINE_ALIAS ?terminate@@YAXXZ, _MSVCRT_terminate, PROC -DEFINE_ALIAS ?unexpected@@YAXXZ, _MSVCRT_unexpected, PROC - +DEFINE_ALIAS ??3@YAXPAX@Z, MSVCRT_operator_delete +DEFINE_ALIAS ??_U@YAPAXI@Z, MSVCRT_operator_new +DEFINE_ALIAS ??_V@YAXPAX@Z, MSVCRT_operator_delete +DEFINE_ALIAS ??2@YAPAXI@Z, MSVCRT_operator_new +DEFINE_ALIAS ?_query_new_handler@@YAP6AHI@ZXZ, MSVCRT__query_new_handler +DEFINE_ALIAS ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z, MSVCRT__set_new_handler +DEFINE_ALIAS ?set_new_handler@@YAP6AXXZP6AXXZ@Z, MSVCRT_set_new_handler +DEFINE_ALIAS ?_query_new_mode@@YAHXZ, MSVCRT__query_new_mode +DEFINE_ALIAS ?_set_new_mode@@YAHH@Z, MSVCRT__set_new_mode +DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, MSVCRT__set_se_translator +DEFINE_ALIAS ?set_terminate@@YAP6AXXZP6AXXZ@Z, MSVCRT_set_terminate +DEFINE_ALIAS ?set_unexpected@@YAP6AXXZP6AXXZ@Z, MSVCRT_set_unexpected +DEFINE_ALIAS ?terminate@@YAXXZ, MSVCRT_terminate +DEFINE_ALIAS ?unexpected@@YAXXZ, MSVCRT_unexpected END Added: trunk/reactos/lib/sdk/crt/except/amd64/ehandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/amd64/e… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/amd64/ehandler.c (added) +++ trunk/reactos/lib/sdk/crt/except/amd64/ehandler.c [iso-8859-1] Sat Aug 20 17:11:16 2011 @@ -1,0 +1,17 @@ + +#include <precomp.h> + + +_CRTIMP +EXCEPTION_DISPOSITION +__cdecl +__C_specific_handler( + struct _EXCEPTION_RECORD *_ExceptionRecord, + void *_EstablisherFrame, + struct _CONTEXT *_ContextRecord, + struct _DISPATCHER_CONTEXT *_DispatcherContext) +{ + UNIMPLEMENTED; + return 0; +} + Propchange: trunk/reactos/lib/sdk/crt/except/amd64/ehandler.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/math/amd64/fmod.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/fmo… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/fmod.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/fmod.S [iso-8859-1] Sat Aug 20 17:11:16 2011 @@ -13,8 +13,8 @@ /* CODE **********************************************************************/ .code64 -PUBLIC _fmod -_fmod: +PUBLIC fmod +fmod: UNIMPLEMENTED fmod ret Modified: trunk/reactos/lib/sdk/crt/startup/cinitexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/cinite… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/cinitexe.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/cinitexe.c [iso-8859-1] Sat Aug 20 17:11:16 2011 @@ -2,7 +2,11 @@ #include <sect_attribs.h> #ifdef _MSC_VER +#ifdef _M_AMD64 +#pragma comment(linker, "/merge:.CRT=.data") +#else #pragma comment(linker, "/merge:.CRT=.rdata") +#endif #endif typedef void (__cdecl *_PVFV)(void); Modified: trunk/reactos/lib/sdk/crt/startup/mscmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/mscmai… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/mscmain.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/mscmain.c [iso-8859-1] Sat Aug 20 17:11:16 2011 @@ -8,6 +8,12 @@ #include <stdlib.h> int _fltused; + +int __mingw_init_ehandler (void) +{ + /* Nothing to do */ + return 1; +} void __do_global_dtors (void) Modified: trunk/reactos/lib/sdk/crt/startup/tlsmcrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/tlsmcr… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/tlsmcrt.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/tlsmcrt.c [iso-8859-1] Sat Aug 20 17:11:16 2011 @@ -10,35 +10,3 @@ otherwise we do tls cleanup in runtime and _CRT_MT has value 2. */ int _CRT_MT = 2; - -// HACK around broken imports from libmingwex, until RosBE64 is updated -#ifdef _M_AMD64 - -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include <windows.h> -#include <stdlib.h> - -int __mingwthr_key_dtor (DWORD key, void (*dtor)(void *)); -int __mingwthr_remove_key_dtor (DWORD key); - -extern int ___w64_mingwthr_remove_key_dtor (DWORD key); -extern int ___w64_mingwthr_add_key_dtor (DWORD key, void (*dtor)(void *)); - -int -__mingwthr_remove_key_dtor (DWORD key) -{ - return ___w64_mingwthr_remove_key_dtor (key); -} - -int -__mingwthr_key_dtor (DWORD key, void (*dtor)(void *)) -{ - if (dtor) - return ___w64_mingwthr_add_key_dtor (key, dtor); - - return 0; -} -#endif -

1 0

[tkreuzer] 53341: [MSVCRT] Fix usage of set_entrypoint
by tkreuzer＠svn.reactos.org 20 Aug '11

20 Aug '11

Author: tkreuzer Date: Sat Aug 20 17:00:31 2011 New Revision: 53341 URL: http://svn.reactos.org/svn/reactos?rev=53341&view=rev Log: [MSVCRT] Fix usage of set_entrypoint Modified: trunk/reactos/dll/win32/msvcrt/CMakeLists.txt Modified: trunk/reactos/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] Sat Aug 20 17:00:31 2011 @@ -28,7 +28,7 @@ endif() add_dependencies(msvcrt psdk) -set_entrypoint(msvcrt DllMain@12) +set_entrypoint(msvcrt DllMain 12) set_image_base(msvcrt ${baseaddress_msvcrt}) target_link_libraries(msvcrt crt wine)

1 0

[tkreuzer] 53340: [PSDK] Simplify definition for YieldProcessor and add DbgRaiseAssertion for amd64 in winnt.h [ASM] Fix some stuff for amd64
by tkreuzer＠svn.reactos.org 20 Aug '11

20 Aug '11

Author: tkreuzer Date: Sat Aug 20 15:53:56 2011 New Revision: 53340 URL: http://svn.reactos.org/svn/reactos?rev=53340&view=rev Log: [PSDK] Simplify definition for YieldProcessor and add DbgRaiseAssertion for amd64 in winnt.h [ASM] Fix some stuff for amd64 Modified: trunk/reactos/include/asm/asm.inc trunk/reactos/include/psdk/winnt.h trunk/reactos/include/reactos/asm.inc Modified: trunk/reactos/include/asm/asm.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/asm.inc?rev=53… ============================================================================== --- trunk/reactos/include/asm/asm.inc [iso-8859-1] (original) +++ trunk/reactos/include/asm/asm.inc [iso-8859-1] Sat Aug 20 15:53:56 2011 @@ -197,16 +197,22 @@ /* To avoid reverse syntax we provide a new macro .PROC, replacing PROC... */ .macro .PROC name .func \name +#ifdef _X86_ _\name: +#else + \name: +#endif .cfi_startproc .equ cfa_current_offset, -8 .endm +#define FUNC .PROC /* ... and .ENDP, replacing ENDP */ .macro .ENDP name .cfi_endproc .endfunc .endm +#define ENDFUNC .ENDP /* MASM compatible PUBLIC */ .macro PUBLIC symbol Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Aug 20 15:53:56 2011 @@ -3318,7 +3318,7 @@ SIZE_T PagefileLimit; LARGE_INTEGER TimeLimit; } QUOTA_LIMITS,*PQUOTA_LIMITS; - + typedef struct _QUOTA_LIMITS_EX { SIZE_T PagedPoolLimit; SIZE_T NonPagedPoolLimit; @@ -5265,17 +5265,9 @@ #error Unknown architecture #endif -#if defined(_M_IX86) - -#ifdef _MSC_VER -#pragma intrinsic(__int2c) -#pragma intrinsic(_mm_pause) +#if defined(_M_IX86) || defined(_M_AMD64) + #define YieldProcessor _mm_pause -#else -#define YieldProcessor() __asm__ __volatile__("pause"); -#define __int2c() __asm__ __volatile__("int $0x2c"); -#endif - FORCEINLINE VOID @@ -5284,13 +5276,6 @@ __int2c(); } -#elif defined (_M_AMD64) -#ifdef _MSC_VER -#pragma intrinsic(_mm_pause) -#define YieldProcessor _mm_pause -#else -#define YieldProcessor() __asm__ __volatile__("pause"); -#endif #elif defined(_M_PPC) #define YieldProcessor() __asm__ __volatile__("nop"); #elif defined(_M_MIPS) Modified: trunk/reactos/include/reactos/asm.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/asm.inc?re… ============================================================================== --- trunk/reactos/include/reactos/asm.inc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/asm.inc [iso-8859-1] Sat Aug 20 15:53:56 2011 @@ -149,16 +149,22 @@ /* To avoid reverse syntax we provide a new macro .PROC, replacing PROC... */ .macro .PROC name .func \name +#ifdef _X86_ _\name: +#else + \name: +#endif .cfi_startproc .equ cfa_current_offset, -8 .endm +#define FUNC .PROC /* ... and .ENDP, replacing ENDP */ .macro .ENDP name .cfi_endproc .endfunc .endm +#define ENDFUNC .ENDP /* MASM compatible PUBLIC */ .macro PUBLIC symbol @@ -269,6 +275,10 @@ #define else .else #define elseif .elseif +#define CR "\r" +#define LF "\n" +#define NUL "\0" + #endif /* Common definitions for FPO macro

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