February 2022 - Wine-commits

Eric Pouech : d2d1: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 0201606baca146c59ce2a6e01a35fd1875808515 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0201606baca146c59ce2a6e0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 1 19:23:14 2022 +0100 d2d1: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/Makefile.in | 1 - dlls/d2d1/bitmap.c | 18 ++--- dlls/d2d1/bitmap_render_target.c | 10 +-- dlls/d2d1/brush.c | 26 +++---- dlls/d2d1/dc_render_target.c | 16 ++--- dlls/d2d1/device.c | 144 +++++++++++++++++++-------------------- dlls/d2d1/effect.c | 4 +- dlls/d2d1/factory.c | 28 ++++---- dlls/d2d1/geometry.c | 24 +++---- dlls/d2d1/hwnd_render_target.c | 28 ++++---- dlls/d2d1/layer.c | 4 +- dlls/d2d1/mesh.c | 4 +- dlls/d2d1/state_block.c | 4 +- dlls/d2d1/stroke.c | 4 +- dlls/d2d1/wic_render_target.c | 32 ++++----- 15 files changed, 173 insertions(+), 174 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0201606baca146c59ce2…

1 0

Eric Pouech : d3d10_1: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 7d8648f2ff7a6f7a3413d80b8c75b617683f6e7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d8648f2ff7a6f7a3413d80b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 1 19:23:15 2022 +0100 d3d10_1: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/Makefile.in | 1 - dlls/d3d10_1/d3d10_1_main.c | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10_1/Makefile.in b/dlls/d3d10_1/Makefile.in index a3bb6a183bb..50ae0383b92 100644 --- a/dlls/d3d10_1/Makefile.in +++ b/dlls/d3d10_1/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = d3d10_1.dll IMPORTLIB = d3d10_1 IMPORTS = dxguid d3d10core dxgi diff --git a/dlls/d3d10_1/d3d10_1_main.c b/dlls/d3d10_1/d3d10_1_main.c index f4fb1126ef2..c7cde0fcef9 100644 --- a/dlls/d3d10_1/d3d10_1_main.c +++ b/dlls/d3d10_1/d3d10_1_main.c @@ -89,7 +89,7 @@ static HRESULT d3d10_create_device1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE dri IDXGIAdapter_AddRef(adapter); if (FAILED(hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory))) { - WARN("Failed to get dxgi factory, hr %#x.\n", hr); + WARN("Failed to get dxgi factory, hr %#lx.\n", hr); return hr; } } @@ -97,7 +97,7 @@ static HRESULT d3d10_create_device1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE dri { if (FAILED(hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory))) { - WARN("Failed to create dxgi factory, hr %#x.\n", hr); + WARN("Failed to create dxgi factory, hr %#lx.\n", hr); return hr; } @@ -109,7 +109,7 @@ static HRESULT d3d10_create_device1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE dri { if (FAILED(hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter))) { - WARN("No adapters found, hr %#x.\n", hr); + WARN("No adapters found, hr %#lx.\n", hr); IDXGIFactory_Release(factory); return hr; } @@ -133,7 +133,7 @@ static HRESULT d3d10_create_device1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE dri FreeLibrary(refrast); if (FAILED(hr)) { - WARN("Failed to create a software adapter, hr %#x.\n", hr); + WARN("Failed to create a software adapter, hr %#lx.\n", hr); IDXGIFactory_Release(factory); return hr; } @@ -150,7 +150,7 @@ static HRESULT d3d10_create_device1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE dri } if (FAILED(hr = IDXGIFactory_CreateSoftwareAdapter(factory, swrast, &adapter))) { - WARN("Failed to create a software adapter, hr %#x.\n", hr); + WARN("Failed to create a software adapter, hr %#lx.\n", hr); IDXGIFactory_Release(factory); return hr; } @@ -170,7 +170,7 @@ static HRESULT d3d10_create_device1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE dri IDXGIFactory_Release(factory); if (FAILED(hr)) { - WARN("Failed to create a device, hr %#x.\n", hr); + WARN("Failed to create a device, hr %#lx.\n", hr); return hr; } @@ -208,7 +208,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *adapter, D3D10_DRIVE * hooking these entry-points. */ if (FAILED(hr = d3d10_create_device1(adapter, driver_type, swrast, flags, feature_level, sdk_version, device))) { - WARN("Failed to create a device, returning %#x.\n", hr); + WARN("Failed to create a device, returning %#lx.\n", hr); *device = NULL; return hr; } @@ -217,7 +217,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *adapter, D3D10_DRIVE { if (FAILED(hr = ID3D10Device1_QueryInterface(*device, &IID_IDXGIDevice, (void **)&dxgi_device))) { - ERR("Failed to get a dxgi device from the d3d10 device, returning %#x.\n", hr); + ERR("Failed to get a dxgi device from the d3d10 device, returning %#lx.\n", hr); goto cleanup; } @@ -225,7 +225,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *adapter, D3D10_DRIVE IDXGIDevice_Release(dxgi_device); if (FAILED(hr)) { - ERR("Failed to get the device adapter, returning %#x.\n", hr); + ERR("Failed to get the device adapter, returning %#lx.\n", hr); goto cleanup; } @@ -233,7 +233,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *adapter, D3D10_DRIVE IDXGIAdapter_Release(adapter); if (FAILED(hr)) { - ERR("Failed to get the adapter factory, returning %#x.\n", hr); + ERR("Failed to get the adapter factory, returning %#lx.\n", hr); goto cleanup; } @@ -241,7 +241,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *adapter, D3D10_DRIVE IDXGIFactory_Release(factory); if (FAILED(hr)) { - WARN("Failed to create a swapchain, returning %#x.\n", hr); + WARN("Failed to create a swapchain, returning %#lx.\n", hr); goto cleanup; }

1 0

Jactry Zeng : dwmapi: Correct parameter types of DwmGetColorizationColor().
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 5a6c1753a037699a8621b650e82923880008aee5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a6c1753a037699a8621b650… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Feb 1 10:30:20 2022 -0600 dwmapi: Correct parameter types of DwmGetColorizationColor(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 4 ++-- include/dwmapi.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 23380a9ecd7..d899a7ab01c 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -67,7 +67,7 @@ @ stdcall DwmEnableMMCSS(long) @ stdcall DwmExtendFrameIntoClientArea(long ptr) @ stdcall DwmFlush() -@ stdcall DwmGetColorizationColor(ptr long) +@ stdcall DwmGetColorizationColor(ptr ptr) @ stdcall DwmGetCompositionTimingInfo(long ptr) @ stdcall DwmGetGraphicsStreamClient(long ptr) @ stdcall DwmGetGraphicsStreamTransformHint(long ptr) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index b6c89f3a7f8..6a66aa51dad 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -77,9 +77,9 @@ HRESULT WINAPI DwmExtendFrameIntoClientArea(HWND hwnd, const MARGINS* margins) /********************************************************************** * DwmGetColorizationColor (DWMAPI.@) */ -HRESULT WINAPI DwmGetColorizationColor(DWORD *colorization, BOOL opaque_blend) +HRESULT WINAPI DwmGetColorizationColor(DWORD *colorization, BOOL *opaque_blend) { - FIXME("(%p, %d) stub\n", colorization, opaque_blend); + FIXME("(%p, %p) stub\n", colorization, opaque_blend); return E_NOTIMPL; } diff --git a/include/dwmapi.h b/include/dwmapi.h index 99e7caef92d..1b19426ce2d 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -198,7 +198,7 @@ DWMAPI DwmEnableComposition(UINT); DWMAPI DwmEnableMMCSS(BOOL); DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*); DWMAPI DwmFlush(void); -DWMAPI DwmGetColorizationColor(DWORD*,BOOL); +DWMAPI DwmGetColorizationColor(DWORD *, BOOL *); DWMAPI DwmGetCompositionTimingInfo(HWND,DWM_TIMING_INFO*); DWMAPI DwmGetGraphicsStreamClient(UINT, UUID *); DWMAPI DwmGetGraphicsStreamTransformHint(UINT, MilMatrix3x2D *);

1 0

Paul Gofman : win32u: Use get_dc_obj() in GetDCHook() and SetDCHook().
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 14204de9fbd7f8d689802ffaababf12498517104 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14204de9fbd7f8d689802ffa… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jan 21 14:36:04 2022 +0300 win32u: Use get_dc_obj() in GetDCHook() and SetDCHook(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/dc.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 3aae73779e9..aed2d3684a7 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -1026,13 +1026,18 @@ BOOL WINAPI NtGdiGetTransform( HDC hdc, DWORD which, XFORM *xform ) */ BOOL WINAPI SetDCHook( HDC hdc, DCHOOKPROC hookProc, DWORD_PTR dwHookData ) { - DC *dc = get_dc_ptr( hdc ); + DC *dc = get_dc_obj( hdc ); if (!dc) return FALSE; + if (dc->attr->disabled) + { + GDI_ReleaseObj( hdc ); + return 0; + } dc->dwHookData = dwHookData; dc->hookProc = hookProc; - release_dc_ptr( dc ); + GDI_ReleaseObj( hdc ); return TRUE; } @@ -1044,13 +1049,18 @@ BOOL WINAPI SetDCHook( HDC hdc, DCHOOKPROC hookProc, DWORD_PTR dwHookData ) */ DWORD_PTR WINAPI GetDCHook( HDC hdc, DCHOOKPROC *proc ) { - DC *dc = get_dc_ptr( hdc ); + DC *dc = get_dc_obj( hdc ); DWORD_PTR ret; if (!dc) return 0; + if (dc->attr->disabled) + { + GDI_ReleaseObj( hdc ); + return 0; + } if (proc) *proc = dc->hookProc; ret = dc->dwHookData; - release_dc_ptr( dc ); + GDI_ReleaseObj( hdc ); return ret; }

1 0

Alistair Leslie-Hughes : msdasql: Fix printf format warnings with long types.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 0b9776726952dc42633078b3e2adbf1efc553f52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b9776726952dc42633078b3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 1 20:06:35 2022 +1100 msdasql: Fix printf format warnings with long types. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/Makefile.in | 1 - dlls/msdasql/msdasql_main.c | 42 +++++++++++++++---------------- dlls/msdasql/session.c | 60 ++++++++++++++++++++++----------------------- 3 files changed, 51 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b9776726952dc426330…

1 0

Alistair Leslie-Hughes : msdasql: Add ITransaction to session interface.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 35cf06c3e197880ff8162bb192fa94b508eb4644 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35cf06c3e197880ff8162bb1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 1 20:06:36 2022 +1100 msdasql: Add ITransaction to session interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 68 +++++++++++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 ++-- 2 files changed, 70 insertions(+), 3 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index abd8252218d..0f74c126138 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -44,6 +44,7 @@ struct msdasql_session ISessionProperties ISessionProperties_iface; IDBCreateCommand IDBCreateCommand_iface; ITransactionJoin ITransactionJoin_iface; + ITransaction ITransaction_iface; LONG refs; IUnknown *datasource; @@ -81,6 +82,11 @@ static inline struct msdasql_session *impl_from_ITransactionJoin( ITransactionJo return CONTAINING_RECORD( iface, struct msdasql_session, ITransactionJoin_iface ); } +static inline struct msdasql_session *impl_from_ITransaction( ITransaction *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_session, ITransaction_iface ); +} + static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { struct msdasql_session *session = impl_from_IUnknown( iface ); @@ -118,6 +124,11 @@ static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void TRACE("(%p)->(ITransactionJoin %p)\n", iface, ppv); *ppv = &session->ITransactionJoin_iface; } + else if(IsEqualGUID(&IID_ITransaction, riid)) + { + TRACE("(%p)->(ITransaction %p)\n", iface, ppv); + *ppv = &session->ITransaction_iface; + } else if(IsEqualGUID(&IID_IBindResource, riid)) { TRACE("(%p)->(IID_IBindResource not support)\n", iface); @@ -1248,6 +1259,61 @@ static const ITransactionJoinVtbl transactionjoinVtbl = transjoin_JoinTransaction }; +static HRESULT WINAPI transaction_QueryInterface(ITransaction *iface, REFIID riid, void **out) +{ + struct msdasql_session *session = impl_from_ITransaction( iface ); + return IUnknown_QueryInterface(&session->session_iface, riid, out); +} + +static ULONG WINAPI transaction_AddRef(ITransaction *iface) +{ + struct msdasql_session *session = impl_from_ITransaction( iface ); + return IUnknown_AddRef(&session->session_iface); +} + +static ULONG WINAPI transaction_Release(ITransaction *iface) +{ + struct msdasql_session *session = impl_from_ITransaction( iface ); + return IUnknown_Release(&session->session_iface); +} + +static HRESULT WINAPI transaction_Commit(ITransaction *iface, BOOL retaining, DWORD tc, DWORD rm) +{ + struct msdasql_session *session = impl_from_ITransaction( iface ); + + FIXME("%p, %d, %ld, %ld\n", session, retaining, tc, rm); + + return E_NOTIMPL; +} + +static HRESULT WINAPI transaction_Abort(ITransaction *iface, BOID *reason, BOOL retaining, BOOL async) +{ + struct msdasql_session *session = impl_from_ITransaction( iface ); + + FIXME("%p, %p, %d, %d\n", session, reason, retaining, async); + + return E_NOTIMPL; +} + +static HRESULT WINAPI transaction_GetTransactionInfo(ITransaction *iface, XACTTRANSINFO *info) +{ + struct msdasql_session *session = impl_from_ITransaction( iface ); + + FIXME("%p, %p\n", session, info); + + return E_NOTIMPL; +} + +static const ITransactionVtbl transactionVtbl = +{ + transaction_QueryInterface, + transaction_AddRef, + transaction_Release, + transaction_Commit, + transaction_Abort, + transaction_GetTransactionInfo +}; + HRESULT create_db_session(REFIID riid, IUnknown *datasource, HDBC hdbc, void **unk) { struct msdasql_session *session; @@ -1263,6 +1329,8 @@ HRESULT create_db_session(REFIID riid, IUnknown *datasource, HDBC hdbc, void **u session->ISessionProperties_iface.lpVtbl = &propertiesVtbl; session->IDBCreateCommand_iface.lpVtbl = &createcommandVtbl; session->ITransactionJoin_iface.lpVtbl = &transactionjoinVtbl; + session->ITransaction_iface.lpVtbl = &transactionVtbl; + IUnknown_QueryInterface(datasource, &IID_IUnknown, (void**)&session->datasource); session->refs = 1; session->hdbc = hdbc; diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index ee81ad1d311..22fbf26c107 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -481,9 +481,8 @@ static void test_sessions(void) IGetDataSource_Release(datasource); hr = IUnknown_QueryInterface(session, &IID_ITransaction, (void**)&transaction); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if(hr == S_OK) - ITransaction_Release(transaction); + ok(hr == S_OK, "got 0x%08x\n", hr); + ITransaction_Release(transaction); hr = IUnknown_QueryInterface(session, &IID_ITransactionLocal, (void**)&local); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Alistair Leslie-Hughes : msdasql/tests: Fix printf format warnings with long types.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: bdb7bb1022d41fafa8a8309374eb0bc1f3f0f120 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdb7bb1022d41fafa8a83093… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 1 20:06:37 2022 +1100 msdasql/tests: Fix printf format warnings with long types. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/tests/Makefile.in | 1 - dlls/msdasql/tests/provider.c | 184 ++++++++++++++++++++--------------------- 2 files changed, 92 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bdb7bb1022d41fafa8a8…

1 0

Eric Pouech : oledb32: Use correct integral type.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 8e3d491051dccccd512dae425d7d8f429e9bbdbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e3d491051dccccd512dae42… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 1 14:05:33 2022 +0100 oledb32: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 2 +- dlls/oledb32/datainit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 81483dc0a09..9bd93b6ca66 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -313,7 +313,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, case DBTYPE_I4: { - signed int *d = dst; + LONG *d = dst; switch(src_type) { case DBTYPE_EMPTY: *d = 0; hr = S_OK; break; diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index ec26d0a11ee..08bc60bce92 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -677,7 +677,7 @@ HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID if (*datasource && prov) { DBPROPIDSET propidset; - enum DBPROPENUM prop; + DWORD prop; CLSID initprov; ULONG count;

1 0

Eric Pouech : comdlg32: Removed useless casts to long.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 0c0f80a33357bc670a4d4096473fc92d3a1b57a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c0f80a33357bc670a4d4096… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 1 14:05:51 2022 +0100 comdlg32: Removed useless casts to long. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/colordlg.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index d5254736b24..1d459dd2d87 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -340,7 +340,7 @@ static BOOL CC_MouseCheckColorGraph( HWND hDlg, int dlgitem, int *hori, int *ver HWND hwnd; POINT point; RECT rect; - long x,y; + int x,y; CONV_LPARAMTOPOINT(lParam, &point); ClientToScreen(hDlg, &point); @@ -353,10 +353,8 @@ static BOOL CC_MouseCheckColorGraph( HWND hDlg, int dlgitem, int *hori, int *ver GetClientRect(hwnd, &rect); ScreenToClient(hwnd, &point); - x = (long) point.x * MAXHORI; - x /= rect.right; - y = (long) (rect.bottom - point.y) * MAXVERT; - y /= rect.bottom; + x = (point.x * MAXHORI) / rect.right; + y = ((rect.bottom - point.y) * MAXVERT) / rect.bottom; if (x < 0) x = 0; if (y < 0) y = 0; @@ -398,7 +396,6 @@ static BOOL CC_MouseCheckResultWindow( HWND hDlg, LPARAM lParam ) static int CC_CheckDigitsInEdit( HWND hwnd, int maxval ) { int i, k, m, result, value; - long editpos; char buffer[30]; GetWindowTextA(hwnd, buffer, ARRAY_SIZE(buffer)); @@ -425,7 +422,7 @@ static int CC_CheckDigitsInEdit( HWND hwnd, int maxval ) } if (result) { - editpos = SendMessageA(hwnd, EM_GETSEL, 0, 0); + LRESULT editpos = SendMessageA(hwnd, EM_GETSEL, 0, 0); SetWindowTextA(hwnd, buffer ); SendMessageA(hwnd, EM_SETSEL, 0, editpos); } @@ -465,7 +462,7 @@ static void CC_PaintSelectedColor(const CCPRIV *infoPtr) static void CC_PaintTriangle(CCPRIV *infoPtr) { HDC hDC; - long temp; + int temp; int w = LOWORD(GetDialogBaseUnits()) / 2; POINT points[3]; int height; @@ -485,9 +482,9 @@ static void CC_PaintTriangle(CCPRIV *infoPtr) ScreenToClient(infoPtr->hwndSelf, points); /* |< | */ oben = points[0].y; /* | \ | */ /* | \| */ - temp = (long)height * (long)infoPtr->l; + temp = height * infoPtr->l; points[0].x += 1; - points[0].y = oben + height - temp / (long)MAXVERT; + points[0].y = oben + height - temp / MAXVERT; points[1].y = points[0].y + w; points[2].y = points[0].y - w; points[2].x = points[1].x = points[0].x + w; @@ -536,8 +533,8 @@ static void CC_PaintCross(CCPRIV *infoPtr) SelectClipRgn(hDC, region); DeleteObject(region); - point.x = ((long)rect.right * (long)x) / (long)MAXHORI; - point.y = rect.bottom - ((long)rect.bottom * (long)y) / (long)MAXVERT; + point.x = (rect.right * x) / MAXHORI; + point.y = rect.bottom - (rect.bottom * y) / MAXVERT; if ( infoPtr->oldcross.left != infoPtr->oldcross.right ) BitBlt(hDC, infoPtr->oldcross.left, infoPtr->oldcross.top, infoPtr->oldcross.right - infoPtr->oldcross.left,

1 0

Eric Pouech : kernelbase: Removed useless casts to long.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 3a7a612776803ea1b15db9ac5d01462fcb685846 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a7a612776803ea1b15db9ac… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 1 14:05:57 2022 +0100 kernelbase: Removed useless casts to long. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/debug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 45bb6c019e9..74709bef89a 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -461,13 +461,13 @@ static BOOL start_debugger( EXCEPTION_POINTERS *epointers, HANDLE event ) { size_t format_size = lstrlenW( format ) + 2*20; cmdline = HeapAlloc( GetProcessHeap(), 0, format_size * sizeof(WCHAR) ); - swprintf( cmdline, format_size, format, (long)GetCurrentProcessId(), (long)HandleToLong(event) ); + swprintf( cmdline, format_size, format, GetCurrentProcessId(), HandleToLong(event) ); HeapFree( GetProcessHeap(), 0, format ); } else { cmdline = HeapAlloc( GetProcessHeap(), 0, 80 * sizeof(WCHAR) ); - swprintf( cmdline, 80, L"winedbg --auto %ld %ld", (long)GetCurrentProcessId(), (long)HandleToLong(event) ); + swprintf( cmdline, 80, L"winedbg --auto %ld %ld", GetCurrentProcessId(), HandleToLong(event) ); } if (!autostart)

1 0