February 2022 - Wine-commits

Nikolay Sivov : mfplat/tests: Add a separate test function for MFGetPlaneSize().
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: ee8ddf37c9af60db6c15f6f7d99c9de593a2e120 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee8ddf37c9af60db6c15f6f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 14 21:46:24 2022 +0300 mfplat/tests: Add a separate test function for MFGetPlaneSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 206 +++++++++++++++++++++++++-------------------- 1 file changed, 114 insertions(+), 92 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index cabcc1b06b0..50f4e059205 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -4117,104 +4117,102 @@ static void test_stream_descriptor(void) IMFStreamDescriptor_Release(stream_desc); } -static void test_MFCalculateImageSize(void) +static const struct image_size_test { - static const struct image_size_test - { - const GUID *subtype; - UINT32 width; - UINT32 height; - UINT32 size; - UINT32 plane_size; /* Matches image size when 0. */ - } - image_size_tests[] = - { - { &MFVideoFormat_RGB8, 3, 5, 20 }, - { &MFVideoFormat_RGB8, 1, 1, 4 }, - { &MFVideoFormat_RGB555, 3, 5, 40 }, - { &MFVideoFormat_RGB555, 1, 1, 4 }, - { &MFVideoFormat_RGB565, 3, 5, 40 }, - { &MFVideoFormat_RGB565, 1, 1, 4 }, - { &MFVideoFormat_RGB24, 3, 5, 60 }, - { &MFVideoFormat_RGB24, 1, 1, 4 }, - { &MFVideoFormat_RGB32, 3, 5, 60 }, - { &MFVideoFormat_RGB32, 1, 1, 4 }, - { &MFVideoFormat_ARGB32, 3, 5, 60 }, - { &MFVideoFormat_ARGB32, 1, 1, 4 }, - { &MFVideoFormat_A2R10G10B10, 3, 5, 60 }, - { &MFVideoFormat_A2R10G10B10, 1, 1, 4 }, - { &MFVideoFormat_A16B16G16R16F, 3, 5, 120 }, - { &MFVideoFormat_A16B16G16R16F, 1, 1, 8 }, + const GUID *subtype; + UINT32 width; + UINT32 height; + UINT32 size; + UINT32 plane_size; /* Matches image size when 0. */ +} +image_size_tests[] = +{ + { &MFVideoFormat_RGB8, 3, 5, 20 }, + { &MFVideoFormat_RGB8, 1, 1, 4 }, + { &MFVideoFormat_RGB555, 3, 5, 40 }, + { &MFVideoFormat_RGB555, 1, 1, 4 }, + { &MFVideoFormat_RGB565, 3, 5, 40 }, + { &MFVideoFormat_RGB565, 1, 1, 4 }, + { &MFVideoFormat_RGB24, 3, 5, 60 }, + { &MFVideoFormat_RGB24, 1, 1, 4 }, + { &MFVideoFormat_RGB32, 3, 5, 60 }, + { &MFVideoFormat_RGB32, 1, 1, 4 }, + { &MFVideoFormat_ARGB32, 3, 5, 60 }, + { &MFVideoFormat_ARGB32, 1, 1, 4 }, + { &MFVideoFormat_A2R10G10B10, 3, 5, 60 }, + { &MFVideoFormat_A2R10G10B10, 1, 1, 4 }, + { &MFVideoFormat_A16B16G16R16F, 3, 5, 120 }, + { &MFVideoFormat_A16B16G16R16F, 1, 1, 8 }, + + /* YUV */ + { &MFVideoFormat_NV12, 1, 3, 9, 4 }, + { &MFVideoFormat_NV12, 1, 2, 6, 3 }, + { &MFVideoFormat_NV12, 2, 2, 6, 6 }, + { &MFVideoFormat_NV12, 3, 2, 12, 9 }, + { &MFVideoFormat_NV12, 4, 2, 12 }, + { &MFVideoFormat_NV12, 320, 240, 115200 }, + { &MFVideoFormat_AYUV, 1, 1, 4 }, + { &MFVideoFormat_AYUV, 2, 1, 8 }, + { &MFVideoFormat_AYUV, 1, 2, 8 }, + { &MFVideoFormat_AYUV, 4, 3, 48 }, + { &MFVideoFormat_AYUV, 320, 240, 307200 }, + { &MFVideoFormat_IMC1, 1, 1, 4 }, + { &MFVideoFormat_IMC1, 2, 1, 4 }, + { &MFVideoFormat_IMC1, 1, 2, 8 }, + { &MFVideoFormat_IMC1, 4, 3, 24 }, + { &MFVideoFormat_IMC1, 320, 240, 153600 }, + { &MFVideoFormat_IMC3, 1, 1, 4 }, + { &MFVideoFormat_IMC3, 2, 1, 4 }, + { &MFVideoFormat_IMC3, 1, 2, 8 }, + { &MFVideoFormat_IMC3, 4, 3, 24 }, + { &MFVideoFormat_IMC3, 320, 240, 153600 }, + { &MFVideoFormat_IMC2, 1, 3, 9, 4 }, + { &MFVideoFormat_IMC2, 1, 2, 6, 3 }, + { &MFVideoFormat_IMC2, 2, 2, 6, 6 }, + { &MFVideoFormat_IMC2, 3, 2, 12, 9 }, + { &MFVideoFormat_IMC2, 4, 2, 12 }, + { &MFVideoFormat_IMC2, 320, 240, 115200 }, + { &MFVideoFormat_IMC4, 1, 3, 9, 4 }, + { &MFVideoFormat_IMC4, 1, 2, 6, 3 }, + { &MFVideoFormat_IMC4, 2, 2, 6, 6 }, + { &MFVideoFormat_IMC4, 3, 2, 12, 9 }, + { &MFVideoFormat_IMC4, 4, 2, 12 }, + { &MFVideoFormat_IMC4, 320, 240, 115200 }, + { &MFVideoFormat_YV12, 1, 1, 3, 1 }, + { &MFVideoFormat_YV12, 2, 1, 3 }, + { &MFVideoFormat_YV12, 1, 2, 6, 3 }, + { &MFVideoFormat_YV12, 4, 3, 18 }, + { &MFVideoFormat_YV12, 320, 240, 115200 }, + + { &MFVideoFormat_I420, 1, 1, 3, 1 }, + { &MFVideoFormat_I420, 2, 1, 3 }, + { &MFVideoFormat_I420, 1, 2, 6, 3 }, + { &MFVideoFormat_I420, 4, 3, 18 }, + { &MFVideoFormat_I420, 320, 240, 115200 }, + + { &MFVideoFormat_IYUV, 1, 1, 3, 1 }, + { &MFVideoFormat_IYUV, 2, 1, 3 }, + { &MFVideoFormat_IYUV, 1, 2, 6, 3 }, + { &MFVideoFormat_IYUV, 4, 3, 18 }, + { &MFVideoFormat_IYUV, 320, 240, 115200 }, + + { &MFVideoFormat_YUY2, 2, 1, 4 }, + { &MFVideoFormat_YUY2, 4, 3, 24 }, + { &MFVideoFormat_YUY2, 128, 128, 32768 }, + { &MFVideoFormat_YUY2, 320, 240, 153600 }, + + { &MFVideoFormat_UYVY, 2, 1, 4 }, + { &MFVideoFormat_UYVY, 4, 3, 24 }, + { &MFVideoFormat_UYVY, 128, 128, 32768 }, + { &MFVideoFormat_UYVY, 320, 240, 153600 }, +}; - /* YUV */ - { &MFVideoFormat_NV12, 1, 3, 9, 4 }, - { &MFVideoFormat_NV12, 1, 2, 6, 3 }, - { &MFVideoFormat_NV12, 2, 2, 6, 6 }, - { &MFVideoFormat_NV12, 3, 2, 12, 9 }, - { &MFVideoFormat_NV12, 4, 2, 12 }, - { &MFVideoFormat_NV12, 320, 240, 115200 }, - { &MFVideoFormat_AYUV, 1, 1, 4 }, - { &MFVideoFormat_AYUV, 2, 1, 8 }, - { &MFVideoFormat_AYUV, 1, 2, 8 }, - { &MFVideoFormat_AYUV, 4, 3, 48 }, - { &MFVideoFormat_AYUV, 320, 240, 307200 }, - { &MFVideoFormat_IMC1, 1, 1, 4 }, - { &MFVideoFormat_IMC1, 2, 1, 4 }, - { &MFVideoFormat_IMC1, 1, 2, 8 }, - { &MFVideoFormat_IMC1, 4, 3, 24 }, - { &MFVideoFormat_IMC1, 320, 240, 153600 }, - { &MFVideoFormat_IMC3, 1, 1, 4 }, - { &MFVideoFormat_IMC3, 2, 1, 4 }, - { &MFVideoFormat_IMC3, 1, 2, 8 }, - { &MFVideoFormat_IMC3, 4, 3, 24 }, - { &MFVideoFormat_IMC3, 320, 240, 153600 }, - { &MFVideoFormat_IMC2, 1, 3, 9, 4 }, - { &MFVideoFormat_IMC2, 1, 2, 6, 3 }, - { &MFVideoFormat_IMC2, 2, 2, 6, 6 }, - { &MFVideoFormat_IMC2, 3, 2, 12, 9 }, - { &MFVideoFormat_IMC2, 4, 2, 12 }, - { &MFVideoFormat_IMC2, 320, 240, 115200 }, - { &MFVideoFormat_IMC4, 1, 3, 9, 4 }, - { &MFVideoFormat_IMC4, 1, 2, 6, 3 }, - { &MFVideoFormat_IMC4, 2, 2, 6, 6 }, - { &MFVideoFormat_IMC4, 3, 2, 12, 9 }, - { &MFVideoFormat_IMC4, 4, 2, 12 }, - { &MFVideoFormat_IMC4, 320, 240, 115200 }, - { &MFVideoFormat_YV12, 1, 1, 3, 1 }, - { &MFVideoFormat_YV12, 2, 1, 3 }, - { &MFVideoFormat_YV12, 1, 2, 6, 3 }, - { &MFVideoFormat_YV12, 4, 3, 18 }, - { &MFVideoFormat_YV12, 320, 240, 115200 }, - - { &MFVideoFormat_I420, 1, 1, 3, 1 }, - { &MFVideoFormat_I420, 2, 1, 3 }, - { &MFVideoFormat_I420, 1, 2, 6, 3 }, - { &MFVideoFormat_I420, 4, 3, 18 }, - { &MFVideoFormat_I420, 320, 240, 115200 }, - - { &MFVideoFormat_IYUV, 1, 1, 3, 1 }, - { &MFVideoFormat_IYUV, 2, 1, 3 }, - { &MFVideoFormat_IYUV, 1, 2, 6, 3 }, - { &MFVideoFormat_IYUV, 4, 3, 18 }, - { &MFVideoFormat_IYUV, 320, 240, 115200 }, - - { &MFVideoFormat_YUY2, 2, 1, 4 }, - { &MFVideoFormat_YUY2, 4, 3, 24 }, - { &MFVideoFormat_YUY2, 128, 128, 32768 }, - { &MFVideoFormat_YUY2, 320, 240, 153600 }, - - { &MFVideoFormat_UYVY, 2, 1, 4 }, - { &MFVideoFormat_UYVY, 4, 3, 24 }, - { &MFVideoFormat_UYVY, 128, 128, 32768 }, - { &MFVideoFormat_UYVY, 320, 240, 153600 }, - }; +static void test_MFCalculateImageSize(void) +{ unsigned int i; UINT32 size; HRESULT hr; - if (!pMFGetPlaneSize) - win_skip("MFGetPlaneSize() is not available.\n"); - size = 1; hr = MFCalculateImageSize(&IID_IUnknown, 1, 1, &size); ok(hr == E_INVALIDARG || broken(hr == S_OK) /* Vista */, "Unexpected hr %#x.\n", hr); @@ -4244,6 +4242,29 @@ static void test_MFCalculateImageSize(void) } } +static void test_MFGetPlaneSize(void) +{ + unsigned int i; + UINT32 size; + HRESULT hr; + + if (!pMFGetPlaneSize) + { + win_skip("MFGetPlaneSize() is not available.\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(image_size_tests); ++i) + { + const struct image_size_test *ptr = &image_size_tests[i]; + unsigned int plane_size = ptr->plane_size ? ptr->plane_size : ptr->size; + + hr = pMFGetPlaneSize(ptr->subtype->Data1, ptr->width, ptr->height, &size); + ok(hr == S_OK, "%u: failed to get plane size, hr %#x.\n", i, hr); + ok(size == plane_size, "%u: unexpected plane size %u, expected %u.\n", i, size, plane_size); + } +} + static void test_MFCompareFullToPartialMediaType(void) { IMFMediaType *full_type, *partial_type; @@ -7940,6 +7961,7 @@ START_TEST(mfplat) test_MFInvokeCallback(); test_stream_descriptor(); test_MFCalculateImageSize(); + test_MFGetPlaneSize(); test_MFCompareFullToPartialMediaType(); test_attributes_serialization(); test_wrapped_media_type();

1 0

Giovanni Mascellani : mfplat: Fix MFGetPlaneSize() behavior for invalid formats.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 3a0eb8bde9014b5ba46a01c77f9219abb52ef614 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a0eb8bde9014b5ba46a01c7… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Feb 14 21:46:25 2022 +0300 mfplat: Fix MFGetPlaneSize() behavior for invalid formats. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 8 ++++---- dlls/mfplat/tests/mfplat.c | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index b77db17189f..9330e420036 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2755,10 +2755,10 @@ HRESULT WINAPI MFGetPlaneSize(DWORD fourcc, DWORD width, DWORD height, DWORD *si memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); subtype.Data1 = fourcc; - if (!(format = mf_get_video_format(&subtype))) - return MF_E_INVALIDMEDIATYPE; - - stride = mf_get_stride_for_format(format, width); + if ((format = mf_get_video_format(&subtype))) + stride = mf_get_stride_for_format(format, width); + else + stride = 0; switch (fourcc) { diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 50f4e059205..c013b7b5c23 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -4254,6 +4254,11 @@ static void test_MFGetPlaneSize(void) return; } + size = 1; + hr = pMFGetPlaneSize(0xdeadbeef, 64, 64, &size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size == 0, "Unexpected size %u.\n", size); + for (i = 0; i < ARRAY_SIZE(image_size_tests); ++i) { const struct image_size_test *ptr = &image_size_tests[i];

1 0

Eric Pouech : msacm32: Use extended structure definition for driver configuration.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 14f8089dc1793a6c7d91d3dfe822d2f51526bbe8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14f8089dc1793a6c7d91d3df… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 18:49:45 2022 +0100 msacm32: Use extended structure definition for driver configuration. 1a) fixes a too short memory allocation on 64bit (DRVCONFIGINFO is 20 byte large while only 16 bytes were allocated) 1b) incidentally, removes a bunch of GCC11 warnings (generated by 1a) 2) introduces DRVCONFIGINFOEX (note, in SDK, it's defined in mmiscapi.h; since it doesn't exist yet in Wine, I added the structure to mmsystem.h, where DRVCONFIGINFO already exists) 3) initializes the missing field Note: my testing don't show on Win10's msacm32 that DRV_CONFIGURE uses the DRVCONFIGINFOEX structure. So, maybe (wild guess here), the extended structure is only used when the driver is linked to some hardware. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/driver.c | 18 +++++++++--------- include/mmsystem.h | 6 ++++++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index a8d6f3cf6d7..036461800b1 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -400,7 +400,7 @@ LRESULT WINAPI acmDriverMessage(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARA { PWINE_ACMDRIVERID padid; LRESULT lResult; - LPDRVCONFIGINFO pConfigInfo = NULL; + LPDRVCONFIGINFOEX pConfigInfo = NULL; LPWSTR section_name = NULL; LPWSTR alias_name = NULL; @@ -425,16 +425,15 @@ LRESULT WINAPI acmDriverMessage(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARA } if (pAlias != NULL) { - /* DRVCONFIGINFO is only 12 bytes long, but native msacm - * reports a 16-byte structure to codecs, so allocate 16 bytes, - * just to be on the safe side. - */ - const unsigned int iStructSize = 16; - pConfigInfo = HeapAlloc(MSACM_hHeap, 0, iStructSize); + pConfigInfo = HeapAlloc(MSACM_hHeap, 0, sizeof(*pConfigInfo)); if (!pConfigInfo) { - ERR("OOM while supplying DRVCONFIGINFO for DRV_CONFIGURE, using NULL\n"); + ERR("OOM while supplying DRVCONFIGINFOEX for DRV_CONFIGURE, using NULL\n"); } else { - pConfigInfo->dwDCISize = iStructSize; + /* In some cases (seen in the 32bit world), a DRVCONFIGINFOEX struct is passed + * (with extended size) instead of the documented DRVCONFIGINFO. + * So, always pass a DRVCONFIGINFOEX to be one the safe side + */ + pConfigInfo->dwDCISize = sizeof(*pConfigInfo); section_name = HeapAlloc(MSACM_hHeap, 0, sizeof(L"Drivers32")); if (section_name) lstrcpyW(section_name, L"Drivers32"); @@ -442,6 +441,7 @@ LRESULT WINAPI acmDriverMessage(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARA alias_name = HeapAlloc(MSACM_hHeap, 0, (lstrlenW(pAlias) + 1) * sizeof(WCHAR)); if (alias_name) lstrcpyW(alias_name, pAlias); pConfigInfo->lpszDCIAliasName = alias_name; + pConfigInfo->dnDevNode = 0; /* FIXME */ if (pConfigInfo->lpszDCISectionName == NULL || pConfigInfo->lpszDCIAliasName == NULL) { HeapFree(MSACM_hHeap, 0, alias_name); diff --git a/include/mmsystem.h b/include/mmsystem.h index 2a0782d0cb9..5684ff20683 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -225,6 +225,12 @@ typedef struct tagDRVCONFIGINFO { LPCWSTR lpszDCIAliasName; } DRVCONFIGINFO, *LPDRVCONFIGINFO; +typedef struct tagDRVCONFIGINFOEX { + DWORD dwDCISize; + LPCWSTR lpszDCISectionName; + LPCWSTR lpszDCIAliasName; + DWORD dnDevNode; +} DRVCONFIGINFOEX, *LPDRVCONFIGINFOEX; LRESULT WINAPI DefDriverProc(DWORD_PTR,HDRVR,UINT,LPARAM,LPARAM); /* this sounds odd, but it's the way it is. OpenDriverA even disappeared

1 0

Zebediah Figura : d3dx9: Do not use d3dx_effect_cleanup() in D3DXCreateEffectEx().
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 8c40c413b946f65a75d15d86990a1d8ac2b2143b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c40c413b946f65a75d15d86… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 00:27:24 2022 -0600 d3dx9: Do not use d3dx_effect_cleanup() in D3DXCreateEffectEx(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 57 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 310e5c0bf17..6ea138e632f 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -6422,15 +6422,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev effect->ID3DXEffect_iface.lpVtbl = &ID3DXEffect_Vtbl; effect->ref = 1; - if (pool) - { - effect->pool = unsafe_impl_from_ID3DXEffectPool(pool); - pool->lpVtbl->AddRef(pool); - } - - IDirect3DDevice9_AddRef(device); - effect->device = device; - effect->flags = flags; list_init(&effect->parameter_block_list); @@ -6487,6 +6478,15 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev TRACE("Tag: %x\n", tag); } + if (pool) + { + effect->pool = unsafe_impl_from_ID3DXEffectPool(pool); + pool->lpVtbl->AddRef(pool); + } + + IDirect3DDevice9_AddRef(device); + effect->device = device; + if (skip_constants_string) { skip_constants_buffer = HeapAlloc(GetProcessHeap(), 0, @@ -6495,7 +6495,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev { if (bytecode) ID3D10Blob_Release(bytecode); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto fail; } strcpy(skip_constants_buffer, skip_constants_string); @@ -6504,7 +6505,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev HeapFree(GetProcessHeap(), 0, skip_constants_buffer); if (bytecode) ID3D10Blob_Release(bytecode); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto fail; } } read_dword(&ptr, &offset); @@ -6518,7 +6520,7 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev FIXME("Failed to parse effect.\n"); HeapFree(GetProcessHeap(), 0, skip_constants_buffer); HeapFree(GetProcessHeap(), 0, skip_constants); - return hr; + goto fail; } for (i = 0; i < skip_constants_count; ++i) @@ -6535,7 +6537,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev debugstr_a(skip_constants[i]), j); HeapFree(GetProcessHeap(), 0, skip_constants_buffer); HeapFree(GetProcessHeap(), 0, skip_constants); - return D3DERR_INVALIDCALL; + hr = D3DERR_INVALIDCALL; + goto fail; } } } @@ -6557,6 +6560,33 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev } return D3D_OK; + +fail: + if (effect->techniques) + { + for (i = 0; i < effect->technique_count; ++i) + free_technique(&effect->techniques[i]); + heap_free(effect->techniques); + } + + if (effect->parameters) + { + for (i = 0; i < effect->parameter_count; ++i) + free_top_level_parameter(&effect->parameters[i]); + heap_free(effect->parameters); + } + + if (effect->objects) + { + for (i = 0; i < effect->object_count; ++i) + free_object(&effect->objects[i]); + heap_free(effect->objects); + } + + IDirect3DDevice9_Release(effect->device); + if (pool) + pool->lpVtbl->Release(pool); + return hr; } HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatalen, @@ -6593,7 +6623,6 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s if (FAILED(hr)) { WARN("Failed to create effect object, hr %#x.\n", hr); - d3dx_effect_cleanup(object); return hr; }

1 0

Zebediah Figura : d3dx9: Separate out d3dx9_effect_init_from_dxbc().
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: f170677724843a5537c12412f9b3d23fd07bfaec URL: https://source.winehq.org/git/wine.git/?a=commit;h=f170677724843a5537c12412… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 00:27:25 2022 -0600 d3dx9: Separate out d3dx9_effect_init_from_dxbc(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 144 +++++++++++++++++++++++++------------------------ 1 file changed, 75 insertions(+), 69 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 6ea138e632f..ccc8da5a9e8 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -6396,16 +6396,10 @@ static const char **parse_skip_constants_string(char *skip_constants_string, uns return new_alloc; } -static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDevice9 *device, - const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, - UINT flags, ID3DBlob **errors, struct ID3DXEffectPool *pool, const char *skip_constants_string) +static HRESULT d3dx9_effect_init_from_dxbc(struct d3dx_effect *effect, + struct IDirect3DDevice9 *device, const char *data, SIZE_T data_size, + unsigned int flags, struct ID3DXEffectPool *pool, const char *skip_constants_string) { -#if D3DX_SDK_VERSION <= 36 - UINT compile_flags = D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; -#else - UINT compile_flags = 0; -#endif - ID3DBlob *bytecode = NULL, *temp_errors = NULL; unsigned int skip_constants_count = 0; char *skip_constants_buffer = NULL; const char **skip_constants = NULL; @@ -6414,11 +6408,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev unsigned int i, j; HRESULT hr; - TRACE("effect %p, device %p, data %p, data_size %lu, defines %p, include %p, flags %#x, errors %p, " - "pool %p, skip_constants %s.\n", - effect, device, data, data_size, defines, include, flags, errors, pool, - debugstr_a(skip_constants_string)); - effect->ID3DXEffect_iface.lpVtbl = &ID3DXEffect_Vtbl; effect->ref = 1; @@ -6429,55 +6418,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev read_dword(&ptr, &tag); TRACE("Tag: %x\n", tag); - if (tag != d3dx9_effect_version(9, 1)) - { - TRACE("HLSL ASCII effect, trying to compile it.\n"); - compile_flags |= flags & ~(D3DXFX_NOT_CLONEABLE | D3DXFX_LARGEADDRESSAWARE); - hr = D3DCompile(data, data_size, NULL, defines, include, - NULL, "fx_2_0", compile_flags, 0, &bytecode, &temp_errors); - if (FAILED(hr)) - { - WARN("Failed to compile ASCII effect.\n"); - if (bytecode) - ID3D10Blob_Release(bytecode); - if (temp_errors) - { - const char *error_string = ID3D10Blob_GetBufferPointer(temp_errors); - const char *string_ptr; - - while (*error_string) - { - string_ptr = error_string; - while (*string_ptr && *string_ptr != '\n' && *string_ptr != '\r' - && string_ptr - error_string < 80) - ++string_ptr; - TRACE("%s\n", debugstr_an(error_string, string_ptr - error_string)); - error_string = string_ptr; - while (*error_string == '\n' || *error_string == '\r') - ++error_string; - } - } - if (errors) - *errors = temp_errors; - else if (temp_errors) - ID3D10Blob_Release(temp_errors); - return hr; - } - if (!bytecode) - { - FIXME("No output from effect compilation.\n"); - return D3DERR_INVALIDCALL; - } - if (errors) - *errors = temp_errors; - else if (temp_errors) - ID3D10Blob_Release(temp_errors); - - ptr = ID3D10Blob_GetBufferPointer(bytecode); - read_dword(&ptr, &tag); - TRACE("Tag: %x\n", tag); - } - if (pool) { effect->pool = unsafe_impl_from_ID3DXEffectPool(pool); @@ -6493,8 +6433,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev sizeof(*skip_constants_buffer) * (strlen(skip_constants_string) + 1)); if (!skip_constants_buffer) { - if (bytecode) - ID3D10Blob_Release(bytecode); hr = E_OUTOFMEMORY; goto fail; } @@ -6503,8 +6441,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev if (!(skip_constants = parse_skip_constants_string(skip_constants_buffer, &skip_constants_count))) { HeapFree(GetProcessHeap(), 0, skip_constants_buffer); - if (bytecode) - ID3D10Blob_Release(bytecode); hr = E_OUTOFMEMORY; goto fail; } @@ -6513,8 +6449,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev TRACE("Offset: %x\n", offset); hr = d3dx_parse_effect(effect, ptr, data_size, offset, skip_constants, skip_constants_count); - if (bytecode) - ID3D10Blob_Release(bytecode); if (hr != D3D_OK) { FIXME("Failed to parse effect.\n"); @@ -6589,6 +6523,78 @@ fail: return hr; } +static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDevice9 *device, + const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, + UINT flags, ID3DBlob **errors, struct ID3DXEffectPool *pool, const char *skip_constants_string) +{ +#if D3DX_SDK_VERSION <= 36 + UINT compile_flags = D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; +#else + UINT compile_flags = 0; +#endif + ID3DBlob *bytecode = NULL, *temp_errors = NULL; + const char *ptr = data; + HRESULT hr; + DWORD tag; + + TRACE("effect %p, device %p, data %p, data_size %lu, defines %p, include %p, flags %#x, errors %p, " + "pool %p, skip_constants %s.\n", + effect, device, data, data_size, defines, include, flags, errors, pool, + debugstr_a(skip_constants_string)); + + read_dword(&ptr, &tag); + + if (tag == d3dx9_effect_version(9, 1)) + return d3dx9_effect_init_from_dxbc(effect, device, data, data_size, flags, pool, skip_constants_string); + + TRACE("HLSL ASCII effect, trying to compile it.\n"); + compile_flags |= flags & ~(D3DXFX_NOT_CLONEABLE | D3DXFX_LARGEADDRESSAWARE); + hr = D3DCompile(data, data_size, NULL, defines, include, + NULL, "fx_2_0", compile_flags, 0, &bytecode, &temp_errors); + if (FAILED(hr)) + { + WARN("Failed to compile ASCII effect.\n"); + if (bytecode) + ID3D10Blob_Release(bytecode); + if (temp_errors) + { + const char *error_string = ID3D10Blob_GetBufferPointer(temp_errors); + const char *string_ptr; + + while (*error_string) + { + string_ptr = error_string; + while (*string_ptr && *string_ptr != '\n' && *string_ptr != '\r' + && string_ptr - error_string < 80) + ++string_ptr; + TRACE("%s\n", debugstr_an(error_string, string_ptr - error_string)); + error_string = string_ptr; + while (*error_string == '\n' || *error_string == '\r') + ++error_string; + } + } + if (errors) + *errors = temp_errors; + else if (temp_errors) + ID3D10Blob_Release(temp_errors); + return hr; + } + if (!bytecode) + { + FIXME("No output from effect compilation.\n"); + return D3DERR_INVALIDCALL; + } + if (errors) + *errors = temp_errors; + else if (temp_errors) + ID3D10Blob_Release(temp_errors); + + hr = d3dx9_effect_init_from_dxbc(effect, device, ID3D10Blob_GetBufferPointer(bytecode), + ID3D10Blob_GetBufferSize(bytecode), flags, pool, skip_constants_string); + ID3D10Blob_Release(bytecode); + return hr; +} + HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatalen, const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skip_constants, DWORD flags, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors)

1 0

Zebediah Figura : d3dx9/tests: Add more tests for ID3DXEffect::CloneEffect().
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: aff66846dd693b3b41afdc1577d24f3191fe9688 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aff66846dd693b3b41afdc15… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 00:27:26 2022 -0600 d3dx9/tests: Add more tests for ID3DXEffect::CloneEffect(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 273 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 261 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aff66846dd693b3b41af…

1 0

Zebediah Figura : d3dx9: Implement ID3DXEffect::CloneEffect().
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: cfb1d2058fb47ff3f72501e0aaf35b97ea128036 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfb1d2058fb47ff3f72501e0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 14 00:27:27 2022 -0600 d3dx9: Implement ID3DXEffect::CloneEffect(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44635 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 143 ++++++++++++++++++++++++++++++++++++++++--- dlls/d3dx9_36/tests/effect.c | 5 +- 2 files changed, 136 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ccc8da5a9e8..bbfb73d64c3 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - +#include <stdbool.h> #include <stdio.h> #include <assert.h> @@ -199,6 +199,10 @@ struct d3dx_effect struct list parameter_block_list; struct d3dx_parameter_block *current_parameter_block; + + char *source; + SIZE_T source_size; + char *skip_constants_string; }; #define INITIAL_SHARED_DATA_SIZE 4 @@ -220,6 +224,9 @@ struct ID3DXEffectCompilerImpl LONG ref; }; +static HRESULT d3dx9_effect_init_from_dxbc(struct d3dx_effect *effect, + struct IDirect3DDevice9 *device, const char *data, SIZE_T data_size, + unsigned int flags, struct ID3DXEffectPool *pool, const char *skip_constants_string); static HRESULT d3dx_parse_state(struct d3dx_effect *effect, struct d3dx_state *state, const char *data, const char **ptr, struct d3dx_object *objects); static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL child); @@ -4304,23 +4311,127 @@ static HRESULT WINAPI d3dx_effect_DeleteParameterBlock(ID3DXEffect *iface, D3DXH } #endif -static HRESULT WINAPI d3dx_effect_CloneEffect(ID3DXEffect *iface, IDirect3DDevice9 *device, - ID3DXEffect **new_effect) +static bool copy_parameter(struct d3dx_effect *dst_effect, const struct d3dx_effect *src_effect, + struct d3dx_parameter *dst, const struct d3dx_parameter *src) { - struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + const char *src_string; + char *dst_string; + IUnknown *iface; + size_t len; + + if ((src->flags & PARAMETER_FLAG_SHARED) && dst_effect->pool) + return true; + + switch (src->type) + { + case D3DXPT_VOID: + case D3DXPT_BOOL: + case D3DXPT_INT: + case D3DXPT_FLOAT: + memcpy(dst->data, src->data, src->bytes); + break; + + case D3DXPT_STRING: + src_string = *(char **)src->data; + len = strlen(src_string); + if (!(dst_string = heap_realloc(*(char **)dst->data, len + 1))) + return false; + *(char **)dst->data = dst_string; + memcpy(dst_string, src_string, len + 1); + break; + + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + case D3DXPT_TEXTURECUBE: + case D3DXPT_PIXELSHADER: + case D3DXPT_VERTEXSHADER: + iface = *(IUnknown **)src->data; + if (src_effect->device == dst_effect->device && iface) + { + if (*(IUnknown **)dst->data) + IUnknown_Release(*(IUnknown **)dst->data); + IUnknown_AddRef(iface); + *(IUnknown **)dst->data = iface; + } + break; + + case D3DXPT_SAMPLER: + case D3DXPT_SAMPLER1D: + case D3DXPT_SAMPLER2D: + case D3DXPT_SAMPLER3D: + case D3DXPT_SAMPLERCUBE: + /* Nothing to do; these parameters are not mutable and cannot be + * retrieved using API calls. */ + break; + + default: + FIXME("Unhandled parameter type %#x.\n", src->type); + } - FIXME("iface %p, device %p, new_effect %p stub.\n", effect, device, new_effect); + return true; +} - if (!new_effect) +static HRESULT WINAPI d3dx_effect_CloneEffect(ID3DXEffect *iface, IDirect3DDevice9 *device, ID3DXEffect **out) +{ + struct d3dx_effect *src = impl_from_ID3DXEffect(iface); + struct d3dx_effect *dst; + unsigned int i, j, k; + HRESULT hr; + + TRACE("iface %p, device %p, out %p.\n", iface, device, out); + + if (!out) return D3DERR_INVALIDCALL; - if (effect->flags & D3DXFX_NOT_CLONEABLE) + if (src->flags & D3DXFX_NOT_CLONEABLE) return E_FAIL; if (!device) return D3DERR_INVALIDCALL; - return E_NOTIMPL; + if (!(dst = heap_alloc_zero(sizeof(*dst)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3dx9_effect_init_from_dxbc(dst, device, src->source, src->source_size, + src->flags, &src->pool->ID3DXEffectPool_iface, src->skip_constants_string))) + { + heap_free(dst); + return hr; + } + + for (i = 0; i < src->parameter_count; ++i) + { + const struct d3dx_top_level_parameter *src_param = &src->parameters[i]; + struct d3dx_top_level_parameter *dst_param = &dst->parameters[i]; + + copy_parameter(dst, src, &dst_param->param, &src_param->param); + for (j = 0; j < src_param->annotation_count; ++j) + copy_parameter(dst, src, &dst_param->annotations[j], &src_param->annotations[j]); + } + + for (i = 0; i < src->technique_count; ++i) + { + const struct d3dx_technique *src_technique = &src->techniques[i]; + struct d3dx_technique *dst_technique = &dst->techniques[i]; + + for (j = 0; j < src_technique->annotation_count; ++j) + copy_parameter(dst, src, &dst_technique->annotations[j], &src_technique->annotations[j]); + + for (j = 0; j < src_technique->pass_count; ++j) + { + const struct d3dx_pass *src_pass = &src_technique->passes[j]; + struct d3dx_pass *dst_pass = &dst_technique->passes[j]; + + for (k = 0; k < src_pass->annotation_count; ++k) + copy_parameter(dst, src, &dst_pass->annotations[k], &src_pass->annotations[k]); + } + } + + *out = &dst->ID3DXEffect_iface; + TRACE("Created effect %p.\n", dst); + return D3D_OK; } #if D3DX_SDK_VERSION >= 27 @@ -6418,6 +6529,14 @@ static HRESULT d3dx9_effect_init_from_dxbc(struct d3dx_effect *effect, read_dword(&ptr, &tag); TRACE("Tag: %x\n", tag); + if (!(flags & D3DXFX_NOT_CLONEABLE)) + { + if (!(effect->source = malloc(data_size))) + return E_OUTOFMEMORY; + memcpy(effect->source, data, data_size); + effect->source_size = data_size; + } + if (pool) { effect->pool = unsafe_impl_from_ID3DXEffectPool(pool); @@ -6429,6 +6548,12 @@ static HRESULT d3dx9_effect_init_from_dxbc(struct d3dx_effect *effect, if (skip_constants_string) { + if (!(flags & D3DXFX_NOT_CLONEABLE) && !(effect->skip_constants_string = strdup(skip_constants_string))) + { + hr = E_OUTOFMEMORY; + goto fail; + } + skip_constants_buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(*skip_constants_buffer) * (strlen(skip_constants_string) + 1)); if (!skip_constants_buffer) @@ -6520,6 +6645,8 @@ fail: IDirect3DDevice9_Release(effect->device); if (pool) pool->lpVtbl->Release(pool); + free(effect->source); + free(effect->skip_constants_string); return hr; } diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 502a04fe05b..285bca1cdae 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -7584,9 +7584,7 @@ static void test_effect_clone(void) ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); hr = effect->lpVtbl->CloneEffect(effect, device, &cloned); - todo_wine ok(hr == D3D_OK, "Got result %#x.\n", hr); - if (hr != D3D_OK) - goto out; + ok(hr == D3D_OK, "Got result %#x.\n", hr); ok(cloned != effect, "Expected new effect instance.\n"); hr = cloned->lpVtbl->GetStateManager(cloned, &ret_manager); @@ -7730,7 +7728,6 @@ static void test_effect_clone(void) IDirect3DVertexShader9_Release(vs); IDirect3DDevice9_Release(device2); DestroyWindow(window2); -out: effect->lpVtbl->Release(effect); refcount = state_manager->ID3DXEffectStateManager_iface.lpVtbl->Release( &state_manager->ID3DXEffectStateManager_iface);

1 0

Jacek Caban : win32u: Move NtUserSetCursorPos implementation from user32.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 5d308b1606ebd748c67b6e706671e869eec0a9ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d308b1606ebd748c67b6e70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 14 14:07:53 2022 +0100 win32u: Move NtUserSetCursorPos implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 31 ------------------------------- dlls/user32/sysparams.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/winpos.c | 4 ++-- dlls/win32u/driver.c | 6 ++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 34 ++++++++++++++++++++++++++++++++++ dlls/win32u/sysparams.c | 20 ++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 3 +++ dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 12 files changed, 76 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5d308b1606ebd748c67b…

1 0

Jacek Caban : win32u: Move MessageBeep implementation from user32.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: 8c5befe49bfcbfb2a4fb9684c1447837256f20ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c5befe49bfcbfb2a4fb9684… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 14 14:08:05 2022 +0100 win32u: Move MessageBeep implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 12 +----------- dlls/user32/message.c | 5 +---- dlls/win32u/driver.c | 19 ++++++++++++++++--- dlls/win32u/sysparams.c | 10 ++++++++++ include/ntuser.h | 1 + 5 files changed, 29 insertions(+), 18 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 73f4ee67257..247093bfc17 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -119,10 +119,6 @@ void USER_unload_driver(void) * These are fallbacks for entry points that are not implemented in the real driver. */ -static void CDECL nulldrv_Beep(void) -{ -} - static BOOL CDECL nulldrv_RegisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) { return TRUE; @@ -287,11 +283,6 @@ static void CDECL nulldrv_ThreadDetach( void ) * Each entry point simply loads the real driver and chains to it. */ -static void CDECL loaderdrv_Beep(void) -{ - load_driver()->pBeep(); -} - static BOOL CDECL loaderdrv_RegisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) { return load_driver()->pRegisterHotKey( hwnd, modifiers, vk ); @@ -369,7 +360,7 @@ static struct user_driver_funcs lazy_load_driver = { NULL }, /* keyboard functions */ NULL, - loaderdrv_Beep, + NULL, NULL, NULL, NULL, @@ -436,7 +427,6 @@ void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT v #define SET_USER_FUNC(name) \ do { if (!driver->p##name) driver->p##name = nulldrv_##name; } while(0) - SET_USER_FUNC(Beep); SET_USER_FUNC(RegisterHotKey); SET_USER_FUNC(UnregisterHotKey); SET_USER_FUNC(DestroyCursorIcon); diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 44b08da79dd..1c60244623a 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4432,10 +4432,7 @@ BOOL WINAPI SetMessageQueue( INT size ) */ BOOL WINAPI MessageBeep( UINT i ) { - BOOL active = TRUE; - SystemParametersInfoA( SPI_GETBEEP, 0, &active, FALSE ); - if (active) USER_Driver->pBeep(); - return TRUE; + return NtUserCallOneParam( i, NtUserMessageBeep ); } diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 2caacd2b2a6..24815922bbb 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -958,6 +958,11 @@ static BOOL CDECL loaderdrv_ActivateKeyboardLayout( HKL layout, UINT flags ) return load_driver()->pActivateKeyboardLayout( layout, flags ); } +static void CDECL loaderdrv_Beep(void) +{ + load_driver()->pBeep(); +} + static INT CDECL loaderdrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) { return load_driver()->pGetKeyNameText( lparam, buffer, size ); @@ -1033,22 +1038,30 @@ static const struct vulkan_funcs * CDECL loaderdrv_wine_get_vulkan_driver( UINT static const struct user_driver_funcs lazy_load_driver = { + /* keyboard functions */ .pActivateKeyboardLayout = loaderdrv_ActivateKeyboardLayout, + .pBeep = loaderdrv_Beep, .pGetKeyNameText = loaderdrv_GetKeyNameText, .pGetKeyboardLayoutList = loaderdrv_GetKeyboardLayoutList, .pMapVirtualKeyEx = loaderdrv_MapVirtualKeyEx, .pToUnicodeEx = loaderdrv_ToUnicodeEx, .pUnregisterHotKey = loaderdrv_UnregisterHotKey, .pVkKeyScanEx = loaderdrv_VkKeyScanEx, - .pChangeDisplaySettingsEx = loaderdrv_ChangeDisplaySettingsEx, - .pEnumDisplaySettingsEx = loaderdrv_EnumDisplaySettingsEx, - .pUpdateDisplayDevices = loaderdrv_UpdateDisplayDevices, + /* cursor/icon functions */ .pSetCursor = loaderdrv_SetCursor, .pSetCursorPos = loaderdrv_SetCursorPos, .pClipCursor = loaderdrv_ClipCursor, + /* clipboard functions */ .pUpdateClipboard = loaderdrv_UpdateClipboard, + /* display modes */ + .pChangeDisplaySettingsEx = loaderdrv_ChangeDisplaySettingsEx, + .pEnumDisplaySettingsEx = loaderdrv_EnumDisplaySettingsEx, + .pUpdateDisplayDevices = loaderdrv_UpdateDisplayDevices, + /* windowing functions */ .pScrollDC = nulldrv_ScrollDC, + /* system parameters */ .pSystemParametersInfo = nulldrv_SystemParametersInfo, + /* vulkan support */ .pwine_get_vulkan_driver = loaderdrv_wine_get_vulkan_driver, }; diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index e29a05661dc..603c16acd41 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4475,6 +4475,14 @@ ULONG WINAPI NtUserGetProcessDpiAwarenessContext( HANDLE process ) return dpi_awareness; } +static BOOL message_beep( UINT i ) +{ + BOOL active = TRUE; + NtUserSystemParametersInfo( SPI_GETBEEP, 0, &active, FALSE ); + if (active) user_driver->pBeep(); + return TRUE; +} + /*********************************************************************** * NtUserCallOneParam (win32u.@) */ @@ -4496,6 +4504,8 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) return get_system_metrics( arg ); case NtUserGetDeskPattern: return get_entry( &entry_DESKPATTERN, 256, (WCHAR *)arg ); + case NtUserMessageBeep: + return message_beep( arg ); default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index 929d773cc97..92173300a35 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -57,6 +57,7 @@ enum NtUserGetSysColorBrush, NtUserGetSysColorPen, NtUserGetSystemMetrics, + NtUserMessageBeep, NtUserRealizePalette, /* temporary exports */ NtUserGetDeskPattern,

1 0

Jacek Caban : win32u: Move GetCursorPos implementation from user.
by Alexandre Julliard 14 Feb '22

14 Feb '22

Module: wine Branch: master Commit: b5b9126c7364adf551ab440548d234238151571c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5b9126c7364adf551ab4405… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 14 14:08:27 2022 +0100 win32u: Move GetCursorPos implementation from user. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 13 +------------ dlls/user32/input.c | 28 +--------------------------- dlls/win32u/driver.c | 6 ++++++ dlls/win32u/input.c | 32 ++++++++++++++++++++++++++++++++ dlls/win32u/sysparams.c | 2 ++ dlls/win32u/win32u_private.h | 3 +++ include/ntuser.h | 1 + 7 files changed, 46 insertions(+), 39 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 247093bfc17..6dbc07d318a 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -136,11 +136,6 @@ static void CDECL nulldrv_SetCursor( HCURSOR cursor ) { } -static BOOL CDECL nulldrv_GetCursorPos( LPPOINT pt ) -{ - return TRUE; -} - static BOOL CDECL nulldrv_SetCursorPos( INT x, INT y ) { return TRUE; @@ -298,11 +293,6 @@ static void CDECL loaderdrv_SetCursor( HCURSOR cursor ) load_driver()->pSetCursor( cursor ); } -static BOOL CDECL loaderdrv_GetCursorPos( LPPOINT pt ) -{ - return load_driver()->pGetCursorPos( pt ); -} - static BOOL CDECL loaderdrv_SetCursorPos( INT x, INT y ) { return load_driver()->pSetCursorPos( x, y ); @@ -371,7 +361,7 @@ static struct user_driver_funcs lazy_load_driver = /* cursor/icon functions */ nulldrv_DestroyCursorIcon, loaderdrv_SetCursor, - loaderdrv_GetCursorPos, + NULL, loaderdrv_SetCursorPos, loaderdrv_ClipCursor, /* clipboard functions */ @@ -431,7 +421,6 @@ void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT v SET_USER_FUNC(UnregisterHotKey); SET_USER_FUNC(DestroyCursorIcon); SET_USER_FUNC(SetCursor); - SET_USER_FUNC(GetCursorPos); SET_USER_FUNC(SetCursorPos); SET_USER_FUNC(ClipCursor); SET_USER_FUNC(UpdateClipboard); diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 210cc368527..b3329eb3c07 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -305,33 +305,7 @@ void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy, */ BOOL WINAPI DECLSPEC_HOTPATCH GetCursorPos( POINT *pt ) { - BOOL ret; - DWORD last_change; - UINT dpi; - - if (!pt) return FALSE; - - SERVER_START_REQ( set_cursor ) - { - if ((ret = !wine_server_call( req ))) - { - pt->x = reply->new_x; - pt->y = reply->new_y; - last_change = reply->last_change; - } - } - SERVER_END_REQ; - - /* query new position from graphics driver if we haven't updated recently */ - if (ret && GetTickCount() - last_change > 100) ret = USER_Driver->pGetCursorPos( pt ); - if (ret && (dpi = get_thread_dpi())) - { - DPI_AWARENESS_CONTEXT context; - context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); - *pt = map_dpi_point( *pt, get_monitor_dpi( MonitorFromPoint( *pt, MONITOR_DEFAULTTOPRIMARY )), dpi ); - SetThreadDpiAwarenessContext( context ); - } - return ret; + return NtUserCallOneParam( (UINT_PTR)pt, NtUserGetCursorPos ); } diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 24815922bbb..ea8d32d62f9 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1010,6 +1010,11 @@ static void CDECL loaderdrv_SetCursor( HCURSOR cursor ) load_driver()->pSetCursor( cursor ); } +static BOOL CDECL loaderdrv_GetCursorPos( POINT *pt ) +{ + return load_driver()->pGetCursorPos( pt ); +} + static BOOL CDECL loaderdrv_SetCursorPos( INT x, INT y ) { return load_driver()->pSetCursorPos( x, y ); @@ -1049,6 +1054,7 @@ static const struct user_driver_funcs lazy_load_driver = .pVkKeyScanEx = loaderdrv_VkKeyScanEx, /* cursor/icon functions */ .pSetCursor = loaderdrv_SetCursor, + .pGetCursorPos = loaderdrv_GetCursorPos, .pSetCursorPos = loaderdrv_SetCursorPos, .pClipCursor = loaderdrv_ClipCursor, /* clipboard functions */ diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 493efcd605b..328546c9f77 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -96,6 +96,38 @@ BOOL WINAPI NtUserSetCursorPos( INT x, INT y ) return ret; } +/*********************************************************************** + * get_cursor_pos + */ +BOOL get_cursor_pos( POINT *pt ) +{ + BOOL ret; + DWORD last_change; + UINT dpi; + + if (!pt) return FALSE; + + SERVER_START_REQ( set_cursor ) + { + if ((ret = !wine_server_call( req ))) + { + pt->x = reply->new_x; + pt->y = reply->new_y; + last_change = reply->last_change; + } + } + SERVER_END_REQ; + + /* query new position from graphics driver if we haven't updated recently */ + if (ret && NtGetTickCount() - last_change > 100) ret = user_driver->pGetCursorPos( pt ); + if (ret && (dpi = get_thread_dpi())) + { + HMONITOR monitor = monitor_from_point( *pt, MONITOR_DEFAULTTOPRIMARY, 0 ); + *pt = map_dpi_point( *pt, get_monitor_dpi( monitor ), dpi ); + } + return ret; +} + /*********************************************************************** * get_locale_kbd_layout */ diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 603c16acd41..ae9b4f73cfb 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4492,6 +4492,8 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) { case NtUserGetClipCursor: return get_clip_cursor( (RECT *)arg ); + case NtUserGetCursorPos: + return get_cursor_pos( (POINT *)arg ); case NtUserGetSysColor: return get_sys_color( arg ); case NtUserRealizePalette: diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 0a5f6ce10b8..cd50b48feec 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -245,6 +245,9 @@ struct unix_funcs /* cursoricon.c */ extern BOOL get_clip_cursor( RECT *rect ) DECLSPEC_HIDDEN; +/* input.c */ +extern BOOL get_cursor_pos( POINT *pt ) DECLSPEC_HIDDEN; + /* sysparams.c */ extern RECT get_display_rect( const WCHAR *display ) DECLSPEC_HIDDEN; extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; diff --git a/include/ntuser.h b/include/ntuser.h index 92173300a35..a115f7c9259 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -53,6 +53,7 @@ struct enum_display_monitor_params enum { NtUserGetClipCursor, + NtUserGetCursorPos, NtUserGetSysColor, NtUserGetSysColorBrush, NtUserGetSysColorPen,

1 0