August 2019 - Wine-Devel - list.winehq.org

[PATCH] advapi32: Initialize the LsaLookupSids() LSA_TRANSLATED_NAME.Name string properly
by Damjan Jovanovic Aug. 2, 2019

Aug. 2, 2019

This fixes Bugzilla bug https://bugs.winehq.org/show_bug.cgi?id=39129 and gets Cygwin's postinstall scripts not to crash. The patch is from wine-staging, and was first submitted to Wine on 7 April 2015: https://github.com/wine-compholio/wine-staging/blob/master/patches/advapi32… Original submission comments: ---snip--- advapi32: Initialize buffer length to zero in LsaLookupSids to prevent crash. (try 2) Superseded 110588-110594 Try 2: - Use RtlInitUnicodeStringEx to simplify code when possible. Same for other patches in this series. (Thanks Nikolay) ---snip--- From: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/advapi32/lsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 2/2] gdi32: Add D3DKMTQueryStatistics stub
by Alistair Leslie-Hughes Aug. 2, 2019

Aug. 2, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47074 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/gdi32/driver.c | 9 +++++++++ dlls/gdi32/gdi32.spec | 1 + include/ddk/d3dkmthk.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 90f9656085..fc0839f51d 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1447,3 +1447,12 @@ NTSTATUS WINAPI D3DKMTDestroyDevice( const D3DKMT_DESTROYDEVICE *desc ) return status; } + +/****************************************************************************** + * D3DKMTQueryStatistics [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats) +{ + FIXME("(%p): stub\n", stats); + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 9abd82173c..cc5d2c21a3 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -88,6 +88,7 @@ @ stdcall D3DKMTEscape(ptr) @ stdcall D3DKMTOpenAdapterFromGdiDisplayName(ptr) @ stdcall D3DKMTOpenAdapterFromHdc(ptr) +@ stdcall D3DKMTQueryStatistics(ptr) @ stdcall DPtoLP(long ptr long) @ stdcall DeleteColorSpace(long) @ stdcall DeleteDC(long) diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 8e28c94bbf..ea4df3a9e0 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -608,6 +608,7 @@ NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDevice(const D3DKMT_DESTROYDEVICE *desc); NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); +NTSTATUS WINAPI D3DKMTQueryStatistics(D3DKMT_QUERYSTATISTICS *stats); #ifdef __cplusplus } -- 2.17.1

2 1

[PATCH 1/2] include: Add missing D3DKMT typedefs
by Alistair Leslie-Hughes Aug. 2, 2019

Aug. 2, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/ddk/d3dkmthk.h | 437 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 437 insertions(+) diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 081758bf5d..8e28c94bbf 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -136,6 +136,8 @@ typedef struct _D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId; } D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP; +#define D3DKMT_QUERYSTATISTICS_SEGMENT_PREFERENCE_MAX 5 + typedef struct _D3DKMT_CLOSEADAPTER { D3DKMT_HANDLE hAdapter; @@ -160,6 +162,441 @@ typedef struct _D3DKMT_DESTROYDCFROMMEMORY HANDLE hBitmap; } D3DKMT_DESTROYDCFROMMEMORY; +typedef enum _D3DKMT_QUERYRESULT_PREEMPTION_ATTEMPT_RESULT +{ + D3DKMT_PreemptionAttempt = 0, + D3DKMT_PreemptionAttemptSuccess = 1, + D3DKMT_PreemptionAttemptMissNoCommand = 2, + D3DKMT_PreemptionAttemptMissNotEnabled = 3, + D3DKMT_PreemptionAttemptMissNextFence = 4, + D3DKMT_PreemptionAttemptMissPagingCommand = 5, + D3DKMT_PreemptionAttemptMissSplittedCommand = 6, + D3DKMT_PreemptionAttemptMissFenceCommand = 7, + D3DKMT_PreemptionAttemptMissRenderPendingFlip = 8, + D3DKMT_PreemptionAttemptMissNotMakingProgress = 9, + D3DKMT_PreemptionAttemptMissLessPriority = 10, + D3DKMT_PreemptionAttemptMissRemainingQuantum = 11, + D3DKMT_PreemptionAttemptMissRemainingPreemptionQuantum = 12, + D3DKMT_PreemptionAttemptMissAlreadyPreempting = 13, + D3DKMT_PreemptionAttemptMissGlobalBlock = 14, + D3DKMT_PreemptionAttemptMissAlreadyRunning = 15, + D3DKMT_PreemptionAttemptStatisticsMax +} D3DKMT_QUERYRESULT_PREEMPTION_ATTEMPT_RESULT; + +typedef enum _D3DKMT_QUERYSTATISTICS_ALLOCATION_PRIORITY_CLASS +{ + D3DKMT_AllocationPriorityClassMinimum, + D3DKMT_AllocationPriorityClassLow, + D3DKMT_AllocationPriorityClassNormal, + D3DKMT_AllocationPriorityClassHigh, + D3DKMT_AllocationPriorityClassMaximum, + D3DKMT_MaxAllocationPriorityClass +} D3DKMT_QUERYSTATISTICS_ALLOCATION_PRIORITY_CLASS; + +typedef enum _D3DKMT_QUERYSTATISTICS_QUEUE_PACKET_TYPE +{ + D3DKMT_RenderCommandBuffer, + D3DKMT_DeferredCommandBuffer, + D3DKMT_SystemCommandBuffer, + D3DKMT_MmIoFlipCommandBuffer, + D3DKMT_WaitCommandBuffer, + D3DKMT_SignalCommandBuffer, + D3DKMT_DeviceCommandBuffer, + D3DKMT_SoftwareCommandBuffer, + D3DKMT_QueuePacketTypeMax +} D3DKMT_QUERYSTATISTICS_QUEUE_PACKET_TYPE; + +typedef enum _D3DKMT_QUERYSTATISTICS_DMA_PACKET_TYPE +{ + D3DKMT_ClientRenderBuffer, + D3DKMT_ClientPagingBuffer, + D3DKMT_SystemPagingBuffer, + D3DKMT_SystemPreemptionBuffer, + D3DKMT_DmaPacketTypeMax +} D3DKMT_QUERYSTATISTICS_DMA_PACKET_TYPE; + +typedef struct _D3DKMT_QUERYSTATSTICS_PAGING_TRANSFER +{ + ULONGLONG BytesFilled; + ULONGLONG BytesDiscarded; + ULONGLONG BytesMappedIntoAperture; + ULONGLONG BytesUnmappedFromAperture; + ULONGLONG BytesTransferredFromMdlToMemory; + ULONGLONG BytesTransferredFromMemoryToMdl; + ULONGLONG BytesTransferredFromApertureToMemory; + ULONGLONG BytesTransferredFromMemoryToAperture; +} D3DKMT_QUERYSTATSTICS_PAGING_TRANSFER; + +typedef struct _D3DKMT_QUERYSTATISTICS_COMMITMENT_DATA +{ + ULONG64 TotalBytesEvictedFromProcess; + ULONG64 BytesBySegmentPreference[D3DKMT_QUERYSTATISTICS_SEGMENT_PREFERENCE_MAX]; +} D3DKMT_QUERYSTATISTICS_COMMITMENT_DATA; + +typedef struct _D3DKMT_QUERYSTATSTICS_SWIZZLING_RANGE +{ + ULONG NbRangesAcquired; + ULONG NbRangesReleased; +} D3DKMT_QUERYSTATSTICS_SWIZZLING_RANGE; + +typedef struct _D3DKMT_QUERYSTATISTICS_COUNTER +{ + ULONG Count; + ULONGLONG Bytes; +} D3DKMT_QUERYSTATISTICS_COUNTER; + +typedef struct _D3DKMT_QUERYSTATISTICS_DMA_BUFFER +{ + D3DKMT_QUERYSTATISTICS_COUNTER Size; + ULONG AllocationListBytes; + ULONG PatchLocationListBytes; +} D3DKMT_QUERYSTATISTICS_DMA_BUFFER; + +typedef struct _D3DKMT_QUERYSTATSTICS_LOCKS +{ + ULONG NbLocks; + ULONG NbLocksWaitFlag; + ULONG NbLocksDiscardFlag; + ULONG NbLocksNoOverwrite; + ULONG NbLocksNoReadSync; + ULONG NbLocksLinearization; + ULONG NbComplexLocks; +} D3DKMT_QUERYSTATSTICS_LOCKS; + +typedef struct _D3DKMT_QUERYSTATSTICS_ALLOCATIONS +{ + D3DKMT_QUERYSTATISTICS_COUNTER Created; + D3DKMT_QUERYSTATISTICS_COUNTER Destroyed; + D3DKMT_QUERYSTATISTICS_COUNTER Opened; + D3DKMT_QUERYSTATISTICS_COUNTER Closed; + D3DKMT_QUERYSTATISTICS_COUNTER MigratedSuccess; + D3DKMT_QUERYSTATISTICS_COUNTER MigratedFail; + D3DKMT_QUERYSTATISTICS_COUNTER MigratedAbandoned; +} D3DKMT_QUERYSTATSTICS_ALLOCATIONS; + +typedef struct _D3DKMT_QUERYSTATSTICS_TERMINATIONS +{ + D3DKMT_QUERYSTATISTICS_COUNTER TerminatedShared; + D3DKMT_QUERYSTATISTICS_COUNTER TerminatedNonShared; + D3DKMT_QUERYSTATISTICS_COUNTER DestroyedShared; + D3DKMT_QUERYSTATISTICS_COUNTER DestroyedNonShared; +} D3DKMT_QUERYSTATSTICS_TERMINATIONS; + +typedef struct _D3DKMT_QUERYSTATISTICS_QUERY_NODE +{ + ULONG NodeId; +} D3DKMT_QUERYSTATISTICS_QUERY_NODE; + +typedef struct _D3DKMT_QUERYSTATISTICS_QUERY_SEGMENT +{ + ULONG SegmentId; +} D3DKMT_QUERYSTATISTICS_QUERY_SEGMENT; + +typedef struct _D3DKMT_QUERYSTATISTICS_PREEMPTION_INFORMATION +{ + ULONG PreemptionCounter[D3DKMT_PreemptionAttemptStatisticsMax]; +} D3DKMT_QUERYSTATISTICS_PREEMPTION_INFORMATION; + +typedef struct _D3DKMT_QUERYSTATISTICS_QUERY_VIDPNSOURCE +{ + ULONG VidPnSourceId; +} D3DKMT_QUERYSTATISTICS_QUERY_VIDPNSOURCE; + +typedef struct _D3DKMT_QUERYSTATISTICS_QUEUE_PACKET_TYPE_INFORMATION +{ + ULONG PacketSubmited; + ULONG PacketCompleted; +} D3DKMT_QUERYSTATISTICS_QUEUE_PACKET_TYPE_INFORMATION; + +typedef struct _D3DKMT_QUERYSTATISTICS_DMA_PACKET_TYPE_INFORMATION +{ + ULONG PacketSubmited; + ULONG PacketCompleted; + ULONG PacketPreempted; + ULONG PacketFaulted; +} D3DKMT_QUERYSTATISTICS_DMA_PACKET_TYPE_INFORMATION; + +typedef struct _D3DKMT_QUERYSTATISTICS_SYSTEM_MEMORY +{ + ULONGLONG BytesAllocated; + ULONGLONG BytesReserved; + ULONG SmallAllocationBlocks; + ULONG LargeAllocationBlocks; + ULONGLONG WriteCombinedBytesAllocated; + ULONGLONG WriteCombinedBytesReserved; + ULONGLONG CachedBytesAllocated; + ULONGLONG CachedBytesReserved; + ULONGLONG SectionBytesAllocated; + ULONGLONG SectionBytesReserved; +} D3DKMT_QUERYSTATISTICS_SYSTEM_MEMORY; + +typedef enum _D3DKMT_QUERYSTATISTICS_TYPE +{ + D3DKMT_QUERYSTATISTICS_ADAPTER, + D3DKMT_QUERYSTATISTICS_PROCESS, + D3DKMT_QUERYSTATISTICS_PROCESS_ADAPTER, + D3DKMT_QUERYSTATISTICS_SEGMENT, + D3DKMT_QUERYSTATISTICS_PROCESS_SEGMENT, + D3DKMT_QUERYSTATISTICS_NODE, + D3DKMT_QUERYSTATISTICS_PROCESS_NODE, + D3DKMT_QUERYSTATISTICS_VIDPNSOURCE, + D3DKMT_QUERYSTATISTICS_PROCESS_VIDPNSOURCE +} D3DKMT_QUERYSTATISTICS_TYPE; + +typedef struct _D3DKMT_QUERYSTATSTICS_PAGING_FAULT +{ + D3DKMT_QUERYSTATISTICS_COUNTER Faults; + D3DKMT_QUERYSTATISTICS_COUNTER FaultsFirstTimeAccess; + D3DKMT_QUERYSTATISTICS_COUNTER FaultsReclaimed; + D3DKMT_QUERYSTATISTICS_COUNTER FaultsMigration; + D3DKMT_QUERYSTATISTICS_COUNTER FaultsIncorrectResource; + D3DKMT_QUERYSTATISTICS_COUNTER FaultsLostContent; + D3DKMT_QUERYSTATISTICS_COUNTER FaultsEvicted; + D3DKMT_QUERYSTATISTICS_COUNTER AllocationsMEM_RESET; + D3DKMT_QUERYSTATISTICS_COUNTER AllocationsUnresetSuccess; + D3DKMT_QUERYSTATISTICS_COUNTER AllocationsUnresetFail; + ULONG AllocationsUnresetSuccessRead; + ULONG AllocationsUnresetFailRead; + D3DKMT_QUERYSTATISTICS_COUNTER Evictions; + D3DKMT_QUERYSTATISTICS_COUNTER EvictionsDueToPreparation; + D3DKMT_QUERYSTATISTICS_COUNTER EvictionsDueToLock; + D3DKMT_QUERYSTATISTICS_COUNTER EvictionsDueToClose; + D3DKMT_QUERYSTATISTICS_COUNTER EvictionsDueToPurge; + D3DKMT_QUERYSTATISTICS_COUNTER EvictionsDueToSuspendCPUAccess; +} D3DKMT_QUERYSTATSTICS_PAGING_FAULT; + +typedef struct _D3DKMT_QUERYSTATSTICS_REFERENCE_DMA_BUFFER +{ + ULONG NbCall; + ULONG NbAllocationsReferenced; + ULONG MaxNbAllocationsReferenced; + ULONG NbNULLReference; + ULONG NbWriteReference; + ULONG NbRenamedAllocationsReferenced; + ULONG NbIterationSearchingRenamedAllocation; + ULONG NbLockedAllocationReferenced; + ULONG NbAllocationWithValidPrepatchingInfoReferenced; + ULONG NbAllocationWithInvalidPrepatchingInfoReferenced; + ULONG NbDMABufferSuccessfullyPrePatched; + ULONG NbPrimariesReferencesOverflow; + ULONG NbAllocationWithNonPreferredResources; + ULONG NbAllocationInsertedInMigrationTable; +} D3DKMT_QUERYSTATSTICS_REFERENCE_DMA_BUFFER; + +typedef struct _D3DKMT_QUERYSTATSTICS_RENAMING +{ + ULONG NbAllocationsRenamed; + ULONG NbAllocationsShrinked; + ULONG NbRenamedBuffer; + ULONG MaxRenamingListLength; + ULONG NbFailuresDueToRenamingLimit; + ULONG NbFailuresDueToCreateAllocation; + ULONG NbFailuresDueToOpenAllocation; + ULONG NbFailuresDueToLowResource; + ULONG NbFailuresDueToNonRetiredLimit; +} D3DKMT_QUERYSTATSTICS_RENAMING; + +typedef struct _D3DKMT_QUERYSTATSTICS_PREPRATION +{ + ULONG BroadcastStall; + ULONG NbDMAPrepared; + ULONG NbDMAPreparedLongPath; + ULONG ImmediateHighestPreparationPass; + D3DKMT_QUERYSTATISTICS_COUNTER AllocationsTrimmed; +} D3DKMT_QUERYSTATSTICS_PREPRATION; + +typedef struct _D3DKMT_QUERYSTATISTICS_MEMORY +{ + ULONGLONG TotalBytesEvicted; + ULONG AllocsCommitted; + ULONG AllocsResident; +} D3DKMT_QUERYSTATISTICS_MEMORY; + +typedef struct _D3DKMT_QUERYSTATISTICS_PROCESS_VIDPNSOURCE_INFORMATION +{ + ULONG Frame; + ULONG CancelledFrame; + ULONG QueuedPresent; + ULONG64 Reserved[8]; +} D3DKMT_QUERYSTATISTICS_PROCESS_VIDPNSOURCE_INFORMATION; + +typedef struct _D3DKMT_QUERYSTATISTICS_PACKET_INFORMATION +{ + D3DKMT_QUERYSTATISTICS_QUEUE_PACKET_TYPE_INFORMATION QueuePacket[D3DKMT_QueuePacketTypeMax]; + D3DKMT_QUERYSTATISTICS_DMA_PACKET_TYPE_INFORMATION DmaPacket[D3DKMT_DmaPacketTypeMax]; +} D3DKMT_QUERYSTATISTICS_PACKET_INFORMATION; + +typedef struct _D3DKMT_QUERYSTATISTICS_PROCESS_NODE_INFORMATION +{ + LARGE_INTEGER RunningTime; + ULONG ContextSwitch; + D3DKMT_QUERYSTATISTICS_PREEMPTION_INFORMATION PreemptionStatistics; + D3DKMT_QUERYSTATISTICS_PACKET_INFORMATION PacketStatistics; + ULONG64 Reserved[8]; +} D3DKMT_QUERYSTATISTICS_PROCESS_NODE_INFORMATION; + +typedef struct _D3DKMT_QUERYSTATISTICS_NODE_INFORMATION +{ + D3DKMT_QUERYSTATISTICS_PROCESS_NODE_INFORMATION GlobalInformation; + D3DKMT_QUERYSTATISTICS_PROCESS_NODE_INFORMATION SystemInformation; + ULONG64 Reserved[8]; +} D3DKMT_QUERYSTATISTICS_NODE_INFORMATION; + +typedef struct _D3DKMT_QUERYSTATISTICS_VIDPNSOURCE_INFORMATION +{ + D3DKMT_QUERYSTATISTICS_PROCESS_VIDPNSOURCE_INFORMATION GlobalInformation; + D3DKMT_QUERYSTATISTICS_PROCESS_VIDPNSOURCE_INFORMATION SystemInformation; + ULONG64 Reserved[8]; +} D3DKMT_QUERYSTATISTICS_VIDPNSOURCE_INFORMATION; + +typedef struct _D3DKMT_QUERYSTATISTICS_ADAPTER_INFORMATION +{ + ULONG NbSegments; + ULONG NodeCount; + ULONG VidPnSourceCount; + ULONG VSyncEnabled; + ULONG TdrDetectedCount; + LONGLONG ZeroLengthDmaBuffers; + ULONGLONG RestartedPeriod; + D3DKMT_QUERYSTATSTICS_REFERENCE_DMA_BUFFER ReferenceDmaBuffer; + D3DKMT_QUERYSTATSTICS_RENAMING Renaming; + D3DKMT_QUERYSTATSTICS_PREPRATION Preparation; + D3DKMT_QUERYSTATSTICS_PAGING_FAULT PagingFault; + D3DKMT_QUERYSTATSTICS_PAGING_TRANSFER PagingTransfer; + D3DKMT_QUERYSTATSTICS_SWIZZLING_RANGE SwizzlingRange; + D3DKMT_QUERYSTATSTICS_LOCKS Locks; + D3DKMT_QUERYSTATSTICS_ALLOCATIONS Allocations; + D3DKMT_QUERYSTATSTICS_TERMINATIONS Terminations; + ULONG64 Reserved[8]; +} D3DKMT_QUERYSTATISTICS_ADAPTER_INFORMATION; + +typedef struct _D3DKMT_QUERYSTATISTICS_POLICY +{ + ULONGLONG PreferApertureForRead[D3DKMT_MaxAllocationPriorityClass]; + ULONGLONG PreferAperture[D3DKMT_MaxAllocationPriorityClass]; + ULONGLONG MemResetOnPaging; + ULONGLONG RemovePagesFromWorkingSetOnPaging; + ULONGLONG MigrationEnabled; +} D3DKMT_QUERYSTATISTICS_POLICY; + +typedef struct _D3DKMT_QUERYSTATISTICS_PROCESS_ADAPTER_INFORMATION +{ + ULONG NbSegments; + ULONG NodeCount; + ULONG VidPnSourceCount; + ULONG VirtualMemoryUsage; + D3DKMT_QUERYSTATISTICS_DMA_BUFFER DmaBuffer; + D3DKMT_QUERYSTATISTICS_COMMITMENT_DATA CommitmentData; + D3DKMT_QUERYSTATISTICS_POLICY _Policy; + ULONG64 Reserved[8]; +} D3DKMT_QUERYSTATISTICS_PROCESS_ADAPTER_INFORMATION; + +typedef struct _D3DKMT_QUERYSTATISTICS_VIDEO_MEMORY +{ + ULONG AllocsCommitted; + D3DKMT_QUERYSTATISTICS_COUNTER AllocsResidentInP[D3DKMT_QUERYSTATISTICS_SEGMENT_PREFERENCE_MAX]; + D3DKMT_QUERYSTATISTICS_COUNTER AllocsResidentInNonPreferred; + ULONGLONG TotalBytesEvictedDueToPreparation; +} D3DKMT_QUERYSTATISTICS_VIDEO_MEMORY; + +typedef struct _D3DKMT_QUERYSTATISTICS_PROCESS_SEGMENT_POLICY +{ + ULONGLONG UseMRU; +} D3DKMT_QUERYSTATISTICS_PROCESS_SEGMENT_POLICY; + +typedef struct _D3DKMT_QUERYSTATISTICS_PROCESS_SEGMENT_INFORMATION +{ + ULONGLONG BytesCommitted; + ULONGLONG MaximumWorkingSet; + ULONGLONG MinimumWorkingSet; + + ULONG NbReferencedAllocationEvictedInPeriod; + + D3DKMT_QUERYSTATISTICS_VIDEO_MEMORY VideoMemory; + D3DKMT_QUERYSTATISTICS_PROCESS_SEGMENT_POLICY _Policy; + + ULONG64 Reserved[8]; +} D3DKMT_QUERYSTATISTICS_PROCESS_SEGMENT_INFORMATION; + +typedef struct _D3DKMT_QUERYSTATISTICS_PROCESS_INFORMATION +{ + ULONG NodeCount; + ULONG VidPnSourceCount; + D3DKMT_QUERYSTATISTICS_SYSTEM_MEMORY SystemMemory; + ULONG64 Reserved[8]; +} D3DKMT_QUERYSTATISTICS_PROCESS_INFORMATION; + +typedef struct _D3DKMT_QUERYSTATISTICS_SEGMENT_INFORMATION +{ + ULONGLONG CommitLimit; + ULONGLONG BytesCommitted; + ULONGLONG BytesResident; + D3DKMT_QUERYSTATISTICS_MEMORY Memory; + ULONG Aperture; + ULONGLONG TotalBytesEvictedByPriority[D3DKMT_MaxAllocationPriorityClass]; + ULONG64 SystemMemoryEndAddress; + struct + { + ULONG64 PreservedDuringStandby : 1; + ULONG64 PreservedDuringHibernate : 1; + ULONG64 PartiallyPreservedDuringHibernate : 1; + ULONG64 Reserved : 61; + } PowerFlags; + ULONG64 Reserved[6]; +} D3DKMT_QUERYSTATISTICS_SEGMENT_INFORMATION; + +typedef struct _D3DKMT_QUERYSTATISTICS_SEGMENT_INFORMATION_V1 +{ + ULONG CommitLimit; + ULONG BytesCommitted; + ULONG BytesResident; + D3DKMT_QUERYSTATISTICS_MEMORY Memory; + ULONG Aperture; + ULONGLONG TotalBytesEvictedByPriority[D3DKMT_MaxAllocationPriorityClass]; + ULONG64 SystemMemoryEndAddress; + struct + { + ULONG64 PreservedDuringStandby : 1; + ULONG64 PreservedDuringHibernate : 1; + ULONG64 PartiallyPreservedDuringHibernate : 1; + ULONG64 Reserved : 61; + } PowerFlags; + + ULONG64 Reserved[7]; +} D3DKMT_QUERYSTATISTICS_SEGMENT_INFORMATION_V1; + +typedef union _D3DKMT_QUERYSTATISTICS_RESULT +{ + D3DKMT_QUERYSTATISTICS_ADAPTER_INFORMATION AdapterInformation; + D3DKMT_QUERYSTATISTICS_SEGMENT_INFORMATION_V1 SegmentInformationV1; + D3DKMT_QUERYSTATISTICS_SEGMENT_INFORMATION SegmentInformation; + D3DKMT_QUERYSTATISTICS_NODE_INFORMATION NodeInformation; + D3DKMT_QUERYSTATISTICS_VIDPNSOURCE_INFORMATION VidPnSourceInformation; + D3DKMT_QUERYSTATISTICS_PROCESS_INFORMATION ProcessInformation; + D3DKMT_QUERYSTATISTICS_PROCESS_ADAPTER_INFORMATION ProcessAdapterInformation; + D3DKMT_QUERYSTATISTICS_PROCESS_SEGMENT_INFORMATION ProcessSegmentInformation; + D3DKMT_QUERYSTATISTICS_PROCESS_NODE_INFORMATION ProcessNodeInformation; + D3DKMT_QUERYSTATISTICS_PROCESS_VIDPNSOURCE_INFORMATION ProcessVidPnSourceInformation; +} D3DKMT_QUERYSTATISTICS_RESULT; + +typedef struct _D3DKMT_QUERYSTATISTICS +{ + D3DKMT_QUERYSTATISTICS_TYPE Type; + LUID AdapterLuid; + HANDLE hProcess; + D3DKMT_QUERYSTATISTICS_RESULT QueryResult; + + union + { + D3DKMT_QUERYSTATISTICS_QUERY_SEGMENT QuerySegment; + D3DKMT_QUERYSTATISTICS_QUERY_SEGMENT QueryProcessSegment; + D3DKMT_QUERYSTATISTICS_QUERY_NODE QueryNode; + D3DKMT_QUERYSTATISTICS_QUERY_NODE QueryProcessNode; + D3DKMT_QUERYSTATISTICS_QUERY_VIDPNSOURCE QueryVidPnSource; + D3DKMT_QUERYSTATISTICS_QUERY_VIDPNSOURCE QueryProcessVidPnSource; + }; +} D3DKMT_QUERYSTATISTICS; + #ifdef __cplusplus extern "C" { -- 2.17.1

1 0

[PATCH] include: Added LVITEMINDEX.
by Alistair Leslie-Hughes Aug. 2, 2019

Aug. 2, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/commctrl.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 0ad5614ab9..906f2c30e9 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3886,6 +3886,17 @@ typedef struct NMLVSCROLL int dy; } NMLVSCROLL, *LPNMLVSCROLL; +typedef struct tagLVITEMINDEX +{ + int iItem; + int iGroup; +} LVITEMINDEX, *PLVITEMINDEX; + +#define LVGGR_GROUP 0 +#define LVGGR_HEADER 1 +#define LVGGR_LABEL 2 +#define LVGGR_SUBSETLINK 3 + #define ListView_SetItemCount(hwnd,count) \ (BOOL)SNDMSG((hwnd),LVM_SETITEMCOUNT,(WPARAM)(INT)(count),0) #define ListView_SetTextBkColor(hwnd,clrBk) \ -- 2.17.1

1 0

[PATCH] include: define ADDRINFOT.
by Alistair Leslie-Hughes Aug. 2, 2019

Aug. 2, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/ws2tcpip.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index ea19ee39ca..3267188de1 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -54,6 +54,12 @@ typedef struct WS(addrinfoW) struct WS(addrinfoW)* ai_next; } ADDRINFOW, *PADDRINFOW; +#ifdef UNICODE +typedef ADDRINFOW ADDRINFOT, *PADDRINFOT; +#else +typedef ADDRINFOA ADDRINFOT, *PADDRINFOT; +#endif + #ifdef USE_WS_PREFIX typedef int WS_socklen_t; #else -- 2.17.1

1 0

[PATCH 2/2] include: Add tchar defines.
by Alistair Leslie-Hughes Aug. 2, 2019

Aug. 2, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/tchar.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/tchar.h b/include/tchar.h index 9e7a846f1c..5234a70bd9 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -91,7 +91,9 @@ extern "C" { #define _istupper WINE_tchar_routine(isupper, _ismbcupper, iswupper) #define _istxdigit WINE_tchar_routine(isxdigit, isxdigit, iswxdigit) #define _itot WINE_tchar_routine(_itoa, _itoa, _itow) +#define _itot_s WINE_tchar_routine(_itoa_s, _itoa_s, _itow_s) #define _ltot WINE_tchar_routine(_ltoa, _ltoa, _ltow) +#define _ltot_s WINE_tchar_routine(_ltoa_s, _ltoa_s, _ltow_s) #define _puttc WINE_tchar_routine(putc, putc, putwc) #define _puttchar WINE_tchar_routine(putchar, putchar, putwchar) #define _putts WINE_tchar_routine(puts, puts, putws) @@ -106,11 +108,13 @@ extern "C" { #define _tchmod WINE_tchar_routine(chmod, _chmod, _wchmod) #define _tcreat WINE_tchar_routine(creat, _creat, _wcreat) #define _tcscat WINE_tchar_routine(strcat, _mbscat, wcscat) +#define _tcscat_s WINE_tchar_routine(strncat_s, _mbsncat_s, wcsncat_s) #define _tcschr WINE_tchar_routine(strchr, _mbschr, wcschr) #define _tcsclen WINE_tchar_routine(strlen, _mbslen, wcslen) #define _tcscmp WINE_tchar_routine(strcmp, _mbscmp, wcscmp) #define _tcscoll WINE_tchar_routine(strcoll, _mbscoll, wcscoll) #define _tcscpy WINE_tchar_routine(strcpy, _mbscpy, wcscpy) +#define _tcscpy_s WINE_tchar_routine(strcpy_s, _mbscpy_s, wcscpy_s) #define _tcscspn WINE_tchar_routine(strcspn, _mbscspn, wcscspn) #define _tcsdec WINE_tchar_routine(_strdec, _mbsdec, _wcsdec) #define _tcsdup WINE_tchar_routine(strdup, _mbsdup, _wcsdup) @@ -120,21 +124,27 @@ extern "C" { #define _tcsinc WINE_tchar_routine(_strinc, _mbsinc, _wcsinc) #define _tcslen WINE_tchar_routine(strlen, strlen, wcslen) #define _tcslwr WINE_tchar_routine(_strlwr, _mbslwr, _wcslwr) +#define _tcslwr_s WINE_tchar_routine(_strlwr_s, _mbslwr_s, _wcslwr_s) #define _tcsnbcnt WINE_tchar_routine(_strncnt, _mbsnbcnt, _wcnscnt) #define _tcsncat WINE_tchar_routine(strncat, _mbsnbcat, wcsncat) +#define _tcscat_s WINE_tchar_routine(strcat_s, _mbsnbcat_s, wcscat_s) #define _tcsnccat WINE_tchar_routine(strncat, _mbsncat, wcsncat) #define _tcsncmp WINE_tchar_routine(strncmp, _mbsnbcmp, wcsncmp) +#define _tcsncpy WINE_tchar_routine(strncpy, _mbsncpy, wcsncpy) +#define _tcsncpy_s WINE_tchar_routine(strncpy_s, _mbsncpy_s, wcsncpy_s) #define _tcsnccmp WINE_tchar_routine(strncmp, _mbsncmp, wcsncmp) #define _tcsnccnt WINE_tchar_routine(_strncnt, _mbsnccnt, _wcsncnt) #define _tcsnccpy WINE_tchar_routine(strncpy, _mbsncpy, wcsncpy) #define _tcsncicmp WINE_tchar_routine(_strnicmp, _mbsnicmp, _wcsnicmp) #define _tcsncpy WINE_tchar_routine(strncpy, _mbsnbcpy, wcsncpy) +#define _tcsncpy WINE_tchar_routine(strncpy_s, _mbsnbcpy_s, wcsncpy_s) #define _tcsncset WINE_tchar_routine(_strnset, _mbsnset, _wcsnset) #define _tcsnextc WINE_tchar_routine(_strnextc, _mbsnextc, _wcsnextc) #define _tcsnicmp WINE_tchar_routine(_strnicmp, _mbsnicmp, _wcsnicmp) #define _tcsnicoll WINE_tchar_routine(_strnicoll, _strnicoll _wcsnicoll) #define _tcsninc WINE_tchar_routine(_strninc, _mbsninc, _wcsninc) #define _tcsnccnt WINE_tchar_routine(_strncnt, _mbsnccnt, _wcsncnt) +#define _tcsnlen WINE_tchar_routine(strnlen, _mbsnblen, wcsnlen) #define _tcsnset WINE_tchar_routine(_strnset, _mbsnbset, _wcsnset) #define _tcspbrk WINE_tchar_routine(strpbrk, _mbspbrk, wcspbrk) #define _tcsspnp WINE_tchar_routine(_strspnp, _mbsspnp, _wcsspnp) @@ -148,6 +158,7 @@ extern "C" { #define _tcstol WINE_tchar_routine(strtol, strtol, wcstol) #define _tcstoul WINE_tchar_routine(strtoul, strtoul, wcstoul) #define _tcsupr WINE_tchar_routine(_strupr, _mbsupr, _wcsupr) +#define _tcsupr_s WINE_tchar_routine(_strupr_s, _mbsupr_s, _wcsupr_s) #define _tcsxfrm WINE_tchar_routine(strxfrm, strxfrm, wcsxfrm) #define _tctime WINE_tchar_routine(ctime, ctime, _wctime) #define _tenviron WINE_tchar_routine(_environ, _environ, _wenviron) @@ -172,6 +183,7 @@ extern "C" { #define _tgetenv WINE_tchar_routine(getenv, getenv, _wgetenv) #define _tmain WINE_tchar_routine(main, main, wmain) #define _tmakepath WINE_tchar_routine(_makepath, _makepath, _wmakepath) +#define _tmakepath_s WINE_tchar_routine(_makepath_s, _makepath_s, _wmakepath_s) #define _tmkdir WINE_tchar_routine(mkdir, _mkdir, _wmkdir) #define _tmktemp WINE_tchar_routine(mktemp, _mktemp, _wmktemp) #define _tperror WINE_tchar_routine(perror, perror, _wperror) @@ -196,6 +208,7 @@ extern "C" { #define _tspawnvp WINE_tchar_routine(_spawnvp, _spawnvp, _tspawnvp) #define _tspawnvpe WINE_tchar_routine(_spawnvpe, _spawnvpe, _tspawnvpe) #define _tsplitpath WINE_tchar_routine(_splitpath, _splitpath, _wsplitpath) +#define _tsplitpath_s WINE_tchar_routine(_splitpath_s, _splitpath_s,_wsplitpath_s) #define _tstat WINE_tchar_routine(_stat, _stat, _wstat) #define _tstati64 WINE_tchar_routine(_stati64, _stati64, _wstati64) #define _tstrdate WINE_tchar_routine(_strdate, _strdate, _wstrdate) @@ -208,6 +221,7 @@ extern "C" { #define _tutime WINE_tchar_routine(utime, _utime, _wutime) #define _tWinMain WINE_tchar_routine(WinMain, WinMain, wWinMain) #define _ultot WINE_tchar_routine(_ultoa, _ultoa, _ultow) +#define _ultot_s WINE_tchar_routine(_ultoa_s, _ultoa_s, _ultow_s) #define _ungettc WINE_tchar_routine(ungetc, ungetc, ungetwc) #define _vftprintf WINE_tchar_routine(vfprintf, vfprintf, vfwprintf) #define _vsntprintf WINE_tchar_routine(vsnprintf, _vsnprintf, _vsnwprintf) -- 2.17.1

1 0

[PATCH 1/2] msvcrt: Add missing declarations.
by Alistair Leslie-Hughes Aug. 2, 2019

Aug. 2, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/msvcrt/mbstring.h | 2 ++ include/msvcrt/stdlib.h | 8 ++++++++ include/msvcrt/string.h | 4 ++++ include/msvcrt/wchar.h | 11 +++++++++++ 4 files changed, 25 insertions(+) diff --git a/include/msvcrt/mbstring.h b/include/msvcrt/mbstring.h index 7a40f7b4cb..f9b106b753 100644 --- a/include/msvcrt/mbstring.h +++ b/include/msvcrt/mbstring.h @@ -75,6 +75,7 @@ int __cdecl _mbsicoll(const unsigned char*,const unsigned char*); unsigned char* __cdecl _mbsinc(const unsigned char*); size_t __cdecl _mbslen(const unsigned char*); unsigned char* __cdecl _mbslwr(unsigned char*); +errno_t __cdecl _mbslwr_s(unsigned char*, size_t); unsigned char* __cdecl _mbsnbcat(unsigned char*,const unsigned char*,size_t); errno_t __cdecl _mbsnbcat_s(unsigned char*,size_t,const unsigned char*,size_t); int __cdecl _mbsnbcmp(const unsigned char*,const unsigned char*,size_t); @@ -104,6 +105,7 @@ unsigned char* __cdecl _mbsstr(const unsigned char*,const unsigned char*); unsigned char* __cdecl _mbstok(unsigned char*,const unsigned char*); unsigned char* __cdecl _mbstok_l(unsigned char*,const unsigned char*,_locale_t); unsigned char* __cdecl _mbsupr(unsigned char*); +errno_t __cdecl _mbsupr_s(unsigned char*, size_t); #ifndef _MBLEADTRAIL_DEFINED #define _MBLEADTRAIL_DEFINED diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 3454b17c93..47a50bc0af 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -159,10 +159,13 @@ char* __cdecl _ecvt(double,int,int*,int*); char* __cdecl _fcvt(double,int,int*,int*); char* __cdecl _fullpath(char*,const char*,size_t); char* __cdecl _gcvt(double,int,char*); +errno_t __cdecl _gcvt_s(char*, size_t, double, int); char* __cdecl _i64toa(__int64,char*,int); +errno_t __cdecl _i64toa_s(__int64, char*, size_t, int); char* __cdecl _itoa(int,char*,int); errno_t __cdecl _itoa_s(int,char*,size_t,int); char* __cdecl _ltoa(__msvcrt_long,char*,int); +errno_t __cdecl _ltoa_s(__msvcrt_long, char*, size_t, int); __msvcrt_ulong __cdecl _lrotl(__msvcrt_ulong,int); __msvcrt_ulong __cdecl _lrotr(__msvcrt_ulong,int); void __cdecl _makepath(char*,const char*,const char*,const char*,const char*); @@ -232,10 +235,15 @@ void __cdecl qsort(void*,size_t,size_t,int (__cdecl *)(const void*,cons #ifndef _WSTDLIB_DEFINED #define _WSTDLIB_DEFINED wchar_t* __cdecl _itow(int,wchar_t*,int); +errno_t __cdecl _itow_s(int,wchar_t*,int, int); wchar_t* __cdecl _i64tow(__int64,wchar_t*,int); +errno_t __cdecl _i64tow_s(__int64, wchar_t*, size_t, int); wchar_t* __cdecl _ltow(__msvcrt_long,wchar_t*,int); +errno_t __cdecl _ltow_s(__msvcrt_long,wchar_t*,int,int); wchar_t* __cdecl _ui64tow(unsigned __int64,wchar_t*,int); +errno_t __cdecl _ui64tow_s(unsigned __int64, wchar_t*, size_t, int); wchar_t* __cdecl _ultow(__msvcrt_ulong,wchar_t*,int); +errno_t __cdecl _ultow_s(__msvcrt_ulong, wchar_t*, size_t, int); wchar_t* __cdecl _wfullpath(wchar_t*,const wchar_t*,size_t); wchar_t* __cdecl _wgetenv(const wchar_t*); void __cdecl _wmakepath(wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index 39a0296204..85ba38a58e 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -95,16 +95,19 @@ int __cdecl _wcsicmp(const wchar_t*,const wchar_t*); int __cdecl _wcsicoll(const wchar_t*,const wchar_t*); int __cdecl _wcsicoll_l(const wchar_t*, const wchar_t*, _locale_t); wchar_t* __cdecl _wcslwr(wchar_t*); +errno_t __cdecl _wcslwr_s(wchar_t*, size_t); int __cdecl _wcscoll_l(const wchar_t*, const wchar_t*, _locale_t); int __cdecl _wcsncoll(const wchar_t*, const wchar_t*, size_t); int __cdecl _wcsncoll_l(const wchar_t*, const wchar_t*, size_t, _locale_t); int __cdecl _wcsnicmp(const wchar_t*,const wchar_t*,size_t); int __cdecl _wcsnicoll(const wchar_t*,const wchar_t*,size_t); int __cdecl _wcsnicoll_l(const wchar_t*, const wchar_t*, size_t, _locale_t); +size_t __cdecl _wcsnlen(const wchar_t*,size_t); wchar_t* __cdecl _wcsnset(wchar_t*,wchar_t,size_t); wchar_t* __cdecl _wcsrev(wchar_t*); wchar_t* __cdecl _wcsset(wchar_t*,wchar_t); wchar_t* __cdecl _wcsupr(wchar_t*); +errno_t __cdecl _wcsupr_s(wchar_t*, size_t); wchar_t* __cdecl wcscat(wchar_t*,const wchar_t*); errno_t __cdecl wcscat_s(wchar_t*,size_t,const wchar_t*); @@ -119,6 +122,7 @@ wchar_t* __cdecl wcsncat(wchar_t*,const wchar_t*,size_t); int __cdecl wcsncmp(const wchar_t*,const wchar_t*,size_t); wchar_t* __cdecl wcsncpy(wchar_t*,const wchar_t*,size_t); errno_t __cdecl wcsncpy_s(wchar_t*,size_t,const wchar_t*,size_t); +size_t __cdecl wcsnlen(const wchar_t*,size_t); wchar_t* __cdecl wcspbrk(const wchar_t*,const wchar_t*); wchar_t* __cdecl wcsrchr(const wchar_t*,wchar_t wcFor); size_t __cdecl wcsspn(const wchar_t*,const wchar_t*); diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 78df974f9a..b944cdeea9 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -392,13 +392,19 @@ static inline int WINAPIV swprintf(wchar_t *buffer, size_t size, const wchar_t * #ifndef _WSTDLIB_DEFINED #define _WSTDLIB_DEFINED wchar_t* __cdecl _itow(int,wchar_t*,int); +errno_t __cdecl _itow_s(int,wchar_t*,int, int); wchar_t* __cdecl _i64tow(__int64,wchar_t*,int); +errno_t __cdecl _i64tow_s(__int64, wchar_t*, size_t, int); wchar_t* __cdecl _ltow(__msvcrt_long,wchar_t*,int); +errno_t __cdecl _ltow_s(__msvcrt_long,wchar_t*,int,int); wchar_t* __cdecl _ui64tow(unsigned __int64,wchar_t*,int); +errno_t __cdecl _ui64tow_s(unsigned __int64, wchar_t*, size_t, int); wchar_t* __cdecl _ultow(__msvcrt_ulong,wchar_t*,int); +errno_t __cdecl _ultow_s(__msvcrt_ulong, wchar_t*, size_t, int); wchar_t* __cdecl _wfullpath(wchar_t*,const wchar_t*,size_t); wchar_t* __cdecl _wgetenv(const wchar_t*); void __cdecl _wmakepath(wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); +int __cdecl _wmakepath_s(wchar_t*,size_t,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); void __cdecl _wperror(const wchar_t*); int __cdecl _wputenv(const wchar_t*); void __cdecl _wsearchenv(const wchar_t*,const wchar_t*,wchar_t*); @@ -431,6 +437,7 @@ int __cdecl _wcsicmp(const wchar_t*,const wchar_t*); int __cdecl _wcsicoll(const wchar_t*,const wchar_t*); int __cdecl _wcsicoll_l(const wchar_t*,const wchar_t*,_locale_t); wchar_t* __cdecl _wcslwr(wchar_t*); +errno_t __cdecl _wcslwr_s(wchar_t*, size_t); int __cdecl _wcsncoll(const wchar_t*,const wchar_t*,size_t); int __cdecl _wcsncoll_l(const wchar_t*,const wchar_t*,size_t,_locale_t); int __cdecl _wcsnicmp(const wchar_t*,const wchar_t*,size_t); @@ -440,6 +447,7 @@ wchar_t* __cdecl _wcsnset(wchar_t*,wchar_t,size_t); wchar_t* __cdecl _wcsrev(wchar_t*); wchar_t* __cdecl _wcsset(wchar_t*,wchar_t); wchar_t* __cdecl _wcsupr(wchar_t*); +errno_t __cdecl _wcsupr_s(wchar_t*, size_t); wchar_t* __cdecl wcscat(wchar_t*,const wchar_t*); errno_t __cdecl wcscat_s(wchar_t*,size_t,const wchar_t*); @@ -451,9 +459,11 @@ errno_t __cdecl wcscpy_s(wchar_t*,size_t,const wchar_t*); size_t __cdecl wcscspn(const wchar_t*,const wchar_t*); size_t __cdecl wcslen(const wchar_t*); wchar_t* __cdecl wcsncat(wchar_t*,const wchar_t*,size_t); +errno_t __cdecl wcsncat_s(wchar_t *, size_t, const wchar_t *, size_t); int __cdecl wcsncmp(const wchar_t*,const wchar_t*,size_t); wchar_t* __cdecl wcsncpy(wchar_t*,const wchar_t*,size_t); errno_t __cdecl wcsncpy_s(wchar_t*,size_t,const wchar_t*,size_t); +size_t __cdecl wcsnlen(const size_t*,size_t); wchar_t* __cdecl wcspbrk(const wchar_t*,const wchar_t*); wchar_t* __cdecl wcsrchr(const wchar_t*,wchar_t wcFor); size_t __cdecl wcsspn(const wchar_t*,const wchar_t*); @@ -515,6 +525,7 @@ static inline wchar_t* __cdecl wmemcpy(wchar_t *dst, const wchar_t *src, size_t { return memcpy(dst, src, n * sizeof(wchar_t)); } +errno_t __cdecl wmemcpy_s(wchar_t *, size_t, const wchar_t *, size_t); static inline wchar_t* __cdecl wmemmove(wchar_t *dst, const wchar_t *src, size_t n) { -- 2.17.1

1 0

[PATCH] secur32: Use RtlComputeCrc32().
by Zebediah Figura Aug. 1, 2019

Aug. 1, 2019

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/secur32/ntlm.c | 3 +- dlls/secur32/secur32_priv.h | 1 - dlls/secur32/util.c | 64 ------------------------------------- 3 files changed, 2 insertions(+), 66 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 3280fa1d25e..f4909658bf8 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "winnls.h" #include "wincred.h" +#include "winternl.h" #include "rpc.h" #include "sspi.h" #include "lm.h" @@ -1637,7 +1638,7 @@ static SECURITY_STATUS ntlm_CreateSignature(PNegoHelper helper, PSecBufferDesc p { if(pMessage->pBuffers[i].BufferType & SECBUFFER_DATA) { - crc = ComputeCrc32(pMessage->pBuffers[i].pvBuffer, + crc = RtlComputeCrc32(pMessage->pBuffers[i].pvBuffer, pMessage->pBuffers[i].cbBuffer, crc); } } diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index a62d6cb2df2..5ed26d67ef2 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -161,7 +161,6 @@ SECURITY_STATUS decodeBase64(char *in_buf, int in_len, BYTE *out_buf, int max_len, int *out_len) DECLSPEC_HIDDEN; /* Functions from util.c */ -ULONG ComputeCrc32(const BYTE *pData, INT iLen, ULONG initial_crc) DECLSPEC_HIDDEN; SECURITY_STATUS SECUR32_CreateNTLM1SessionKey(PBYTE password, int len, PBYTE session_key) DECLSPEC_HIDDEN; SECURITY_STATUS SECUR32_CreateNTLM2SubKeys(PNegoHelper helper) DECLSPEC_HIDDEN; arc4_info *SECUR32_arc4Alloc(void) DECLSPEC_HIDDEN; diff --git a/dlls/secur32/util.c b/dlls/secur32/util.c index acb62905053..b5cac5b6c06 100644 --- a/dlls/secur32/util.c +++ b/dlls/secur32/util.c @@ -28,57 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntlm); -/* The CRC32 code is copyright (C) 1986 Gary S. Brown and was placed in the - * public domain. - * CRC polynomial 0xedb88320 - */ -static const ULONG CRC_table[256] = -{ - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, - 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, - 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, - 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, - 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, - 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, - 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, - 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, - 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, - 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, - 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, - 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, - 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, - 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, - 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, - 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, - 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, - 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, - 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, - 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, - 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, - 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d -}; - static const char client_to_server_sign_constant[] = "session key to client-to-server signing key magic constant"; static const char client_to_server_seal_constant[] = "session key to client-to-server sealing key magic constant"; static const char server_to_client_sign_constant[] = "session key to server-to-client signing key magic constant"; @@ -108,19 +57,6 @@ VOID WINAPI MD5Init( MD5_CTX *ctx ); VOID WINAPI MD5Update( MD5_CTX *ctx, const unsigned char *buf, unsigned int len ); VOID WINAPI MD5Final( MD5_CTX *ctx ); -ULONG ComputeCrc32(const BYTE *pData, INT iLen, ULONG initial_crc) -{ - ULONG crc = ~initial_crc; - - while (iLen > 0) - { - crc = CRC_table[(crc ^ *pData) & 0xff] ^ (crc >> 8); - pData++; - iLen--; - } - return ~crc; -} - SECURITY_STATUS SECUR32_CreateNTLM1SessionKey(PBYTE password, int len, PBYTE session_key) { MD4_CTX ctx; -- 2.20.1

1 3

[PATCH 5/5] wined3d: Use d3d_info to determine BGRA vertex support in wined3d_buffer_load().
by Henri Verbeet Aug. 1, 2019

Aug. 1, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2ed3984bea1..fed63ca7d86 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -898,7 +898,7 @@ static void buffer_mark_used(struct wined3d_buffer *buffer) void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_d3d_info *d3d_info = context->d3d_info; BOOL decl_changed = FALSE; TRACE("buffer %p.\n", buffer); @@ -932,9 +932,9 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * if (!use_vs(state)) { - if (!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] && !context->d3d_info->ffp_generic_attributes) + if (!d3d_info->vertex_bgra && !d3d_info->ffp_generic_attributes) fixup_flags |= WINED3D_BUFFER_FIXUP_D3DCOLOR; - if (!context->d3d_info->xyzrhw) + if (!d3d_info->xyzrhw) fixup_flags |= WINED3D_BUFFER_FIXUP_XYZRHW; } -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to wined3d_shader_resource_view_gl_bind().
by Henri Verbeet Aug. 1, 2019

Aug. 1, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/view.c | 5 ++--- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 32cbc029e7f..fb393395258 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3809,7 +3809,7 @@ static void wined3d_context_gl_bind_shader_resources(struct wined3d_context_gl * sampler = device->default_sampler; else if (!(sampler = state->sampler[shader_type][entry->sampler_idx])) sampler = device->null_sampler; - wined3d_shader_resource_view_gl_bind(wined3d_shader_resource_view_gl(view), bind_idx, sampler, &context_gl->c); + wined3d_shader_resource_view_gl_bind(wined3d_shader_resource_view_gl(view), bind_idx, sampler, context_gl); } } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 7962496920b..d26ff6ea618 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -828,10 +828,9 @@ HRESULT CDECL wined3d_shader_resource_view_create(const struct wined3d_view_desc } void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl *view_gl, - unsigned int unit, struct wined3d_sampler *sampler, struct wined3d_context *context) + unsigned int unit, struct wined3d_sampler *sampler, struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_texture_gl *texture_gl; wined3d_context_gl_active_texture(context_gl, gl_info, unit); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ae46b4afee3..c7d9cd74258 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4137,7 +4137,7 @@ static inline struct wined3d_shader_resource_view_gl *wined3d_shader_resource_vi } void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl *view_gl, unsigned int unit, - struct wined3d_sampler *sampler, struct wined3d_context *context) DECLSPEC_HIDDEN; + struct wined3d_sampler *sampler, struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; struct wined3d_unordered_access_view { -- 2.11.0

1 0