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

[PATCH v2 1/6] advapi32/tests: Add basic RegLoadMUIString tests.
by Akihiro Sagawa May 9, 2019

May 9, 2019

Motivation: Before adding cache mechanism in RegLoadMUIString, I'll add some conformance tests for the function and fix its implementation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/advapi32/tests/registry.c | 115 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+)

1 0

[PATCH] msvcrt: Make __acrt_iob_func() static.
by Francois Gouget May 9, 2019

May 9, 2019

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msvcrt/iob.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/iob.c b/dlls/msvcrt/iob.c index c02913b45ab..f8d46ad6e46 100644 --- a/dlls/msvcrt/iob.c +++ b/dlls/msvcrt/iob.c @@ -30,7 +30,7 @@ extern MSVCRT_FILE * CDECL __p__iob(void); /********************************************************************* * __acrt_iob_func(UCRTBASE.@) */ -MSVCRT_FILE * CDECL __acrt_iob_func(unsigned idx) +static MSVCRT_FILE * CDECL __acrt_iob_func(unsigned idx) { return __p__iob() + idx; } -- 2.20.1

2 3

[PATCH v4 1/4] mspatcha: Add functions to API header file.
by Conor McCarthy May 9, 2019

May 9, 2019

Signed-off-by: Conor McCarthy <conor.mccarthy.444(a)gmail.com> --- include/patchapi.h | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/include/patchapi.h b/include/patchapi.h index 5adaf0a..1ccdf9d 100644 --- a/include/patchapi.h +++ b/include/patchapi.h @@ -1,5 +1,6 @@ /* * Copyright 2011 Hans Leidekker for CodeWeavers + * Copyright 2019 Conor McCarthy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,11 +24,33 @@ extern "C" { #endif +#define PATCH_OPTION_USE_LZX_A 0x00000001 +#define PATCH_OPTION_USE_LZX_B 0x00000002 +#define PATCH_OPTION_USE_LZX_LARGE 0x00000004 /* raise maximum window from 8 -> 32 Mb */ + +#define PATCH_OPTION_NO_BINDFIX 0x00010000 +#define PATCH_OPTION_NO_LOCKFIX 0x00020000 +#define PATCH_OPTION_NO_REBASE 0x00040000 +#define PATCH_OPTION_FAIL_IF_SAME_FILE 0x00080000 +#define PATCH_OPTION_FAIL_IF_BIGGER 0x00100000 +#define PATCH_OPTION_NO_CHECKSUM 0x00200000 +#define PATCH_OPTION_NO_RESTIMEFIX 0x00400000 +#define PATCH_OPTION_NO_TIMESTAMP 0x00800000 +#define PATCH_OPTION_INTERLEAVE_FILES 0x40000000 +#define PATCH_OPTION_RESERVED1 0x80000000 + #define APPLY_OPTION_FAIL_IF_EXACT 0x00000001 #define APPLY_OPTION_FAIL_IF_CLOSE 0x00000002 #define APPLY_OPTION_TEST_ONLY 0x00000004 #define APPLY_OPTION_VALID_FLAGS 0x00000007 +#define ERROR_PATCH_DECODE_FAILURE 0xC00E4101 +#define ERROR_PATCH_CORRUPT 0xC00E4102 +#define ERROR_PATCH_NEWER_FORMAT 0xC00E4103 +#define ERROR_PATCH_WRONG_FILE 0xC00E4104 +#define ERROR_PATCH_NOT_NECESSARY 0xC00E4105 +#define ERROR_PATCH_NOT_AVAILABLE 0xC00E4106 + typedef struct _PATCH_IGNORE_RANGE { ULONG OffsetInOldFile; @@ -41,16 +64,66 @@ typedef struct _PATCH_RETAIN_RANGE ULONG OffsetInNewFile; } PATCH_RETAIN_RANGE, *PPATCH_RETAIN_RANGE; +typedef struct _PATCH_INTERLEAVE_MAP { + ULONG CountRanges; + struct { + ULONG OldOffset; + ULONG OldLength; + ULONG NewLength; + } Range[1]; +} PATCH_INTERLEAVE_MAP, *PPATCH_INTERLEAVE_MAP; + +typedef BOOL(CALLBACK PATCH_SYMLOAD_CALLBACK)(ULONG, LPCSTR, ULONG, ULONG, ULONG, ULONG, ULONG, PVOID); + +typedef PATCH_SYMLOAD_CALLBACK *PPATCH_SYMLOAD_CALLBACK; + +typedef struct _PATCH_OPTION_DATA { + ULONG SizeOfThisStruct; + ULONG SymbolOptionFlags; + LPCSTR NewFileSymbolPath; + LPCSTR *OldFileSymbolPathArray; + ULONG ExtendedOptionFlags; + PPATCH_SYMLOAD_CALLBACK SymLoadCallback; + PVOID SymLoadContext; + PPATCH_INTERLEAVE_MAP* InterleaveMapArray; + ULONG MaxLzxWindowSize; +} PATCH_OPTION_DATA, *PPATCH_OPTION_DATA; + +typedef BOOL (CALLBACK PATCH_PROGRESS_CALLBACK)(PVOID, ULONG, ULONG); + +typedef PATCH_PROGRESS_CALLBACK *PPATCH_PROGRESS_CALLBACK; + BOOL WINAPI ApplyPatchToFileA(LPCSTR,LPCSTR,LPCSTR,ULONG); BOOL WINAPI ApplyPatchToFileW(LPCWSTR,LPCWSTR,LPCWSTR,ULONG); #define ApplyPatchToFile WINELIB_NAME_AW(ApplyPatchToFile) +BOOL WINAPI ApplyPatchToFileByHandles(HANDLE, HANDLE, HANDLE, ULONG); +BOOL WINAPI ApplyPatchToFileExA(LPCSTR, LPCSTR, LPCSTR, ULONG, PPATCH_PROGRESS_CALLBACK, PVOID); +BOOL WINAPI ApplyPatchToFileExW(LPCWSTR, LPCWSTR, LPCWSTR, ULONG, PPATCH_PROGRESS_CALLBACK, PVOID); +#define ApplyPatchToFileEx WINELIB_NAME_AW(ApplyPatchToFileEx) +BOOL WINAPI ApplyPatchToFileByHandlesEx(HANDLE, HANDLE, HANDLE, ULONG, PPATCH_PROGRESS_CALLBACK, PVOID); +BOOL WINAPI ApplyPatchToFileByBuffers(PBYTE, ULONG, PBYTE, ULONG, PBYTE*, ULONG, ULONG*, FILETIME*, ULONG, + PPATCH_PROGRESS_CALLBACK, PVOID); + +BOOL WINAPI TestApplyPatchToFileA(LPCSTR, LPCSTR, ULONG); +BOOL WINAPI TestApplyPatchToFileW(LPCWSTR, LPCWSTR, ULONG); +#define TestApplyPatchToFile WINELIB_NAME_AW(TestApplyPatchToFile) +BOOL WINAPI TestApplyPatchToFileByHandles(HANDLE, HANDLE, ULONG); +BOOL WINAPI TestApplyPatchToFileByBuffers(PBYTE, ULONG, PBYTE, ULONG, ULONG*, ULONG); + BOOL WINAPI GetFilePatchSignatureA(LPCSTR, ULONG, PVOID, ULONG, PPATCH_IGNORE_RANGE, ULONG, PPATCH_RETAIN_RANGE, ULONG, LPSTR); BOOL WINAPI GetFilePatchSignatureW(LPCWSTR, ULONG, PVOID, ULONG, PPATCH_IGNORE_RANGE, ULONG, PPATCH_RETAIN_RANGE, ULONG, LPWSTR); #define GetFilePatchSignature WINELIB_NAME_AW(GetFilePatchSignature) +BOOL WINAPI GetFilePatchSignatureByHandle(HANDLE, ULONG, PVOID, ULONG, PPATCH_IGNORE_RANGE, + ULONG, PPATCH_RETAIN_RANGE, ULONG, LPSTR); +BOOL WINAPI GetFilePatchSignatureByBuffer(PBYTE, ULONG, ULONG, PVOID, ULONG, PPATCH_IGNORE_RANGE, ULONG, + PPATCH_RETAIN_RANGE, ULONG, LPSTR); +INT WINAPI NormalizeFileForPatchSignature(PVOID, ULONG, ULONG, PATCH_OPTION_DATA*, ULONG, + ULONG, ULONG, PPATCH_IGNORE_RANGE, ULONG, PPATCH_RETAIN_RANGE); + #ifdef __cplusplus } #endif -- 2.7.4

2 7

[PATCH] include: Add more kernel mode graphics driver definitions.
by Zhiyi Zhang May 9, 2019

May 9, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/d3dukmdt.h | 2 + include/ddk/d3dkmthk.h | 115 ++++++++++++++++++++++++ include/ntstatus.h | 192 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 309 insertions(+) diff --git a/include/d3dukmdt.h b/include/d3dukmdt.h index ce2b0c2488..60f8055bee 100644 --- a/include/d3dukmdt.h +++ b/include/d3dukmdt.h @@ -138,4 +138,6 @@ typedef enum _D3DDDIFORMAT D3DDDIFMT_FORCE_UINT = 0x7fffffff, } D3DDDIFORMAT; +typedef UINT D3DDDI_VIDEO_PRESENT_SOURCE_ID; + #endif /* __WINE_D3DUKMDT_H */ diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 0000b2f653..c87321058c 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -21,6 +21,121 @@ #include <d3dukmdt.h> +typedef enum _D3DKMT_VIDPNSOURCEOWNER_TYPE +{ + D3DKMT_VIDPNSOURCEOWNER_UNOWNED = 0, + D3DKMT_VIDPNSOURCEOWNER_SHARED = 1, + D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE = 2, + D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVEGDI = 3, + D3DKMT_VIDPNSOURCEOWNER_EMULATED = 4 +} D3DKMT_VIDPNSOURCEOWNER_TYPE; + +typedef struct _D3DKMT_CREATEDEVICEFLAGS +{ + UINT LegacyMode : 1; + UINT RequestVSync : 1; + UINT DisableGpuTimeout : 1; + UINT Reserved : 29; +} D3DKMT_CREATEDEVICEFLAGS; + +typedef struct _D3DDDI_ALLOCATIONLIST +{ + D3DKMT_HANDLE hAllocation; + union + { + struct + { + UINT WriteOperation : 1; + UINT DoNotRetireInstance : 1; + UINT OfferPriority : 3; + UINT Reserved : 27; + } DUMMYSTRUCTNAME; + UINT Value; + } DUMMYUNIONNAME; +} D3DDDI_ALLOCATIONLIST; + +typedef struct _D3DDDI_PATCHLOCATIONLIST +{ + UINT AllocationIndex; + union + { + struct + { + UINT SlotId : 24; + UINT Reserved : 8; + } DUMMYSTRUCTNAME; + UINT Value; + } DUMMYUNIONNAME; + UINT DriverId; + UINT AllocationOffset; + UINT PatchOffset; + UINT SplitOffset; +} D3DDDI_PATCHLOCATIONLIST; + +typedef struct _D3DKMT_DESTROYDEVICE +{ + D3DKMT_HANDLE hDevice; +} D3DKMT_DESTROYDEVICE; + +typedef struct _D3DKMT_CHECKOCCLUSION +{ + HWND hWnd; +} D3DKMT_CHECKOCCLUSION; + +typedef struct _D3DKMT_CREATEDEVICE +{ + union + { + D3DKMT_HANDLE hAdapter; + VOID *pAdapter; + } DUMMYUNIONNAME; + D3DKMT_CREATEDEVICEFLAGS Flags; + D3DKMT_HANDLE hDevice; + VOID *pCommandBuffer; + UINT CommandBufferSize; + D3DDDI_ALLOCATIONLIST *pAllocationList; + UINT AllocationListSize; + D3DDDI_PATCHLOCATIONLIST *pPatchLocationList; + UINT PatchLocationListSize; +} D3DKMT_CREATEDEVICE; + +typedef struct _D3DKMT_OPENADAPTERFROMHDC +{ + HDC hDc; + D3DKMT_HANDLE hAdapter; + LUID AdapterLuid; + D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId; +} D3DKMT_OPENADAPTERFROMHDC; + +typedef struct _D3DKMT_OPENADAPTERFROMDEVICENAME +{ + const WCHAR *pDeviceName; + D3DKMT_HANDLE hAdapter; + LUID AdapterLuid; +} D3DKMT_OPENADAPTERFROMDEVICENAME; + +typedef struct _D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME +{ + WCHAR DeviceName[32]; + D3DKMT_HANDLE hAdapter; + LUID AdapterLuid; + D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId; +} D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME; + +typedef struct _D3DKMT_SETVIDPNSOURCEOWNER +{ + D3DKMT_HANDLE hDevice; + const D3DKMT_VIDPNSOURCEOWNER_TYPE *pType; + const D3DDDI_VIDEO_PRESENT_SOURCE_ID *pVidPnSourceId; + UINT VidPnSourceCount; +} D3DKMT_SETVIDPNSOURCEOWNER; + +typedef struct _D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP +{ + D3DKMT_HANDLE hAdapter; + D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId; +} D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP; + typedef struct _D3DKMT_CLOSEADAPTER { D3DKMT_HANDLE hAdapter; diff --git a/include/ntstatus.h b/include/ntstatus.h index 735b6c2c41..b3dddaba86 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -1210,6 +1210,198 @@ #define STATUS_GENERIC_COMMAND_FAILED ((NTSTATUS) 0xC0150026) #define STATUS_SXS_FILE_HASH_MISSING ((NTSTATUS) 0xC0150027) +#define STATUS_GRAPHICS_NOT_EXCLUSIVE_MODE_OWNER ((NTSTATUS) 0xC01E0000L) +#define STATUS_GRAPHICS_INSUFFICIENT_DMA_BUFFER ((NTSTATUS) 0xC01E0001L) +#define STATUS_GRAPHICS_INVALID_DISPLAY_ADAPTER ((NTSTATUS) 0xC01E0002L) +#define STATUS_GRAPHICS_ADAPTER_WAS_RESET ((NTSTATUS) 0xC01E0003L) +#define STATUS_GRAPHICS_INVALID_DRIVER_MODEL ((NTSTATUS) 0xC01E0004L) +#define STATUS_GRAPHICS_PRESENT_MODE_CHANGED ((NTSTATUS) 0xC01E0005L) +#define STATUS_GRAPHICS_PRESENT_OCCLUDED ((NTSTATUS) 0xC01E0006L) +#define STATUS_GRAPHICS_PRESENT_DENIED ((NTSTATUS) 0xC01E0007L) +#define STATUS_GRAPHICS_CANNOTCOLORCONVERT ((NTSTATUS) 0xC01E0008L) +#define STATUS_GRAPHICS_DRIVER_MISMATCH ((NTSTATUS) 0xC01E0009L) +#define STATUS_GRAPHICS_PARTIAL_DATA_POPULATED ((NTSTATUS) 0x401E000AL) +#define STATUS_GRAPHICS_PRESENT_REDIRECTION_DISABLED ((NTSTATUS) 0xC01E000BL) +#define STATUS_GRAPHICS_PRESENT_UNOCCLUDED ((NTSTATUS) 0xC01E000CL) +#define STATUS_GRAPHICS_WINDOWDC_NOT_AVAILABLE ((NTSTATUS) 0xC01E000DL) +#define STATUS_GRAPHICS_WINDOWLESS_PRESENT_DISABLED ((NTSTATUS) 0xC01E000EL) +#define STATUS_GRAPHICS_PRESENT_INVALID_WINDOW ((NTSTATUS) 0xC01E000FL) +#define STATUS_GRAPHICS_PRESENT_BUFFER_NOT_BOUND ((NTSTATUS) 0xC01E0010L) +#define STATUS_GRAPHICS_VAIL_STATE_CHANGED ((NTSTATUS) 0xC01E0011L) +#define STATUS_GRAPHICS_NO_VIDEO_MEMORY ((NTSTATUS) 0xC01E0100L) +#define STATUS_GRAPHICS_CANT_LOCK_MEMORY ((NTSTATUS) 0xC01E0101L) +#define STATUS_GRAPHICS_ALLOCATION_BUSY ((NTSTATUS) 0xC01E0102L) +#define STATUS_GRAPHICS_TOO_MANY_REFERENCES ((NTSTATUS) 0xC01E0103L) +#define STATUS_GRAPHICS_TRY_AGAIN_LATER ((NTSTATUS) 0xC01E0104L) +#define STATUS_GRAPHICS_TRY_AGAIN_NOW ((NTSTATUS) 0xC01E0105L) +#define STATUS_GRAPHICS_ALLOCATION_INVALID ((NTSTATUS) 0xC01E0106L) +#define STATUS_GRAPHICS_UNSWIZZLING_APERTURE_UNAVAILABLE ((NTSTATUS) 0xC01E0107L) +#define STATUS_GRAPHICS_UNSWIZZLING_APERTURE_UNSUPPORTED ((NTSTATUS) 0xC01E0108L) +#define STATUS_GRAPHICS_CANT_EVICT_PINNED_ALLOCATION ((NTSTATUS) 0xC01E0109L) +#define STATUS_GRAPHICS_INVALID_ALLOCATION_USAGE ((NTSTATUS) 0xC01E0110L) +#define STATUS_GRAPHICS_CANT_RENDER_LOCKED_ALLOCATION ((NTSTATUS) 0xC01E0111L) +#define STATUS_GRAPHICS_ALLOCATION_CLOSED ((NTSTATUS) 0xC01E0112L) +#define STATUS_GRAPHICS_INVALID_ALLOCATION_INSTANCE ((NTSTATUS) 0xC01E0113L) +#define STATUS_GRAPHICS_INVALID_ALLOCATION_HANDLE ((NTSTATUS) 0xC01E0114L) +#define STATUS_GRAPHICS_WRONG_ALLOCATION_DEVICE ((NTSTATUS) 0xC01E0115L) +#define STATUS_GRAPHICS_ALLOCATION_CONTENT_LOST ((NTSTATUS) 0xC01E0116L) +#define STATUS_GRAPHICS_GPU_EXCEPTION_ON_DEVICE ((NTSTATUS) 0xC01E0200L) +#define STATUS_GRAPHICS_SKIP_ALLOCATION_PREPARATION ((NTSTATUS) 0x401E0201L) +#define STATUS_GRAPHICS_INVALID_VIDPN_TOPOLOGY ((NTSTATUS) 0xC01E0300L) +#define STATUS_GRAPHICS_VIDPN_TOPOLOGY_NOT_SUPPORTED ((NTSTATUS) 0xC01E0301L) +#define STATUS_GRAPHICS_VIDPN_TOPOLOGY_CURRENTLY_NOT_SUPPORTED ((NTSTATUS) 0xC01E0302L) +#define STATUS_GRAPHICS_INVALID_VIDPN ((NTSTATUS) 0xC01E0303L) +#define STATUS_GRAPHICS_INVALID_VIDEO_PRESENT_SOURCE ((NTSTATUS) 0xC01E0304L) +#define STATUS_GRAPHICS_INVALID_VIDEO_PRESENT_TARGET ((NTSTATUS) 0xC01E0305L) +#define STATUS_GRAPHICS_VIDPN_MODALITY_NOT_SUPPORTED ((NTSTATUS) 0xC01E0306L) +#define STATUS_GRAPHICS_MODE_NOT_PINNED ((NTSTATUS) 0x401E0307L) +#define STATUS_GRAPHICS_INVALID_VIDPN_SOURCEMODESET ((NTSTATUS) 0xC01E0308L) +#define STATUS_GRAPHICS_INVALID_VIDPN_TARGETMODESET ((NTSTATUS) 0xC01E0309L) +#define STATUS_GRAPHICS_INVALID_FREQUENCY ((NTSTATUS) 0xC01E030AL) +#define STATUS_GRAPHICS_INVALID_ACTIVE_REGION ((NTSTATUS) 0xC01E030BL) +#define STATUS_GRAPHICS_INVALID_TOTAL_REGION ((NTSTATUS) 0xC01E030CL) +#define STATUS_GRAPHICS_INVALID_VIDEO_PRESENT_SOURCE_MODE ((NTSTATUS) 0xC01E0310L) +#define STATUS_GRAPHICS_INVALID_VIDEO_PRESENT_TARGET_MODE ((NTSTATUS) 0xC01E0311L) +#define STATUS_GRAPHICS_PINNED_MODE_MUST_REMAIN_IN_SET ((NTSTATUS) 0xC01E0312L) +#define STATUS_GRAPHICS_PATH_ALREADY_IN_TOPOLOGY ((NTSTATUS) 0xC01E0313L) +#define STATUS_GRAPHICS_MODE_ALREADY_IN_MODESET ((NTSTATUS) 0xC01E0314L) +#define STATUS_GRAPHICS_INVALID_VIDEOPRESENTSOURCESET ((NTSTATUS) 0xC01E0315L) +#define STATUS_GRAPHICS_INVALID_VIDEOPRESENTTARGETSET ((NTSTATUS) 0xC01E0316L) +#define STATUS_GRAPHICS_SOURCE_ALREADY_IN_SET ((NTSTATUS) 0xC01E0317L) +#define STATUS_GRAPHICS_TARGET_ALREADY_IN_SET ((NTSTATUS) 0xC01E0318L) +#define STATUS_GRAPHICS_INVALID_VIDPN_PRESENT_PATH ((NTSTATUS) 0xC01E0319L) +#define STATUS_GRAPHICS_NO_RECOMMENDED_VIDPN_TOPOLOGY ((NTSTATUS) 0xC01E031AL) +#define STATUS_GRAPHICS_INVALID_MONITOR_FREQUENCYRANGESET ((NTSTATUS) 0xC01E031BL) +#define STATUS_GRAPHICS_INVALID_MONITOR_FREQUENCYRANGE ((NTSTATUS) 0xC01E031CL) +#define STATUS_GRAPHICS_FREQUENCYRANGE_NOT_IN_SET ((NTSTATUS) 0xC01E031DL) +#define STATUS_GRAPHICS_NO_PREFERRED_MODE ((NTSTATUS) 0x401E031EL) +#define STATUS_GRAPHICS_FREQUENCYRANGE_ALREADY_IN_SET ((NTSTATUS) 0xC01E031FL) +#define STATUS_GRAPHICS_STALE_MODESET ((NTSTATUS) 0xC01E0320L) +#define STATUS_GRAPHICS_INVALID_MONITOR_SOURCEMODESET ((NTSTATUS) 0xC01E0321L) +#define STATUS_GRAPHICS_INVALID_MONITOR_SOURCE_MODE ((NTSTATUS) 0xC01E0322L) +#define STATUS_GRAPHICS_NO_RECOMMENDED_FUNCTIONAL_VIDPN ((NTSTATUS) 0xC01E0323L) +#define STATUS_GRAPHICS_MODE_ID_MUST_BE_UNIQUE ((NTSTATUS) 0xC01E0324L) +#define STATUS_GRAPHICS_EMPTY_ADAPTER_MONITOR_MODE_SUPPORT_INTERSECTION ((NTSTATUS) 0xC01E0325L) +#define STATUS_GRAPHICS_VIDEO_PRESENT_TARGETS_LESS_THAN_SOURCES ((NTSTATUS) 0xC01E0326L) +#define STATUS_GRAPHICS_PATH_NOT_IN_TOPOLOGY ((NTSTATUS) 0xC01E0327L) +#define STATUS_GRAPHICS_ADAPTER_MUST_HAVE_AT_LEAST_ONE_SOURCE ((NTSTATUS) 0xC01E0328L) +#define STATUS_GRAPHICS_ADAPTER_MUST_HAVE_AT_LEAST_ONE_TARGET ((NTSTATUS) 0xC01E0329L) +#define STATUS_GRAPHICS_INVALID_MONITORDESCRIPTORSET ((NTSTATUS) 0xC01E032AL) +#define STATUS_GRAPHICS_INVALID_MONITORDESCRIPTOR ((NTSTATUS) 0xC01E032BL) +#define STATUS_GRAPHICS_MONITORDESCRIPTOR_NOT_IN_SET ((NTSTATUS) 0xC01E032CL) +#define STATUS_GRAPHICS_MONITORDESCRIPTOR_ALREADY_IN_SET ((NTSTATUS) 0xC01E032DL) +#define STATUS_GRAPHICS_MONITORDESCRIPTOR_ID_MUST_BE_UNIQUE ((NTSTATUS) 0xC01E032EL) +#define STATUS_GRAPHICS_INVALID_VIDPN_TARGET_SUBSET_TYPE ((NTSTATUS) 0xC01E032FL) +#define STATUS_GRAPHICS_RESOURCES_NOT_RELATED ((NTSTATUS) 0xC01E0330L) +#define STATUS_GRAPHICS_SOURCE_ID_MUST_BE_UNIQUE ((NTSTATUS) 0xC01E0331L) +#define STATUS_GRAPHICS_TARGET_ID_MUST_BE_UNIQUE ((NTSTATUS) 0xC01E0332L) +#define STATUS_GRAPHICS_NO_AVAILABLE_VIDPN_TARGET ((NTSTATUS) 0xC01E0333L) +#define STATUS_GRAPHICS_MONITOR_COULD_NOT_BE_ASSOCIATED_WITH_ADAPTER ((NTSTATUS) 0xC01E0334L) +#define STATUS_GRAPHICS_NO_VIDPNMGR ((NTSTATUS) 0xC01E0335L) +#define STATUS_GRAPHICS_NO_ACTIVE_VIDPN ((NTSTATUS) 0xC01E0336L) +#define STATUS_GRAPHICS_STALE_VIDPN_TOPOLOGY ((NTSTATUS) 0xC01E0337L) +#define STATUS_GRAPHICS_MONITOR_NOT_CONNECTED ((NTSTATUS) 0xC01E0338L) +#define STATUS_GRAPHICS_SOURCE_NOT_IN_TOPOLOGY ((NTSTATUS) 0xC01E0339L) +#define STATUS_GRAPHICS_INVALID_PRIMARYSURFACE_SIZE ((NTSTATUS) 0xC01E033AL) +#define STATUS_GRAPHICS_INVALID_VISIBLEREGION_SIZE ((NTSTATUS) 0xC01E033BL) +#define STATUS_GRAPHICS_INVALID_STRIDE ((NTSTATUS) 0xC01E033CL) +#define STATUS_GRAPHICS_INVALID_PIXELFORMAT ((NTSTATUS) 0xC01E033DL) +#define STATUS_GRAPHICS_INVALID_COLORBASIS ((NTSTATUS) 0xC01E033EL) +#define STATUS_GRAPHICS_INVALID_PIXELVALUEACCESSMODE ((NTSTATUS) 0xC01E033FL) +#define STATUS_GRAPHICS_TARGET_NOT_IN_TOPOLOGY ((NTSTATUS) 0xC01E0340L) +#define STATUS_GRAPHICS_NO_DISPLAY_MODE_MANAGEMENT_SUPPORT ((NTSTATUS) 0xC01E0341L) +#define STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE ((NTSTATUS) 0xC01E0342L) +#define STATUS_GRAPHICS_CANT_ACCESS_ACTIVE_VIDPN ((NTSTATUS) 0xC01E0343L) +#define STATUS_GRAPHICS_INVALID_PATH_IMPORTANCE_ORDINAL ((NTSTATUS) 0xC01E0344L) +#define STATUS_GRAPHICS_INVALID_PATH_CONTENT_GEOMETRY_TRANSFORMATION ((NTSTATUS) 0xC01E0345L) +#define STATUS_GRAPHICS_PATH_CONTENT_GEOMETRY_TRANSFORMATION_NOT_SUPPORTED ((NTSTATUS) 0xC01E0346L) +#define STATUS_GRAPHICS_INVALID_GAMMA_RAMP ((NTSTATUS) 0xC01E0347L) +#define STATUS_GRAPHICS_GAMMA_RAMP_NOT_SUPPORTED ((NTSTATUS) 0xC01E0348L) +#define STATUS_GRAPHICS_MULTISAMPLING_NOT_SUPPORTED ((NTSTATUS) 0xC01E0349L) +#define STATUS_GRAPHICS_MODE_NOT_IN_MODESET ((NTSTATUS) 0xC01E034AL) +#define STATUS_GRAPHICS_DATASET_IS_EMPTY ((NTSTATUS) 0x401E034BL) +#define STATUS_GRAPHICS_NO_MORE_ELEMENTS_IN_DATASET ((NTSTATUS) 0x401E034CL) +#define STATUS_GRAPHICS_INVALID_VIDPN_TOPOLOGY_RECOMMENDATION_REASON ((NTSTATUS) 0xC01E034DL) +#define STATUS_GRAPHICS_INVALID_PATH_CONTENT_TYPE ((NTSTATUS) 0xC01E034EL) +#define STATUS_GRAPHICS_INVALID_COPYPROTECTION_TYPE ((NTSTATUS) 0xC01E034FL) +#define STATUS_GRAPHICS_UNASSIGNED_MODESET_ALREADY_EXISTS ((NTSTATUS) 0xC01E0350L) +#define STATUS_GRAPHICS_PATH_CONTENT_GEOMETRY_TRANSFORMATION_NOT_PINNED ((NTSTATUS) 0x401E0351L) +#define STATUS_GRAPHICS_INVALID_SCANLINE_ORDERING ((NTSTATUS) 0xC01E0352L) +#define STATUS_GRAPHICS_TOPOLOGY_CHANGES_NOT_ALLOWED ((NTSTATUS) 0xC01E0353L) +#define STATUS_GRAPHICS_NO_AVAILABLE_IMPORTANCE_ORDINALS ((NTSTATUS) 0xC01E0354L) +#define STATUS_GRAPHICS_INCOMPATIBLE_PRIVATE_FORMAT ((NTSTATUS) 0xC01E0355L) +#define STATUS_GRAPHICS_INVALID_MODE_PRUNING_ALGORITHM ((NTSTATUS) 0xC01E0356L) +#define STATUS_GRAPHICS_INVALID_MONITOR_CAPABILITY_ORIGIN ((NTSTATUS) 0xC01E0357L) +#define STATUS_GRAPHICS_INVALID_MONITOR_FREQUENCYRANGE_CONSTRAINT ((NTSTATUS) 0xC01E0358L) +#define STATUS_GRAPHICS_MAX_NUM_PATHS_REACHED ((NTSTATUS) 0xC01E0359L) +#define STATUS_GRAPHICS_CANCEL_VIDPN_TOPOLOGY_AUGMENTATION ((NTSTATUS) 0xC01E035AL) +#define STATUS_GRAPHICS_INVALID_CLIENT_TYPE ((NTSTATUS) 0xC01E035BL) +#define STATUS_GRAPHICS_CLIENTVIDPN_NOT_SET ((NTSTATUS) 0xC01E035CL) +#define STATUS_GRAPHICS_SPECIFIED_CHILD_ALREADY_CONNECTED ((NTSTATUS) 0xC01E0400L) +#define STATUS_GRAPHICS_CHILD_DESCRIPTOR_NOT_SUPPORTED ((NTSTATUS) 0xC01E0401L) +#define STATUS_GRAPHICS_UNKNOWN_CHILD_STATUS ((NTSTATUS) 0x401E042FL) +#define STATUS_GRAPHICS_NOT_A_LINKED_ADAPTER ((NTSTATUS) 0xC01E0430L) +#define STATUS_GRAPHICS_LEADLINK_NOT_ENUMERATED ((NTSTATUS) 0xC01E0431L) +#define STATUS_GRAPHICS_CHAINLINKS_NOT_ENUMERATED ((NTSTATUS) 0xC01E0432L) +#define STATUS_GRAPHICS_ADAPTER_CHAIN_NOT_READY ((NTSTATUS) 0xC01E0433L) +#define STATUS_GRAPHICS_CHAINLINKS_NOT_STARTED ((NTSTATUS) 0xC01E0434L) +#define STATUS_GRAPHICS_CHAINLINKS_NOT_POWERED_ON ((NTSTATUS) 0xC01E0435L) +#define STATUS_GRAPHICS_INCONSISTENT_DEVICE_LINK_STATE ((NTSTATUS) 0xC01E0436L) +#define STATUS_GRAPHICS_LEADLINK_START_DEFERRED ((NTSTATUS) 0x401E0437L) +#define STATUS_GRAPHICS_NOT_POST_DEVICE_DRIVER ((NTSTATUS) 0xC01E0438L) +#define STATUS_GRAPHICS_POLLING_TOO_FREQUENTLY ((NTSTATUS) 0x401E0439L) +#define STATUS_GRAPHICS_START_DEFERRED ((NTSTATUS) 0x401E043AL) +#define STATUS_GRAPHICS_ADAPTER_ACCESS_NOT_EXCLUDED ((NTSTATUS) 0xC01E043BL) +#define STATUS_GRAPHICS_DEPENDABLE_CHILD_STATUS ((NTSTATUS) 0x401E043CL) +#define STATUS_GRAPHICS_OPM_NOT_SUPPORTED ((NTSTATUS) 0xC01E0500L) +#define STATUS_GRAPHICS_COPP_NOT_SUPPORTED ((NTSTATUS) 0xC01E0501L) +#define STATUS_GRAPHICS_UAB_NOT_SUPPORTED ((NTSTATUS) 0xC01E0502L) +#define STATUS_GRAPHICS_OPM_INVALID_ENCRYPTED_PARAMETERS ((NTSTATUS) 0xC01E0503L) +#define STATUS_GRAPHICS_OPM_NO_PROTECTED_OUTPUTS_EXIST ((NTSTATUS) 0xC01E0505L) +#define STATUS_GRAPHICS_OPM_INTERNAL_ERROR ((NTSTATUS) 0xC01E050BL) +#define STATUS_GRAPHICS_OPM_INVALID_HANDLE ((NTSTATUS) 0xC01E050CL) +#define STATUS_GRAPHICS_PVP_INVALID_CERTIFICATE_LENGTH ((NTSTATUS) 0xC01E050EL) +#define STATUS_GRAPHICS_OPM_SPANNING_MODE_ENABLED ((NTSTATUS) 0xC01E050FL) +#define STATUS_GRAPHICS_OPM_THEATER_MODE_ENABLED ((NTSTATUS) 0xC01E0510L) +#define STATUS_GRAPHICS_PVP_HFS_FAILED ((NTSTATUS) 0xC01E0511L) +#define STATUS_GRAPHICS_OPM_INVALID_SRM ((NTSTATUS) 0xC01E0512L) +#define STATUS_GRAPHICS_OPM_OUTPUT_DOES_NOT_SUPPORT_HDCP ((NTSTATUS) 0xC01E0513L) +#define STATUS_GRAPHICS_OPM_OUTPUT_DOES_NOT_SUPPORT_ACP ((NTSTATUS) 0xC01E0514L) +#define STATUS_GRAPHICS_OPM_OUTPUT_DOES_NOT_SUPPORT_CGMSA ((NTSTATUS) 0xC01E0515L) +#define STATUS_GRAPHICS_OPM_HDCP_SRM_NEVER_SET ((NTSTATUS) 0xC01E0516L) +#define STATUS_GRAPHICS_OPM_RESOLUTION_TOO_HIGH ((NTSTATUS) 0xC01E0517L) +#define STATUS_GRAPHICS_OPM_ALL_HDCP_HARDWARE_ALREADY_IN_USE ((NTSTATUS) 0xC01E0518L) +#define STATUS_GRAPHICS_OPM_PROTECTED_OUTPUT_NO_LONGER_EXISTS ((NTSTATUS) 0xC01E051AL) +#define STATUS_GRAPHICS_OPM_PROTECTED_OUTPUT_DOES_NOT_HAVE_COPP_SEMANTICS ((NTSTATUS) 0xC01E051CL) +#define STATUS_GRAPHICS_OPM_INVALID_INFORMATION_REQUEST ((NTSTATUS) 0xC01E051DL) +#define STATUS_GRAPHICS_OPM_DRIVER_INTERNAL_ERROR ((NTSTATUS) 0xC01E051EL) +#define STATUS_GRAPHICS_OPM_PROTECTED_OUTPUT_DOES_NOT_HAVE_OPM_SEMANTICS ((NTSTATUS) 0xC01E051FL) +#define STATUS_GRAPHICS_OPM_SIGNALING_NOT_SUPPORTED ((NTSTATUS) 0xC01E0520L) +#define STATUS_GRAPHICS_OPM_INVALID_CONFIGURATION_REQUEST ((NTSTATUS) 0xC01E0521L) +#define STATUS_GRAPHICS_I2C_NOT_SUPPORTED ((NTSTATUS) 0xC01E0580L) +#define STATUS_GRAPHICS_I2C_DEVICE_DOES_NOT_EXIST ((NTSTATUS) 0xC01E0581L) +#define STATUS_GRAPHICS_I2C_ERROR_TRANSMITTING_DATA ((NTSTATUS) 0xC01E0582L) +#define STATUS_GRAPHICS_I2C_ERROR_RECEIVING_DATA ((NTSTATUS) 0xC01E0583L) +#define STATUS_GRAPHICS_DDCCI_VCP_NOT_SUPPORTED ((NTSTATUS) 0xC01E0584L) +#define STATUS_GRAPHICS_DDCCI_INVALID_DATA ((NTSTATUS) 0xC01E0585L) +#define STATUS_GRAPHICS_DDCCI_MONITOR_RETURNED_INVALID_TIMING_STATUS_BYTE ((NTSTATUS) 0xC01E0586L) +#define STATUS_GRAPHICS_DDCCI_INVALID_CAPABILITIES_STRING ((NTSTATUS) 0xC01E0587L) +#define STATUS_GRAPHICS_MCA_INTERNAL_ERROR ((NTSTATUS) 0xC01E0588L) +#define STATUS_GRAPHICS_DDCCI_INVALID_MESSAGE_COMMAND ((NTSTATUS) 0xC01E0589L) +#define STATUS_GRAPHICS_DDCCI_INVALID_MESSAGE_LENGTH ((NTSTATUS) 0xC01E058AL) +#define STATUS_GRAPHICS_DDCCI_INVALID_MESSAGE_CHECKSUM ((NTSTATUS) 0xC01E058BL) +#define STATUS_GRAPHICS_INVALID_PHYSICAL_MONITOR_HANDLE ((NTSTATUS) 0xC01E058CL) +#define STATUS_GRAPHICS_MONITOR_NO_LONGER_EXISTS ((NTSTATUS) 0xC01E058DL) +#define STATUS_GRAPHICS_ONLY_CONSOLE_SESSION_SUPPORTED ((NTSTATUS) 0xC01E05E0L) +#define STATUS_GRAPHICS_NO_DISPLAY_DEVICE_CORRESPONDS_TO_NAME ((NTSTATUS) 0xC01E05E1L) +#define STATUS_GRAPHICS_DISPLAY_DEVICE_NOT_ATTACHED_TO_DESKTOP ((NTSTATUS) 0xC01E05E2L) +#define STATUS_GRAPHICS_MIRRORING_DEVICES_NOT_SUPPORTED ((NTSTATUS) 0xC01E05E3L) +#define STATUS_GRAPHICS_INVALID_POINTER ((NTSTATUS) 0xC01E05E4L) +#define STATUS_GRAPHICS_NO_MONITORS_CORRESPOND_TO_DISPLAY_DEVICE ((NTSTATUS) 0xC01E05E5L) +#define STATUS_GRAPHICS_PARAMETER_ARRAY_TOO_SMALL ((NTSTATUS) 0xC01E05E6L) +#define STATUS_GRAPHICS_INTERNAL_ERROR ((NTSTATUS) 0xC01E05E7L) +#define STATUS_GRAPHICS_SESSION_TYPE_CHANGE_IN_PROGRESS ((NTSTATUS) 0xC01E05E8L) + #define DBG_EXCEPTION_HANDLED ((NTSTATUS) 0x00010001) #define DBG_CONTINUE ((NTSTATUS) 0x00010002) #define DBG_TERMINATE_THREAD ((NTSTATUS) 0x40010003) -- 2.20.1

1 0

[PATCH 2/8] kernel32: added missing numa functions
by romanstingler May 9, 2019

May 9, 2019

From: Roman Stingler <roman.stingler(a)gmail.com> Signed-off-by: Roman Stingler <roman.stingler(a)gmail.com> --- ...pi-ms-win-core-kernel32-legacy-l1-1-1.spec | 4 +- dlls/kernel32/kernel32.spec | 8 ++-- dlls/kernel32/process.c | 37 +++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 3 +- include/ntdef.h | 2 + include/winbase.h | 15 ++++++++ 6 files changed, 62 insertions(+), 7 deletions(-) diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec index 5531d2dbd7..946e3de99e 100644 --- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec @@ -29,9 +29,9 @@ @ stub GetMaximumProcessorGroupCount @ stdcall GetNamedPipeClientProcessId(long ptr) kernel32.GetNamedPipeClientProcessId @ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId -@ stub GetNumaAvailableMemoryNodeEx +@ stdcall GetNumaAvailableMemoryNodeEx(long ptr) @ stdcall GetNumaNodeProcessorMask(long ptr) kernel32.GetNumaNodeProcessorMask -@ stub GetNumaProcessorNodeEx +@ stdcall GetNumaProcessorNodeEx(ptr ptr) @ stdcall GetShortPathNameA(str ptr long) kernel32.GetShortPathNameA @ stdcall GetStartupInfoA(ptr) kernel32.GetStartupInfoA @ stdcall GetStringTypeExA(long long str long ptr) kernel32.GetStringTypeExA diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 295a4dbab6..08a9a9cd9d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -742,16 +742,16 @@ # @ stub GetNLSVersionEx # @ stub GetNumaAvailableMemory @ stdcall GetNumaAvailableMemoryNode(long ptr) -# @ stub GetNumaAvailableMemoryNodeEx +@ stdcall GetNumaAvailableMemoryNodeEx(long ptr) @ stdcall GetNumaHighestNodeNumber(ptr) # @ stub GetNumaNodeNumberFromHandle @ stdcall GetNumaNodeProcessorMask(long ptr) @ stdcall GetNumaNodeProcessorMaskEx(long ptr) # @ stub GetNumaProcessorMap @ stdcall GetNumaProcessorNode(long ptr) -# @ stub GetNumaProcessorNodeEx -# @ stub GetNumaProximityNode -# @ stub GetNumaProximityNodeEx +@ stdcall GetNumaProcessorNodeEx(ptr ptr) +@ stdcall GetNumaProximityNode(long ptr) +@ stdcall GetNumaProximityNodeEx(long ptr) @ stdcall GetNumberFormatA(long long str ptr ptr long) @ stdcall GetNumberFormatEx(wstr long wstr ptr ptr long) @ stdcall GetNumberFormatW(long long wstr ptr ptr long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 09f0433deb..a5e0d8d089 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4449,6 +4449,16 @@ BOOL WINAPI GetNumaAvailableMemoryNode(UCHAR node, PULONGLONG available_bytes) return FALSE; } +/********************************************************************** + * GetNumaAvailableMemoryNodeEx (KERNEL32.@) + */ +BOOL WINAPI GetNumaAvailableMemoryNodeEx(USHORT node, PULONGLONG available_bytes) +{ + FIXME("(%c %p): stub\n", node, available_bytes); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + /*********************************************************************** * GetNumaProcessorNode (KERNEL32.@) */ @@ -4470,6 +4480,33 @@ BOOL WINAPI GetNumaProcessorNode(UCHAR processor, PUCHAR node) return FALSE; } +/*********************************************************************** + * GetNumaProcessorNodeEx (KERNEL32.@) + */ +BOOL WINAPI GetNumaProcessorNodeEx(PPROCESSOR_NUMBER processor, PUSHORT node_number) +{ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * GetNumaProximityNode (KERNEL32.@) + */ +BOOL WINAPI GetNumaProximityNode(ULONG proximity_id, PUCHAR node_number) +{ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * GetNumaProximityNodeEx (KERNEL32.@) + */ +BOOL WINAPI GetNumaProximityNodeEx(ULONG proximity_id, PUSHORT node_number) +{ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + /********************************************************************** * GetProcessDEPPolicy (KERNEL32.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 22ea65fe1c..abddb12533 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -576,7 +576,8 @@ # @ stub GetNextFgPolicyRefreshInfoInternal @ stdcall GetNumaHighestNodeNumber(ptr) kernel32.GetNumaHighestNodeNumber @ stdcall GetNumaNodeProcessorMaskEx(long ptr) kernel32.GetNumaNodeProcessorMaskEx -# @ stub GetNumaProximityNodeEx +@ stdcall GetNumaProximityNode(long ptr) kernel32.GetNumaProximityNode +@ stdcall GetNumaProximityNodeEx(long ptr) kernel32.GetNumaProximityNodeEx @ stdcall GetNumberFormatEx(wstr long wstr ptr ptr long) kernel32.GetNumberFormatEx @ stdcall GetNumberFormatW(long long wstr ptr ptr long) kernel32.GetNumberFormatW @ stdcall GetNumberOfConsoleInputEvents(long ptr) kernel32.GetNumberOfConsoleInputEvents diff --git a/include/ntdef.h b/include/ntdef.h index 83ecffd608..b9a27cabcb 100644 --- a/include/ntdef.h +++ b/include/ntdef.h @@ -39,6 +39,8 @@ typedef enum _WAIT_TYPE { WaitNotification } WAIT_TYPE; +#define MAXUSHORT 0xffff + #ifdef __cplusplus } #endif diff --git a/include/winbase.h b/include/winbase.h index 314a8b7f60..867f0a846f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1675,6 +1682,7 @@ typedef enum _PROC_THREAD_ATTRIBUTE_NUM ProcThreadAttributeParentProcess = 0, ProcThreadAttributeHandleList = 2, ProcThreadAttributeGroupAffinity = 3, + ProcThreadAttributePreferredNode = 4, ProcThreadAttributeIdealProcessor = 5, ProcThreadAttributeUmsThread = 6, ProcThreadAttributeMitigationPolicy = 7, @@ -1690,6 +1698,7 @@ typedef enum _PROC_THREAD_ATTRIBUTE_NUM #define PROC_THREAD_ATTRIBUTE_PARENT_PROCESS (ProcThreadAttributeParentProcess | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_HANDLE_LIST (ProcThreadAttributeHandleList | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_GROUP_AFFINITY (ProcThreadAttributeGroupAffinity | PROC_THREAD_ATTRIBUTE_THREAD | PROC_THREAD_ATTRIBUTE_INPUT) +#define PROC_THREAD_ATTRIBUTE_PREFERRED_NODE (ProcThreadAttributePreferredNode | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_IDEAL_PROCESSOR (ProcThreadAttributeIdealProcessor | PROC_THREAD_ATTRIBUTE_THREAD | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_UMS_THREAD (ProcThreadAttributeUmsThread | PROC_THREAD_ATTRIBUTE_THREAD | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_MITIGATION_POLICY (ProcThreadAttributeMitigationPolicy | PROC_THREAD_ATTRIBUTE_INPUT) @@ -2179,6 +2188,12 @@ WINBASEAPI BOOL WINAPI GetNamedPipeServerSessionId(HANDLE,PULONG); WINBASEAPI VOID WINAPI GetNativeSystemInfo(LPSYSTEM_INFO); WINBASEAPI PUMS_CONTEXT WINAPI GetNextUmsListItem(PUMS_CONTEXT); WINBASEAPI BOOL WINAPI GetNumaProcessorNode(UCHAR,PUCHAR); +WINBASEAPI BOOL WINAPI GetNumaAvailableMemoryNode(UCHAR,PULONGLONG); +WINBASEAPI BOOL WINAPI GetNumaNodeProcessorMaskEx(USHORT,PGROUP_AFFINITY); +WINBASEAPI BOOL WINAPI GetNumaProcessorNodeEx(PPROCESSOR_NUMBER,PUSHORT); +WINBASEAPI BOOL WINAPI GetNumaProximityNode(ULONG,PUCHAR); +WINBASEAPI BOOL WINAPI GetNumaAvailableMemoryNodeEx(USHORT,PULONGLONG); +WINBASEAPI BOOL WINAPI GetNumaProximityNodeEx(ULONG,PUSHORT); WINADVAPI BOOL WINAPI GetNumberOfEventLogRecords(HANDLE,PDWORD); WINADVAPI BOOL WINAPI GetOldestEventLogRecord(HANDLE,PDWORD); WINBASEAPI BOOL WINAPI GetOverlappedResult(HANDLE,LPOVERLAPPED,LPDWORD,BOOL); -- 2.21.0

3 2

[PATCH 5/5] winebus.sys: Pack hatswitch values into button bytes
by Andrew Eikum May 8, 2019

May 8, 2019

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 80 +++++++++++++++++++++++------------ dlls/winebus.sys/controller.h | 2 +- 2 files changed, 53 insertions(+), 29 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 59c16980ac4..cd69f831d76 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -123,7 +123,7 @@ struct platform_private int button_start; int axis_start; int ball_start; - int hat_start; + int hat_bit_offs; /* hatswitches are reported in the same bytes as buttons */ int report_descriptor_size; BYTE *report_descriptor; @@ -164,10 +164,6 @@ static const BYTE CONTROLLER_BUTTONS[] = { 0x95, CONTROLLER_NUM_BUTTONS, /* REPORT_COUNT (11) */ 0x75, 0x01, /* REPORT_SIZE (1) */ 0x81, 0x02, /* INPUT (Data,Var,Abs) */ - /* padding */ - 0x95, 0x05, /* REPORT_COUNT (5) */ - 0x75, 0x01, /* REPORT_SIZE (1) */ - 0x81, 0x03, /* INPUT (Cnst,Var,Abs) */ }; static const BYTE CONTROLLER_AXIS [] = { @@ -302,22 +298,50 @@ static void set_ball_value(struct platform_private *ext, int index, int value1, static void set_hat_value(struct platform_private *ext, int index, int value) { - int offset; - offset = ext->hat_start + index; + int byte = ext->button_start + (ext->hat_bit_offs + 4 * index) / 8; + int bit_offs = (ext->hat_bit_offs + 4 * index) % 8; + int num_low_bits, num_high_bits; + unsigned char val, low_mask, high_mask; + + /* 4-bit hatswitch value is packed into button bytes */ + if (bit_offs <= 4) + { + num_low_bits = 4; + num_high_bits = 0; + low_mask = 0xf; + high_mask = 0; + } + else + { + num_low_bits = 8 - bit_offs; + num_high_bits = 4 - num_low_bits; + low_mask = (1 << num_low_bits) - 1; + high_mask = (1 << num_high_bits) - 1; + } + switch (value) { /* 8 1 2 * 7 0 3 * 6 5 4 */ - case SDL_HAT_CENTERED: ext->report_buffer[offset] = 0; break; - case SDL_HAT_UP: ext->report_buffer[offset] = 1; break; - case SDL_HAT_RIGHTUP: ext->report_buffer[offset] = 2; break; - case SDL_HAT_RIGHT: ext->report_buffer[offset] = 3; break; - case SDL_HAT_RIGHTDOWN: ext->report_buffer[offset] = 4; break; - case SDL_HAT_DOWN: ext->report_buffer[offset] = 5; break; - case SDL_HAT_LEFTDOWN: ext->report_buffer[offset] = 6; break; - case SDL_HAT_LEFT: ext->report_buffer[offset] = 7; break; - case SDL_HAT_LEFTUP: ext->report_buffer[offset] = 8; break; + case SDL_HAT_CENTERED: val = 0; break; + case SDL_HAT_UP: val = 1; break; + case SDL_HAT_RIGHTUP: val = 2; break; + case SDL_HAT_RIGHT: val = 3; break; + case SDL_HAT_RIGHTDOWN: val = 4; break; + case SDL_HAT_DOWN: val = 5; break; + case SDL_HAT_LEFTDOWN: val = 6; break; + case SDL_HAT_LEFT: val = 7; break; + case SDL_HAT_LEFTUP: val = 8; break; + default: return; + } + + ext->report_buffer[byte] &= ~(low_mask << bit_offs); + ext->report_buffer[byte] |= (val & low_mask) << bit_offs; + if (high_mask) + { + ext->report_buffer[byte + 1] &= ~high_mask; + ext->report_buffer[byte + 1] |= val & high_mask; } } @@ -423,19 +447,17 @@ static BOOL build_report_descriptor(struct platform_private *ext) if (button_count) { descript_size += sizeof(REPORT_BUTTONS); - if (button_count % 8) - descript_size += sizeof(REPORT_PADDING); - report_size += (button_count + 7) / 8; } hat_count = pSDL_JoystickNumHats(ext->sdl_joystick); - ext->hat_start = report_size; + ext->hat_bit_offs = button_count; if (hat_count) { descript_size += sizeof(REPORT_HATSWITCH); - report_size += hat_count; } + report_size += (button_count + hat_count * 4 + 7) / 8; + descript_size += test_haptic(ext); TRACE("Report Descriptor will be %i bytes\n", descript_size); @@ -468,11 +490,6 @@ static BOOL build_report_descriptor(struct platform_private *ext) if (button_count) { report_ptr = add_button_block(report_ptr, 1, button_count); - if (button_count % 8) - { - BYTE padding = 8 - (button_count % 8); - report_ptr = add_padding_block(report_ptr, padding); - } } if (hat_count) report_ptr = add_hatswitch(report_ptr, hat_count); @@ -540,9 +557,11 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) ext->axis_start = 0; ext->button_start = CONTROLLER_NUM_AXES * sizeof(WORD); - ext->hat_start = ext->button_start + (CONTROLLER_NUM_BUTTONS + 7) / 8; + ext->hat_bit_offs = CONTROLLER_NUM_BUTTONS; - ext->buffer_length = (CONTROLLER_NUM_BUTTONS + 7) / 8 + CONTROLLER_NUM_AXES * sizeof(WORD) + CONTROLLER_NUM_HATSWITCHES; + ext->buffer_length = (CONTROLLER_NUM_BUTTONS + CONTROLLER_NUM_HATSWITCHES * 4 + 7) / 8 + + CONTROLLER_NUM_AXES * sizeof(WORD) + + 2/* unknown constant*/; TRACE("Report Descriptor will be %i bytes\n", descript_size); TRACE("Report will be %i bytes\n", ext->buffer_length); @@ -566,6 +585,7 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) memcpy(report_ptr, CONTROLLER_BUTTONS, sizeof(CONTROLLER_BUTTONS)); report_ptr += sizeof(CONTROLLER_BUTTONS); report_ptr = add_hatswitch(report_ptr, 1); + report_ptr = add_padding_block(report_ptr, 16);/* unknown constant */ report_ptr += build_haptic(ext, report_ptr); memcpy(report_ptr, REPORT_TAIL, sizeof(REPORT_TAIL)); @@ -584,6 +604,10 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) set_hat_value(ext, 0, compose_dpad_value(ext->sdl_controller)); + /* unknown constant */ + ext->report_buffer[12] = 0x89; + ext->report_buffer[13] = 0xc5; + return TRUE; } diff --git a/dlls/winebus.sys/controller.h b/dlls/winebus.sys/controller.h index 5fce16b1f6f..293290dbb51 100644 --- a/dlls/winebus.sys/controller.h +++ b/dlls/winebus.sys/controller.h @@ -79,7 +79,7 @@ static const BYTE REPORT_HATSWITCH[] = { 0x25, 0x08, /* LOGICAL_MAXIMUM (0x08) */ 0x35, 0x00, /* PHYSICAL_MINIMUM (0) */ 0x45, 0x08, /* PHYSICAL_MAXIMUM (8) */ - 0x75, 0x08, /* REPORT_SIZE (8) */ + 0x75, 0x04, /* REPORT_SIZE (4) */ 0x95, 0x01, /* REPORT_COUNT (1) */ 0x81, 0x02, /* INPUT (Data,Var,Abs) */ }; -- 2.21.0

2 1

[PATCH 4/5] winebus.sys: Report SDL controller buttons in the right order
by Andrew Eikum May 8, 2019

May 8, 2019

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 8 ++++---- dlls/xinput1_3/hid.c | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 8ff8373da40..59c16980ac4 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -808,10 +808,10 @@ static BOOL set_mapped_report_from_event(SDL_Event *event) case SDL_CONTROLLER_BUTTON_Y: usage = 3; break; case SDL_CONTROLLER_BUTTON_LEFTSHOULDER: usage = 4; break; case SDL_CONTROLLER_BUTTON_RIGHTSHOULDER: usage = 5; break; - case SDL_CONTROLLER_BUTTON_LEFTSTICK: usage = 6; break; - case SDL_CONTROLLER_BUTTON_RIGHTSTICK: usage = 7; break; - case SDL_CONTROLLER_BUTTON_START: usage = 8; break; - case SDL_CONTROLLER_BUTTON_BACK: usage = 9; break; + case SDL_CONTROLLER_BUTTON_BACK: usage = 6; break; + case SDL_CONTROLLER_BUTTON_START: usage = 7; break; + case SDL_CONTROLLER_BUTTON_LEFTSTICK: usage = 8; break; + case SDL_CONTROLLER_BUTTON_RIGHTSTICK: usage = 9; break; case SDL_CONTROLLER_BUTTON_GUIDE: usage = 10; break; case SDL_CONTROLLER_BUTTON_DPAD_UP: diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index f0036b14265..34e4e51285c 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -375,11 +375,10 @@ void HID_update_state(xinput_controller* device) case 4: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_Y; break; case 5: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_SHOULDER; break; case 6: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_SHOULDER; break; - case 7: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_THUMB; break; - case 8: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_THUMB; break; - - case 9: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_START; break; - case 10: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_BACK; break; + case 7: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_BACK; break; + case 8: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_START; break; + case 9: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_THUMB; break; + case 10: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_THUMB; break; case 11: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_GUIDE; break; } } -- 2.21.0

2 1

[PATCH 3/5] winebus.sys: Report SDL controller dpad as hatswitch
by Andrew Eikum May 8, 2019

May 8, 2019

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 59 ++++++++++++++++++++++++++++++++------ dlls/xinput1_3/hid.c | 50 ++++++++++++++++++++++++++------ 2 files changed, 91 insertions(+), 18 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 21f4aedc95e..8ff8373da40 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -92,6 +92,7 @@ MAKE_FUNCPTR(SDL_JoystickGetAxis); MAKE_FUNCPTR(SDL_JoystickGetHat); MAKE_FUNCPTR(SDL_IsGameController); MAKE_FUNCPTR(SDL_GameControllerGetAxis); +MAKE_FUNCPTR(SDL_GameControllerGetButton); MAKE_FUNCPTR(SDL_GameControllerName); MAKE_FUNCPTR(SDL_GameControllerOpen); MAKE_FUNCPTR(SDL_GameControllerEventState); @@ -150,21 +151,21 @@ static const BYTE REPORT_AXIS_TAIL[] = { }; #define IDX_ABS_AXIS_COUNT 23 -#define CONTROLLER_NUM_BUTTONS 15 +#define CONTROLLER_NUM_BUTTONS 11 static const BYTE CONTROLLER_BUTTONS[] = { 0x05, 0x09, /* USAGE_PAGE (Button) */ 0x19, 0x01, /* USAGE_MINIMUM (Button 1) */ - 0x29, CONTROLLER_NUM_BUTTONS, /* USAGE_MAXIMUM (Button 15) */ + 0x29, CONTROLLER_NUM_BUTTONS, /* USAGE_MAXIMUM (Button 11) */ 0x15, 0x00, /* LOGICAL_MINIMUM (0) */ 0x25, 0x01, /* LOGICAL_MAXIMUM (1) */ 0x35, 0x00, /* LOGICAL_MINIMUM (0) */ 0x45, 0x01, /* LOGICAL_MAXIMUM (1) */ - 0x95, CONTROLLER_NUM_BUTTONS, /* REPORT_COUNT (15) */ + 0x95, CONTROLLER_NUM_BUTTONS, /* REPORT_COUNT (11) */ 0x75, 0x01, /* REPORT_SIZE (1) */ 0x81, 0x02, /* INPUT (Data,Var,Abs) */ /* padding */ - 0x95, 0x01, /* REPORT_COUNT (1) */ + 0x95, 0x05, /* REPORT_COUNT (5) */ 0x75, 0x01, /* REPORT_SIZE (1) */ 0x81, 0x03, /* INPUT (Cnst,Var,Abs) */ }; @@ -199,6 +200,8 @@ static const BYTE CONTROLLER_TRIGGERS [] = { #define CONTROLLER_NUM_AXES 6 +#define CONTROLLER_NUM_HATSWITCHES 1 + static const BYTE HAPTIC_RUMBLE[] = { 0x06, 0x00, 0xff, /* USAGE PAGE (vendor-defined) */ 0x09, 0x01, /* USAGE (1) */ @@ -496,6 +499,33 @@ static BOOL build_report_descriptor(struct platform_private *ext) return TRUE; } +static SHORT compose_dpad_value(SDL_GameController *joystick) +{ + if (pSDL_GameControllerGetButton(joystick, SDL_CONTROLLER_BUTTON_DPAD_UP)) + { + if (pSDL_GameControllerGetButton(joystick, SDL_CONTROLLER_BUTTON_DPAD_RIGHT)) + return SDL_HAT_RIGHTUP; + if (pSDL_GameControllerGetButton(joystick, SDL_CONTROLLER_BUTTON_DPAD_LEFT)) + return SDL_HAT_LEFTUP; + return SDL_HAT_UP; + } + + if (pSDL_GameControllerGetButton(joystick, SDL_CONTROLLER_BUTTON_DPAD_DOWN)) + { + if (pSDL_GameControllerGetButton(joystick, SDL_CONTROLLER_BUTTON_DPAD_RIGHT)) + return SDL_HAT_RIGHTDOWN; + if (pSDL_GameControllerGetButton(joystick, SDL_CONTROLLER_BUTTON_DPAD_LEFT)) + return SDL_HAT_LEFTDOWN; + return SDL_HAT_DOWN; + } + + if (pSDL_GameControllerGetButton(joystick, SDL_CONTROLLER_BUTTON_DPAD_RIGHT)) + return SDL_HAT_RIGHT; + if (pSDL_GameControllerGetButton(joystick, SDL_CONTROLLER_BUTTON_DPAD_LEFT)) + return SDL_HAT_LEFT; + return SDL_HAT_CENTERED; +} + static BOOL build_mapped_report_descriptor(struct platform_private *ext) { BYTE *report_ptr; @@ -505,12 +535,14 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) descript_size += sizeof(CONTROLLER_AXIS); descript_size += sizeof(CONTROLLER_TRIGGERS); descript_size += sizeof(CONTROLLER_BUTTONS); + descript_size += sizeof(REPORT_HATSWITCH); descript_size += test_haptic(ext); ext->axis_start = 0; ext->button_start = CONTROLLER_NUM_AXES * sizeof(WORD); + ext->hat_start = ext->button_start + (CONTROLLER_NUM_BUTTONS + 7) / 8; - ext->buffer_length = (CONTROLLER_NUM_BUTTONS + 7) / 8 + CONTROLLER_NUM_AXES * sizeof(WORD); + ext->buffer_length = (CONTROLLER_NUM_BUTTONS + 7) / 8 + CONTROLLER_NUM_AXES * sizeof(WORD) + CONTROLLER_NUM_HATSWITCHES; TRACE("Report Descriptor will be %i bytes\n", descript_size); TRACE("Report will be %i bytes\n", ext->buffer_length); @@ -533,6 +565,7 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) report_ptr += sizeof(CONTROLLER_TRIGGERS); memcpy(report_ptr, CONTROLLER_BUTTONS, sizeof(CONTROLLER_BUTTONS)); report_ptr += sizeof(CONTROLLER_BUTTONS); + report_ptr = add_hatswitch(report_ptr, 1); report_ptr += build_haptic(ext, report_ptr); memcpy(report_ptr, REPORT_TAIL, sizeof(REPORT_TAIL)); @@ -549,6 +582,8 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) for (i = SDL_CONTROLLER_AXIS_LEFTX; i < SDL_CONTROLLER_AXIS_MAX; i++) set_axis_value(ext, i, pSDL_GameControllerGetAxis(ext->sdl_controller, i)); + set_hat_value(ext, 0, compose_dpad_value(ext->sdl_controller)); + return TRUE; } @@ -778,10 +813,15 @@ static BOOL set_mapped_report_from_event(SDL_Event *event) case SDL_CONTROLLER_BUTTON_START: usage = 8; break; case SDL_CONTROLLER_BUTTON_BACK: usage = 9; break; case SDL_CONTROLLER_BUTTON_GUIDE: usage = 10; break; - case SDL_CONTROLLER_BUTTON_DPAD_UP: usage = 11; break; - case SDL_CONTROLLER_BUTTON_DPAD_DOWN: usage = 12; break; - case SDL_CONTROLLER_BUTTON_DPAD_LEFT: usage = 13; break; - case SDL_CONTROLLER_BUTTON_DPAD_RIGHT: usage = 14; break; + + case SDL_CONTROLLER_BUTTON_DPAD_UP: + case SDL_CONTROLLER_BUTTON_DPAD_DOWN: + case SDL_CONTROLLER_BUTTON_DPAD_LEFT: + case SDL_CONTROLLER_BUTTON_DPAD_RIGHT: + set_hat_value(private, 0, compose_dpad_value(private->sdl_controller)); + process_hid_report(device, private->report_buffer, private->buffer_length); + break; + default: ERR("Unknown Button %i\n",ie->button); } @@ -1040,6 +1080,7 @@ NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_ LOAD_FUNCPTR(SDL_JoystickGetHat); LOAD_FUNCPTR(SDL_IsGameController); LOAD_FUNCPTR(SDL_GameControllerGetAxis); + LOAD_FUNCPTR(SDL_GameControllerGetButton); LOAD_FUNCPTR(SDL_GameControllerName); LOAD_FUNCPTR(SDL_GameControllerOpen); LOAD_FUNCPTR(SDL_GameControllerEventState); diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 1ccecb1acc6..f0036b14265 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -124,8 +124,8 @@ static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA ppd, XINPUT_CAPABILITIES *xinput_ button_count = max(button_count, button_caps[i].NotRange.Usage); } HeapFree(GetProcessHeap(), 0, button_caps); - if (button_count < 14) - WARN("Too few buttons, Continue\n"); + if (button_count < 11) + WARN("Too few buttons, continuing anyway\n"); xinput_caps->Gamepad.wButtons = 0xffff; value_caps_count = caps->NumberInputValueCaps; @@ -335,8 +335,8 @@ void HID_update_state(xinput_controller* device) CHAR *report = private->reports[(private->current_report)%2]; CHAR *target_report = private->reports[(private->current_report+1)%2]; - USAGE buttons[15]; - ULONG button_length; + USAGE buttons[11]; + ULONG button_length, hat_value; LONG value; if (!private->enabled) @@ -361,7 +361,7 @@ void HID_update_state(xinput_controller* device) private->current_report = (private->current_report+1)%2; device->state.dwPacketNumber++; - button_length = 15; + button_length = ARRAY_SIZE(buttons); HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, buttons, &button_length, private->ppd, target_report, private->report_length); device->state.Gamepad.wButtons = 0; @@ -381,10 +381,42 @@ void HID_update_state(xinput_controller* device) case 9: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_START; break; case 10: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_BACK; break; case 11: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_GUIDE; break; - case 12: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP; break; - case 13: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN; break; - case 14: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT; break; - case 15: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT; break; + } + } + + if(HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, &hat_value, + private->ppd, target_report, private->report_length) == HIDP_STATUS_SUCCESS) + { + switch(hat_value){ + /* 8 1 2 + * 7 0 3 + * 6 5 4 */ + case 0: + break; + case 1: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP; + break; + case 2: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP | XINPUT_GAMEPAD_DPAD_RIGHT; + break; + case 3: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT; + break; + case 4: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT | XINPUT_GAMEPAD_DPAD_DOWN; + break; + case 5: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN; + break; + case 6: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN | XINPUT_GAMEPAD_DPAD_LEFT; + break; + case 7: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT; + break; + case 8: + device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT | XINPUT_GAMEPAD_DPAD_UP; + break; } } -- 2.21.0

2 1

[PATCH 2/5] winebus.sys: Report hatswitch values correctly
by Andrew Eikum May 8, 2019

May 8, 2019

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 21 ++++++++++++--------- dlls/winebus.sys/bus_udev.c | 27 +++++++++++++++------------ dlls/winebus.sys/controller.h | 2 +- 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 701d5a53825..21f4aedc95e 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -303,15 +303,18 @@ static void set_hat_value(struct platform_private *ext, int index, int value) offset = ext->hat_start + index; switch (value) { - case SDL_HAT_CENTERED: ext->report_buffer[offset] = 8; break; - case SDL_HAT_UP: ext->report_buffer[offset] = 0; break; - case SDL_HAT_RIGHTUP: ext->report_buffer[offset] = 1; break; - case SDL_HAT_RIGHT: ext->report_buffer[offset] = 2; break; - case SDL_HAT_RIGHTDOWN: ext->report_buffer[offset] = 3; break; - case SDL_HAT_DOWN: ext->report_buffer[offset] = 4; break; - case SDL_HAT_LEFTDOWN: ext->report_buffer[offset] = 5; break; - case SDL_HAT_LEFT: ext->report_buffer[offset] = 6; break; - case SDL_HAT_LEFTUP: ext->report_buffer[offset] = 7; break; + /* 8 1 2 + * 7 0 3 + * 6 5 4 */ + case SDL_HAT_CENTERED: ext->report_buffer[offset] = 0; break; + case SDL_HAT_UP: ext->report_buffer[offset] = 1; break; + case SDL_HAT_RIGHTUP: ext->report_buffer[offset] = 2; break; + case SDL_HAT_RIGHT: ext->report_buffer[offset] = 3; break; + case SDL_HAT_RIGHTDOWN: ext->report_buffer[offset] = 4; break; + case SDL_HAT_DOWN: ext->report_buffer[offset] = 5; break; + case SDL_HAT_LEFTDOWN: ext->report_buffer[offset] = 6; break; + case SDL_HAT_LEFT: ext->report_buffer[offset] = 7; break; + case SDL_HAT_LEFTUP: ext->report_buffer[offset] = 8; break; } } diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 9baccf6a24b..ddda78d5694 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -303,32 +303,35 @@ static void set_abs_axis_value(struct wine_input_private *ext, int code, int val ext->hat_values[index] = value; if ((code - ABS_HAT0X) % 2) index--; + /* 8 1 2 + * 7 0 3 + * 6 5 4 */ if (ext->hat_values[index] == 0) { if (ext->hat_values[index+1] == 0) - value = 8; - else if (ext->hat_values[index+1] < 0) value = 0; - else - value = 4; - } - else if (ext->hat_values[index] > 0) - { - if (ext->hat_values[index+1] == 0) - value = 2; else if (ext->hat_values[index+1] < 0) value = 1; else + value = 5; + } + else if (ext->hat_values[index] > 0) + { + if (ext->hat_values[index+1] == 0) value = 3; + else if (ext->hat_values[index+1] < 0) + value = 2; + else + value = 4; } else { if (ext->hat_values[index+1] == 0) - value = 6; - else if (ext->hat_values[index+1] < 0) value = 7; + else if (ext->hat_values[index+1] < 0) + value = 8; else - value = 5; + value = 6; } ext->current_report_buffer[ext->hat_map[index]] = value; } diff --git a/dlls/winebus.sys/controller.h b/dlls/winebus.sys/controller.h index d443d6ca178..5fce16b1f6f 100644 --- a/dlls/winebus.sys/controller.h +++ b/dlls/winebus.sys/controller.h @@ -75,7 +75,7 @@ static const BYTE REPORT_REL_AXIS_TAIL[] = { static const BYTE REPORT_HATSWITCH[] = { 0x05, 0x01, /* USAGE_PAGE (Generic Desktop) */ 0x09, 0x39, /* USAGE (Hatswitch) */ - 0x15, 0x00, /* LOGICAL_MINIMUM (0) */ + 0x15, 0x01, /* LOGICAL_MINIMUM (1) */ 0x25, 0x08, /* LOGICAL_MAXIMUM (0x08) */ 0x35, 0x00, /* PHYSICAL_MINIMUM (0) */ 0x45, 0x08, /* PHYSICAL_MAXIMUM (8) */ -- 2.21.0

2 1

[PATCH 1/5] winebus.sys: Order axes before buttons
by Andrew Eikum May 8, 2019

May 8, 2019

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 71 +++++++++++++++++++++++------------ dlls/winebus.sys/bus_udev.c | 58 ++++++++++++++++++---------- dlls/winebus.sys/controller.h | 16 -------- 3 files changed, 84 insertions(+), 61 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 49ec69965bf..701d5a53825 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -119,6 +119,7 @@ struct platform_private SDL_GameController *sdl_controller; SDL_JoystickID id; + int button_start; int axis_start; int ball_start; int hat_start; @@ -247,6 +248,23 @@ static BYTE *add_axis_block(BYTE *report_ptr, BYTE count, BYTE page, const BYTE return report_ptr; } +static void set_button_value(struct platform_private *ext, int index, int value) +{ + int byte_index = ext->button_start + index / 8; + int bit_index = index % 8; + BYTE mask = 1 << bit_index; + + if (value) + { + ext->report_buffer[byte_index] = ext->report_buffer[byte_index] | mask; + } + else + { + mask = ~mask; + ext->report_buffer[byte_index] = ext->report_buffer[byte_index] & mask; + } +} + static void set_axis_value(struct platform_private *ext, int index, short value) { int offset; @@ -362,16 +380,6 @@ static BOOL build_report_descriptor(struct platform_private *ext) descript_size = sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL); report_size = 0; - /* For now lump all buttons just into incremental usages, Ignore Keys */ - button_count = pSDL_JoystickNumButtons(ext->sdl_joystick); - if (button_count) - { - descript_size += sizeof(REPORT_BUTTONS); - if (button_count % 8) - descript_size += sizeof(REPORT_PADDING); - report_size = (button_count + 7) / 8; - } - axis_count = pSDL_JoystickNumAxes(ext->sdl_joystick); if (axis_count > 6) { @@ -403,6 +411,17 @@ static BOOL build_report_descriptor(struct platform_private *ext) report_size += (sizeof(WORD) * 2 * ball_count); } + /* For now lump all buttons just into incremental usages, Ignore Keys */ + button_count = pSDL_JoystickNumButtons(ext->sdl_joystick); + ext->button_start = report_size; + if (button_count) + { + descript_size += sizeof(REPORT_BUTTONS); + if (button_count % 8) + descript_size += sizeof(REPORT_PADDING); + report_size += (button_count + 7) / 8; + } + hat_count = pSDL_JoystickNumHats(ext->sdl_joystick); ext->hat_start = report_size; if (hat_count) @@ -428,15 +447,6 @@ static BOOL build_report_descriptor(struct platform_private *ext) report_ptr[IDX_HEADER_PAGE] = device_usage[0]; report_ptr[IDX_HEADER_USAGE] = device_usage[1]; report_ptr += sizeof(REPORT_HEADER); - if (button_count) - { - report_ptr = add_button_block(report_ptr, 1, button_count); - if (button_count % 8) - { - BYTE padding = 8 - (button_count % 8); - report_ptr = add_padding_block(report_ptr, padding); - } - } if (axis_count) { if (axis_count == 6 && button_count >= 14) @@ -449,6 +459,15 @@ static BOOL build_report_descriptor(struct platform_private *ext) { report_ptr = add_axis_block(report_ptr, ball_count * 2, HID_USAGE_PAGE_GENERIC, &joystick_usages[axis_count], FALSE); } + if (button_count) + { + report_ptr = add_button_block(report_ptr, 1, button_count); + if (button_count % 8) + { + BYTE padding = 8 - (button_count % 8); + report_ptr = add_padding_block(report_ptr, padding); + } + } if (hat_count) report_ptr = add_hatswitch(report_ptr, hat_count); @@ -480,12 +499,14 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) INT i, descript_size; descript_size = sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL); - descript_size += sizeof(CONTROLLER_BUTTONS); descript_size += sizeof(CONTROLLER_AXIS); descript_size += sizeof(CONTROLLER_TRIGGERS); + descript_size += sizeof(CONTROLLER_BUTTONS); descript_size += test_haptic(ext); - ext->axis_start = (CONTROLLER_NUM_BUTTONS + 7) / 8; + ext->axis_start = 0; + ext->button_start = CONTROLLER_NUM_AXES * sizeof(WORD); + ext->buffer_length = (CONTROLLER_NUM_BUTTONS + 7) / 8 + CONTROLLER_NUM_AXES * sizeof(WORD); TRACE("Report Descriptor will be %i bytes\n", descript_size); @@ -503,12 +524,12 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) report_ptr[IDX_HEADER_PAGE] = HID_USAGE_PAGE_GENERIC; report_ptr[IDX_HEADER_USAGE] = HID_USAGE_GENERIC_GAMEPAD; report_ptr += sizeof(REPORT_HEADER); - memcpy(report_ptr, CONTROLLER_BUTTONS, sizeof(CONTROLLER_BUTTONS)); - report_ptr += sizeof(CONTROLLER_BUTTONS); memcpy(report_ptr, CONTROLLER_AXIS, sizeof(CONTROLLER_AXIS)); report_ptr += sizeof(CONTROLLER_AXIS); memcpy(report_ptr, CONTROLLER_TRIGGERS, sizeof(CONTROLLER_TRIGGERS)); report_ptr += sizeof(CONTROLLER_TRIGGERS); + memcpy(report_ptr, CONTROLLER_BUTTONS, sizeof(CONTROLLER_BUTTONS)); + report_ptr += sizeof(CONTROLLER_BUTTONS); report_ptr += build_haptic(ext, report_ptr); memcpy(report_ptr, REPORT_TAIL, sizeof(REPORT_TAIL)); @@ -681,7 +702,7 @@ static BOOL set_report_from_event(SDL_Event *event) { SDL_JoyButtonEvent *ie = &event->jbutton; - set_button_value(ie->button, ie->state, private->report_buffer); + set_button_value(private, ie->button, ie->state); process_hid_report(device, private->report_buffer, private->buffer_length); break; @@ -764,7 +785,7 @@ static BOOL set_mapped_report_from_event(SDL_Event *event) if (usage >= 0) { - set_button_value(usage, ie->state, private->report_buffer); + set_button_value(private, usage, ie->state); process_hid_report(device, private->report_buffer, private->buffer_length); } break; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index a2c72406cb7..9baccf6a24b 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -197,6 +197,7 @@ struct wine_input_private { int report_descriptor_size; BYTE *report_descriptor; + int button_start; BYTE button_map[KEY_MAX]; BYTE rel_map[HID_REL_MAX]; BYTE hat_map[8]; @@ -276,6 +277,22 @@ static const BYTE* what_am_I(struct udev_device *dev) return Unknown; } +static void set_button_value(int index, int value, BYTE* buffer) +{ + int bindex = index / 8; + int b = index % 8; + BYTE mask; + + mask = 1<<b; + if (value) + buffer[bindex] = buffer[bindex] | mask; + else + { + mask = ~mask; + buffer[bindex] = buffer[bindex] & mask; + } +} + static void set_abs_axis_value(struct wine_input_private *ext, int code, int value) { int index; @@ -403,16 +420,6 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ descript_size = sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL); report_size = 0; - /* For now lump all buttons just into incremental usages, Ignore Keys */ - button_count = count_buttons(ext->base.device_fd, ext->button_map); - if (button_count) - { - descript_size += sizeof(REPORT_BUTTONS); - if (button_count % 8) - descript_size += sizeof(REPORT_PADDING); - report_size = (button_count + 7) / 8; - } - abs_count = 0; memset(abs_pages, 0, sizeof(abs_pages)); for (i = 0; i < HID_ABS_MAX; i++) @@ -463,6 +470,17 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ descript_size += sizeof(REPORT_AXIS_HEADER) * rel_count; descript_size += sizeof(REPORT_REL_AXIS_TAIL) * rel_count; + /* For now lump all buttons just into incremental usages, Ignore Keys */ + ext->button_start = report_size; + button_count = count_buttons(ext->base.device_fd, ext->button_map); + if (button_count) + { + descript_size += sizeof(REPORT_BUTTONS); + if (button_count % 8) + descript_size += sizeof(REPORT_PADDING); + report_size += (button_count + 7) / 8; + } + hat_count = 0; for (i = ABS_HAT0X; i <=ABS_HAT3X; i+=2) if (test_bit(absbits, i)) @@ -491,15 +509,6 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ report_ptr[IDX_HEADER_PAGE] = device_usage[0]; report_ptr[IDX_HEADER_USAGE] = device_usage[1]; report_ptr += sizeof(REPORT_HEADER); - if (button_count) - { - report_ptr = add_button_block(report_ptr, 1, button_count); - if (button_count % 8) - { - BYTE padding = 8 - (button_count % 8); - report_ptr = add_padding_block(report_ptr, padding); - } - } if (abs_count) { for (i = 1; i < TOP_ABS_PAGE; i++) @@ -528,6 +537,15 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ } } } + if (button_count) + { + report_ptr = add_button_block(report_ptr, 1, button_count); + if (button_count % 8) + { + BYTE padding = 8 - (button_count % 8); + report_ptr = add_padding_block(report_ptr, padding); + } + } if (hat_count) report_ptr = add_hatswitch(report_ptr, hat_count); @@ -592,7 +610,7 @@ static BOOL set_report_from_event(struct wine_input_private *ext, struct input_e return FALSE; #endif case EV_KEY: - set_button_value(ext->button_map[ie->code], ie->value, ext->current_report_buffer); + set_button_value(ext->button_start + ext->button_map[ie->code], ie->value, ext->current_report_buffer); return FALSE; case EV_ABS: set_abs_axis_value(ext, ie->code, ie->value); diff --git a/dlls/winebus.sys/controller.h b/dlls/winebus.sys/controller.h index 80e9c786c77..d443d6ca178 100644 --- a/dlls/winebus.sys/controller.h +++ b/dlls/winebus.sys/controller.h @@ -113,19 +113,3 @@ static inline BYTE *add_hatswitch(BYTE *report_ptr, INT count) report_ptr[IDX_HATSWITCH_COUNT] = count; return report_ptr + sizeof(REPORT_HATSWITCH); } - -static inline void set_button_value(int index, int value, BYTE* buffer) -{ - int bindex = index / 8; - int b = index % 8; - BYTE mask; - - mask = 1<<b; - if (value) - buffer[bindex] = buffer[bindex] | mask; - else - { - mask = ~mask; - buffer[bindex] = buffer[bindex] & mask; - } -} -- 2.21.0

2 1