October 2021 - Wine-Commits

Jan Sikorski : d3d11: Don't grab wined3d lock for wined3d_device_context_flush().
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: 82b02b1ce6f122b6b6b234f723a24d6c6d35869a URL: https://source.winehq.org/git/wine.git/?a=commit;h=82b02b1ce6f122b6b6b234f7… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:15 2021 +0200 d3d11: Don't grab wined3d lock for wined3d_device_context_flush(). Signed-off-by: Jan Sikorski <jsikorski(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 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 2ea657b9641..e5618f09174 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2665,9 +2665,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_Flush(ID3D11DeviceContext1 *i TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); wined3d_device_context_flush(context->wined3d_context); - wined3d_mutex_unlock(); } static D3D11_DEVICE_CONTEXT_TYPE STDMETHODCALLTYPE d3d11_device_context_GetType(ID3D11DeviceContext1 *iface) @@ -5755,9 +5753,7 @@ static void STDMETHODCALLTYPE d3d10_device_Flush(ID3D10Device1 *iface) TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); wined3d_device_context_flush(device->immediate_context.wined3d_context); - wined3d_mutex_unlock(); } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device1 *iface,

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for wined3d_device_context_reset_state().
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: b02663fa06a4af5dc27693e686ec14f4c1ecc574 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b02663fa06a4af5dc27693e6… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:14 2021 +0200 d3d11: Don't grab wined3d lock for wined3d_device_context_reset_state(). Signed-off-by: Jan Sikorski <jsikorski(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 | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 43db6b76b8c..2ea657b9641 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2656,9 +2656,7 @@ static void STDMETHODCALLTYPE d3d11_device_context_ClearState(ID3D11DeviceContex TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); wined3d_device_context_reset_state(context->wined3d_context); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_Flush(ID3D11DeviceContext1 *iface)

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for view clears.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: 5ed9af20cdeb9b3aa4519926520ec9491fe42b4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ed9af20cdeb9b3aa4519926… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:11 2021 +0200 d3d11: Don't grab wined3d lock for view clears. Signed-off-by: Jan Sikorski <jsikorski(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 | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 979b0632c49..84af9a16baf 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1412,11 +1412,9 @@ static void STDMETHODCALLTYPE d3d11_device_context_ClearRenderTargetView(ID3D11D if (!view) return; - wined3d_mutex_lock(); if (FAILED(hr = wined3d_device_context_clear_rendertarget_view(context->wined3d_context, view->wined3d_view, NULL, WINED3DCLEAR_TARGET, &color, 0.0f, 0))) ERR("Failed to clear view, hr %#x.\n", hr); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_ClearUnorderedAccessViewUint(ID3D11DeviceContext1 *iface, @@ -1429,10 +1427,8 @@ static void STDMETHODCALLTYPE d3d11_device_context_ClearUnorderedAccessViewUint( iface, unordered_access_view, values[0], values[1], values[2], values[3]); view = unsafe_impl_from_ID3D11UnorderedAccessView(unordered_access_view); - wined3d_mutex_lock(); wined3d_device_context_clear_uav_uint(context->wined3d_context, view->wined3d_view, (const struct wined3d_uvec4 *)values); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_ClearUnorderedAccessViewFloat(ID3D11DeviceContext1 *iface, @@ -1445,10 +1441,8 @@ static void STDMETHODCALLTYPE d3d11_device_context_ClearUnorderedAccessViewFloat iface, unordered_access_view, debug_float4(values)); view = unsafe_impl_from_ID3D11UnorderedAccessView(unordered_access_view); - wined3d_mutex_lock(); wined3d_device_context_clear_uav_float(context->wined3d_context, view->wined3d_view, (const struct wined3d_vec4 *)values); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_ClearDepthStencilView(ID3D11DeviceContext1 *iface, @@ -1467,11 +1461,9 @@ static void STDMETHODCALLTYPE d3d11_device_context_ClearDepthStencilView(ID3D11D wined3d_flags = wined3d_clear_flags_from_d3d11_clear_flags(flags); - wined3d_mutex_lock(); if (FAILED(hr = wined3d_device_context_clear_rendertarget_view(context->wined3d_context, view->wined3d_view, NULL, wined3d_flags, NULL, depth, stencil))) ERR("Failed to clear view, hr %#x.\n", hr); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_GenerateMips(ID3D11DeviceContext1 *iface, @@ -5053,11 +5045,9 @@ static void STDMETHODCALLTYPE d3d10_device_ClearRenderTargetView(ID3D10Device1 * if (!view) return; - wined3d_mutex_lock(); if (FAILED(hr = wined3d_device_context_clear_rendertarget_view(device->immediate_context.wined3d_context, view->wined3d_view, NULL, WINED3DCLEAR_TARGET, &color, 0.0f, 0))) ERR("Failed to clear view, hr %#x.\n", hr); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_device_ClearDepthStencilView(ID3D10Device1 *iface, @@ -5076,11 +5066,9 @@ static void STDMETHODCALLTYPE d3d10_device_ClearDepthStencilView(ID3D10Device1 * wined3d_flags = wined3d_clear_flags_from_d3d11_clear_flags(flags); - wined3d_mutex_lock(); if (FAILED(hr = wined3d_device_context_clear_rendertarget_view(device->immediate_context.wined3d_context, view->wined3d_view, NULL, wined3d_flags, NULL, depth, stencil))) ERR("Failed to clear view, hr %#x.\n", hr); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_device_GenerateMips(ID3D10Device1 *iface,

1 0

Rémi Bernon : dinput: Factor all GetObjectInfo implementations together.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: 9f493b0ed8a45326aff559b3e746d811b4dde688 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f493b0ed8a45326aff559b3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 18 10:21:56 2021 +0200 dinput: Factor all GetObjectInfo implementations together. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 68 +++++++++++++++++---------------------------- dlls/dinput/joystick_hid.c | 36 +----------------------- dlls/dinput/keyboard.c | 64 ++---------------------------------------- dlls/dinput/mouse.c | 30 +------------------- dlls/dinput8/tests/device.c | 4 +-- 5 files changed, 31 insertions(+), 171 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f493b0ed8a45326aff5…

1 0

Jacek Caban : win32u: Don't use CDECL for font backend functions.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: a859171327a743d146c5c8c4c59e8226226fa96d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a859171327a743d146c5c8c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 15 16:53:39 2021 +0200 win32u: Don't use CDECL for font backend functions. 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/win32u/freetype.c | 44 ++++++++++++++++++++++---------------------- dlls/win32u/ntgdi_private.h | 40 ++++++++++++++++++++-------------------- 2 files changed, 42 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a859171327a743d146c5…

1 0

Alexandre Julliard : windowscodecs: Use the bundled libpng.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: c3d8a29a049921feb7d4ce57c134158fad4809c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3d8a29a049921feb7d4ce57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 14:36:33 2021 +0200 windowscodecs: Use the bundled libpng. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 120 ------------------ configure.ac | 17 --- dlls/windowscodecs/Makefile.in | 4 +- dlls/windowscodecs/libpng.c | 280 ++++++++--------------------------------- dlls/windowscodecs/pngformat.c | 4 +- dlls/windowscodecs/unix_lib.c | 7 -- include/config.h.in | 6 - 7 files changed, 54 insertions(+), 384 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c3d8a29a049921feb7d4…

1 0

Rémi Bernon : dinput: Implement internal enum_objects for the keyboard device.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: 71ecc179aab7ad103e06b52ea76ae1f1e25b3d3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=71ecc179aab7ad103e06b52e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 18 10:21:55 2021 +0200 dinput: Implement internal enum_objects for the keyboard device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 25 +----------- dlls/dinput/keyboard.c | 93 ++++++++++++++++++++++++++++++++------------- dlls/dinput8/tests/device.c | 1 - 3 files changed, 68 insertions(+), 51 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 3d3865ec6dd..56354e886d1 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1158,29 +1158,6 @@ HRESULT WINAPI IDirectInputDevice2WImpl_EnumObjects( IDirectInputDevice8W *iface if (flags & ~(DIDFT_AXIS | DIDFT_POV | DIDFT_BUTTON | DIDFT_NODATA | DIDFT_COLLECTION)) return DIERR_INVALIDPARAM; - if (!impl->vtbl->enum_objects) - { - DIDEVICEOBJECTINSTANCEW ddoi; - DWORD i; - - /* Only the fields till dwFFMaxForce are relevant */ - memset( &ddoi, 0, sizeof(ddoi) ); - ddoi.dwSize = FIELD_OFFSET( DIDEVICEOBJECTINSTANCEW, dwFFMaxForce ); - - for (i = 0; i < impl->data_format.wine_df->dwNumObjs; i++) - { - LPDIOBJECTDATAFORMAT odf = dataformat_to_odf( impl->data_format.wine_df, i ); - - if (flags != DIDFT_ALL && !(flags & DIDFT_GETTYPE( odf->dwType ))) continue; - if (IDirectInputDevice_GetObjectInfo( iface, &ddoi, odf->dwType, DIPH_BYID ) != DI_OK) - continue; - - if (callback( &ddoi, context ) != DIENUM_CONTINUE) break; - } - - return DI_OK; - } - if (flags == DIDFT_ALL || (flags & DIDFT_AXIS)) { hr = impl->vtbl->enum_objects( iface, &filter, DIDFT_AXIS, callback, context ); @@ -1421,7 +1398,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetObjectInfo( memset(pdidoi, 0, pdidoi->dwSize); pdidoi->dwSize = dwSize; if (odf->pguid) pdidoi->guidType = *odf->pguid; - pdidoi->dwOfs = This->data_format.offsets ? This->data_format.offsets[idx] : odf->dwOfs; + pdidoi->dwOfs = odf->dwOfs; pdidoi->dwType = odf->dwType; pdidoi->dwFlags = odf->dwFlags; diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index a296ebc98ce..50e292abaad 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -196,14 +196,11 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysKeyboar { BYTE subtype = get_keyboard_subtype(); SysKeyboardImpl* newDevice; - LPDIDATAFORMAT df = NULL; - int i, idx = 0; HRESULT hr; if (FAILED(hr = direct_input_device_alloc( sizeof(SysKeyboardImpl), &SysKeyboardWvt, &keyboard_internal_vtbl, rguid, dinput, (void **)&newDevice ))) return hr; - df = newDevice->base.data_format.wine_df; newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysKeyboardImpl*->base.crit"); fill_keyboard_dideviceinstanceW( &newDevice->base.instance, newDevice->base.dinput->dwVersion, subtype ); @@ -211,33 +208,14 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysKeyboar newDevice->base.caps.dwFirmwareRevision = 100; newDevice->base.caps.dwHardwareRevision = 100; - /* Create copy of default data format */ - memcpy(df, &c_dfDIKeyboard, c_dfDIKeyboard.dwSize); - if (!(df->rgodf = malloc( df->dwNumObjs * df->dwObjSize ))) goto failed; - - for (i = 0; i < df->dwNumObjs; i++) + if (FAILED(hr = direct_input_device_init( &newDevice->base.IDirectInputDevice8W_iface ))) { - char buf[MAX_PATH]; - BYTE dik_code; - - if (!GetKeyNameTextA(((i & 0x7f) << 16) | ((i & 0x80) << 17), buf, sizeof(buf))) - continue; - - dik_code = map_dik_code( i, 0, subtype, dinput->dwVersion ); - memcpy(&df->rgodf[idx], &c_dfDIKeyboard.rgodf[dik_code], df->dwObjSize); - df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON; + IDirectInputDevice_Release( &newDevice->base.IDirectInputDevice8W_iface ); + return hr; } - df->dwNumObjs = idx; - newDevice->base.caps.dwButtons = idx; *out = newDevice; return DI_OK; - -failed: - if (df) free( df->rgodf ); - free( df ); - free( newDevice ); - return DIERR_OUTOFMEMORY; } static HRESULT keyboarddev_create_device( IDirectInputImpl *dinput, REFGUID rguid, IDirectInputDevice8W **out ) @@ -407,12 +385,75 @@ static HRESULT keyboard_internal_unacquire( IDirectInputDevice8W *iface ) return DI_OK; } +static BOOL try_enum_object( const DIPROPHEADER *filter, DWORD flags, LPDIENUMDEVICEOBJECTSCALLBACKW callback, + DIDEVICEOBJECTINSTANCEW *instance, void *data ) +{ + if (flags != DIDFT_ALL && !(flags & DIDFT_GETTYPE( instance->dwType ))) return DIENUM_CONTINUE; + + switch (filter->dwHow) + { + case DIPH_DEVICE: + return callback( instance, data ); + case DIPH_BYOFFSET: + if (filter->dwObj != instance->dwOfs) return DIENUM_CONTINUE; + return callback( instance, data ); + case DIPH_BYID: + if ((filter->dwObj & 0x00ffffff) != (instance->dwType & 0x00ffffff)) return DIENUM_CONTINUE; + return callback( instance, data ); + } + + return DIENUM_CONTINUE; +} + +static HRESULT keyboard_internal_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *header, DWORD flags, + LPDIENUMDEVICEOBJECTSCALLBACKW callback, void *context ) +{ + SysKeyboardImpl *impl = impl_from_IDirectInputDevice8W( iface ); + BYTE subtype = GET_DIDEVICE_SUBTYPE( impl->base.instance.dwDevType ); + DIDEVICEOBJECTINSTANCEW instance = + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Key, + .dwOfs = DIK_ESCAPE, + .dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( DIK_ESCAPE ), + }; + DIDATAFORMAT *format = impl->base.data_format.wine_df; + int *offsets = impl->base.data_format.offsets; + DIPROPHEADER filter = *header; + DWORD i, dik; + BOOL ret; + + if (header->dwHow != DIPH_DEVICE && header->dwHow != DIPH_BYOFFSET && header->dwHow != DIPH_BYID) + return DIERR_UNSUPPORTED; + + if (filter.dwHow == DIPH_BYOFFSET) + { + if (!offsets) return DIENUM_CONTINUE; + for (i = 0; i < format->dwNumObjs; ++i) + if (offsets[i] == filter.dwObj) break; + if (i == format->dwNumObjs) return DIENUM_CONTINUE; + filter.dwObj = format->rgodf[i].dwOfs; + } + + for (i = 0; i < 512; ++i) + { + if (!GetKeyNameTextW( i << 16, instance.tszName, ARRAY_SIZE(instance.tszName) )) continue; + if (!(dik = map_dik_code( i, 0, subtype, impl->base.dinput->dwVersion ))) continue; + instance.dwOfs = dik; + instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( dik ); + ret = try_enum_object( &filter, flags, callback, &instance, context ); + if (ret != DIENUM_CONTINUE) return DIENUM_STOP; + } + + return DIENUM_CONTINUE; +} + static const struct dinput_device_vtbl keyboard_internal_vtbl = { NULL, keyboard_internal_acquire, keyboard_internal_unacquire, - NULL, + keyboard_internal_enum_objects, }; static const IDirectInputDevice8WVtbl SysKeyboardWvt = diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 9122799b118..8d208a0bcb1 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -1068,7 +1068,6 @@ static BOOL CALLBACK check_objects( const DIDEVICEOBJECTINSTANCEW *obj, void *ar winetest_push_context( "obj[%d]", params->index ); - todo_wine_if( obj->dwSize == sizeof(DIDEVICEOBJECTINSTANCE_DX3W) ) check_member( *obj, *exp, "%u", dwSize ); check_member_guid( *obj, *exp, guidType ); todo_wine_if( todo->offset )

1 0

Jacek Caban : win32u: Use syscall interface for some D3DKMT functions.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: 00222f6d063e7d55989eb79695ed638c4d092bb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00222f6d063e7d55989eb796… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 15 16:53:28 2021 +0200 win32u: Use syscall interface for some D3DKMT functions. 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/win32u/gdiobj.c | 7 --- dlls/win32u/syscall.c | 7 +++ dlls/win32u/win32u.spec | 14 +++--- dlls/win32u/win32u_private.h | 7 --- dlls/win32u/wrappers.c | 35 --------------- dlls/wow64win/gdi.c | 105 +++++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 7 +++ 7 files changed, 126 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=00222f6d063e7d55989e…

1 0

Rémi Bernon : dinput: Introduce new direct_input_device_init helper.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: be9a36c4ff86b2231f51c8a5df6f61175ebd3936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be9a36c4ff86b2231f51c8a5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 18 10:21:52 2021 +0200 dinput: Introduce new direct_input_device_init helper. To initialize the device data format by enumerating its objects. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 73 ++++++++++++++++++++++++++++++++++++ dlls/dinput/device_private.h | 6 +++ dlls/dinput/joystick_hid.c | 89 +++++++------------------------------------- 3 files changed, 92 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be9a36c4ff86b2231f51…

1 0

Alexandre Julliard : user32: Use the bundled libpng.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: wine Branch: master Commit: 9f9441c9cf72cff1b539ca4f674e6c1081344988 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f9441c9cf72cff1b539ca4f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 18 14:34:21 2021 +0200 user32: Use the bundled libpng. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/Makefile.in | 5 +- dlls/user32/cursoricon.c | 211 ++++++++++++++++++++++++++-- dlls/user32/png.c | 341 --------------------------------------------- dlls/user32/user_main.c | 3 - dlls/user32/user_private.h | 9 -- 5 files changed, 203 insertions(+), 366 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f9441c9cf72cff1b539…

1 0