February 2021 - Wine-Commits

Nikolay Sivov : wbemdisp: Add SWbemNamedValueSet stub.
by Alexandre Julliard Feb. 24, 2021

Feb. 24, 2021

Module: wine Branch: master Commit: 1922298fe3a0a0ebca788905547d99d2dc65a9e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1922298fe3a0a0ebca788905… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 24 09:40:23 2021 +0300 wbemdisp: Add SWbemNamedValueSet stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 237 ++++++++++++++++++++++++++++++++++++++- dlls/wbemdisp/main.c | 3 + dlls/wbemdisp/tests/wbemdisp.c | 12 ++ dlls/wbemdisp/wbemdisp_private.h | 1 + include/wbemdisp.idl | 11 ++ 5 files changed, 263 insertions(+), 1 deletion(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 28c8e5b4120..bbb0625f4e8 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -47,6 +47,7 @@ enum type_id ISWbemPropertySet_tid, ISWbemServices_tid, ISWbemSecurity_tid, + ISWbemNamedValueSet_tid, last_tid }; @@ -61,7 +62,8 @@ static REFIID wbemdisp_tid_id[] = &IID_ISWbemProperty, &IID_ISWbemPropertySet, &IID_ISWbemServices, - &IID_ISWbemSecurity + &IID_ISWbemSecurity, + &IID_ISWbemNamedValueSet, }; static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) @@ -2456,3 +2458,236 @@ static HRESULT ISWbemSecurity_create( ISWbemSecurity **obj ) TRACE( "returning iface %p\n", *obj ); return S_OK; } + +struct namedvalueset +{ + ISWbemNamedValueSet ISWbemNamedValueSet_iface; + LONG refs; +}; + +static struct namedvalueset *impl_from_ISWbemNamedValueSet( ISWbemNamedValueSet *iface ) +{ + return CONTAINING_RECORD( iface, struct namedvalueset, ISWbemNamedValueSet_iface ); +} + +static HRESULT WINAPI namedvalueset_QueryInterface( + ISWbemNamedValueSet *iface, + REFIID riid, + void **ppvObject ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + + TRACE( "%p, %s, %p\n", set, debugstr_guid( riid ), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemNamedValueSet ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemNamedValueSet_AddRef( iface ); + return S_OK; +} + +static ULONG WINAPI namedvalueset_AddRef( + ISWbemNamedValueSet *iface ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + return InterlockedIncrement( &set->refs ); +} + +static ULONG WINAPI namedvalueset_Release( + ISWbemNamedValueSet *iface ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + LONG refs = InterlockedDecrement( &set->refs ); + if (!refs) + { + TRACE( "destroying %p\n", set ); + heap_free( set ); + } + return refs; +} + +static HRESULT WINAPI namedvalueset_GetTypeInfoCount( + ISWbemNamedValueSet *iface, + UINT *count ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + TRACE( "%p, %p\n", set, count ); + + *count = 1; + return S_OK; +} + +static HRESULT WINAPI namedvalueset_GetTypeInfo( + ISWbemNamedValueSet *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + + TRACE( "%p, %u, %u, %p\n", set, index, lcid, info ); + + return get_typeinfo( ISWbemNamedValueSet_tid, info ); +} + +static HRESULT WINAPI namedvalueset_GetIDsOfNames( + ISWbemNamedValueSet *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", set, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemNamedValueSet_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI namedvalueset_Invoke( + ISWbemNamedValueSet *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + struct namedvalueset *set = impl_from_ISWbemNamedValueSet( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", set, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemNamedValueSet_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &set->ISWbemNamedValueSet_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI namedvalueset_get__NewEnum( + ISWbemNamedValueSet *iface, + IUnknown **unk ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_Item( + ISWbemNamedValueSet *iface, + BSTR name, + LONG flags, + ISWbemNamedValue **value ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_Count( + ISWbemNamedValueSet *iface, + LONG *count ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_Add( + ISWbemNamedValueSet *iface, + BSTR name, + VARIANT *value, + LONG flags, + ISWbemNamedValue **namedvalue ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_Remove( + ISWbemNamedValueSet *iface, + BSTR name, + LONG flags ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_Clone( + ISWbemNamedValueSet *iface, + ISWbemNamedValueSet **valueset ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static HRESULT WINAPI namedvalueset_DeleteAll( + ISWbemNamedValueSet *iface ) +{ + FIXME("\n"); + + return E_NOTIMPL; +} + +static const ISWbemNamedValueSetVtbl namedvalueset_vtbl = +{ + namedvalueset_QueryInterface, + namedvalueset_AddRef, + namedvalueset_Release, + namedvalueset_GetTypeInfoCount, + namedvalueset_GetTypeInfo, + namedvalueset_GetIDsOfNames, + namedvalueset_Invoke, + namedvalueset_get__NewEnum, + namedvalueset_Item, + namedvalueset_Count, + namedvalueset_Add, + namedvalueset_Remove, + namedvalueset_Clone, + namedvalueset_DeleteAll, +}; + +HRESULT SWbemNamedValueSet_create( void **obj ) +{ + struct namedvalueset *set; + + TRACE( "%p\n", obj ); + + if (!(set = heap_alloc_zero( sizeof(*set) ))) return E_OUTOFMEMORY; + set->ISWbemNamedValueSet_iface.lpVtbl = &namedvalueset_vtbl; + set->refs = 1; + + *obj = &set->ISWbemNamedValueSet_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} diff --git a/dlls/wbemdisp/main.c b/dlls/wbemdisp/main.c index cfaf7d787eb..b0064582187 100644 --- a/dlls/wbemdisp/main.c +++ b/dlls/wbemdisp/main.c @@ -262,6 +262,7 @@ static const struct IClassFactoryVtbl factory_vtbl = }; static struct factory swbem_locator_cf = { { &factory_vtbl }, SWbemLocator_create }; +static struct factory swbem_namedvalueset_cf = { { &factory_vtbl }, SWbemNamedValueSet_create }; static struct factory winmgmts_cf = { { &factory_vtbl }, WinMGMTS_create }; BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) @@ -289,6 +290,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *obj ) cf = &swbem_locator_cf.IClassFactory_iface; else if (IsEqualGUID( rclsid, &CLSID_WinMGMTS )) cf = &winmgmts_cf.IClassFactory_iface; + else if (IsEqualGUID( rclsid, &CLSID_SWbemNamedValueSet )) + cf = &swbem_namedvalueset_cf.IClassFactory_iface; else return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index fa51ce6d756..24225ad1ac1 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -402,12 +402,24 @@ static void test_locator(void) ISWbemLocator_Release( locator ); } +static void test_namedvalueset(void) +{ + ISWbemNamedValueSet *set; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_SWbemNamedValueSet, NULL, CLSCTX_INPROC_SERVER, &IID_ISWbemNamedValueSet, (void **)&set ); + ok( hr == S_OK, "got %x\n", hr ); + + ISWbemNamedValueSet_Release(set); +} + START_TEST(wbemdisp) { CoInitialize( NULL ); test_ParseDisplayName(); test_locator(); + test_namedvalueset(); CoUninitialize(); } diff --git a/dlls/wbemdisp/wbemdisp_private.h b/dlls/wbemdisp/wbemdisp_private.h index b03a13e2ea0..1648843fcba 100644 --- a/dlls/wbemdisp/wbemdisp_private.h +++ b/dlls/wbemdisp/wbemdisp_private.h @@ -17,3 +17,4 @@ */ HRESULT SWbemLocator_create(LPVOID *) DECLSPEC_HIDDEN; +HRESULT SWbemNamedValueSet_create(void **) DECLSPEC_HIDDEN; diff --git a/include/wbemdisp.idl b/include/wbemdisp.idl index 8ccdd0ca5e2..6f09f7ee154 100644 --- a/include/wbemdisp.idl +++ b/include/wbemdisp.idl @@ -1196,4 +1196,15 @@ coclass SWbemLocator interface ISWbemLocator; } +[ + threading(apartment), + uuid(9aed384e-ce8b-11d1-8b05-00600806d9b6), + progid("WbemScripting.SWbemNamedValueSet.1"), + vi_progid("WbemScripting.SWbemNamedValueSet") +] +coclass SWbemNamedValueSet +{ + interface ISWbemNamedValueSet; +} + } /* WbemScripting */

1 0

Arkadiusz Hiler : winebus.sys: Remove incorrect Report ID from the bus_sdl HID report descriptor.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: ee4e33ed9acf8a0dc4318d6cb0b5ba6c5cf19c0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee4e33ed9acf8a0dc4318d6c… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Feb 23 15:54:07 2021 +0200 winebus.sys: Remove incorrect Report ID from the bus_sdl HID report descriptor. According to "USB Device Class Definition for Human Interface Devices Firmware Specification Version 1.11" Report ID 0 is reserved and should not be used. On top of that if Report ID is used anywhere in the descriptor the reports are expected to be prepended with an ID and this is not the case for bus_sdl devices. It worked only because our current HID parser implementation treats the Report ID 0 as there would be none. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 8f48b44eb95..bf62f448976 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -199,7 +199,6 @@ static const BYTE CONTROLLER_TRIGGERS [] = { static const BYTE HAPTIC_RUMBLE[] = { 0x06, 0x00, 0xff, /* USAGE PAGE (vendor-defined) */ 0x09, 0x01, /* USAGE (1) */ - 0x85, 0x00, /* REPORT_ID (0) */ /* padding */ 0x95, 0x02, /* REPORT_COUNT (2) */ 0x75, 0x08, /* REPORT_SIZE (8) */

1 0

Rémi Bernon : winex11.drv: Don't assume that GenericEvent has a window.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: 4cb6334b1bd5de08a0e27d1c4f7feb33ae6c0dd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cb6334b1bd5de08a0e27d1c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 15 12:38:27 2021 +0100 winex11.drv: Don't assume that GenericEvent has a window. It doesn't, and we then lookup HWND from an invalid Window value. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index d21d2a7fb1b..99943478729 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -390,6 +390,9 @@ static inline BOOL call_event_handler( Display *display, XEvent *event ) return FALSE; /* no handler, ignore it */ } +#ifdef GenericEvent + if (event->type == GenericEvent) hwnd = 0; else +#endif if (XFindContext( display, event->xany.window, winContext, (char **)&hwnd ) != 0) hwnd = 0; /* not for a registered window */ if (!hwnd && event->xany.window == root_window) hwnd = GetDesktopWindow();

1 0

Rémi Bernon : d3d11: Always return the rectangle count in d3d11_immediate_context_RSGetScissorRects().
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: fbed47422a23806194797e5bae1fe27bc5bb2ac8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbed47422a23806194797e5b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 23 19:50:47 2021 +0100 d3d11: Always return the rectangle count in d3d11_immediate_context_RSGetScissorRects(). Signed-off-by: Rémi Bernon <rbernon(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 | 6 +++--- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index a5d9dc1aa7b..c8ec35a59c0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2270,14 +2270,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetScissorRects(ID3D11De wined3d_device_get_scissor_rects(device->wined3d_device, &actual_count, rects); wined3d_mutex_unlock(); - if (!rects) - { - *rect_count = actual_count; - return; - } - - if (*rect_count > actual_count) + if (rects && *rect_count > actual_count) memset(&rects[actual_count], 0, (*rect_count - actual_count) * sizeof(*rects)); + *rect_count = actual_count; } static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShaderResources(ID3D11DeviceContext1 *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2eff98fe8fc..32a9dc2e530 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7235,7 +7235,7 @@ static void test_device_context_state(void) memset(tmp_rect, 0xa5, sizeof(tmp_rect)); count = 2; ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); - todo_wine ok(count == 0, "Got unexpected scissor rect count %u.\n", count); + ok(count == 0, "Got unexpected scissor rect count %u.\n", count); tmp_sob = (ID3D11Buffer *)0xdeadbeef; ID3D11DeviceContext1_SOGetTargets(context, 1, &tmp_sob); @@ -7514,7 +7514,7 @@ static void test_device_context_state(void) memset(tmp_rect, 0xa5, sizeof(tmp_rect)); count = 2; ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); - todo_wine ok(count == 1, "Got scissor rect count %u, expected 1.\n", count); + ok(count == 1, "Got scissor rect count %u, expected 1.\n", count); ok(!memcmp(tmp_rect, &rect, sizeof(rect)), "Got scissor rect %s, expected %s.\n", wine_dbgstr_rect(tmp_rect), wine_dbgstr_rect(&rect)); @@ -7962,7 +7962,7 @@ static void test_device_context_state(void) memset(tmp_rect, 0xa5, sizeof(tmp_rect)); count = 2; ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); - todo_wine ok(count == 1, "Got scissor rect count %u, expected 1.\n", count); + ok(count == 1, "Got scissor rect count %u, expected 1.\n", count); ok(!memcmp(tmp_rect, &rect, sizeof(rect)), "Got scissor rect %s, expected %s.\n", wine_dbgstr_rect(tmp_rect), wine_dbgstr_rect(&rect));

1 0

Henri Verbeet : d3d11: Implement d3d11_immediate_context_SwapDeviceContextState() on top of wined3d_device_set_state().
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: 7b487c38d0e9b2f1c91f43f0c652b564c9b62ec1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b487c38d0e9b2f1c91f43f0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 23 19:50:46 2021 +0100 d3d11: Implement d3d11_immediate_context_SwapDeviceContextState() on top of wined3d_device_set_state(). Based on a patch by Rémi Bernon. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 36 +++--- dlls/d3d11/device.c | 293 ++++++++++++++++++++++++++++----------------- dlls/d3d11/tests/d3d11.c | 140 +++++++++------------- 3 files changed, 250 insertions(+), 219 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b487c38d0e9b2f1c91f…

1 0

Rémi Bernon : wined3d: Introduce public API to set a wined3d_state object on a device.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: 80e1eb87ad531ecde5038739ab4e51026cc616ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=80e1eb87ad531ecde5038739… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 23 19:50:45 2021 +0100 wined3d: Introduce public API to set a wined3d_state object on a device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 139 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/stateblock.c | 22 ++++++++ dlls/wined3d/wined3d.spec | 5 ++ include/wine/wined3d.h | 6 ++ 4 files changed, 167 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=80e1eb87ad531ecde503…

1 0

Rémi Bernon : wined3d: Use a separate allocation for the device state.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: 50949c953a77d5b87acbb51cc9e30056b6c7c40f URL: https://source.winehq.org/git/wine.git/?a=commit;h=50949c953a77d5b87acbb51c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 23 19:50:43 2021 +0100 wined3d: Use a separate allocation for the device state. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 10 +- dlls/wined3d/device.c | 417 ++++++++++++++++++++++++----------------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 251 insertions(+), 180 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=50949c953a77d5b87acb…

1 0

Paul Gofman : advapi32: Handle exceptions from dereferencing invalid crypt objects' handles.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: 992117ac9820a8c8d1174a62179c87ca7cf309ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=992117ac9820a8c8d1174a62… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 23 16:07:32 2021 +0300 advapi32: Handle exceptions from dereferencing invalid crypt objects' handles. Fixes crash on start in "Re:ZERO -Starting Life in Another World- The Prophecy of the Throne". Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/crypt.c | 19 +++++++++++++++---- dlls/advapi32/tests/crypt.c | 20 ++++++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 6cdb5f3ecff..20c55558fa5 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -37,6 +37,7 @@ #include "winreg.h" #include "rpc.h" #include "wine/debug.h" +#include "wine/exception.h" #include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -59,12 +60,22 @@ static HWND crypt_hWindow; static void *pointer_from_handle(UINT_PTR handle, DWORD magic) { - if (!handle || *(DWORD *)handle != magic) + void *ret = NULL; + + __TRY + { + if (handle && *(DWORD *)handle == magic) + ret = (void *)handle; + } + __EXCEPT_PAGE_FAULT { - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; } - return (void *)handle; + __ENDTRY + + if (!ret) + SetLastError(ERROR_INVALID_PARAMETER); + + return ret; } static PCRYPTPROV provider_from_handle(HCRYPTPROV handle) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index a6e3d447ba8..6df47cd626b 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -154,6 +154,8 @@ static void test_CryptReleaseContext(void) ret = CryptContextAddRef(0, NULL, 0); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + ret = CryptContextAddRef(0xdeadbeef, NULL, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); ret = CryptReleaseContext(prov, 0); ok(ret, "got %u\n", GetLastError()); @@ -272,6 +274,9 @@ static void test_incorrect_api_usage(void) ok (result, "%08x\n", GetLastError()); if (!result) return; + /* Looks like native handles are just pointers. */ + ok(!!*(void **)hProv, "Got zero *(void **)hProv.\n"); + result = CryptCreateHash(hProv, CALG_SHA, 0, 0, &hHash); ok (result, "%d\n", GetLastError()); if (!result) return; @@ -301,6 +306,9 @@ static void test_incorrect_api_usage(void) result = CryptDestroyHash(0); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + result = CryptCreateHash(0xdeadbeef, CALG_SHA, 0, 0, &hHash); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + result = CryptCreateHash(0, CALG_SHA, 0, 0, &hHash); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); @@ -310,13 +318,25 @@ static void test_incorrect_api_usage(void) dwLen = 1; result = CryptDecrypt(hKey, 0, TRUE, 0, &temp, &dwLen); ok (result, "%d\n", GetLastError()); + result = CryptDecrypt(hKey, 0xdeadbeef, TRUE, 0, &temp, &dwLen); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); result = CryptDecrypt(0, 0, TRUE, 0, &temp, &dwLen); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + result = CryptDecrypt(0xdeadbeef, 0, TRUE, 0, &temp, &dwLen); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); result = CryptEncrypt(hKey, 0, TRUE, 0, &temp, &dwLen, sizeof(temp)); ok (result, "%d\n", GetLastError()); + result = CryptEncrypt(hKey, 0xdeadbeef, TRUE, 0, &temp, &dwLen, sizeof(temp)); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); result = CryptEncrypt(0, 0, TRUE, 0, &temp, &dwLen, sizeof(temp)); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + result = CryptEncrypt(0xdeadbeef, 0, TRUE, 0, &temp, &dwLen, sizeof(temp)); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + + dwLen = 1; + result = CryptExportKey(hKey, 0xdeadbeef, 0, 0, &temp, &dwLen); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); result = CryptDestroyKey(hKey); ok (result, "%d\n", GetLastError());

1 0

Akihiro Sagawa : krnl386.exe: Cap GetFreeSpace value to 2GB.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: eca2bfd071ea2142f5c4126badb5bcf923a9a655 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eca2bfd071ea2142f5c4126b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Feb 20 21:26:27 2021 +0900 krnl386.exe: Cap GetFreeSpace value to 2GB. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46962 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/global.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/global.c b/dlls/krnl386.exe16/global.c index e66007784ee..0a8da28e99b 100644 --- a/dlls/krnl386.exe16/global.c +++ b/dlls/krnl386.exe16/global.c @@ -750,7 +750,7 @@ DWORD WINAPI GetFreeSpace16( UINT16 wFlags ) { MEMORYSTATUS ms; GlobalMemoryStatus( &ms ); - return ms.dwAvailVirtual; + return min( ms.dwAvailVirtual, MAXLONG ); } /***********************************************************************

1 0

Nikolay Sivov : dwrite: Remove unused function.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: fba2788d835262fae6e33fc70e775ec327ca33b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fba2788d835262fae6e33fc7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 23 15:46:00 2021 +0300 dwrite: Remove unused function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 6528970635b..d28c6cef870 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -118,11 +118,6 @@ static inline unsigned short get_table_entry(const unsigned short *table, WCHAR return table[table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0xf)]; } -static inline FLOAT get_scaled_advance_width(INT32 advance, FLOAT emSize, const DWRITE_FONT_METRICS *metrics) -{ - return (FLOAT)advance * emSize / (FLOAT)metrics->designUnitsPerEm; -} - static inline BOOL is_simulation_valid(DWRITE_FONT_SIMULATIONS simulations) { return (simulations & ~(DWRITE_FONT_SIMULATIONS_NONE | DWRITE_FONT_SIMULATIONS_BOLD |

1 0