November 2023 - Wine-Commits

Rémi Bernon : mfplat: Add MFInitAMMediaTypeFromMFMediaType stub.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: aa9ca347c30b9eac47e6bb163cfc3b76df041311 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa9ca347c30b9eac47e6bb163cfc3b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 20 09:54:03 2023 +0100 mfplat: Add MFInitAMMediaTypeFromMFMediaType stub. --- dlls/mfplat/mediatype.c | 9 +++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index b82c926cb4e..fabc36dcc3c 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3684,6 +3684,15 @@ HRESULT WINAPI MFInitMediaTypeFromVideoInfoHeader(IMFMediaType *media_type, cons return hr; } +/*********************************************************************** + * MFInitAMMediaTypeFromMFMediaType (mfplat.@) + */ +HRESULT WINAPI MFInitAMMediaTypeFromMFMediaType(IMFMediaType *media_type, GUID format, AM_MEDIA_TYPE *am_type) +{ + FIXME("%p, %s, %p\n", media_type, debugstr_guid(&format), am_type); + return E_NOTIMPL; +} + /*********************************************************************** * MFInitMediaTypeFromAMMediaType (mfplat.@) */ diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index bbe938b2b2c..d7f75351960 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -117,7 +117,7 @@ @ stdcall MFGetWorkQueueMMCSSPriority(long ptr) rtworkq.RtwqGetWorkQueueMMCSSPriority @ stdcall MFHeapAlloc(long long str long long) @ stdcall MFHeapFree(ptr) -@ stub MFInitAMMediaTypeFromMFMediaType +@ stdcall MFInitAMMediaTypeFromMFMediaType(ptr int128 ptr) @ stdcall MFInitAttributesFromBlob(ptr ptr long) @ stdcall MFInitMediaTypeFromAMMediaType(ptr ptr) @ stub MFInitMediaTypeFromMFVideoFormat diff --git a/include/mfapi.h b/include/mfapi.h index bdf68adf45d..ef5bec16369 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -589,6 +589,7 @@ HRESULT WINAPI MFTGetInfo(CLSID clsid, WCHAR **name, MFT_REGISTER_TYPE_INFO **in MFT_REGISTER_TYPE_INFO **output_types, UINT32 *output_types_count, IMFAttributes **attributes); BOOL WINAPI MFIsFormatYUV(DWORD format); HRESULT WINAPI MFInitAttributesFromBlob(IMFAttributes *attributes, const UINT8 *buffer, UINT size); +HRESULT WINAPI MFInitAMMediaTypeFromMFMediaType(IMFMediaType *media_type, GUID format, AM_MEDIA_TYPE *am_type); HRESULT WINAPI MFInitMediaTypeFromAMMediaType(IMFMediaType *mediatype, const AM_MEDIA_TYPE *am_type); HRESULT WINAPI MFInitMediaTypeFromVideoInfoHeader(IMFMediaType *media_type, const VIDEOINFOHEADER *vih, UINT32 size, const GUID *subtype);

1 0

Rémi Bernon : mfplat/tests: Add tests for MFCreateAMMediaTypeFromMFMediaType.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: 486e6967b3c11104608818e89876759567ad89d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/486e6967b3c11104608818e8987675… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 20 10:36:49 2023 +0100 mfplat/tests: Add tests for MFCreateAMMediaTypeFromMFMediaType. --- dlls/mfplat/tests/mfplat.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 5a399f39608..f5cfe9cb4ee 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -7534,6 +7534,44 @@ skip_tests: IMFMediaType_Release(media_type); } +static void test_MFCreateAMMediaTypeFromMFMediaType(void) +{ + IMFMediaType *media_type; + AM_MEDIA_TYPE *am_type; + HRESULT hr; + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#lx.\n", hr); + + hr = MFCreateAMMediaTypeFromMFMediaType(media_type, GUID_NULL, &am_type); + todo_wine ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFCreateAMMediaTypeFromMFMediaType(media_type, GUID_NULL, &am_type); + todo_wine ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFCreateAMMediaTypeFromMFMediaType(media_type, GUID_NULL, &am_type); + todo_wine ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFCreateAMMediaTypeFromMFMediaType(media_type, GUID_NULL, &am_type); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr != S_OK) goto skip_tests; + ok(IsEqualGUID(&am_type->majortype, &MFMediaType_Audio), "got %s.\n", debugstr_guid(&am_type->majortype)); + ok(IsEqualGUID(&am_type->subtype, &MFAudioFormat_PCM), "got %s.\n", debugstr_guid(&am_type->subtype)); + ok(IsEqualGUID(&am_type->formattype, &FORMAT_WaveFormatEx), "got %s.\n", debugstr_guid(&am_type->formattype)); + ok(am_type->cbFormat == sizeof(WAVEFORMATEX), "got %lu\n", am_type->cbFormat); + CoTaskMemFree(am_type->pbFormat); + CoTaskMemFree(am_type); + +skip_tests: + IMFMediaType_Release(media_type); +} + static void test_MFCreateDXSurfaceBuffer(void) { IDirect3DSurface9 *backbuffer = NULL, *surface; @@ -10279,6 +10317,7 @@ START_TEST(mfplat) test_MFInitMediaTypeFromWaveFormatEx(); test_MFCreateMFVideoFormatFromMFMediaType(); test_MFInitAMMediaTypeFromMFMediaType(); + test_MFCreateAMMediaTypeFromMFMediaType(); test_MFCreateDXSurfaceBuffer(); test_MFCreateTrackedSample(); test_MFFrameRateToAverageTimePerFrame();

1 0

Rémi Bernon : mfplat: Implement MFInitAMMediaTypeFromMFMediaType.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: 7f1eef65bf7c779ea39ea102b8f4d66eb7cd729f URL: https://gitlab.winehq.org/wine/wine/-/commit/7f1eef65bf7c779ea39ea102b8f4d6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 22 14:52:51 2023 +0100 mfplat: Implement MFInitAMMediaTypeFromMFMediaType. --- dlls/mfplat/mediatype.c | 317 ++++++++++++++++++++++++++++++++++++++++----- dlls/mfplat/tests/mfplat.c | 20 ++- 2 files changed, 294 insertions(+), 43 deletions(-)

1 0

Rémi Bernon : mfplat: Add support for internal MFVideoFormat_A2B10G10R10.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: 59bbc61a6d1bbb9c59cf57cd13283d48fd1308f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/59bbc61a6d1bbb9c59cf57cd13283d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 22 14:39:06 2023 +0100 mfplat: Add support for internal MFVideoFormat_A2B10G10R10. --- dlls/mfplat/mediatype.c | 5 +++++ dlls/mfplat/tests/mfplat.c | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 0b4a6fa4eaf..c989e7e08a9 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -31,6 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +/* SDK MFVideoFormat_A2R10G10B10 uses D3DFMT_A2B10G10R10, let's name it the other way */ +DEFINE_MEDIATYPE_GUID(MFVideoFormat_A2B10G10R10, D3DFMT_A2R10G10B10); + DEFINE_MEDIATYPE_GUID(MFVideoFormat_IMC1, MAKEFOURCC('I','M','C','1')); DEFINE_MEDIATYPE_GUID(MFVideoFormat_IMC2, MAKEFOURCC('I','M','C','2')); DEFINE_MEDIATYPE_GUID(MFVideoFormat_IMC3, MAKEFOURCC('I','M','C','3')); @@ -2639,6 +2642,7 @@ static const struct uncompressed_video_format video_formats[] = { &MFVideoFormat_RGB565, 2, 3, 1, 0 }, { &MFVideoFormat_RGB555, 2, 3, 1, 0 }, { &MFVideoFormat_A2R10G10B10, 4, 3, 1, 0 }, + { &MFVideoFormat_A2B10G10R10, 4, 3, 1, 0 }, { &MFVideoFormat_RGB8, 1, 3, 1, 0 }, { &MFVideoFormat_L8, 1, 3, 1, 0 }, { &MFVideoFormat_AYUV, 4, 3, 0, 1 }, @@ -3549,6 +3553,7 @@ HRESULT WINAPI MFInitVideoFormat_RGB(MFVIDEOFORMAT *format, DWORD width, DWORD h case D3DFMT_R5G6B5: case D3DFMT_X1R5G5B5: case D3DFMT_A2B10G10R10: + case D3DFMT_A2R10G10B10: case D3DFMT_P8: transfer_function = MFVideoTransFunc_sRGB; break; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 4fcf5f19558..b44b95ff71a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -65,6 +65,9 @@ DEFINE_GUID(DUMMY_GUID3, 0x12345678,0x1234,0x1234,0x23,0x23,0x23,0x23,0x23,0x23, extern const CLSID CLSID_FileSchemePlugin; +/* SDK MFVideoFormat_A2R10G10B10 uses D3DFMT_A2B10G10R10, let's name it the other way */ +DEFINE_MEDIATYPE_GUID(MFVideoFormat_A2B10G10R10, D3DFMT_A2R10G10B10); + DEFINE_MEDIATYPE_GUID(MFVideoFormat_IMC1, MAKEFOURCC('I','M','C','1')); DEFINE_MEDIATYPE_GUID(MFVideoFormat_IMC2, MAKEFOURCC('I','M','C','2')); DEFINE_MEDIATYPE_GUID(MFVideoFormat_IMC3, MAKEFOURCC('I','M','C','3')); @@ -4705,6 +4708,9 @@ image_size_tests[] = { &MFVideoFormat_A2R10G10B10, 3, 5, 60, 0, 320, 60, 64 }, { &MFVideoFormat_A2R10G10B10, 1, 1, 4, 0, 64, 4, 64 }, { &MFVideoFormat_A2R10G10B10, 320, 240, 307200, 0, 307200, 307200, 1280 }, + { &MFVideoFormat_A2B10G10R10, 3, 5, 60, 0, 320, 60, 64 }, + { &MFVideoFormat_A2B10G10R10, 1, 1, 4, 0, 64, 4, 64 }, + { &MFVideoFormat_A2B10G10R10, 320, 240, 307200, 0, 307200, 307200, 1280 }, { &MFVideoFormat_A16B16G16R16F, 3, 5, 120, 0, 320, 120, 64 }, { &MFVideoFormat_A16B16G16R16F, 1, 1, 8, 0, 64, 8, 64 }, { &MFVideoFormat_A16B16G16R16F, 320, 240, 614400, 0, 614400, 614400, 2560 }, @@ -6171,6 +6177,8 @@ static void test_MFGetStrideForBitmapInfoHeader(void) { &MFVideoFormat_ARGB32, 1, -4 }, { &MFVideoFormat_A2R10G10B10, 3, -12 }, { &MFVideoFormat_A2R10G10B10, 1, -4 }, + { &MFVideoFormat_A2B10G10R10, 3, -12 }, + { &MFVideoFormat_A2B10G10R10, 1, -4 }, { &MFVideoFormat_A16B16G16R16F, 3, -24 }, { &MFVideoFormat_A16B16G16R16F, 1, -8 }, @@ -7528,6 +7536,7 @@ static void test_MFMapDX9FormatToDXGIFormat(void) { DXGI_FORMAT_R16G16B16A16_SNORM, D3DFMT_Q16W16V16U16 }, { DXGI_FORMAT_R32G32_FLOAT, D3DFMT_G32R32F }, { DXGI_FORMAT_R10G10B10A2_UNORM, D3DFMT_A2B10G10R10 }, + { 0, D3DFMT_A2R10G10B10 }, /* doesn't map to DXGI */ { DXGI_FORMAT_R8G8B8A8_SNORM, D3DFMT_Q8W8V8U8 }, { DXGI_FORMAT_R16G16_FLOAT, D3DFMT_G16R16F }, { DXGI_FORMAT_R16G16_UNORM, D3DFMT_G16R16 }, @@ -8938,6 +8947,7 @@ static void check_video_format(const MFVIDEOFORMAT *format, unsigned int width, case D3DFMT_R5G6B5: case D3DFMT_X1R5G5B5: case D3DFMT_A2B10G10R10: + case D3DFMT_A2R10G10B10: case D3DFMT_P8: transfer_function = MFVideoTransFunc_sRGB; break; @@ -8994,6 +9004,7 @@ static void test_MFInitVideoFormat_RGB(void) D3DFMT_R5G6B5, D3DFMT_X1R5G5B5, D3DFMT_A2B10G10R10, + D3DFMT_A2R10G10B10, D3DFMT_P8, D3DFMT_L8, D3DFMT_YUY2,

1 0

Piotr Caban : msvcrt: Hold _ENV_LOCK when accessing environment variables.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: 141aa0a2834b3e2d171607940a870460b5c033a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/141aa0a2834b3e2d171607940a8704… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 21 20:03:28 2023 +0100 msvcrt: Hold _ENV_LOCK when accessing environment variables. --- dlls/msvcrt/environ.c | 77 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 59 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 3c90ec4bf21..9e358d971f9 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "msvcrt.h" +#include "mtdll.h" #include <winnls.h> #include "wine/debug.h" @@ -220,9 +221,14 @@ static char * getenv_helper(const char *name) */ char * CDECL getenv(const char *name) { + char *ret; + if (!MSVCRT_CHECK_PMT(name != NULL)) return NULL; - return getenv_helper(name); + _lock(_ENV_LOCK); + ret = getenv_helper(name); + _unlock(_ENV_LOCK); + return ret; } static wchar_t * wgetenv_helper(const wchar_t *name) @@ -242,9 +248,14 @@ static wchar_t * wgetenv_helper(const wchar_t *name) */ wchar_t * CDECL _wgetenv(const wchar_t *name) { + wchar_t *ret; + if (!MSVCRT_CHECK_PMT(name != NULL)) return NULL; - return wgetenv_helper(name); + _lock(_ENV_LOCK); + ret = wgetenv_helper(name); + _unlock(_ENV_LOCK); + return ret; } static int putenv_helper(const char *name, const char *val, const char *eq) @@ -253,7 +264,10 @@ static int putenv_helper(const char *name, const char *val, const char *eq) char *env; int r; - if (env_init(FALSE, TRUE)) return -1; + _lock(_ENV_LOCK); + r = env_init(FALSE, TRUE); + _unlock(_ENV_LOCK); + if (r) return -1; if (eq) { @@ -279,7 +293,9 @@ static int putenv_helper(const char *name, const char *val, const char *eq) return -1; } + _lock(_ENV_LOCK); r = env_set(&env, &wenv); + _unlock(_ENV_LOCK); free(env); free(wenv); return r; @@ -303,7 +319,10 @@ static int wputenv_helper(const wchar_t *name, const wchar_t *val, const wchar_t char *env; int r; - if (env_init(TRUE, TRUE)) return -1; + _lock(_ENV_LOCK); + r = env_init(TRUE, TRUE); + _unlock(_ENV_LOCK); + if (r) return -1; if (eq) { @@ -329,7 +348,9 @@ static int wputenv_helper(const wchar_t *name, const wchar_t *val, const wchar_t return -1; } + _lock(_ENV_LOCK); r = env_set(&env, &wenv); + _unlock(_ENV_LOCK); free(env); free(wenv); return r; @@ -420,20 +441,25 @@ int CDECL _dupenv_s(char **buffer, size_t *numberOfElements, const char *varname if (!MSVCRT_CHECK_PMT(buffer != NULL)) return EINVAL; if (!MSVCRT_CHECK_PMT(varname != NULL)) return EINVAL; + _lock(_ENV_LOCK); if (!(e = getenv(varname))) { + _unlock(_ENV_LOCK); *buffer = NULL; if (numberOfElements) *numberOfElements = 0; return 0; } sz = strlen(e) + 1; - if (!(*buffer = malloc(sz))) + *buffer = malloc(sz); + if (*buffer) strcpy(*buffer, e); + _unlock(_ENV_LOCK); + + if (!*buffer) { if (numberOfElements) *numberOfElements = 0; return *_errno() = ENOMEM; } - strcpy(*buffer, e); if (numberOfElements) *numberOfElements = sz; return 0; } @@ -450,20 +476,25 @@ int CDECL _wdupenv_s(wchar_t **buffer, size_t *numberOfElements, if (!MSVCRT_CHECK_PMT(buffer != NULL)) return EINVAL; if (!MSVCRT_CHECK_PMT(varname != NULL)) return EINVAL; + _lock(_ENV_LOCK); if (!(e = _wgetenv(varname))) { + _unlock(_ENV_LOCK); *buffer = NULL; if (numberOfElements) *numberOfElements = 0; return 0; } sz = wcslen(e) + 1; - if (!(*buffer = malloc(sz * sizeof(wchar_t)))) + *buffer = malloc(sz * sizeof(wchar_t)); + if (*buffer) wcscpy(*buffer, e); + _unlock(_ENV_LOCK); + + if (!*buffer) { if (numberOfElements) *numberOfElements = 0; return *_errno() = ENOMEM; } - wcscpy(*buffer, e); if (numberOfElements) *numberOfElements = sz; return 0; } @@ -482,12 +513,17 @@ int CDECL getenv_s(size_t *ret_len, char* buffer, size_t len, const char *varnam if (!MSVCRT_CHECK_PMT((buffer && len > 0) || (!buffer && !len))) return EINVAL; if (buffer) buffer[0] = 0; - if (!(e = getenv_helper(varname))) return 0; - *ret_len = strlen(e) + 1; - if (!len) return 0; - if (len < *ret_len) return ERANGE; + _lock(_ENV_LOCK); + e = getenv_helper(varname); + if (e) + { + *ret_len = strlen(e) + 1; + if (len >= *ret_len) strcpy(buffer, e); + } + _unlock(_ENV_LOCK); - strcpy(buffer, e); + if (!e || !len) return 0; + if (len < *ret_len) return ERANGE; return 0; } @@ -504,12 +540,17 @@ int CDECL _wgetenv_s(size_t *ret_len, wchar_t *buffer, size_t len, if (!MSVCRT_CHECK_PMT((buffer && len > 0) || (!buffer && !len))) return EINVAL; if (buffer) buffer[0] = 0; - if (!(e = wgetenv_helper(varname))) return 0; - *ret_len = wcslen(e) + 1; - if (!len) return 0; - if (len < *ret_len) return ERANGE; + _lock(_ENV_LOCK); + e = wgetenv_helper(varname); + if (e) + { + *ret_len = wcslen(e) + 1; + if (len >= *ret_len) wcscpy(buffer, e); + } + _unlock(_ENV_LOCK); - wcscpy(buffer, e); + if (!e || !len) return 0; + if (len < *ret_len) return ERANGE; return 0; }

1 0

Hans Leidekker : wineusb.sys: Add support for URB_FUNCTION_VENDOR_DEVICE.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: b313c4095ff2262d8c3076562442cb95dc059e34 URL: https://gitlab.winehq.org/wine/wine/-/commit/b313c4095ff2262d8c3076562442cb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 8 12:30:49 2023 +0100 wineusb.sys: Add support for URB_FUNCTION_VENDOR_DEVICE. --- dlls/wineusb.sys/unixlib.c | 9 ++++++++- dlls/wineusb.sys/wineusb.c | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wineusb.sys/unixlib.c b/dlls/wineusb.sys/unixlib.c index 95220dd3828..401993dc543 100644 --- a/dlls/wineusb.sys/unixlib.c +++ b/dlls/wineusb.sys/unixlib.c @@ -362,6 +362,7 @@ static void LIBUSB_CALL transfer_cb(struct libusb_transfer *transfer) break; } + case URB_FUNCTION_VENDOR_DEVICE: case URB_FUNCTION_VENDOR_INTERFACE: { struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST *req = &urb->UrbControlVendorClassRequest; @@ -539,10 +540,11 @@ static NTSTATUS usb_submit_urb(void *args) return STATUS_SUCCESS; } + case URB_FUNCTION_VENDOR_DEVICE: case URB_FUNCTION_VENDOR_INTERFACE: { struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST *req = &urb->UrbControlVendorClassRequest; - uint8_t req_type = LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_INTERFACE; + uint8_t req_type = LIBUSB_REQUEST_TYPE_VENDOR; struct transfer_ctx *transfer_ctx; unsigned char *buffer; @@ -551,6 +553,11 @@ static NTSTATUS usb_submit_urb(void *args) transfer_ctx->irp = irp; transfer_ctx->transfer_buffer = params->transfer_buffer; + if (urb->UrbHeader.Function == URB_FUNCTION_VENDOR_DEVICE) + req_type |= LIBUSB_RECIPIENT_DEVICE; + else + req_type |= LIBUSB_RECIPIENT_INTERFACE; + if (req->TransferFlags & USBD_TRANSFER_DIRECTION_IN) req_type |= LIBUSB_ENDPOINT_IN; if (req->TransferFlags & ~USBD_TRANSFER_DIRECTION_IN) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 801393cacf6..29d28ee002d 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -556,6 +556,7 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: case URB_FUNCTION_SELECT_CONFIGURATION: + case URB_FUNCTION_VENDOR_DEVICE: case URB_FUNCTION_VENDOR_INTERFACE: { struct usb_submit_urb_params params = @@ -586,6 +587,7 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) break; } + case URB_FUNCTION_VENDOR_DEVICE: case URB_FUNCTION_VENDOR_INTERFACE: { struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST *req = &urb->UrbControlVendorClassRequest;

1 0

Hans Leidekker : winhttp: Use an unsigned integer for number values in query_headers().
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: 75b41873e630c4c3ffd85976eceaf33ceaf7640a URL: https://gitlab.winehq.org/wine/wine/-/commit/75b41873e630c4c3ffd85976eceaf3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 22 15:09:40 2023 +0100 winhttp: Use an unsigned integer for number values in query_headers(). --- dlls/winhttp/request.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 6ea71734cff..aed26d98c07 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -734,15 +734,15 @@ static DWORD query_headers( struct request *request, DWORD level, const WCHAR *n if (!header || (request_only && !header->is_request)) return ERROR_WINHTTP_HEADER_NOT_FOUND; if (level & WINHTTP_QUERY_FLAG_NUMBER) { - if (!buffer || sizeof(int) > *buflen) ret = ERROR_INSUFFICIENT_BUFFER; + if (!buffer || sizeof(DWORD) > *buflen) ret = ERROR_INSUFFICIENT_BUFFER; else { - int *number = buffer; - *number = wcstol( header->value, NULL, 10 ); - TRACE("returning number: %d\n", *number); + DWORD *number = buffer; + *number = wcstoul( header->value, NULL, 10 ); + TRACE("returning number: %lu\n", *number); ret = ERROR_SUCCESS; } - *buflen = sizeof(int); + *buflen = sizeof(DWORD); } else if (level & WINHTTP_QUERY_FLAG_SYSTEMTIME) {

1 0

Hans Leidekker : ntoskrnl: Stub EtwRegisterClassicProvider() and EtwUnregister().
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: 860a6d762f1eb9a3b2977061f15e7c5ba5144349 URL: https://gitlab.winehq.org/wine/wine/-/commit/860a6d762f1eb9a3b2977061f15e7c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 9 11:35:01 2023 +0100 ntoskrnl: Stub EtwRegisterClassicProvider() and EtwUnregister(). --- dlls/ntoskrnl.exe/ntoskrnl.c | 20 ++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ 2 files changed, 22 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ebff0a3f3aa..45b8e1ab1c1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -27,6 +27,7 @@ #include "excpt.h" #include "winreg.h" #include "ntsecapi.h" +#include "evntprov.h" #include "ddk/csq.h" #include "wine/server.h" #include "wine/heap.h" @@ -4599,6 +4600,25 @@ void WINAPI KeLowerIrql(KIRQL new) #endif +typedef void (WINAPI *PETW_CLASSIC_CALLBACK)( + const GUID *guid, UCHAR control_code, void *enable_context, void *callback_context); + +NTSTATUS WINAPI EtwRegisterClassicProvider(const GUID *provider, ULONG type, PETW_CLASSIC_CALLBACK callback, + void *context, REGHANDLE *handle) +{ + FIXME("provider %s, type %lu, enable_callback %p, context %p, handle %p\n", debugstr_guid(provider), type, + callback, context, handle); + + *handle = 0xdeadbeef; + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI EtwUnregister(REGHANDLE handle) +{ + FIXME("handle %I64x\n", handle); + return STATUS_SUCCESS; +} + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index f3559c89b2e..aa7831eac5f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1,3 +1,5 @@ +@ stdcall EtwRegisterClassicProvider(ptr long ptr ptr ptr) +@ stdcall EtwUnregister(int64) @ stdcall -arch=!i386 ExAcquireFastMutex(ptr) @ stdcall -fastcall ExAcquireFastMutexUnsafe(ptr) @ stub ExAcquireRundownProtection

1 0

Alexandros Frantzis : winewayland.drv: Implement vkCreateSwapchainKHR.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: 249c21cfdd528aaa63022b2da9e2857179093110 URL: https://gitlab.winehq.org/wine/wine/-/commit/249c21cfdd528aaa63022b2da9e285… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Sep 17 12:21:29 2021 +0300 winewayland.drv: Implement vkCreateSwapchainKHR. --- dlls/winewayland.drv/vulkan.c | 46 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 8cc37c9dcc9..1b8ac8713c2 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -52,6 +52,7 @@ typedef struct VkWaylandSurfaceCreateInfoKHR } VkWaylandSurfaceCreateInfoKHR; static VkResult (*pvkCreateInstance)(const VkInstanceCreateInfo *, const VkAllocationCallbacks *, VkInstance *); +static VkResult (*pvkCreateSwapchainKHR)(VkDevice, const VkSwapchainCreateInfoKHR *, const VkAllocationCallbacks *, VkSwapchainKHR *); static VkResult (*pvkCreateWaylandSurfaceKHR)(VkInstance, const VkWaylandSurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *); static void (*pvkDestroyInstance)(VkInstance, const VkAllocationCallbacks *); static void (*pvkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); @@ -226,6 +227,49 @@ static VkResult wayland_vkCreateInstance(const VkInstanceCreateInfo *create_info return res; } +static VkResult wayland_vkCreateSwapchainKHR(VkDevice device, + const VkSwapchainCreateInfoKHR *create_info, + const VkAllocationCallbacks *allocator, + VkSwapchainKHR *swapchain) +{ + VkResult res; + VkSwapchainCreateInfoKHR create_info_host; + struct wine_vk_surface *wine_vk_surface; + + TRACE("%p %p %p %p\n", device, create_info, allocator, swapchain); + + if (allocator) + FIXME("Support for allocation callbacks not implemented yet\n"); + + wine_vk_surface = wine_vk_surface_from_handle(create_info->surface); + if (!wine_vk_surface_is_valid(wine_vk_surface)) + return VK_ERROR_SURFACE_LOST_KHR; + + create_info_host = *create_info; + create_info_host.surface = wine_vk_surface->native; + + /* Some apps do not properly handle a 0x0 image extent in capabilities, + * and erroneously try to create a swapchain with it, so use the minimum + * 1x1 to accommodate them. */ + if (create_info_host.imageExtent.width == 0 || + create_info_host.imageExtent.height == 0) + { + create_info_host.imageExtent.width = 1; + create_info_host.imageExtent.height = 1; + } + + res = pvkCreateSwapchainKHR(device, &create_info_host, NULL /* allocator */, + swapchain); + if (res != VK_SUCCESS) + { + ERR("Failed to create vulkan wayland swapchain, res=%d\n", res); + return res; + } + + TRACE("Created swapchain=0x%s\n", wine_dbgstr_longlong(*swapchain)); + return res; +} + static VkResult wayland_vkCreateWin32SurfaceKHR(VkInstance instance, const VkWin32SurfaceCreateInfoKHR *create_info, const VkAllocationCallbacks *allocator, @@ -554,6 +598,7 @@ static void wine_vk_init(void) #define LOAD_FUNCPTR(f) if (!(p##f = dlsym(vulkan_handle, #f))) goto fail #define LOAD_OPTIONAL_FUNCPTR(f) p##f = dlsym(vulkan_handle, #f) LOAD_FUNCPTR(vkCreateInstance); + LOAD_FUNCPTR(vkCreateSwapchainKHR); LOAD_FUNCPTR(vkCreateWaylandSurfaceKHR); LOAD_FUNCPTR(vkDestroyInstance); LOAD_FUNCPTR(vkDestroySurfaceKHR); @@ -578,6 +623,7 @@ fail: static const struct vulkan_funcs vulkan_funcs = { .p_vkCreateInstance = wayland_vkCreateInstance, + .p_vkCreateSwapchainKHR = wayland_vkCreateSwapchainKHR, .p_vkCreateWin32SurfaceKHR = wayland_vkCreateWin32SurfaceKHR, .p_vkDestroyInstance = wayland_vkDestroyInstance, .p_vkDestroySurfaceKHR = wayland_vkDestroySurfaceKHR,

1 0

Alexandros Frantzis : winewayland.drv: Implement vkGetSwapchainImagesKHR.
by Alexandre Julliard Nov. 22, 2023

Nov. 22, 2023

Module: wine Branch: master Commit: ca5f7fe4c7ee5aeb5a9fffe2c4892788af26322e URL: https://gitlab.winehq.org/wine/wine/-/commit/ca5f7fe4c7ee5aeb5a9fffe2c48927… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Sep 20 12:59:01 2021 +0300 winewayland.drv: Implement vkGetSwapchainImagesKHR. This is a simple passthrough implementation to the native Vulkan driver. --- dlls/winewayland.drv/vulkan.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 14ac6dcc7f0..5ecf3787656 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -67,6 +67,7 @@ static VkResult (*pvkGetPhysicalDeviceSurfaceFormatsKHR)(VkPhysicalDevice, VkSur static VkResult (*pvkGetPhysicalDeviceSurfacePresentModesKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkPresentModeKHR *); static VkResult (*pvkGetPhysicalDeviceSurfaceSupportKHR)(VkPhysicalDevice, uint32_t, VkSurfaceKHR, VkBool32 *); static VkBool32 (*pvkGetPhysicalDeviceWaylandPresentationSupportKHR)(VkPhysicalDevice, uint32_t, struct wl_display *); +static VkResult (*pvkGetSwapchainImagesKHR)(VkDevice, VkSwapchainKHR, uint32_t *, VkImage *); static void *vulkan_handle; static const struct vulkan_funcs vulkan_funcs; @@ -624,6 +625,14 @@ static VkBool32 wayland_vkGetPhysicalDeviceWin32PresentationSupportKHR(VkPhysica process_wayland.wl_display); } +static VkResult wayland_vkGetSwapchainImagesKHR(VkDevice device, VkSwapchainKHR swapchain, + uint32_t *count, VkImage *images) +{ + TRACE("%p, 0x%s %p %p\n", device, wine_dbgstr_longlong(swapchain), count, images); + + return pvkGetSwapchainImagesKHR(device, swapchain, count, images); +} + static VkSurfaceKHR wayland_wine_get_native_surface(VkSurfaceKHR surface) { return wine_vk_surface_from_handle(surface)->native; @@ -655,6 +664,7 @@ static void wine_vk_init(void) LOAD_FUNCPTR(vkGetPhysicalDeviceSurfacePresentModesKHR); LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceSupportKHR); LOAD_FUNCPTR(vkGetPhysicalDeviceWaylandPresentationSupportKHR); + LOAD_FUNCPTR(vkGetSwapchainImagesKHR); #undef LOAD_FUNCPTR #undef LOAD_OPTIONAL_FUNCPTR @@ -683,6 +693,7 @@ static const struct vulkan_funcs vulkan_funcs = .p_vkGetPhysicalDeviceSurfacePresentModesKHR = wayland_vkGetPhysicalDeviceSurfacePresentModesKHR, .p_vkGetPhysicalDeviceSurfaceSupportKHR = wayland_vkGetPhysicalDeviceSurfaceSupportKHR, .p_vkGetPhysicalDeviceWin32PresentationSupportKHR = wayland_vkGetPhysicalDeviceWin32PresentationSupportKHR, + .p_vkGetSwapchainImagesKHR = wayland_vkGetSwapchainImagesKHR, .p_wine_get_native_surface = wayland_wine_get_native_surface, };

1 0