wine-commits September 2020

wine-commits@winehq.org

1 participants
703 discussions

Paul Gofman : d3d11: Avoid crash in _CopySubresourceRegion[1]() on NULL resources.
by Alexandre Julliard 17 Sep '20

17 Sep '20

Module: wine Branch: master Commit: 962e939a4da3f73814ce82e693585a8371ae4502 URL: https://source.winehq.org/git/wine.git/?a=commit;h=962e939a4da3f73814ce82e6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 16 15:19:23 2020 +0300 d3d11: Avoid crash in _CopySubresourceRegion[1]() on NULL resources. Marvel's Avengers randomly hits this case. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 9 +++++++++ dlls/d3d11/tests/d3d11.c | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0508fa3f7b..2a68e02585 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -965,6 +965,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion(ID3D iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, src_resource, src_subresource_idx, src_box); + if (!dst_resource || !src_resource) + return; + if (src_box) wined3d_box_set(&wined3d_src_box, src_box->left, src_box->top, src_box->right, src_box->bottom, src_box->front, src_box->back); @@ -2438,6 +2441,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion1(ID3 iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, src_resource, src_subresource_idx, src_box, flags); + if (!dst_resource || !src_resource) + return; + if (src_box) wined3d_box_set(&wined3d_src_box, src_box->left, src_box->top, src_box->right, src_box->bottom, src_box->front, src_box->back); @@ -4507,6 +4513,9 @@ static void STDMETHODCALLTYPE d3d10_device_CopySubresourceRegion(ID3D10Device1 * iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, src_resource, src_subresource_idx, src_box); + if (!dst_resource || !src_resource) + return; + if (src_box) wined3d_box_set(&wined3d_src_box, src_box->left, src_box->top, src_box->right, src_box->bottom, src_box->front, src_box->back); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3099d22d27..208b0b20a9 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12689,6 +12689,11 @@ static void test_copy_subresource_region(void) ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, + 1, 1, 0, NULL, 0, &box); + ID3D11DeviceContext_CopySubresourceRegion(context, NULL, 0, + 1, 1, 0, (ID3D11Resource *)src_texture, 0, &box); + set_box(&box, 0, 0, 0, 2, 2, 1); ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, 1, 1, 0, (ID3D11Resource *)src_texture, 0, &box);

1 0

Nikolay Sivov : dxva2: Return single software device for GetVideoProcessorDeviceGuids().
by Alexandre Julliard 17 Sep '20

17 Sep '20

Module: wine Branch: master Commit: 88f47823e1e8e188379162f1cf785808f9edb981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88f47823e1e8e188379162f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 17 14:25:36 2020 +0300 dxva2: Return single software device for GetVideoProcessorDeviceGuids(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/Makefile.in | 2 +- dlls/dxva2/main.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in index e3fc2fd6c3..d331512f01 100644 --- a/dlls/dxva2/Makefile.in +++ b/dlls/dxva2/Makefile.in @@ -1,5 +1,5 @@ MODULE = dxva2.dll -IMPORTS = uuid +IMPORTS = uuid ole32 IMPORTLIB = dxva2 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 15d65a5834..22a35c4fbb 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -180,9 +180,15 @@ static HRESULT WINAPI device_manager_processor_service_RegisterVideoProcessorSof static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorDeviceGuids( IDirectXVideoProcessorService *iface, const DXVA2_VideoDesc *video_desc, UINT *count, GUID **guids) { - FIXME("%p, %p, %p, %p.\n", iface, video_desc, count, guids); + FIXME("%p, %p, %p, %p semi-stub.\n", iface, video_desc, count, guids); - return E_NOTIMPL; + if (!(*guids = CoTaskMemAlloc(sizeof(**guids)))) + return E_OUTOFMEMORY; + + memcpy(*guids, &DXVA2_VideoProcSoftwareDevice, sizeof(**guids)); + *count = 1; + + return S_OK; } static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorRenderTargets(

1 0

Nikolay Sivov : dxva2: Implement CreateSurface().
by Alexandre Julliard 17 Sep '20

17 Sep '20

Module: wine Branch: master Commit: 574fd3d3effa13ad1d4b0ed39d2155a7c03cb9e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=574fd3d3effa13ad1d4b0ed3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 17 14:25:35 2020 +0300 dxva2: Implement CreateSurface(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 37 +++++++++++++++++++++++++++++---- dlls/dxva2/tests/dxva2.c | 54 ++++++++++++++++++++++++++++++++++-------------- 2 files changed, 71 insertions(+), 20 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index dd949b3d31..15d65a5834 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -19,6 +19,7 @@ #define COBJMACROS #include <stdarg.h> +#include <limits.h> #include "windef.h" #include "winbase.h" #include "d3d9.h" @@ -132,12 +133,40 @@ static ULONG WINAPI device_manager_processor_service_Release(IDirectXVideoProces static HRESULT WINAPI device_manager_processor_service_CreateSurface(IDirectXVideoProcessorService *iface, UINT width, UINT height, UINT backbuffers, D3DFORMAT format, D3DPOOL pool, DWORD usage, DWORD dxvaType, - IDirect3DSurface9 **surface, HANDLE *shared_handle) + IDirect3DSurface9 **surfaces, HANDLE *shared_handle) { - FIXME("%p, %u, %u, %u, %u, %u, %u, %u, %p, %p.\n", iface, width, height, backbuffers, format, pool, usage, dxvaType, - surface, shared_handle); + struct device_manager *manager = impl_from_IDirectXVideoProcessorService(iface); + unsigned int i, j; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u, %u, %u, %u, %u, %u, %u, %p, %p.\n", iface, width, height, backbuffers, format, pool, usage, dxvaType, + surfaces, shared_handle); + + if (backbuffers >= UINT_MAX) + return E_INVALIDARG; + + memset(surfaces, 0, (backbuffers + 1) * sizeof(*surfaces)); + + for (i = 0; i < backbuffers + 1; ++i) + { + if (FAILED(hr = IDirect3DDevice9_CreateOffscreenPlainSurface(manager->device, width, height, format, + pool, &surfaces[i], NULL))) + break; + } + + if (FAILED(hr)) + { + for (j = 0; j < i; ++j) + { + if (surfaces[j]) + { + IDirect3DSurface9_Release(surfaces[j]); + surfaces[j] = NULL; + } + } + } + + return hr; } static HRESULT WINAPI device_manager_processor_service_RegisterVideoProcessorSoftwareDevice( diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 49b192a1fa..58b0231420 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -59,13 +59,31 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window) return device; } +static void test_surface_desc(IDirect3DSurface9 *surface) +{ + D3DSURFACE_DESC desc = { 0 }; + HRESULT hr; + + hr = IDirect3DSurface9_GetDesc(surface, &desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ok(desc.Format == D3DFMT_X8R8G8B8, "Unexpected format %d.\n", desc.Format); + ok(desc.Type == D3DRTYPE_SURFACE, "Unexpected type %d.\n", desc.Type); + ok(desc.Usage == 0, "Unexpected usage %d.\n", desc.Usage); + ok(desc.Pool == D3DPOOL_DEFAULT, "Unexpected pool %d.\n", desc.Pool); + ok(desc.MultiSampleType == D3DMULTISAMPLE_NONE, "Unexpected multisample type %d.\n", desc.MultiSampleType); + ok(desc.MultiSampleQuality == 0, "Unexpected multisample quality %d.\n", desc.MultiSampleQuality); + ok(desc.Width == 64, "Unexpected width %u.\n", desc.Width); + ok(desc.Height == 64, "Unexpected height %u.\n", desc.Height); +} + static void test_device_manager(void) { IDirectXVideoProcessorService *processor_service; IDirectXVideoAccelerationService *accel_service; IDirect3DDevice9 *device, *device2, *device3; IDirect3DDeviceManager9 *manager; - IDirect3DSurface9 *surface; + IDirect3DSurface9 *surfaces[2]; int refcount, refcount2; HANDLE handle, handle1; IDirect3D9 *d3d; @@ -262,12 +280,20 @@ static void test_device_manager(void) hr = DXVA2CreateVideoService(device, &IID_IDirectXVideoAccelerationService, (void **)&accel_service); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + surfaces[0] = surfaces[1] = NULL; + hr = IDirectXVideoAccelerationService_CreateSurface(accel_service, 64, 64, 0, D3DFMT_X8R8G8B8, + D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, surfaces, NULL); + ok(hr == S_OK, "Failed to create a surface, hr %#x.\n", hr); + ok(!!surfaces[0] && !surfaces[1], "Unexpected surfaces.\n"); + IDirect3DSurface9_Release(surfaces[0]); + hr = IDirectXVideoAccelerationService_CreateSurface(accel_service, 64, 64, 1, D3DFMT_X8R8G8B8, - D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL); -todo_wine + D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, surfaces, NULL); ok(hr == S_OK, "Failed to create a surface, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IDirect3DSurface9_Release(surface); + ok(!!surfaces[0] && !!surfaces[1], "Unexpected surfaces.\n"); + test_surface_desc(surfaces[0]); + IDirect3DSurface9_Release(surfaces[0]); + IDirect3DSurface9_Release(surfaces[1]); IDirectXVideoAccelerationService_Release(accel_service); @@ -281,20 +307,16 @@ todo_wine hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IDirectXVideoAccelerationService_CreateSurface(accel_service, 64, 64, 1, D3DFMT_X8R8G8B8, - D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL); -todo_wine + hr = IDirectXVideoAccelerationService_CreateSurface(accel_service, 64, 64, 0, D3DFMT_X8R8G8B8, + D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, surfaces, NULL); ok(hr == S_OK, "Failed to create a surface, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - hr = IDirect3DSurface9_GetDevice(surface, &device3); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(device2 == device3, "Unexpected device.\n"); - IDirect3DDevice9_Release(device3); + hr = IDirect3DSurface9_GetDevice(surfaces[0], &device3); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(device2 == device3, "Unexpected device.\n"); + IDirect3DDevice9_Release(device3); - IDirect3DSurface9_Release(surface); - } + IDirect3DSurface9_Release(surfaces[0]); IDirectXVideoAccelerationService_Release(accel_service);

1 0

Nikolay Sivov : evr/tests: Add a test for returned input type instance.
by Alexandre Julliard 17 Sep '20

17 Sep '20

Module: wine Branch: master Commit: 7c1b534a182f74835e84337e5c7ac6617755970a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c1b534a182f74835e84337e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 17 14:24:39 2020 +0300 evr/tests: Add a test for returned input type instance. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index a68952c42a..3e2675497a 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -805,11 +805,11 @@ done: static void test_default_mixer_type_negotiation(void) { + IMFMediaType *media_type, *media_type2; IDirect3DDeviceManager9 *manager; DXVA2_VideoProcessorCaps caps; IMFVideoMediaType *video_type; IMFVideoProcessor *processor; - IMFMediaType *media_type; IDirect3DDevice9 *device; IMFTransform *transform; GUID guid, *guids; @@ -896,6 +896,18 @@ static void test_default_mixer_type_negotiation(void) todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +if (hr == S_OK) +{ + ok(media_type != (IMFMediaType *)video_type, "Unexpected media type instance.\n"); + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(media_type == media_type2, "Unexpected media type instance.\n"); + IMFMediaType_Release(media_type); + IMFMediaType_Release(media_type2); +} hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&processor); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : evr/mixer: Handle uninitialized input case in GetOutputAvailableType().
by Alexandre Julliard 17 Sep '20

17 Sep '20

Module: wine Branch: master Commit: deac29d411dccadcd12a815ab0a4a8cb6f5ebdee URL: https://source.winehq.org/git/wine.git/?a=commit;h=deac29d411dccadcd12a815a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 17 14:24:38 2020 +0300 evr/mixer: Handle uninitialized input case in GetOutputAvailableType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 4 +++- dlls/evr/tests/evr.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 70199f37a1..710e20815a 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -533,7 +533,9 @@ static HRESULT WINAPI video_mixer_transform_GetOutputAvailableType(IMFTransform EnterCriticalSection(&mixer->cs); - if (index >= mixer->output.type_count) + if (!mixer->inputs[0].media_type) + hr = MF_E_TRANSFORM_TYPE_NOT_SET; + else if (index >= mixer->output.type_count) hr = MF_E_NO_MORE_TYPES; else { diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index ecf1f850c7..a68952c42a 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -835,6 +835,9 @@ static void test_default_mixer_type_negotiation(void) hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr);

1 0

Gijs Vermeulen : msvcirt: Set error when file can't be opened in fstream_open_ctor.
by Alexandre Julliard 17 Sep '20

17 Sep '20

Module: wine Branch: master Commit: 19342f43bb34402df76dedbadf0ced52209123ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=19342f43bb34402df76dedba… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Sep 17 12:44:15 2020 +0200 msvcirt: Set error when file can't be opened in fstream_open_ctor. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 3443261934..0b0a34940d 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -4627,13 +4627,14 @@ iostream* __thiscall fstream_open_ctor(iostream *this, const char *name, ios_ope } filebuf_ctor(fb); - filebuf_open(fb, name, mode, protection); iostream_internal_sb_ctor(this, &fb->base, &MSVCP_fstream_vtable, virt_init); base = istream_get_ios(&this->base1); base->delbuf = 1; + if (!filebuf_open(fb, name, mode, protection)) + base->state |= IOSTATE_failbit; return this; }

1 0

Nikolay Sivov : oleacc/tests: Use wide string constants.
by Alexandre Julliard 17 Sep '20

17 Sep '20

Module: wine Branch: master Commit: da4dc79db93309ede68ca8baa82716f51f55fa0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=da4dc79db93309ede68ca8ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 17 10:43:03 2020 +0300 oleacc/tests: Use wide string constants. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index c1e7d93ba3..e4ef0e78bf 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -726,9 +726,6 @@ static void test_AccessibleChildren(IAccessible *acc) static void test_default_client_accessible_object(void) { - static const WCHAR testW[] = {'t','e','s','t',' ','t',' ','&','j','u','n','k',0}; - static const WCHAR shortcutW[] = {'A','l','t','+','t',0}; - IAccessible *acc; IDispatch *disp; IOleWindow *ow; @@ -813,7 +810,7 @@ static void test_default_client_accessible_object(void) V_I4(&vid) = CHILDID_SELF; hr = IAccessible_get_accName(acc, vid, &str); ok(hr == S_OK, "got %x\n", hr); - ok(!lstrcmpW(str, testW), "name = %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"test t &junk"), "name = %s\n", wine_dbgstr_w(str)); SysFreeString(str); V_I4(&vid) = 1; @@ -855,7 +852,7 @@ static void test_default_client_accessible_object(void) hr = IAccessible_get_accKeyboardShortcut(acc, vid, &str); ok(hr == S_OK, "got %x\n", hr); - ok(!lstrcmpW(str, shortcutW), "str = %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, L"Alt+t"), "str = %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = (void*)0xdeadbeef;

1 0

Nikolay Sivov : oleacc: Use wide string constants.
by Alexandre Julliard 17 Sep '20

17 Sep '20

Module: wine Branch: master Commit: 58285160895f39e0ec396a01e99d8ab28bf5d273 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58285160895f39e0ec396a01… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 17 10:43:02 2020 +0300 oleacc: Use wide string constants. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/client.c | 3 +-- dlls/oleacc/main.c | 28 +++++++++------------------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 1d43ec3106..3b33be55a2 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -274,7 +274,6 @@ static HRESULT WINAPI Client_get_accHelpTopic(IAccessible *iface, static HRESULT WINAPI Client_get_accKeyboardShortcut(IAccessible *iface, VARIANT varID, BSTR *pszKeyboardShortcut) { - static const WCHAR shortcut_fmt[] = {'A','l','t','+','!',0}; Client *This = impl_from_Client(iface); WCHAR name[1024]; UINT i, len; @@ -293,7 +292,7 @@ static HRESULT WINAPI Client_get_accKeyboardShortcut(IAccessible *iface, if(i+1 >= len) return S_FALSE; - *pszKeyboardShortcut = SysAllocString(shortcut_fmt); + *pszKeyboardShortcut = SysAllocString(L"Alt+!"); if(!*pszKeyboardShortcut) return E_OUTOFMEMORY; diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index f26abbd117..f6b66a8bca 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -37,15 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); static const WCHAR lresult_atom_prefix[] = {'w','i','n','e','_','o','l','e','a','c','c',':'}; -static const WCHAR menuW[] = {'#','3','2','7','6','8',0}; -static const WCHAR desktopW[] = {'#','3','2','7','6','9',0}; -static const WCHAR dialogW[] = {'#','3','2','7','7','0',0}; -static const WCHAR winswitchW[] = {'#','3','2','7','7','1',0}; -static const WCHAR mdi_clientW[] = {'M','D','I','C','l','i','e','n','t',0}; -static const WCHAR richeditW[] = {'R','I','C','H','E','D','I','T',0}; -static const WCHAR richedit20aW[] = {'R','i','c','h','E','d','i','t','2','0','A',0}; -static const WCHAR richedit20wW[] = {'R','i','c','h','E','d','i','t','2','0','W',0}; - typedef HRESULT (WINAPI *accessible_create)(HWND, const IID*, void**); extern HRESULT WINAPI OLEACC_DllGetClassObject(REFCLSID, REFIID, void**) DECLSPEC_HIDDEN; @@ -60,15 +51,15 @@ static struct { accessible_create create_window; } builtin_classes[] = { {WC_LISTBOXW, 0x10000, NULL, NULL}, - {menuW, 0x10001, NULL, NULL}, + {L"#32768", 0x10001, NULL, NULL}, /* menu */ {WC_BUTTONW, 0x10002, NULL, NULL}, {WC_STATICW, 0x10003, NULL, NULL}, {WC_EDITW, 0x10004, NULL, NULL}, {WC_COMBOBOXW, 0x10005, NULL, NULL}, - {dialogW, 0x10006, NULL, NULL}, - {winswitchW, 0x10007, NULL, NULL}, - {mdi_clientW, 0x10008, NULL, NULL}, - {desktopW, 0x10009, NULL, NULL}, + {L"#32770", 0x10006, NULL, NULL}, /* dialog */ + {L"#32771", 0x10007, NULL, NULL}, /* winswitcher */ + {L"MDIClient", 0x10008, NULL, NULL}, + {L"#32769", 0x10009, NULL, NULL}, /* desktop */ {WC_SCROLLBARW, 0x1000a, NULL, NULL}, {STATUSCLASSNAMEW, 0x1000b, NULL, NULL}, {TOOLBARCLASSNAMEW, 0x1000c, NULL, NULL}, @@ -85,9 +76,9 @@ static struct { {MONTHCAL_CLASSW, 0, NULL, NULL}, {DATETIMEPICK_CLASSW, 0, NULL, NULL}, {WC_IPADDRESSW, 0, NULL, NULL}, - {richeditW, 0x1001c, NULL, NULL}, - {richedit20aW, 0, NULL, NULL}, - {richedit20wW, 0, NULL, NULL}, + {L"RICHEDIT", 0x1001c, NULL, NULL}, + {L"RichEdit20A", 0, NULL, NULL}, + {L"RichEdit20W", 0, NULL, NULL}, }; static HINSTANCE oleacc_handle = 0; @@ -243,7 +234,6 @@ HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, vo LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) { - static const WCHAR atom_fmt[] = {'%','0','8','x',':','%','0','8','x',':','%','0','8','x',0}; static const LARGE_INTEGER seek_zero = {{0}}; WCHAR atom_str[ARRAY_SIZE(lresult_atom_prefix)+3*8+3]; @@ -319,7 +309,7 @@ LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) } memcpy(atom_str, lresult_atom_prefix, sizeof(lresult_atom_prefix)); - swprintf(atom_str+ARRAY_SIZE(lresult_atom_prefix), 3*8 + 3, atom_fmt, GetCurrentProcessId(), + swprintf(atom_str+ARRAY_SIZE(lresult_atom_prefix), 3*8 + 3, L"%08x:%08x:%08x", GetCurrentProcessId(), HandleToUlong(mapping), stat.cbSize.u.LowPart); atom = GlobalAddAtomW(atom_str); if(!atom) {

1 0

Esme Povirk : gdiplus/tests: Don't test point type array padding.
by Alexandre Julliard 17 Sep '20

17 Sep '20

Module: wine Branch: master Commit: 6a5eed549de8947e6d789c6e87ae24b58bc979b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a5eed549de8947e6d789c6e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Sep 16 16:29:01 2020 -0500 gdiplus/tests: Don't test point type array padding. Since the point types are an array of bytes, padded to a DWORD boundary, some of the bytes at the end are undefined, and there's no good reason to test them. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/region.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index d69f09db60..04c388bf5a 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -641,8 +641,8 @@ static void test_getregiondata(void) expect_float(buf + 25, 50.0); expect_float(buf + 26, 70.2); expect_dword(buf + 27, 0x01010100); - ok(*(buf + 28) == 0x00000101 || *(buf + 28) == 0x43050101 /* Win 7 */, - "expected 00000101 or 43050101 got %08x\n", *(buf + 28)); + ok((*(buf + 28) & 0xffff) == 0x0101, + "expected ????0101 got %08x\n", *(buf + 28)); expect_dword(buf + 29, 0xeeeeeeee); test_region_data(buf, needed, __LINE__); @@ -791,9 +791,8 @@ static void test_getregiondata(void) expect_float(buf + 30, 789.799561); expect_dword(buf + 31, 0x03030300); expect_dword(buf + 32, 0x03030301); - ok(*(buf + 33) == 0x00030303 /* before win7 */ || - *(buf + 33) == 0x43030303 /* 32-bit win7 */ || *(buf + 33) == 0x4c030303 /* 64-bit win7 */, - "expected 0x00030303 or 0x43030303 or 0x4c030303 got %08x\n", *(buf + 33)); + ok((*(buf + 33) & 0xffffff) == 0x030303, + "expected 0x??030303 got %08x\n", *(buf + 33)); expect_dword(buf + 34, 0xeeeeeeee); test_region_data(buf, needed, __LINE__);

1 0

Isabella Bosia : vkd3d-shader: Output "tri" instead of "triangle" in tessellator domains.
by Alexandre Julliard 17 Sep '20

17 Sep '20

Module: vkd3d Branch: master Commit: 3c30efe14c4255a0ffa6abd2e9b71af1067b02ea URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3c30efe14c4255a0ffa6abd… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Thu Sep 17 00:00:55 2020 +0100 vkd3d-shader: Output "tri" instead of "triangle" in tessellator domains. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index c487eae..d86a84a 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -427,7 +427,7 @@ static void shader_dump_tessellator_domain(struct vkd3d_string_buffer *buffer, shader_addline(buffer, "isoline"); break; case VKD3D_TESSELLATOR_DOMAIN_TRIANGLE: - shader_addline(buffer, "triangle"); + shader_addline(buffer, "tri"); break; case VKD3D_TESSELLATOR_DOMAIN_QUAD: shader_addline(buffer, "quad");

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2020