Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 63222: [KMTEST] Add a temp hack that allows to compile kmtest_drv with either the current incompatible object type data imports or with the fixed ones
by tkreuzer＠svn.reactos.org 10 May '14

10 May '14

Author: tkreuzer Date: Sat May 10 17:19:53 2014 New Revision: 63222 URL: http://svn.reactos.org/svn/reactos?rev=63222&view=rev Log: [KMTEST] Add a temp hack that allows to compile kmtest_drv with either the current incompatible object type data imports or with the fixed ones Modified: trunk/rostests/kmtests/npfs/NpfsHelpers.c trunk/rostests/kmtests/ntos_ex/ExFastMutex.c trunk/rostests/kmtests/ntos_ex/ExResource.c trunk/rostests/kmtests/ntos_io/IoCreateFile.c trunk/rostests/kmtests/ntos_ke/KeEvent.c trunk/rostests/kmtests/ntos_ke/KeGuardedMutex.c trunk/rostests/kmtests/ntos_mm/MmSection.c trunk/rostests/kmtests/ntos_mm/ZwAllocateVirtualMemory.c trunk/rostests/kmtests/ntos_mm/ZwCreateSection.c trunk/rostests/kmtests/ntos_mm/ZwMapViewOfSection.c trunk/rostests/kmtests/ntos_ob/ObTypes.c Modified: trunk/rostests/kmtests/npfs/NpfsHelpers.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/npfs/NpfsHelpers.… ============================================================================== --- trunk/rostests/kmtests/npfs/NpfsHelpers.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/npfs/NpfsHelpers.c [iso-8859-1] Sat May 10 17:19:53 2014 @@ -742,7 +742,11 @@ { Status = ObReferenceObjectByHandle(ThreadHandle, SYNCHRONIZE, +#ifdef _PROPER_NT_EXPORTS + *PsThreadType, +#else PsThreadType, +#endif KernelMode, &ThreadObject, NULL); Modified: trunk/rostests/kmtests/ntos_ex/ExFastMutex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ex/ExFastMut… ============================================================================== --- trunk/rostests/kmtests/ntos_ex/ExFastMutex.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ex/ExFastMutex.c [iso-8859-1] Sat May 10 17:19:53 2014 @@ -90,7 +90,7 @@ KmtSetIrql(OriginalIrql); CheckMutex(Mutex, 1L, NULL, 0LU, PASSIVE_LEVEL, OriginalIrql); } - + if (!KmtIsCheckedBuild) { /* release without acquire */ @@ -196,7 +196,13 @@ InitializeObjectAttributes(&Attributes, NULL, OBJ_KERNEL_HANDLE, NULL, NULL); Status = PsCreateSystemThread(&ThreadData->Handle, GENERIC_ALL, &Attributes, NULL, NULL, AcquireMutexThread, ThreadData); ok_eq_hex(Status, STATUS_SUCCESS); - Status = ObReferenceObjectByHandle(ThreadData->Handle, SYNCHRONIZE, PsThreadType, KernelMode, (PVOID *)&ThreadData->Thread, NULL); + Status = ObReferenceObjectByHandle(ThreadData->Handle, SYNCHRONIZE, +#ifdef _PROPER_NT_EXPORTS + *PsThreadType, +#else + PsThreadType, +#endif + KernelMode, (PVOID *)&ThreadData->Thread, NULL); ok_eq_hex(Status, STATUS_SUCCESS); return KeWaitForSingleObject(&ThreadData->OutEvent, Executive, KernelMode, FALSE, Timeout); Modified: trunk/rostests/kmtests/ntos_ex/ExResource.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ex/ExResourc… ============================================================================== --- trunk/rostests/kmtests/ntos_ex/ExResource.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ex/ExResource.c [iso-8859-1] Sat May 10 17:19:53 2014 @@ -268,7 +268,14 @@ InitializeObjectAttributes(&Attributes, NULL, OBJ_KERNEL_HANDLE, NULL, NULL); Status = PsCreateSystemThread(&ThreadData->Handle, GENERIC_ALL, &Attributes, NULL, NULL, AcquireResourceThread, ThreadData); ok_eq_hex(Status, STATUS_SUCCESS); - Status = ObReferenceObjectByHandle(ThreadData->Handle, SYNCHRONIZE, PsThreadType, KernelMode, (PVOID *)&ThreadData->Thread, NULL); + Status = ObReferenceObjectByHandle(ThreadData->Handle, SYNCHRONIZE, +#ifdef _PROPER_NT_EXPORTS + *PsThreadType, +#else + PsThreadType, +#endif + + KernelMode, (PVOID *)&ThreadData->Thread, NULL); ok_eq_hex(Status, STATUS_SUCCESS); return KeWaitForSingleObject(&ThreadData->OutEvent, Executive, KernelMode, FALSE, Timeout); Modified: trunk/rostests/kmtests/ntos_io/IoCreateFile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/IoCreateF… ============================================================================== --- trunk/rostests/kmtests/ntos_io/IoCreateFile.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_io/IoCreateFile.c [iso-8859-1] Sat May 10 17:19:53 2014 @@ -57,7 +57,11 @@ { Status = ObReferenceObjectByHandle(TargetHandle, FILE_READ_DATA, +#ifdef _PROPER_NT_EXPORTS + *IoFileObjectType, +#else IoFileObjectType, +#endif KernelMode, (PVOID *)&TargetFileObject, NULL); @@ -103,7 +107,11 @@ { Status = ObReferenceObjectByHandle(ParentHandle, FILE_READ_DATA, +#ifdef _PROPER_NT_EXPORTS + *IoFileObjectType, +#else IoFileObjectType, +#endif KernelMode, (PVOID *)&ParentFileObject, NULL); @@ -173,7 +181,11 @@ { Status = ObReferenceObjectByHandle(ParentHandle, FILE_READ_DATA, +#ifdef _PROPER_NT_EXPORTS + *IoFileObjectType, +#else IoFileObjectType, +#endif KernelMode, (PVOID *)&ParentFileObject, NULL); @@ -187,7 +199,11 @@ ok_eq_long(RtlCompareUnicodeString(&ParentFileObject->FileName, &TargetFileObject->FileName, FALSE), 0); Status = ObReferenceObjectByHandle(SystemRootHandle, FILE_READ_DATA, +#ifdef _PROPER_NT_EXPORTS + *IoFileObjectType, +#else IoFileObjectType, +#endif KernelMode, (PVOID *)&SystemRootFileObject, NULL); @@ -240,7 +256,12 @@ { Status = ObReferenceObjectByHandle(ParentHandle, FILE_READ_DATA, +#ifdef _PROPER_NT_EXPORTS + *IoFileObjectType, +#else IoFileObjectType, +#endif + KernelMode, (PVOID *)&ParentFileObject, NULL); @@ -302,7 +323,12 @@ { Status = ObReferenceObjectByHandle(ParentHandle, FILE_READ_DATA, +#ifdef _PROPER_NT_EXPORTS + *IoFileObjectType, +#else IoFileObjectType, +#endif + KernelMode, (PVOID *)&ParentFileObject, NULL); @@ -316,7 +342,12 @@ ok_eq_long(RtlCompareUnicodeString(&ParentFileObject->FileName, &TargetFileObject->FileName, FALSE), 0); Status = ObReferenceObjectByHandle(SystemRootHandle, FILE_READ_DATA, +#ifdef _PROPER_NT_EXPORTS + *IoFileObjectType, +#else IoFileObjectType, +#endif + KernelMode, (PVOID *)&SystemRootFileObject, NULL); @@ -534,7 +565,11 @@ /* Then, just wait on our thread to finish */ Status = ObReferenceObjectByHandle(ThreadHandle, SYNCHRONIZE, +#ifdef _PROPER_NT_EXPORTS + *PsThreadType, +#else PsThreadType, +#endif KernelMode, &ThreadObject, NULL); Modified: trunk/rostests/kmtests/ntos_ke/KeEvent.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeEvent.c… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeEvent.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ke/KeEvent.c [iso-8859-1] Sat May 10 17:19:53 2014 @@ -169,7 +169,13 @@ Threads[i].Signal = FALSE; Status = PsCreateSystemThread(&Threads[i].Handle, GENERIC_ALL, NULL, NULL, NULL, WaitForEventThread, &Threads[i]); ok_eq_hex(Status, STATUS_SUCCESS); - Status = ObReferenceObjectByHandle(Threads[i].Handle, SYNCHRONIZE, PsThreadType, KernelMode, (PVOID *)&Threads[i].Thread, NULL); + Status = ObReferenceObjectByHandle(Threads[i].Handle, SYNCHRONIZE, +#ifdef _PROPER_NT_EXPORTS + *PsThreadType, +#else + PsThreadType, +#endif + KernelMode, (PVOID *)&Threads[i].Thread, NULL); ok_eq_hex(Status, STATUS_SUCCESS); ThreadObjects[i] = Threads[i].Thread; Priority = KeQueryPriorityThread(Threads[i].Thread); Modified: trunk/rostests/kmtests/ntos_ke/KeGuardedMutex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeGuarded… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeGuardedMutex.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ke/KeGuardedMutex.c [iso-8859-1] Sat May 10 17:19:53 2014 @@ -204,7 +204,13 @@ InitializeObjectAttributes(&Attributes, NULL, OBJ_KERNEL_HANDLE, NULL, NULL); Status = PsCreateSystemThread(&ThreadData->Handle, GENERIC_ALL, &Attributes, NULL, NULL, AcquireMutexThread, ThreadData); ok_eq_hex(Status, STATUS_SUCCESS); - Status = ObReferenceObjectByHandle(ThreadData->Handle, SYNCHRONIZE, PsThreadType, KernelMode, (PVOID *)&ThreadData->Thread, NULL); + Status = ObReferenceObjectByHandle(ThreadData->Handle, SYNCHRONIZE, +#ifdef _PROPER_NT_EXPORTS + *PsThreadType, +#else + PsThreadType, +#endif + KernelMode, (PVOID *)&ThreadData->Thread, NULL); ok_eq_hex(Status, STATUS_SUCCESS); return KeWaitForSingleObject(&ThreadData->OutEvent, Executive, KernelMode, FALSE, Timeout); Modified: trunk/rostests/kmtests/ntos_mm/MmSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmSection… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] Sat May 10 17:19:53 2014 @@ -428,7 +428,13 @@ if (!skip(Status == STATUS_SUCCESS && FileHandle1 != NULL, "Failed to open file 1\n")) { - Status = ObReferenceObjectByHandle(FileHandle1, FILE_READ_DATA | FILE_WRITE_DATA, IoFileObjectType, KernelMode, (PVOID *)&FileObject1, NULL); + Status = ObReferenceObjectByHandle(FileHandle1, FILE_READ_DATA | FILE_WRITE_DATA, +#ifdef _PROPER_NT_EXPORTS + *IoFileObjectType, +#else + IoFileObjectType, +#endif + KernelMode, (PVOID *)&FileObject1, NULL); ok_eq_hex(Status, STATUS_SUCCESS); ok(FileObject1 != NULL, "FileObject1 is NULL\n"); CheckObject(FileHandle1, 3L, 1L); @@ -436,7 +442,13 @@ if (!skip(Status == STATUS_SUCCESS && FileHandle2 != NULL, "Failed to open file 2\n")) { - Status = ObReferenceObjectByHandle(FileHandle2, FILE_READ_DATA | FILE_WRITE_DATA, IoFileObjectType, KernelMode, (PVOID *)&FileObject2, NULL); + Status = ObReferenceObjectByHandle(FileHandle2, FILE_READ_DATA | FILE_WRITE_DATA, +#ifdef _PROPER_NT_EXPORTS + *IoFileObjectType, +#else + IoFileObjectType, +#endif + KernelMode, (PVOID *)&FileObject2, NULL); ok_eq_hex(Status, STATUS_SUCCESS); ok(FileObject2 != NULL, "FileObject2 is NULL\n"); } Modified: trunk/rostests/kmtests/ntos_mm/ZwAllocateVirtualMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/ZwAllocat… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/ZwAllocateVirtualMemory.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/ZwAllocateVirtualMemory.c [iso-8859-1] Sat May 10 17:19:53 2014 @@ -437,7 +437,13 @@ goto cleanup; } - Status = ObReferenceObjectByHandle(Thread1, THREAD_ALL_ACCESS, PsThreadType, KernelMode, &ThreadObjects[0], NULL); + Status = ObReferenceObjectByHandle(Thread1, THREAD_ALL_ACCESS, +#ifdef _PROPER_NT_EXPORTS + *PsThreadType, +#else + PsThreadType, +#endif + KernelMode, &ThreadObjects[0], NULL); if (!NT_SUCCESS(Status)) { trace("error referencing thread1\n"); @@ -451,7 +457,13 @@ goto cleanup; } - Status = ObReferenceObjectByHandle(Thread2, THREAD_ALL_ACCESS, PsThreadType, KernelMode, &ThreadObjects[1], NULL); + Status = ObReferenceObjectByHandle(Thread2, THREAD_ALL_ACCESS, +#ifdef _PROPER_NT_EXPORTS + *PsThreadType, +#else + PsThreadType, +#endif + KernelMode, &ThreadObjects[1], NULL); if (!NT_SUCCESS(Status)) { trace("error referencing thread2\n"); Modified: trunk/rostests/kmtests/ntos_mm/ZwCreateSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/ZwCreateS… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/ZwCreateSection.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/ZwCreateSection.c [iso-8859-1] Sat May 10 17:19:53 2014 @@ -464,7 +464,13 @@ /* FIXME: Null pointer dereference. See ROSTESTS-108 */ #ifdef ROSTESTS_108_FIXED //mimic lack of section support for a particular file as well. - Status = ObReferenceObjectByHandle(FileHandle, STANDARD_RIGHTS_ALL, IoFileObjectType, KernelMode, (PVOID *)&FileObject, NULL); + Status = ObReferenceObjectByHandle(FileHandle, STANDARD_RIGHTS_ALL, +#ifdef _PROPER_NT_EXPORTS + *IoFileObjectType, +#else + IoFileObjectType, +#endif + KernelMode, (PVOID *)&FileObject, NULL); if (!skip(NT_SUCCESS(Status), "Cannot reference object by handle\n")) { PSECTION_OBJECT_POINTERS Pointers = FileObject->SectionObjectPointer; Modified: trunk/rostests/kmtests/ntos_mm/ZwMapViewOfSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/ZwMapView… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/ZwMapViewOfSection.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/ZwMapViewOfSection.c [iso-8859-1] Sat May 10 17:19:53 2014 @@ -390,7 +390,13 @@ Status = PsCreateSystemThread(&SysThreadHandle, STANDARD_RIGHTS_ALL, &ObjectAttributes, NULL, NULL, SystemProcessWorker, NULL); if (!skip(NT_SUCCESS(Status), "Error creating System thread. Error = %p\n", Status)) { - Status = ObReferenceObjectByHandle(SysThreadHandle, THREAD_ALL_ACCESS, PsThreadType, KernelMode, &ThreadObject, NULL); + Status = ObReferenceObjectByHandle(SysThreadHandle, THREAD_ALL_ACCESS, +#ifdef _PROPER_NT_EXPORTS + *PsThreadType, +#else + PsThreadType, +#endif + KernelMode, &ThreadObject, NULL); if (!skip(NT_SUCCESS(Status), "Error getting reference to System thread when testing file-backed section\n")) { //wait until the system thread actually terminates @@ -515,7 +521,13 @@ if (!skip(NT_SUCCESS(Status), "Error creating System thread. Error = %p\n", Status)) { - Status = ObReferenceObjectByHandle(SysThreadHandle, THREAD_ALL_ACCESS, PsThreadType, KernelMode, &ThreadObject, NULL); + Status = ObReferenceObjectByHandle(SysThreadHandle, THREAD_ALL_ACCESS, +#ifdef _PROPER_NT_EXPORTS + *PsThreadType, +#else + PsThreadType, +#endif + KernelMode, &ThreadObject, NULL); if (!skip(NT_SUCCESS(Status), "Error getting reference to System thread when testing pagefile-backed section\n")) { //wait until the system thread actually terminates Modified: trunk/rostests/kmtests/ntos_ob/ObTypes.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ob/ObTypes.c… ============================================================================== --- trunk/rostests/kmtests/ntos_ob/ObTypes.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ob/ObTypes.c [iso-8859-1] Sat May 10 17:19:53 2014 @@ -164,6 +164,40 @@ SeDefaultObjectMethod = ObpTypeObjectType->TypeInfo.SecurityProcedure; ok(SeDefaultObjectMethod != NULL, "No SeDefaultObjectMethod\n"); +#ifdef _PROPER_NT_EXPORTS +#define ExSemaphoreObjectType *ExSemaphoreObjectType +#define SeTokenObjectType *SeTokenObjectType +#define PsProcessType *PsProcessType +#define PsThreadType *PsThreadType +#define ExEventObjectType *ExEventObjectType +#define IoFileObjectType *IoFileObjectType +#endif +#ifdef _PROPER_NT_NDK_EXPORTS +#define ObpTypeObjectType *ObpTypeObjectType +#define ObpDirectoryObjectType *ObpDirectoryObjectType +#define ObpSymbolicLinkObjectType *ObpSymbolicLinkObjectType +#define PsJobType *PsJobType +#define DbgkDebugObjectType *DbgkDebugObjectType +#define ExEventPairObjectType *ExEventPairObjectType +#define ExMutantObjectType *ExMutantObjectType +#define ExCallbackObjectType *ExCallbackObjectType +#define ExTimerObjectType *ExTimerObjectType +#define ExProfileObjectType *ExProfileObjectType +#define ExpKeyedEventObjectType *ExpKeyedEventObjectType +#define ExWindowStationObjectType *ExWindowStationObjectType +#define ExDesktopObjectType *ExDesktopObjectType +#define MmSectionObjectType *MmSectionObjectType +#define CmpKeyObjectType *CmpKeyObjectType +#define LpcPortObjectType *LpcPortObjectType +#define LpcWaitablePortObjectType *LpcWaitablePortObjectType +#define IoAdapterObjectType *IoAdapterObjectType +#define IoControllerObjectType *IoControllerObjectType +#define IoDeviceObjectType *IoDeviceObjectType +#define IoDriverObjectType *IoDriverObjectType +#define IoCompletionObjectType *IoCompletionObjectType +#define WmipGuidObjectType *WmipGuidObjectType +#endif + Index = 1; CheckObjectType(Type, ObpTypeObjectType, OBT_MAINTAIN_TYPE_LIST | OBT_CUSTOM_KEY, 0x100, 0x020000, 0x020000, 0x020000, 0x0f0001, 0x1f0001); ok_eq_hex(ObpTypeObjectType->Key, TAG('ObjT'));

1 0

[tkreuzer] 63221: [WIN32K] Fix comments for some systemcalls, noticed by Giannis
by tkreuzer＠svn.reactos.org 10 May '14

10 May '14

Author: tkreuzer Date: Sat May 10 16:43:13 2014 New Revision: 63221 URL: http://svn.reactos.org/svn/reactos?rev=63221&view=rev Log: [WIN32K] Fix comments for some systemcalls, noticed by Giannis Modified: trunk/reactos/win32ss/w32ksvc.h Modified: trunk/reactos/win32ss/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/w32ksvc.h?rev=6322… ============================================================================== --- trunk/reactos/win32ss/w32ksvc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/w32ksvc.h [iso-8859-1] Sat May 10 16:43:13 2014 @@ -235,7 +235,7 @@ SVC_(GdiMoveTo, 4) SVC_(GdiOffsetClipRgn, 3) SVC_(GdiOffsetRgn, 3) -SVC_(GdiOpenDCW, 8) /* FIXME: 7 params on XP */ +SVC_(GdiOpenDCW, 8) /* FIXME: 7 params on XP/2k3 */ SVC_(GdiPatBlt, 6) SVC_(GdiPolyPatBlt, 5) SVC_(GdiPathToRegion, 1) @@ -374,7 +374,7 @@ SVC_(UserEndMenu, 0) SVC_(UserEndPaint, 2) SVC_(UserEnumDisplayDevices, 4) -SVC_(UserEnumDisplayMonitors, 5) /* FIXME: 4 on XP */ +SVC_(UserEnumDisplayMonitors, 5) /* FIXME: 4 on XP/2k3 */ SVC_(UserEnumDisplaySettings, 4) SVC_(UserEvent, 1) SVC_(UserExcludeUpdateRgn, 2) @@ -495,7 +495,7 @@ SVC_(UserRealWaitMessageEx, 2) SVC_(UserRedrawWindow, 4) SVC_(UserRegisterClassExWOW, 7) -SVC_(UserRegisterUserApiHook, 4) /* FIXME: 2 params on XP */ +SVC_(UserRegisterUserApiHook, 4) /* Note: 2 params on XP, 4 on 2k3 */ SVC_(UserRegisterHotKey, 4) SVC_(UserRegisterRawInputDevices, 3) SVC_(UserRegisterTasklist, 1) @@ -589,7 +589,7 @@ SVC_(UserUnregisterHotKey, 2) SVC_(UserUpdateInputContext, 3) SVC_(UserUpdateInstance, 3) -SVC_(UserUpdateLayeredWindow, 10) /* FIXME: 9 params on XP */ +SVC_(UserUpdateLayeredWindow, 10) /* Note: 9 params on XP, 10 on 2k3 */ SVC_(UserGetLayeredWindowAttributes, 4) SVC_(UserSetLayeredWindowAttributes, 4) SVC_(UserUpdatePerUserSystemParameters, 2)

1 0

[tkreuzer] 63220: [KS/NTOSKRNL/WIN32K] Fix MSVC warnings [WMILIB] Don't put it in a cab file, so we can use it in first stage [DDK/VDDSVC.H] use the 16 bit interface only on MIPS [WINE/PORT.H] WIN3...
by tkreuzer＠svn.reactos.org 10 May '14

10 May '14

Author: tkreuzer Date: Sat May 10 14:33:37 2014 New Revision: 63220 URL: http://svn.reactos.org/svn/reactos?rev=63220&view=rev Log: [KS/NTOSKRNL/WIN32K] Fix MSVC warnings [WMILIB] Don't put it in a cab file, so we can use it in first stage [DDK/VDDSVC.H] use the 16 bit interface only on MIPS [WINE/PORT.H] WIN32 -> _WIN32 [NTOSKRNL] KfAcquire/ReleaseSpinLock -> KeAcquire/ReleaseSpinLock [NTOSKRNL] Make sure KeUpdateSystemTime returns properly on non-x86 builds Modified: trunk/reactos/drivers/ksfilter/ks/topology.c trunk/reactos/drivers/wmi/CMakeLists.txt trunk/reactos/include/ddk/vddsvc.h trunk/reactos/include/reactos/wine/port.h trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/amd64/mm.h trunk/reactos/ntoskrnl/ke/time.c trunk/reactos/ntoskrnl/ps/quota.c trunk/reactos/win32ss/gdi/eng/mem.c trunk/reactos/win32ss/user/ntuser/misc/rtlstr.c trunk/reactos/win32ss/w32ksvc.h Modified: trunk/reactos/drivers/ksfilter/ks/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/topolo… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] Sat May 10 14:33:37 2014 @@ -28,7 +28,7 @@ /* calculate request length */ Name.Length = 0; - Name.MaximumLength = wcslen(ObjectType) * sizeof(WCHAR) + CreateParametersSize + 1 * sizeof(WCHAR); + Name.MaximumLength = (USHORT)(wcslen(ObjectType) * sizeof(WCHAR) + CreateParametersSize + 1 * sizeof(WCHAR)); Name.MaximumLength += sizeof(WCHAR); /* acquire request buffer */ Name.Buffer = AllocateItem(NonPagedPool, Name.MaximumLength); @@ -39,7 +39,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } - /* build a request which looks like {ObjectClass}\CreateParameters + /* build a request which looks like {ObjectClass}\CreateParameters * For pins the parent is the reference string used in registration * For clocks it is full path for pin\{ClockGuid}\ClockCreateParams */ Modified: trunk/reactos/drivers/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wmi/CMakeLists.txt… ============================================================================== --- trunk/reactos/drivers/wmi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/wmi/CMakeLists.txt [iso-8859-1] Sat May 10 14:33:37 2014 @@ -12,4 +12,4 @@ add_importlibs(wmilib ntoskrnl) -add_cd_file(TARGET wmilib DESTINATION reactos/system32/drivers FOR all) +add_cd_file(TARGET wmilib DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/include/ddk/vddsvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/vddsvc.h?rev=6… ============================================================================== --- trunk/reactos/include/ddk/vddsvc.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/vddsvc.h [iso-8859-1] Sat May 10 14:33:37 2014 @@ -50,7 +50,7 @@ */ PVOID WINAPI getIntelRegistersPointer(VOID); -#ifdef __i386__ +#ifndef _M_MIPS ULONG WINAPI getEAX(VOID); VOID WINAPI setEAX(ULONG); Modified: trunk/reactos/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/port.… ============================================================================== --- trunk/reactos/include/reactos/wine/port.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/port.h [iso-8859-1] Sat May 10 14:33:37 2014 @@ -278,7 +278,7 @@ #endif /* HAVE_PWRITE */ #endif /* __REACTOS__ */ -#ifdef WIN32 +#ifdef _WIN32 #ifndef HAVE_SIGSETJMP # include <setjmp.h> typedef jmp_buf sigjmp_buf; Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sat May 10 14:33:37 2014 @@ -1964,7 +1964,7 @@ } /* Acquire spinlock for ExpNonPagedLookasideListHead */ - OldIrql = KfAcquireSpinLock(&ExpNonPagedLookasideListLock); + KeAcquireSpinLock(&ExpNonPagedLookasideListLock, &OldIrql); /* Copy info from non-paged lookaside lists */ ExpCopyLookasideInformation(&Info, @@ -1973,7 +1973,7 @@ TRUE); /* Release spinlock for ExpNonPagedLookasideListHead */ - KfReleaseSpinLock(&ExpNonPagedLookasideListLock, OldIrql); + KeReleaseSpinLock(&ExpNonPagedLookasideListLock, OldIrql); if (Remaining == 0) { @@ -1981,7 +1981,7 @@ } /* Acquire spinlock for ExpPagedLookasideListHead */ - OldIrql = KfAcquireSpinLock(&ExpPagedLookasideListLock); + KeAcquireSpinLock(&ExpPagedLookasideListLock, &OldIrql); /* Copy info from paged lookaside lists */ ExpCopyLookasideInformation(&Info, @@ -1990,7 +1990,7 @@ TRUE); /* Release spinlock for ExpPagedLookasideListHead */ - KfReleaseSpinLock(&ExpPagedLookasideListLock, OldIrql); + KeReleaseSpinLock(&ExpPagedLookasideListLock, OldIrql); Leave: Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Sat May 10 14:33:37 2014 @@ -296,7 +296,7 @@ { /// FIXME __debugbreak(); - return (PointerPte->u.Long & 0xFFFFFC01 != 0); + return ((PointerPte->u.Long & 0xFFFFFC01) != 0); } VOID Modified: trunk/reactos/ntoskrnl/ke/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/time.c?rev=632… ============================================================================== --- trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] Sat May 10 14:33:37 2014 @@ -78,6 +78,9 @@ /* Increase interrupt count and end the interrupt */ Prcb->InterruptCount++; KiEndInterrupt(Irql, TrapFrame); + + /* Note: non-x86 return back to the caller! */ + return; } /* Add the increment time to the shared data */ Modified: trunk/reactos/ntoskrnl/ps/quota.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/quota.c?rev=63… ============================================================================== --- trunk/reactos/ntoskrnl/ps/quota.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/quota.c [iso-8859-1] Sat May 10 14:33:37 2014 @@ -132,9 +132,9 @@ { KIRQL OldIrql; - OldIrql = KfAcquireSpinLock(&PspQuotaLock); + KeAcquireSpinLock(&PspQuotaLock, &OldIrql); InsertTailList(&PspQuotaBlockList, &QuotaBlock->QuotaList); - KfReleaseSpinLock(&PspQuotaLock, OldIrql); + KeReleaseSpinLock(&PspQuotaLock, OldIrql); } VOID @@ -147,9 +147,9 @@ if (QuotaBlock != &PspDefaultQuotaBlock && InterlockedDecrementUL(&QuotaBlock->ReferenceCount) == 0) { - OldIrql = KfAcquireSpinLock(&PspQuotaLock); + KeAcquireSpinLock(&PspQuotaLock, &OldIrql); RemoveEntryList(&QuotaBlock->QuotaList); - KfReleaseSpinLock(&PspQuotaLock, OldIrql); + KeReleaseSpinLock(&PspQuotaLock, OldIrql); ExFreePool(QuotaBlock); } } Modified: trunk/reactos/win32ss/gdi/eng/mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/mem.c?rev=… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/mem.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/mem.c [iso-8859-1] Sat May 10 14:33:37 2014 @@ -114,7 +114,7 @@ else if (ProbeMode == PAGE_READWRITE) Operation = IoModifyAccess; else return NULL; - pmdl = IoAllocateMdl(Address, Size, FALSE, TRUE, NULL); + pmdl = IoAllocateMdl(Address, (ULONG)Size, FALSE, TRUE, NULL); if (pmdl == NULL) { return NULL; Modified: trunk/reactos/win32ss/user/ntuser/misc/rtlstr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc/r… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc/rtlstr.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc/rtlstr.c [iso-8859-1] Sat May 10 14:33:37 2014 @@ -19,11 +19,11 @@ IN PCSZ SourceString, IN INT Unknown) { - ULONG DestSize; + USHORT DestSize; if (SourceString) { - DestSize = strlen(SourceString); + DestSize = (USHORT)strlen(SourceString); DestinationString->Length = DestSize; DestinationString->MaximumLength = DestSize + sizeof(CHAR); } @@ -44,11 +44,11 @@ IN PCWSTR SourceString, IN INT Unknown) { - ULONG DestSize; + USHORT DestSize; if (SourceString) { - DestSize = wcslen(SourceString) * sizeof(WCHAR); + DestSize = (USHORT)wcslen(SourceString) * sizeof(WCHAR); DestinationString->Length = DestSize; DestinationString->MaximumLength = DestSize + sizeof(WCHAR); } Modified: trunk/reactos/win32ss/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/w32ksvc.h?rev=6322… ============================================================================== --- trunk/reactos/win32ss/w32ksvc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/w32ksvc.h [iso-8859-1] Sat May 10 14:33:37 2014 @@ -1,6 +1,6 @@ // SVC_(<NAME>, <ARG_COUNT>) // -// Funcs, order, should, match, Windows, XP, 5.1.2600, SP2) +// Funcs order should match Windows XP 5.1.2600 SP2 // SVC_(GdiAbortDoc, 1) SVC_(GdiAbortPath, 1) @@ -235,7 +235,7 @@ SVC_(GdiMoveTo, 4) SVC_(GdiOffsetClipRgn, 3) SVC_(GdiOffsetRgn, 3) -SVC_(GdiOpenDCW, 8) +SVC_(GdiOpenDCW, 8) /* FIXME: 7 params on XP */ SVC_(GdiPatBlt, 6) SVC_(GdiPolyPatBlt, 5) SVC_(GdiPathToRegion, 1) @@ -374,8 +374,7 @@ SVC_(UserEndMenu, 0) SVC_(UserEndPaint, 2) SVC_(UserEnumDisplayDevices, 4) -// SVC_(UserEnumDisplayMonitors, 4, Wrong, number, of, param, ?) -SVC_(UserEnumDisplayMonitors, 5) +SVC_(UserEnumDisplayMonitors, 5) /* FIXME: 4 on XP */ SVC_(UserEnumDisplaySettings, 4) SVC_(UserEvent, 1) SVC_(UserExcludeUpdateRgn, 2) @@ -496,7 +495,7 @@ SVC_(UserRealWaitMessageEx, 2) SVC_(UserRedrawWindow, 4) SVC_(UserRegisterClassExWOW, 7) -SVC_(UserRegisterUserApiHook, 4) +SVC_(UserRegisterUserApiHook, 4) /* FIXME: 2 params on XP */ SVC_(UserRegisterHotKey, 4) SVC_(UserRegisterRawInputDevices, 3) SVC_(UserRegisterTasklist, 1) @@ -590,7 +589,7 @@ SVC_(UserUnregisterHotKey, 2) SVC_(UserUpdateInputContext, 3) SVC_(UserUpdateInstance, 3) -SVC_(UserUpdateLayeredWindow, 10) +SVC_(UserUpdateLayeredWindow, 10) /* FIXME: 9 params on XP */ SVC_(UserGetLayeredWindowAttributes, 4) SVC_(UserSetLayeredWindowAttributes, 4) SVC_(UserUpdatePerUserSystemParameters, 2)

1 0

[tkreuzer] 63219: [MSVCRT] Fix export of __uncaught_exception [MSHTML] Add x64 asm wrappers
by tkreuzer＠svn.reactos.org 10 May '14

10 May '14

Author: tkreuzer Date: Sat May 10 14:16:11 2014 New Revision: 63219 URL: http://svn.reactos.org/svn/reactos?rev=63219&view=rev Log: [MSVCRT] Fix export of __uncaught_exception [MSHTML] Add x64 asm wrappers Modified: trunk/reactos/dll/win32/mshtml/msvc.S trunk/reactos/dll/win32/msvcrt/msvcrt.spec Modified: trunk/reactos/dll/win32/mshtml/msvc.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/msvc.S?re… ============================================================================== --- trunk/reactos/dll/win32/mshtml/msvc.S [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/msvc.S [iso-8859-1] Sat May 10 14:16:11 2014 @@ -4,13 +4,23 @@ .code MACRO(DEFINE_WRAPPER_FUNC, n, off, x) +#ifdef _M_IX86 PUBLIC _wrapper_func_&n& _wrapper_func_&n&: -mov eax, [esp+4] -mov eax, [eax+4] -mov [esp+4], eax -mov eax, [eax] -jmp dword ptr [eax+off] + mov eax, [esp+4] + mov eax, [eax+4] + mov [esp+4], eax + mov eax, [eax] + jmp dword ptr [eax+off] +#elif defined(_M_AMD64) +PUBLIC wrapper_func_&n& +wrapper_func_&n&: + mov rcx, [rcx+4] + mov rax, [rcx] + jmp qword ptr [rax+off] +#else +#error Unimplemented +#endif ENDM DEFINE_WRAPPER_FUNC 3, 12, 24 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 May 10 14:16:11 2014 @@ -73,7 +73,7 @@ # @ cdecl ??_U@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg @ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) MSVCRT_operator_delete @ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) MSVCRT_operator_delete -@ cdecl -arch=win64 -norelay __uncaught_exception(ptr) +@ cdecl -norelay __uncaught_exception(ptr) @ cdecl -arch=win32 -norelay ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler @ cdecl -arch=win64 -norelay ?_query_new_handler@@YAP6AH_K@ZXZ() MSVCRT__query_new_handler @ cdecl ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode @@ -256,7 +256,6 @@ @ cdecl __threadhandle() kernel32.GetCurrentThread @ cdecl __threadid() kernel32.GetCurrentThreadId @ cdecl __toascii(long) -@ cdecl __uncaught_exception() @ cdecl __unDName(ptr str long ptr ptr long) @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) @ extern __unguarded_readlc_active

1 0

[tkreuzer] 63218: [SPEC2DEF] Improve the previous fix.
by tkreuzer＠svn.reactos.org 10 May '14

10 May '14

Author: tkreuzer Date: Sat May 10 14:12:20 2014 New Revision: 63218 URL: http://svn.reactos.org/svn/reactos?rev=63218&view=rev Log: [SPEC2DEF] Improve the previous fix. Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Sat May 10 14:12:20 2014 @@ -325,7 +325,22 @@ int nNameLength = pstr->len; const char* pcDot, *pcAt; - if ((giArch == ARCH_X86) && fDeco && + /* Check for non-x86 first */ + if (giArch != ARCH_X86) + { + /* Does the string already have stdcall decoration? */ + pcAt = ScanToken(pcName, '@'); + if ((pcAt < (pcName + nNameLength)) && (pcName[0] == '_')) + { + /* Skip leading underscore and remove trailing decoration */ + pcName++; + nNameLength = pcAt - pcName; + } + + /* Print the undecorated function name */ + fprintf(fileDest, "%.*s", nNameLength, pcName); + } + else if (fDeco && ((pexp->nCallingConvention == CC_STDCALL) || (pexp->nCallingConvention == CC_FASTCALL))) { @@ -370,15 +385,6 @@ } else { - /* Does the string already have stdcall decoration? */ - pcAt = ScanToken(pcName, '@'); - if (pcAt && (pcAt < (pcName + nNameLength)) && pcName[0] == '_') - { - /* Skip leading underscore and remove trailing decoration */ - pcName++; - nNameLength = pcAt - pcName; - } - /* Print the undecorated function name */ fprintf(fileDest, "%.*s", nNameLength, pcName); }

1 0

[tkreuzer] 63217: [SPEC2DEF] Add support for adding aliases when exporting data by specifying the -withalias switch. This will cause MS LINK to generate _FooVar as an alias alias for _imp__FooVar. ...
by tkreuzer＠svn.reactos.org 10 May '14

10 May '14

Author: tkreuzer Date: Sat May 10 13:55:09 2014 New Revision: 63217 URL: http://svn.reactos.org/svn/reactos?rev=63217&view=rev Log: [SPEC2DEF] Add support for adding aliases when exporting data by specifying the -withalias switch. This will cause MS LINK to generate _FooVar as an alias alias for _imp__FooVar. While this looks wrong and is not the way you usually handle data imports, this is what we have in the DDK for a number of data exports like KdDebuggerNotPresent, IoFileObjectType, ..., which we currently define in an incompatible way. Remove stdcall decorations on non-x86 builds Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Sat May 10 13:55:09 2014 @@ -52,6 +52,7 @@ FL_STUB = 2, FL_NONAME = 4, FL_ORDINAL = 8, + FL_DATA_ALIAS = 16 }; enum @@ -369,6 +370,15 @@ } else { + /* Does the string already have stdcall decoration? */ + pcAt = ScanToken(pcName, '@'); + if (pcAt && (pcAt < (pcName + nNameLength)) && pcName[0] == '_') + { + /* Skip leading underscore and remove trailing decoration */ + pcName++; + nNameLength = pcAt - pcName; + } + /* Print the undecorated function name */ fprintf(fileDest, "%.*s", nNameLength, pcName); } @@ -492,7 +502,9 @@ fprintf(fileDest, " PRIVATE"); } - if (pexp->nCallingConvention == CC_EXTERN) + /* Make this a data export, unless this is MSVC and -withalias was given */ + if ((pexp->nCallingConvention == CC_EXTERN) && + !(gbMSComp && (pexp->uFlags & FL_DATA_ALIAS))) { fprintf(fileDest, " DATA"); } @@ -644,6 +656,15 @@ else if (CompareToken(pc, "-stub")) { exp.uFlags |= FL_STUB; + } + else if (CompareToken(pc, "-withalias")) + { + /* This flag is to create a nin _imp_ prefixed alias for a + data export, so that the hacked DDK declarations work */ + if (exp.nCallingConvention != CC_EXTERN) + fprintf(stderr, "error: line %d -withalias on non-data export\n", nLine); + else + exp.uFlags |= FL_DATA_ALIAS; } else if (CompareToken(pc, "-norelay") || CompareToken(pc, "-register") ||

1 0

[tkreuzer] 63216: [CPPRT] Add an alias for __CxxFrameHandler3 on x64 builds
by tkreuzer＠svn.reactos.org 10 May '14

10 May '14

Author: tkreuzer Date: Sat May 10 12:01:17 2014 New Revision: 63216 URL: http://svn.reactos.org/svn/reactos?rev=63216&view=rev Log: [CPPRT] Add an alias for __CxxFrameHandler3 on x64 builds Modified: trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s Modified: trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/amd64/cpprt.… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s [iso-8859-1] Sat May 10 12:01:17 2014 @@ -13,4 +13,7 @@ ; void __cdecl `eh vector destructor iterator'(void *,unsigned __int64,int,void (__cdecl*)(void *)) DEFINE_ALIAS ??_M@YAXPEAX_KHP6AX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YAXPEAX_KHP6AX0@Z@Z +; These are the same +DEFINE_ALIAS __CxxFrameHandler3, __CxxFrameHandler + END

1 0

[jimtabor] 63215: [Win32k] - Patch by Huw Campbell : Fixes maximizing Explorer window, the horizontal scroll bar is not painted correctly. See CORE-6249.
by jimtabor＠svn.reactos.org 10 May '14

10 May '14

Author: jimtabor Date: Sat May 10 11:38:52 2014 New Revision: 63215 URL: http://svn.reactos.org/svn/reactos?rev=63215&view=rev Log: [Win32k] - Patch by Huw Campbell : Fixes maximizing Explorer window, the horizontal scroll bar is not painted correctly. See CORE-6249. Modified: trunk/reactos/win32ss/user/ntuser/winpos.c Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Sat May 10 11:38:52 2014 @@ -1710,6 +1710,7 @@ RECTL valid_rects[2]; PROSRGNDATA VisRgn; HRGN VisBefore = NULL; + HRGN VisBeforeJustClient = NULL; HRGN VisAfter = NULL; HRGN DirtyRgn = NULL; HRGN ExposedRgn = NULL; @@ -1806,6 +1807,28 @@ RGNOBJAPI_Unlock(VisRgn); NtGdiOffsetRgn(VisBefore, -Window->rcWindow.left, -Window->rcWindow.top); } + + /* Calculate the non client area for resizes, as this is used in the copy region */ + if (!(WinPos.flags & SWP_NOSIZE)) + { + VisBeforeJustClient = VIS_ComputeVisibleRegion(Window, TRUE, FALSE, + (Window->style & WS_CLIPSIBLINGS) ? TRUE : FALSE); + VisRgn = NULL; + + if ( VisBeforeJustClient != NULL && + (VisRgn = (PROSRGNDATA)RGNOBJAPI_Lock(VisBeforeJustClient, NULL)) && + REGION_Complexity(VisRgn) == NULLREGION ) + { + RGNOBJAPI_Unlock(VisRgn); + GreDeleteObject(VisBeforeJustClient); + VisBeforeJustClient = NULL; + } + else if(VisRgn) + { + RGNOBJAPI_Unlock(VisRgn); + NtGdiOffsetRgn(VisBeforeJustClient, -Window->rcWindow.left, -Window->rcWindow.top); + } + } } } @@ -1909,8 +1932,6 @@ ((WinPos.flags & SWP_NOSIZE) || !(WvrFlags & WVR_REDRAW)) && !(Window->ExStyle & WS_EX_TRANSPARENT) ) { - CopyRgn = IntSysCreateRectRgn(0, 0, 0, 0); - RgnType = NtGdiCombineRgn(CopyRgn, VisAfter, VisBefore, RGN_AND); /* * If this is (also) a window resize, the whole nonclient area @@ -1920,19 +1941,14 @@ * we don't have to crop (can't take anything away from an empty * region...) */ - if (!(WinPos.flags & SWP_NOSIZE) && - RgnType != ERROR && - RgnType != NULLREGION ) + + CopyRgn = IntSysCreateRectRgn(0, 0, 0, 0); + if (WinPos.flags & SWP_NOSIZE) + RgnType = NtGdiCombineRgn(CopyRgn, VisAfter, VisBefore, RGN_AND); + else if (VisBeforeJustClient != NULL) { - PROSRGNDATA pCopyRgn; - RECTL ORect = OldClientRect; - RECTL NRect = NewClientRect; - RECTL_vOffsetRect(&ORect, - OldWindowRect.left, - OldWindowRect.top); - RECTL_vOffsetRect(&NRect, - NewWindowRect.left, - NewWindowRect.top); - RECTL_bIntersectRect(&CopyRect, &ORect, &NRect); - pCopyRgn = RGNOBJAPI_Lock(CopyRgn, NULL); - REGION_CropAndOffsetRegion(pCopyRgn, pCopyRgn, &CopyRect, NULL); - RGNOBJAPI_Unlock(pCopyRgn); + RgnType = NtGdiCombineRgn(CopyRgn, VisAfter, VisBeforeJustClient, RGN_AND); + GreDeleteObject(VisBeforeJustClient); } /* No use in copying bits which are in the update region. */

1 0

[tkreuzer] 63214: [KS] Fix some prototypes and some MSVC/x64 warnings
by tkreuzer＠svn.reactos.org 10 May '14

10 May '14

Author: tkreuzer Date: Sat May 10 10:02:09 2014 New Revision: 63214 URL: http://svn.reactos.org/svn/reactos?rev=63214&view=rev Log: [KS] Fix some prototypes and some MSVC/x64 warnings Modified: trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/event.c trunk/reactos/drivers/ksfilter/ks/ksfunc.h trunk/reactos/drivers/ksfilter/ks/methods.c trunk/reactos/drivers/ksfilter/ks/misc.c trunk/reactos/drivers/ksfilter/ks/property.c trunk/reactos/drivers/ksfilter/ks/swenum.c trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Sat May 10 10:02:09 2014 @@ -1140,7 +1140,7 @@ if (Status) { /* store bytes returned */ - *BytesReturned = IoStatusBlock.Information; + *BytesReturned = (ULONG)IoStatusBlock.Information; /* return status */ return IoStatusBlock.Status; } @@ -1181,7 +1181,7 @@ Status = IoStatusBlock.Status; } - *BytesReturned = IoStatusBlock.Information; + *BytesReturned = (ULONG)IoStatusBlock.Information; return Status; } @@ -1716,8 +1716,8 @@ return; } - /* FIXME - * delete object / device header + /* FIXME + * delete object / device header * remove dead pin / filter instance */ UNIMPLEMENTED @@ -1782,7 +1782,7 @@ Status = IoCallDriver(DeviceObject, Irp); /* is the request still pending */ - if (Status == STATUS_PENDING) + if (Status == STATUS_PENDING) { /* have a nap */ KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); @@ -1887,7 +1887,7 @@ /* get the basic header */ BasicHeader = (PKSBASIC_HEADER)((ULONG_PTR)Object - sizeof(KSBASIC_HEADER)); - ASSERT(BasicHeader->Type == KsObjectTypeDevice || BasicHeader->Type == KsObjectTypeFilterFactory || + ASSERT(BasicHeader->Type == KsObjectTypeDevice || BasicHeader->Type == KsObjectTypeFilterFactory || BasicHeader->Type == KsObjectTypeFilter || BasicHeader->Type == KsObjectTypePin); return (PVOID)BasicHeader->Next.Pin; @@ -2128,7 +2128,7 @@ PKSPROPERTY_ITEM PropertyItem, CurrentPropertyItem; NTSTATUS Status; - // max properties + // max properties PropertyCount = PropertySetA->PropertiesCount + PropertySetB->PropertiesCount; // allocate items @@ -2518,7 +2518,7 @@ PKSBASIC_HEADER BasicHeader = (PKSBASIC_HEADER)((ULONG_PTR)Object - sizeof(KSBASIC_HEADER)); /* sanity check */ - ASSERT(BasicHeader->Type == KsObjectTypeDevice || BasicHeader->Type == KsObjectTypeFilterFactory || + ASSERT(BasicHeader->Type == KsObjectTypeDevice || BasicHeader->Type == KsObjectTypeFilterFactory || BasicHeader->Type == KsObjectTypeFilter || BasicHeader->Type == KsObjectTypePin); if (BasicHeader->ClientAggregate) Modified: trunk/reactos/drivers/ksfilter/ks/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/event.… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/event.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/event.c [iso-8859-1] Sat May 10 10:02:09 2014 @@ -87,7 +87,7 @@ KspEnableEvent( IN PIRP Irp, IN ULONG EventSetsCount, - IN PKSEVENT_SET EventSet, + IN const KSEVENT_SET* EventSet, IN OUT PLIST_ENTRY EventsList OPTIONAL, IN KSEVENTS_LOCKTYPE EventsFlags OPTIONAL, IN PVOID EventsLock OPTIONAL, @@ -99,7 +99,7 @@ KSEVENT Event; PKSEVENT_ITEM EventItem, FoundEventItem; PKSEVENTDATA EventData; - PKSEVENT_SET FoundEventSet; + const KSEVENT_SET* FoundEventSet; PKSEVENT_ENTRY EventEntry; ULONG Index, SubIndex, Size; PVOID Object; @@ -270,7 +270,7 @@ /* invalid type requested */ return STATUS_INVALID_PARAMETER; } - } + } /* calculate request size */ @@ -398,18 +398,19 @@ /* @implemented */ +_IRQL_requires_max_(PASSIVE_LEVEL) KSDDKAPI NTSTATUS NTAPI KsEnableEventWithAllocator( - IN PIRP Irp, - IN ULONG EventSetsCount, - IN PKSEVENT_SET EventSet, - IN OUT PLIST_ENTRY EventsList OPTIONAL, - IN KSEVENTS_LOCKTYPE EventsFlags OPTIONAL, - IN PVOID EventsLock OPTIONAL, - IN PFNKSALLOCATOR Allocator OPTIONAL, - IN ULONG EventItemSize OPTIONAL) + _In_ PIRP Irp, + _In_ ULONG EventSetsCount, + _In_reads_(EventSetsCount) const KSEVENT_SET* EventSet, + _Inout_opt_ PLIST_ENTRY EventsList, + _In_opt_ KSEVENTS_LOCKTYPE EventsFlags, + _In_opt_ PVOID EventsLock, + _In_opt_ PFNKSALLOCATOR Allocator, + _In_opt_ ULONG EventItemSize) { return KspEnableEvent(Irp, EventSetsCount, EventSet, EventsList, EventsFlags, EventsLock, Allocator, EventItemSize); } Modified: trunk/reactos/drivers/ksfilter/ks/ksfunc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksfunc… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] Sat May 10 10:02:09 2014 @@ -175,7 +175,7 @@ KspEnableEvent( IN PIRP Irp, IN ULONG EventSetsCount, - IN PKSEVENT_SET EventSet, + IN const KSEVENT_SET* EventSet, IN OUT PLIST_ENTRY EventsList OPTIONAL, IN KSEVENTS_LOCKTYPE EventsFlags OPTIONAL, IN PVOID EventsLock OPTIONAL, Modified: trunk/reactos/drivers/ksfilter/ks/methods.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/method… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/methods.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/methods.c [iso-8859-1] Sat May 10 10:02:09 2014 @@ -147,7 +147,7 @@ if (Allocator) { /* allocate the requested amount */ - Status = Allocator(Irp, Irp->IoStatus.Information, FALSE); + Status = Allocator(Irp, (ULONG)Irp->IoStatus.Information, FALSE); /* check if the block was allocated */ if (!NT_SUCCESS(Status)) @@ -189,13 +189,14 @@ /* @implemented */ +_IRQL_requires_max_(PASSIVE_LEVEL) KSDDKAPI NTSTATUS NTAPI KsMethodHandler( - IN PIRP Irp, - IN ULONG MethodSetsCount, - IN PKSMETHOD_SET MethodSet) + _In_ PIRP Irp, + _In_ ULONG MethodSetsCount, + _In_reads_(MethodSetsCount) const KSMETHOD_SET* MethodSet) { return KspMethodHandlerWithAllocator(Irp, MethodSetsCount, MethodSet, NULL, 0); } @@ -203,15 +204,16 @@ /* @implemented */ +_IRQL_requires_max_(PASSIVE_LEVEL) KSDDKAPI NTSTATUS NTAPI KsMethodHandlerWithAllocator( - IN PIRP Irp, - IN ULONG MethodSetsCount, - IN PKSMETHOD_SET MethodSet, - IN PFNKSALLOCATOR Allocator OPTIONAL, - IN ULONG MethodItemSize OPTIONAL) + _In_ PIRP Irp, + _In_ ULONG MethodSetsCount, + _In_reads_(MethodSetsCount) const KSMETHOD_SET* MethodSet, + _In_opt_ PFNKSALLOCATOR Allocator, + _In_opt_ ULONG MethodItemSize) { return KspMethodHandlerWithAllocator(Irp, MethodSetsCount, MethodSet, Allocator, MethodItemSize); } Modified: trunk/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Sat May 10 10:02:09 2014 @@ -103,7 +103,7 @@ OUT PVOID * Result) { PIO_STACK_LOCATION IoStack; - ULONG ObjectLength, ParametersLength; + SIZE_T ObjectLength, ParametersLength; PVOID Buffer; /* get current irp stack */ @@ -129,7 +129,7 @@ /* store result */ *Result = Buffer; - *Size = ParametersLength; + *Size = (ULONG)ParametersLength; return STATUS_SUCCESS; } @@ -199,7 +199,7 @@ PKSBASIC_HEADER BasicHeader = (PKSBASIC_HEADER)((ULONG_PTR)Object - sizeof(KSBASIC_HEADER)); /* sanity check */ - ASSERT(BasicHeader->Type == KsObjectTypeDevice || BasicHeader->Type == KsObjectTypeFilterFactory || + ASSERT(BasicHeader->Type == KsObjectTypeDevice || BasicHeader->Type == KsObjectTypeFilterFactory || BasicHeader->Type == KsObjectTypeFilter || BasicHeader->Type == KsObjectTypePin); /* return objects outer unknown */ Modified: trunk/reactos/drivers/ksfilter/ks/property.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/proper… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] Sat May 10 10:02:09 2014 @@ -300,7 +300,7 @@ if (Allocator) { /* allocate the requested amount */ - Status = Allocator(Irp, Irp->IoStatus.Information, FALSE); + Status = Allocator(Irp, (ULONG)Irp->IoStatus.Information, FALSE); /* check if the block was allocated */ if (!NT_SUCCESS(Status)) @@ -364,15 +364,16 @@ /* @implemented */ +_IRQL_requires_max_(PASSIVE_LEVEL) KSDDKAPI NTSTATUS NTAPI KsPropertyHandlerWithAllocator( - IN PIRP Irp, - IN ULONG PropertySetsCount, - IN PKSPROPERTY_SET PropertySet, - IN PFNKSALLOCATOR Allocator OPTIONAL, - IN ULONG PropertyItemSize OPTIONAL) + _In_ PIRP Irp, + _In_ ULONG PropertySetsCount, + _In_reads_(PropertySetsCount) const KSPROPERTY_SET* PropertySet, + _In_opt_ PFNKSALLOCATOR Allocator, + _In_opt_ ULONG PropertyItemSize) { return KspPropertyHandler(Irp, PropertySetsCount, PropertySet, Allocator, PropertyItemSize); } Modified: trunk/reactos/drivers/ksfilter/ks/swenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/swenum… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] Sat May 10 10:02:09 2014 @@ -329,7 +329,7 @@ IN LPWSTR ReferenceString) { LPWSTR DeviceName; - ULONG Length; + SIZE_T Length; PLIST_ENTRY Entry; PBUS_DEVICE_ENTRY DeviceEntry = NULL; /* GCC warning */ BOOLEAN ItemExists = FALSE; @@ -523,7 +523,7 @@ IN OUT PWCHAR *String) { LPWSTR Name; - ULONG Length; + SIZE_T Length; PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)Context; /* sanity checks */ @@ -665,7 +665,7 @@ PIRP Irp, PBUS_DEVICE_ENTRY DeviceEntry) { - ULONG Length; + SIZE_T Length; LPWSTR Buffer; PIO_STACK_LOCATION IoStack; @@ -885,7 +885,7 @@ PBUS_DEVICE_ENTRY DeviceEntry; PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; LPWSTR Name; - ULONG Length; + SIZE_T Length; /* get current irp stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -972,7 +972,7 @@ IN PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension, IN PSWENUM_INSTALL_INTERFACE InstallInterface) { - ULONG Length, Index; + SIZE_T Length, Index; UNICODE_STRING DeviceString, InterfaceString, ReferenceString; HANDLE hKey, hDeviceKey, hInterfaceKey, hReferenceKey; NTSTATUS Status; @@ -1369,7 +1369,7 @@ PDEV_EXTENSION DeviceExtension; PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; PIO_STACK_LOCATION IoStack; - ULONG Length; + SIZE_T Length; NTSTATUS Status; LPWSTR Buffer; @@ -1489,7 +1489,7 @@ IN REFGUID InterfaceGuid OPTIONAL, IN PWCHAR ServiceRelativePath OPTIONAL) { - ULONG Length; + SIZE_T Length; NTSTATUS Status = STATUS_SUCCESS; UNICODE_STRING ServiceKeyPath = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Services\\"); PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=6321… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Sat May 10 10:02:09 2014 @@ -3525,7 +3525,7 @@ KsMethodHandler( _In_ PIRP Irp, _In_ ULONG MethodSetsCount, - _In_reads_(MethodSetsCount) const PKSMETHOD_SET MethodSet); + _In_reads_(MethodSetsCount) const KSMETHOD_SET* MethodSet); _IRQL_requires_max_(PASSIVE_LEVEL) KSDDKAPI @@ -3534,7 +3534,7 @@ KsMethodHandlerWithAllocator( _In_ PIRP Irp, _In_ ULONG MethodSetsCount, - _In_reads_(MethodSetsCount) const PKSMETHOD_SET MethodSet, + _In_reads_(MethodSetsCount) const KSMETHOD_SET* MethodSet, _In_opt_ PFNKSALLOCATOR Allocator, _In_opt_ ULONG MethodItemSize); @@ -3576,7 +3576,7 @@ KsPropertyHandlerWithAllocator( _In_ PIRP Irp, _In_ ULONG PropertySetsCount, - _In_reads_(PropertySetsCount) const PKSPROPERTY_SET PropertySet, + _In_reads_(PropertySetsCount) const KSPROPERTY_SET* PropertySet, _In_opt_ PFNKSALLOCATOR Allocator, _In_opt_ ULONG PropertyItemSize); @@ -3659,7 +3659,7 @@ KsEnableEventWithAllocator( _In_ PIRP Irp, _In_ ULONG EventSetsCount, - _In_reads_(EventSetsCount) const PKSEVENT_SET EventSet, + _In_reads_(EventSetsCount) const KSEVENT_SET* EventSet, _Inout_opt_ PLIST_ENTRY EventsList, _In_opt_ KSEVENTS_LOCKTYPE EventsFlags, _In_opt_ PVOID EventsLock, @@ -4819,7 +4819,7 @@ DECLARE_INTERFACE_(IKsControl,IUnknown) { - STDMETHOD_(NTSTATUS, QueryInterface)( THIS_ + STDMETHOD_(NTSTATUS, QueryInterface)( THIS_ REFIID InterfaceId, PVOID* Interface)PURE;

1 0

[akhaldi] 63213: [RPCRT4] * Fix the ros_diff.
by akhaldi＠svn.reactos.org 10 May '14

10 May '14

Author: akhaldi Date: Sat May 10 09:37:38 2014 New Revision: 63213 URL: http://svn.reactos.org/svn/reactos?rev=63213&view=rev Log: [RPCRT4] * Fix the ros_diff. Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ro… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff [iso-8859-1] Sat May 10 09:37:38 2014 @@ -1,695 +1,6 @@ -diff -prudN .\wine\dlls\rpcrt4/cproxy.c .\reactos\dll\win32\rpcrt4/cproxy.c ---- .\wine\dlls\rpcrt4/cproxy.c 2014-05-09 03:43:55.921033400 +0200 -+++ .\reactos\dll\win32\rpcrt4/cproxy.c 2013-12-27 18:11:56.483967600 +0100 -@@ -21,24 +21,7 @@ - * TODO: Handle non-i386 architectures - */ - --#include "config.h" --#include "wine/port.h" -- --#include <stdarg.h> -- --#define COBJMACROS -- --#include "windef.h" --#include "winbase.h" --#include "winerror.h" -- --#include "objbase.h" --#include "rpcproxy.h" -- --#include "cpsf.h" --#include "ndr_misc.h" --#include "ndr_stubless.h" --#include "wine/debug.h" -+#include "precomp.h" - - WINE_DEFAULT_DEBUG_CHANNEL(ole); - -diff -prudN .\wine\dlls\rpcrt4/cpsf.c .\reactos\dll\win32\rpcrt4/cpsf.c ---- .\wine\dlls\rpcrt4/cpsf.c 2014-05-09 03:43:55.924033600 +0200 -+++ .\reactos\dll\win32\rpcrt4/cpsf.c 2013-12-27 18:11:57.185968800 +0100 -@@ -18,28 +18,9 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - --#include "config.h" --#include "wine/port.h" -- --#include <stdarg.h> --#include <stdio.h> --#include <string.h> -- --#define COBJMACROS -- --#include "windef.h" --#include "winbase.h" --#include "winerror.h" --#include "winreg.h" -- --#include "objbase.h" -- --#include "rpcproxy.h" -- --#include "wine/unicode.h" --#include "wine/debug.h" -+#include "precomp.h" - --#include "cpsf.h" -+#include <winreg.h> - - WINE_DEFAULT_DEBUG_CHANNEL(ole); - -diff -prudN .\wine\dlls\rpcrt4/cstub.c .\reactos\dll\win32\rpcrt4/cstub.c ---- .\wine\dlls\rpcrt4/cstub.c 2014-05-09 03:43:55.927033800 +0200 -+++ .\reactos\dll\win32\rpcrt4/cstub.c 2013-12-27 18:11:56.905168300 +0100 -@@ -19,25 +19,7 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - --#include "config.h" --#include "wine/port.h" -- --#include <stdarg.h> -- --#define COBJMACROS -- --#include "windef.h" --#include "winbase.h" --#include "winerror.h" --#include "excpt.h" -- --#include "objbase.h" --#include "rpcproxy.h" -- --#include "wine/debug.h" --#include "wine/exception.h" -- --#include "cpsf.h" -+#include "precomp.h" - - WINE_DEFAULT_DEBUG_CHANNEL(ole); - -diff -prudN .\wine\dlls\rpcrt4/epm_towers.h .\reactos\dll\win32\rpcrt4/epm_towers.h ---- .\wine\dlls\rpcrt4/epm_towers.h 2014-05-09 03:43:55.988037200 +0200 -+++ .\reactos\dll\win32\rpcrt4/epm_towers.h 2013-12-27 18:11:57.170368800 +0100 -@@ -19,7 +19,9 @@ - * - */ - --#include "epm.h" -+#pragma once -+ -+#include <epm_c.h> - - #define EPM_PROTOCOL_DNET_NSP 0x04 - #define EPM_PROTOCOL_OSI_TP4 0x05 -diff -prudN .\wine\dlls\rpcrt4/msvc.S .\reactos\dll\win32\rpcrt4/msvc.S ---- .\wine\dlls\rpcrt4/msvc.S 1970-01-01 01:00:00.000000000 +0100 -+++ .\reactos\dll\win32\rpcrt4/msvc.S 2012-02-14 21:27:35.943001900 +0100 -@@ -0,0 +1,146 @@ -+ -+#include <asm.inc> -+ -+#ifdef _M_IX86 -+.code32 -+ -+EXTERN _ndr_client_call:PROC -+ -+PUBLIC _call_stubless_func -+_call_stubless_func: -+ -+ mov ecx,[esp+4] /* This Pointer */ -+ mov ecx,[ecx] /* This->lpVtbl */ -+ mov ecx,[ecx-8] /* MIDL_STUBLESS_PROXY_INFO */ -+ mov edx,[ecx+8] /* Info->FormatStringOffset */ -+ mov edx,[edx+eax*2] /* FormatStringOffset[index] */ -+ and edx, 0000FFFFh -+ add edx,[ecx+4] /* info->ProcFormatString + offset */ -+ mov eax, [edx+8] /* arguments size */ -+ and eax, 0000FFFFh -+ push eax -+ lea eax, [esp+8] /* &This */ -+ push eax -+ push edx /* format string */ -+ push [ecx] /* info->pstubdesc */ -+ call _ndr_client_call -+ lea esp, [esp+12] -+ pop edx /* arguments size */ -+ mov ecx, [esp] /* return address */ -+ add esp, edx -+ jmp ecx -+#else -+.code64 -+ -+EXTERN ndr_client_call:PROC -+ -+PUBLIC call_stubless_func -+FUNC call_stubless_func -+ mov [rsp + 8], rcx -+ .SAVEREG rcx, 8 -+ mov [rsp + 10h], rdx -+ .SAVEREG rdx, 10h -+ mov [rsp + 18h], r8 -+ .SAVEREG r8, 18h -+ mov [rsp + 20h], r9 -+ .SAVEREG r9, 20h -+ sub rsp, 38h -+ .ALLOCSTACK 38h -+ .ENDPROLOG -+ -+ lea r8, [rsp +38h + 8] /* &This */ -+ mov rcx, [rcx] /* This->lpVtbl */ -+ mov rcx, [rcx - 10h] /* MIDL_STUBLESS_PROXY_INFO */ -+ mov rdx, [rcx + 10h] /* info->FormatStringOffset */ -+ movzx rdx, word ptr [rdx+r10*2] /* FormatStringOffset[index] */ -+ add rdx, [rcx + 8] /* info->ProcFormatString + offset */ -+ mov rcx, [rcx] /* info->pStubDesc */ -+ -+ movaps [rsp + 20h], xmm1 -+ movaps [rsp + 28h], xmm2 -+ movaps [rsp + 30h], xmm3 -+ lea r9, [rsp + 18h] /* fpu_args */ -+ call ndr_client_call -+ add rsp, 38h -+ ret -+ENDFUNC -+ -+PUBLIC call_server_func -+FUNC call_server_func -+ push rbp -+ .PUSHREG rbp -+ mov rbp, rsp -+ push rsi -+ .PUSHREG rsi -+ push rdi -+ .PUSHREG rdi -+ .ENDPROLOG -+ -+ mov rax, rcx /* function to call */ -+ mov rcx, 32 /* allocate max(32,stack_size) bytes of stack space */ -+ cmp r8, rcx -+ cmovg rcx, r8 -+ sub rsp, rcx -+ and rsp, NOT 15 -+ mov rcx, r8 -+ shr rcx, 3 -+ mov rdi, rsp -+ mov rsi, rdx -+ rep movsq /* copy arguments */ -+ mov rcx, [rsp] -+ mov rdx, [rsp + 8] -+ mov r8, [rsp + 16] -+ mov r9, [rsp + 24] -+ movd xmm0, rcx -+ movd xmm1, rdx -+ movd xmm2, r8 -+ movd xmm3, r9 -+ call rax -+ -+ lea rsp, [rbp - 16] /* restore stack */ -+ pop rdi -+ pop rsi -+ pop rbp -+ ret -+ENDFUNC -+ -+ -+PUBLIC NdrClientCall2 -+FUNC NdrClientCall2 -+ mov [rsp + 18h], r8 -+ .SAVEREG r8, 18h -+ mov [rsp + 20h], r9 -+ .SAVEREG r9, 20h -+ sub rsp, 28h -+ .ALLOCSTACK 28h -+ .ENDPROLOG -+ -+ lea r8, [rsp + 28h + 18h] -+ xor r9, r9 -+ call ndr_client_call -+ -+ add rsp, 28h -+ ret -+ENDFUNC -+ -+EXTERN ndr_async_client_call:PROC -+PUBLIC NdrAsyncClientCall -+FUNC NdrAsyncClientCall -+ mov [rsp + 18h], r8 -+ .SAVEREG r8, 18h -+ mov [rsp + 20h], r9 -+ .SAVEREG r9, 20h -+ sub rsp, 28h -+ .ALLOCSTACK 28h -+ .ENDPROLOG -+ -+ lea r8, [rsp + 28h + 18h] -+ call ndr_async_client_call -+ -+ add rsp, 28h -+ ret -+ENDFUNC -+ -+#endif -+ -+END -diff -prudN .\wine\dlls\rpcrt4/ncastatus.h .\reactos\dll\win32\rpcrt4/ncastatus.h ---- .\wine\dlls\rpcrt4/ncastatus.h 2014-05-09 03:43:55.867030300 +0200 -+++ .\reactos\dll\win32\rpcrt4/ncastatus.h 2013-12-27 18:11:56.764768100 +0100 -@@ -18,6 +18,8 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -+#pragma once -+ - #define NCA_S_COMM_FAILURE 0x1C010001 - #define NCA_S_OP_RNG_ERROR 0x1C010002 - #define NCA_S_UNK_IF 0x1C010003 -diff -prudN .\wine\dlls\rpcrt4/ndr_clientserver.c .\reactos\dll\win32\rpcrt4/ndr_clientserver.c ---- .\wine\dlls\rpcrt4/ndr_clientserver.c 2014-05-09 03:43:55.931034000 +0200 -+++ .\reactos\dll\win32\rpcrt4/ndr_clientserver.c 2013-12-27 18:11:56.437167500 +0100 -@@ -22,22 +22,7 @@ - * - check for errors and throw exceptions - */ - --#include <stdarg.h> -- --#define COBJMACROS -- --#include "windef.h" --#include "winbase.h" --#include "winerror.h" -- --#include "objbase.h" -- --#include "rpcproxy.h" -- --#include "wine/debug.h" -- --#include "ndr_misc.h" --#include "rpcndr.h" -+#include "precomp.h" - - WINE_DEFAULT_DEBUG_CHANNEL(rpc); - -diff -prudN .\wine\dlls\rpcrt4/ndr_contexthandle.c .\reactos\dll\win32\rpcrt4/ndr_contexthandle.c ---- .\wine\dlls\rpcrt4/ndr_contexthandle.c 2014-05-09 03:43:55.935034200 +0200 -+++ .\reactos\dll\win32\rpcrt4/ndr_contexthandle.c 2013-12-27 18:11:56.639967900 +0100 -@@ -19,14 +19,7 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - --#include "ndr_misc.h" --#include "rpc_assoc.h" --#include "rpcndr.h" -- --#include "wine/rpcfc.h" -- --#include "wine/debug.h" --#include "wine/list.h" -+#include "precomp.h" - - WINE_DEFAULT_DEBUG_CHANNEL(ole); - -diff -prudN .\wine\dlls\rpcrt4/ndr_es.c .\reactos\dll\win32\rpcrt4/ndr_es.c ---- .\wine\dlls\rpcrt4/ndr_es.c 2014-05-09 03:43:55.938034400 +0200 -+++ .\reactos\dll\win32\rpcrt4/ndr_es.c 2013-12-27 18:11:56.764768100 +0100 -@@ -18,21 +18,9 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - --#include <stdarg.h> --#include <stdio.h> -- --#include "windef.h" --#include "winbase.h" --#include "winerror.h" --#include "rpc.h" --#include "midles.h" --#include "ndrtypes.h" -- --#include "ndr_misc.h" --#include "ndr_stubless.h" -+#include "precomp.h" - --#include "wine/debug.h" --#include "wine/rpcfc.h" -+#include <midles.h> - - WINE_DEFAULT_DEBUG_CHANNEL(ole); - -diff -prudN .\wine\dlls\rpcrt4/ndr_fullpointer.c .\reactos\dll\win32\rpcrt4/ndr_fullpointer.c ---- .\wine\dlls\rpcrt4/ndr_fullpointer.c 2014-05-09 03:43:55.941034600 +0200 -+++ .\reactos\dll\win32\rpcrt4/ndr_fullpointer.c 2013-12-27 18:11:56.655567900 +0100 -@@ -18,14 +18,7 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - --#include <stdarg.h> -- --#include "windef.h" --#include "winbase.h" --#include "rpc.h" --#include "rpcndr.h" -- --#include "wine/debug.h" -+#include "precomp.h" - - WINE_DEFAULT_DEBUG_CHANNEL(rpc); - -diff -prudN .\wine\dlls\rpcrt4/ndr_marshall.c .\reactos\dll\win32\rpcrt4/ndr_marshall.c ---- .\wine\dlls\rpcrt4/ndr_marshall.c 2014-05-09 03:43:55.945034800 +0200 -+++ .\reactos\dll\win32\rpcrt4/ndr_marshall.c 2014-04-27 11:37:38.078578700 +0200 -@@ -27,25 +27,7 @@ - * - Checks for integer addition overflow in user marshall functions - */ - --#include <assert.h> --#include <stdarg.h> --#include <stdio.h> --#include <string.h> --#include <limits.h> -- --#define NONAMELESSUNION --#include "windef.h" --#include "winbase.h" --#include "winerror.h" -- --#include "ndr_misc.h" --#include "rpcndr.h" --#include "ndrtypes.h" -- --#include "wine/unicode.h" --#include "wine/rpcfc.h" -- --#include "wine/debug.h" -+#include "precomp.h" - - WINE_DEFAULT_DEBUG_CHANNEL(ole); - -diff -prudN .\wine\dlls\rpcrt4/ndr_misc.h .\reactos\dll\win32\rpcrt4/ndr_misc.h ---- .\wine\dlls\rpcrt4/ndr_misc.h 2014-05-09 03:43:55.873030700 +0200 -+++ .\reactos\dll\win32\rpcrt4/ndr_misc.h 2013-12-27 18:11:56.624367800 +0100 -@@ -21,13 +21,6 @@ - #ifndef __WINE_NDR_MISC_H - #define __WINE_NDR_MISC_H - --#include <stdarg.h> -- --#include "windef.h" --#include "winbase.h" --#include "rpc.h" --#include "rpcndr.h" -- - struct IPSFactoryBuffer; - - PFORMAT_STRING ComputeConformanceOrVariance( -diff -prudN .\wine\dlls\rpcrt4/ndr_ole.c .\reactos\dll\win32\rpcrt4/ndr_ole.c ---- .\wine\dlls\rpcrt4/ndr_ole.c 2014-05-09 03:43:55.948035000 +0200 -+++ .\reactos\dll\win32\rpcrt4/ndr_ole.c 2013-12-27 18:11:56.468367600 +0100 -@@ -22,27 +22,7 @@ - * - finish RpcStream_Vtbl - */ - --#include <stdarg.h> --#include <stdio.h> --#include <string.h> -- --#define COBJMACROS --#define NONAMELESSUNION --#define NONAMELESSSTRUCT -- --#include "windef.h" --#include "winbase.h" --#include "winerror.h" -- --#include "objbase.h" -- --#include "ndr_misc.h" --#include "rpcndr.h" --#include "rpcproxy.h" --#include "wine/rpcfc.h" --#include "cpsf.h" -- --#include "wine/debug.h" -+#include "precomp.h" - - WINE_DEFAULT_DEBUG_CHANNEL(ole); - -diff -prudN .\wine\dlls\rpcrt4/ndr_stubless.c .\reactos\dll\win32\rpcrt4/ndr_stubless.c ---- .\wine\dlls\rpcrt4/ndr_stubless.c 2014-05-09 03:43:55.952035200 +0200 -+++ .\reactos\dll\win32\rpcrt4/ndr_stubless.c 2013-12-27 18:11:56.437167500 +0100 -@@ -23,28 +23,7 @@ - * - Some types of binding handles - */ - --#include "config.h" --#include "wine/port.h" -- --#include <stdarg.h> --#include <stdio.h> --#include <string.h> -- --#include "windef.h" --#include "winbase.h" --#include "winerror.h" -- --#include "objbase.h" --#include "rpc.h" --#include "rpcproxy.h" -- --#include "wine/exception.h" --#include "wine/debug.h" --#include "wine/rpcfc.h" -- --#include "cpsf.h" --#include "ndr_misc.h" --#include "ndr_stubless.h" -+#include "precomp.h" - - WINE_DEFAULT_DEBUG_CHANNEL(rpc); - -diff -prudN .\wine\dlls\rpcrt4/ndr_stubless.h .\reactos\dll\win32\rpcrt4/ndr_stubless.h ---- .\wine\dlls\rpcrt4/ndr_stubless.h 2014-05-09 03:43:55.878030900 +0200 -+++ .\reactos\dll\win32\rpcrt4/ndr_stubless.h 2013-12-27 18:11:56.452767500 +0100 -@@ -18,10 +18,12 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - --#include "ndrtypes.h" -+#pragma once -+ -+#include <ndrtypes.h> - - /* there can't be any alignment with the structures in this file */ --#include "pshpack1.h" -+#include <pshpack1.h> - - typedef struct _NDR_PROC_HEADER - { -@@ -223,7 +225,7 @@ typedef struct _NDR_EHD_CONTEXT - unsigned char param_num; - } NDR_EHD_CONTEXT; - --#include "poppack.h" -+#include <poppack.h> - - enum stubless_phase - { -diff -prudN .\wine\dlls\rpcrt4/precomp.h .\reactos\dll\win32\rpcrt4/precomp.h ---- .\wine\dlls\rpcrt4/precomp.h 1970-01-01 01:00:00.000000000 +0100 -+++ .\reactos\dll\win32\rpcrt4/precomp.h 2014-03-14 01:43:22.357516600 +0100 -@@ -0,0 +1,40 @@ -+#ifndef _RPCRT4_PCH_ -+#define _RPCRT4_PCH_ -+ -+#include <config.h> -+ -+#include <assert.h> -+#include <stdarg.h> -+#include <stdio.h> -+ -+#define _INC_WINDOWS -+ -+#define COBJMACROS -+#define NONAMELESSUNION -+#define NONAMELESSSTRUCT -+ -+#include <ntstatus.h> -+#define WIN32_NO_STATUS -+#include <windef.h> -+#include <winbase.h> -+#include <winternl.h> -+#include <objbase.h> -+#include <rpcproxy.h> -+#include <security.h> -+ -+#include <wine/debug.h> -+#include <wine/exception.h> -+#include <wine/list.h> -+#include <wine/rpcfc.h> -+#include <wine/unicode.h> -+ -+#include "cpsf.h" -+#include "ncastatus.h" -+#include "ndr_misc.h" -+#include "ndr_stubless.h" -+#include "rpc_assoc.h" -+#include "rpc_binding.h" -+#include "rpc_message.h" -+#include "rpc_server.h" -+ -+#endif /* _RPCRT4_PCH_ */ -diff -prudN .\wine\dlls\rpcrt4/rpc_assoc.c .\reactos\dll\win32\rpcrt4/rpc_assoc.c ---- .\wine\dlls\rpcrt4/rpc_assoc.c 2014-05-09 03:43:55.955035400 +0200 -+++ .\reactos\dll\win32\rpcrt4/rpc_assoc.c 2013-12-27 18:11:56.780368100 +0100 -@@ -19,19 +19,7 @@ - * - */ - --#include <stdarg.h> --#include <assert.h> -- --#include "rpc.h" --#include "rpcndr.h" --#include "winternl.h" -- --#include "wine/unicode.h" --#include "wine/debug.h" -- --#include "rpc_binding.h" --#include "rpc_assoc.h" --#include "rpc_message.h" -+#include "precomp.h" - - WINE_DEFAULT_DEBUG_CHANNEL(rpc); - -diff -prudN .\wine\dlls\rpcrt4/rpc_assoc.h .\reactos\dll\win32\rpcrt4/rpc_assoc.h ---- .\wine\dlls\rpcrt4/rpc_assoc.h 2014-05-09 03:43:55.884031300 +0200 -+++ .\reactos\dll\win32\rpcrt4/rpc_assoc.h 2013-12-27 18:11:56.905168300 +0100 -@@ -20,7 +20,6 @@ - */ - - #include "rpc_binding.h" --#include "wine/list.h" - - typedef struct _RpcAssoc - { -diff -prudN .\wine\dlls\rpcrt4/rpc_async.c .\reactos\dll\win32\rpcrt4/rpc_async.c ---- .\wine\dlls\rpcrt4/rpc_async.c 2014-05-09 03:43:55.958035500 +0200 -+++ .\reactos\dll\win32\rpcrt4/rpc_async.c 2013-12-27 18:11:56.468367600 +0100 -@@ -19,17 +19,7 @@ - * - */ - --#include <stdarg.h> -- --#include "rpc.h" --#include "rpcndr.h" --#include "rpcasync.h" -- --#include "wine/debug.h" -- --#include "rpc_binding.h" --#include "rpc_message.h" --#include "ndr_stubless.h" -+#include "precomp.h" - - WINE_DEFAULT_DEBUG_CHANNEL(rpc); - -diff -prudN .\wine\dlls\rpcrt4/rpc_binding.c .\reactos\dll\win32\rpcrt4/rpc_binding.c ---- .\wine\dlls\rpcrt4/rpc_binding.c 2014-05-09 03:43:55.962035800 +0200 -+++ .\reactos\dll\win32\rpcrt4/rpc_binding.c 2013-12-27 18:11:56.452767500 +0100 -@@ -21,25 +21,7 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - --#include <stdarg.h> --#include <stdio.h> --#include <string.h> --#include <assert.h> -- --#include "windef.h" --#include "winbase.h" --#include "winnls.h" --#include "winerror.h" --#include "winternl.h" --#include "wine/unicode.h" -- --#include "rpc.h" --#include "rpcndr.h" -- --#include "wine/debug.h" -- --#include "rpc_binding.h" --#include "rpc_assoc.h" -+#include "precomp.h" - - WINE_DEFAULT_DEBUG_CHANNEL(rpc); - -diff -prudN .\wine\dlls\rpcrt4/rpc_binding.h .\reactos\dll\win32\rpcrt4/rpc_binding.h ---- .\wine\dlls\rpcrt4/rpc_binding.h 2014-05-09 03:43:55.890031600 +0200 -+++ .\reactos\dll\win32\rpcrt4/rpc_binding.h 2013-12-27 18:11:56.483967600 +0100 -@@ -21,12 +21,8 @@ - #ifndef __WINE_RPC_BINDING_H - #define __WINE_RPC_BINDING_H - --#include "rpcndr.h" --#include "security.h" --#include "wine/list.h" - #include "rpc_defs.h" - -- - enum secure_packet_direction - { - SECURE_PACKET_SEND, -diff -prudN .\wine\dlls\rpcrt4/rpc_defs.h .\reactos\dll\win32\rpcrt4/rpc_defs.h ---- .\wine\dlls\rpcrt4/rpc_defs.h 2014-05-09 03:43:55.895031900 +0200 -+++ .\reactos\dll\win32\rpcrt4/rpc_defs.h 2013-01-25 00:19:54.167254400 +0100 -@@ -22,7 +22,7 @@ - #ifndef __WINE_RPC_DEFS_H - #define __WINE_RPC_DEFS_H - --#include "pshpack1.h" -+#include <pshpack1.h> - typedef struct - { - unsigned char rpc_ver; /* RPC major version (5) */ -@@ -168,7 +168,7 @@ typedef struct - unsigned char auth_reserved; /* reserved, must be zero */ - unsigned int auth_context_id; /* unique value for the authenticated connection */ - } RpcAuthVerifier; --#include "poppack.h" -+#include <poppack.h> - - #define RPC_AUTH_VERIFIER_LEN(common_hdr) \ - ((common_hdr)->auth_len ? (common_hdr)->auth_len + sizeof(RpcAuthVerifier) : 0) diff -prudN .\wine\dlls\rpcrt4/rpc_epmap.c .\reactos\dll\win32\rpcrt4/rpc_epmap.c --- .\wine\dlls\rpcrt4/rpc_epmap.c 2014-05-09 03:43:55.965035900 +0200 +++ .\reactos\dll\win32\rpcrt4/rpc_epmap.c 2013-12-27 18:11:56.421567500 +0100 -@@ -20,19 +20,7 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - --#include <stdarg.h> -- --#include "windef.h" --#include "winbase.h" --#include "winerror.h" -- --#include "rpc.h" -- --#include "wine/debug.h" --#include "wine/exception.h" -- --#include "rpc_binding.h" --#include "epm.h" -+#include "precomp.h" - #include "epm_towers.h" - - WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -92,7 +80,7 @@ static BOOL start_rpcss(void) lstrcatW( cmd, rpcss ); @@ -708,86 +19,9 @@ { case EXCEPTION_ACCESS_VIOLATION: case EXCEPTION_ILLEGAL_INSTRUCTION: -diff -prudN .\wine\dlls\rpcrt4/rpc_message.c .\reactos\dll\win32\rpcrt4/rpc_message.c ---- .\wine\dlls\rpcrt4/rpc_message.c 2014-05-09 03:43:55.969036200 +0200 -+++ .\reactos\dll\win32\rpcrt4/rpc_message.c 2014-04-27 11:37:38.078578700 +0200 -@@ -20,25 +20,9 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - --#include <stdarg.h> --#include <stdio.h> --#include <string.h> -- --#include "windef.h" --#include "winbase.h" --#include "winerror.h" --#include "winuser.h" -- --#include "rpc.h" --#include "rpcndr.h" --#include "rpcdcep.h" -- --#include "wine/debug.h" -+#include "precomp.h" - --#include "rpc_binding.h" --#include "rpc_defs.h" --#include "rpc_message.h" --#include "ncastatus.h" -+#include <winuser.h> - - WINE_DEFAULT_DEBUG_CHANNEL(rpc); - -diff -prudN .\wine\dlls\rpcrt4/rpc_message.h .\reactos\dll\win32\rpcrt4/rpc_message.h ---- .\wine\dlls\rpcrt4/rpc_message.h 2014-05-09 03:43:55.901032300 +0200 -+++ .\reactos\dll\win32\rpcrt4/rpc_message.h 2013-12-27 18:11:56.499567600 +0100 -@@ -21,8 +21,6 @@ - #ifndef __WINE_RPC_MESSAGE_H - #define __WINE_RPC_MESSAGE_H - --#include "rpc_defs.h" -- - typedef unsigned int NCA_STATUS; - - RpcPktHdr *RPCRT4_BuildFaultHeader(ULONG DataRepresentation, RPC_STATUS Status) DECLSPEC_HIDDEN; diff -prudN .\wine\dlls\rpcrt4/rpc_server.c .\reactos\dll\win32\rpcrt4/rpc_server.c --- .\wine\dlls\rpcrt4/rpc_server.c 2014-05-09 03:43:55.973036400 +0200 +++ .\reactos\dll\win32\rpcrt4/rpc_server.c 2013-12-27 18:11:56.780368100 +0100 -@@ -20,31 +20,9 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - --#include "config.h" --#include "wine/port.h" -- --#include <stdarg.h> --#include <stdio.h> --#include <string.h> --#include <assert.h> -- --#include "windef.h" --#include "winbase.h" --#include "winerror.h" -- --#include "rpc.h" --#include "rpcndr.h" --#include "excpt.h" -- --#include "wine/debug.h" --#include "wine/exception.h" -+#include "precomp.h" - --#include "rpc_server.h" --#include "rpc_assoc.h" --#include "rpc_message.h" --#include "rpc_defs.h" --#include "ncastatus.h" --#include "secext.h" -+#include <secext.h> - - WINE_DEFAULT_DEBUG_CHANNEL(rpc); - @@ -1075,8 +1053,10 @@ void RPCRT4_destroy_all_protseqs(void) EnterCriticalSection(&server_cs); LIST_FOR_EACH_ENTRY_SAFE(cps, cursor2, &protseqs, RpcServerProtseq, entry) @@ -799,61 +33,9 @@ destroy_serverprotoseq(cps); } LeaveCriticalSection(&server_cs); -diff -prudN .\wine\dlls\rpcrt4/rpc_server.h .\reactos\dll\win32\rpcrt4/rpc_server.h ---- .\wine\dlls\rpcrt4/rpc_server.h 2014-05-09 03:43:55.907032600 +0200 -+++ .\reactos\dll\win32\rpcrt4/rpc_server.h 2013-12-27 18:11:56.905168300 +0100 -@@ -22,7 +22,6 @@ - #define __WINE_RPC_SERVER_H - - #include "rpc_binding.h" --#include "wine/list.h" - - struct protseq_ops; - diff -prudN .\wine\dlls\rpcrt4/rpc_transport.c .\reactos\dll\win32\rpcrt4/rpc_transport.c --- .\wine\dlls\rpcrt4/rpc_transport.c 2014-05-09 03:43:55.977036600 +0200 +++ .\reactos\dll\win32\rpcrt4/rpc_transport.c 2014-05-09 03:10:59.250551600 +0200 -@@ -23,14 +23,7 @@ - * - */ - --#include "config.h" -- --#include <stdarg.h> --#include <stdio.h> --#include <string.h> --#include <assert.h> --#include <stdlib.h> --#include <sys/types.h> -+#include "precomp.h" - - #if defined(__MINGW32__) || defined (_MSC_VER) - # include <ws2tcpip.h> -@@ -76,23 +69,8 @@ - # define ioctlsocket ioctl - #endif /* defined(__MINGW32__) || defined (_MSC_VER) */ - --#include "windef.h" --#include "winbase.h" --#include "winnls.h" --#include "winerror.h" --#include "wininet.h" --#include "winternl.h" --#include "wine/unicode.h" -- --#include "rpc.h" --#include "rpcndr.h" -- --#include "wine/debug.h" -+#include <wininet.h> - --#include "rpc_binding.h" --#include "rpc_assoc.h" --#include "rpc_message.h" --#include "rpc_server.h" - #include "epm_towers.h" - - #ifndef SOL_TCP @@ -113,31 +91,41 @@ typedef struct _RpcConnection_np { RpcConnection common; @@ -1151,78 +333,3 @@ @ stub NdrRpcSsDefaultAllocate @ stub NdrRpcSsDefaultFree @ stub NdrRpcSsDisableAllocate -diff -prudN .\wine\dlls\rpcrt4/rpcrt4_main.c .\reactos\dll\win32\rpcrt4/rpcrt4_main.c ---- .\wine\dlls\rpcrt4/rpcrt4_main.c 2014-05-09 03:43:55.980036800 +0200 -+++ .\reactos\dll\win32\rpcrt4/rpcrt4_main.c 2014-05-09 03:45:42.047103500 +0200 -@@ -28,35 +28,10 @@ - * NT-based native rpcrt4's. Commonly-used transport for self-to-self RPC's. - */ - --#include "config.h" -- --#include <stdarg.h> --#include <stdio.h> --#include <stdlib.h> --#include <string.h> -- --#include "ntstatus.h" --#define WIN32_NO_STATUS --#include "windef.h" --#include "winerror.h" --#include "winbase.h" --#include "winuser.h" --#include "winnt.h" --#include "winternl.h" --#include "ntsecapi.h" --#include "iptypes.h" --#include "iphlpapi.h" --#include "wine/unicode.h" --#include "rpc.h" -- --#include "ole2.h" --#include "rpcndr.h" --#include "rpcproxy.h" -- --#include "rpc_binding.h" --#include "rpc_server.h" -+#include "precomp.h" - --#include "wine/debug.h" -+#include <ntsecapi.h> -+#include <iphlpapi.h> - - WINE_DEFAULT_DEBUG_CHANNEL(rpc); - -diff -prudN .\wine\dlls\rpcrt4/unix_func.c .\reactos\dll\win32\rpcrt4/unix_func.c ---- .\wine\dlls\rpcrt4/unix_func.c 1970-01-01 01:00:00.000000000 +0100 -+++ .\reactos\dll\win32\rpcrt4/unix_func.c 2013-01-25 00:19:53.278052800 +0100 -@@ -0,0 +1,29 @@ -+#define WIN32_NO_STATUS -+#define _INC_WINDOWS -+#include <windef.h> -+#include <winsock2.h> -+ -+const char * -+WSAAPI -+inet_ntop (int af, -+ const void *src, -+ char *dst, -+ size_t cnt) -+{ -+ struct in_addr in; -+ char *text_addr; -+ -+ if (af == AF_INET) -+ { -+ memcpy(&in.s_addr, src, sizeof(in.s_addr)); -+ text_addr = inet_ntoa(in); -+ if (text_addr && dst) -+ { -+ strncpy(dst, text_addr, cnt); -+ return dst; -+ } -+ } -+ -+ return 0; -+} -+

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