February 2022 - Wine-Commits

Eric Pouech : d3d10_1: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

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

Henri Verbeet : wined3d: Use wined3d_bit_scan() in shader_generate_arb_declarations().
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: 59b06fdb437da4f13dbdc87f4abf58dce9fbe471 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59b06fdb437da4f13dbdc87f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 1 19:23:11 2022 +0100 wined3d: Use wined3d_bit_scan() in shader_generate_arb_declarations(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 54a90a690ac..fc53f78f95d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -765,7 +765,7 @@ static void shader_generate_arb_declarations(const struct wined3d_shader *shader char pshader = shader_is_pshader_version(reg_maps->shader_version.type); const struct wined3d_shader_lconst *lconst; unsigned max_constantsF; - DWORD map; + uint32_t map; /* In pixel shaders, all private constants are program local, we don't need anything * from program.env. Thus we can advertise the full set of constants in pixel shaders. @@ -837,21 +837,27 @@ static void shader_generate_arb_declarations(const struct wined3d_shader *shader } } - for (i = 0, map = reg_maps->temporary; map; map >>= 1, ++i) + map = reg_maps->temporary; + while (map) { - if (map & 1) shader_addline(buffer, "TEMP R%u;\n", i); + i = wined3d_bit_scan(&map); + shader_addline(buffer, "TEMP R%u;\n", i); } - for (i = 0, map = reg_maps->address; map; map >>= 1, ++i) + map = reg_maps->address; + while (map) { - if (map & 1) shader_addline(buffer, "ADDRESS A%u;\n", i); + i = wined3d_bit_scan(&map); + shader_addline(buffer, "ADDRESS A%u;\n", i); } if (pshader && reg_maps->shader_version.major == 1 && reg_maps->shader_version.minor <= 3) { - for (i = 0, map = reg_maps->texcoord; map; map >>= 1, ++i) + map = reg_maps->texcoord; + while (map) { - if (map & 1) shader_addline(buffer, "TEMP T%u;\n", i); + i = wined3d_bit_scan(&map); + shader_addline(buffer, "TEMP T%u;\n", i); } }

1 0

Alistair Leslie-Hughes : msdasql: Add ITransaction to session interface.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

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

Eric Pouech : d2d1: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

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

Nikolay Sivov : d3d11: Always initialize out view pointer in CreateDepthStencilView().
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: a3c65a329e9d337999bb0ba2617d9e4a0d202c03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3c65a329e9d337999bb0ba2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 31 17:08:10 2022 +0300 d3d11: Always initialize out view pointer in CreateDepthStencilView(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 2 ++ dlls/d3d11/device.c | 4 ++++ dlls/d3d11/tests/d3d11.c | 2 ++ 3 files changed, 8 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index f8dcbb8cb47..a5f7f4202d5 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -2678,9 +2678,11 @@ static void test_create_depthstencil_view(void) hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); ok(SUCCEEDED(hr), "Test %u: Failed to create 2d texture, hr %#x.\n", i, hr); + dsview = (void *)0xdeadbeef; get_dsv_desc(&dsv_desc, &invalid_desc_tests[i].dsv_desc); hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, &dsv_desc, &dsview); ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!dsview, "Unexpected pointer %p.\n", dsview); ID3D10Texture2D_Release(texture); } diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7e5acc11824..92d4533b105 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3440,6 +3440,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilView(ID3D11Devic TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + *view = NULL; + if (FAILED(hr = d3d_depthstencil_view_create(device, resource, desc, &object))) return hr; @@ -6103,6 +6105,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilView(ID3D10Devic TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + *view = NULL; + if (desc) { d3d11_desc.Format = desc->Format; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ec385a92f50..93f0aa896e8 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3788,9 +3788,11 @@ static void test_create_depthstencil_view(void) hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); ok(SUCCEEDED(hr), "Test %u: Failed to create 2d texture, hr %#x.\n", i, hr); + dsview = (void *)0xdeadbeef; get_dsv_desc(&dsv_desc, &invalid_desc_tests[i].dsv_desc); hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, &dsv_desc, &dsview); ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!dsview, "Unexpected pointer %p.\n", dsview); ID3D11Texture2D_Release(texture); }

1 0

Alistair Leslie-Hughes : msdasql/tests: Fix printf format warnings with long types.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

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

Paul Gofman : win32u: Use get_dc_obj() in GetDCHook() and SetDCHook().
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

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

Nikolay Sivov : xmllite: Fix long types warnings.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

Module: wine Branch: master Commit: 2848ce7621ae2dc699b781789f11f227069f0dd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2848ce7621ae2dc699b78178… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 1 19:01:05 2022 +0300 xmllite: Fix long types warnings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/Makefile.in | 1 - dlls/xmllite/reader.c | 24 ++++++++++++------------ dlls/xmllite/writer.c | 48 +++++++++++++++++++++++++----------------------- 3 files changed, 37 insertions(+), 36 deletions(-) diff --git a/dlls/xmllite/Makefile.in b/dlls/xmllite/Makefile.in index 003c36a3a37..aeb448162f6 100644 --- a/dlls/xmllite/Makefile.in +++ b/dlls/xmllite/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = xmllite.dll IMPORTLIB = xmllite diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 834c36ae18c..ccdc1ae2c1b 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -840,7 +840,7 @@ static HRESULT readerinput_growraw(xmlreaderinput *readerinput) read = 0; hr = ISequentialStream_Read(readerinput->stream, buffer->data + buffer->written, len, &read); - TRACE("written=%d, alloc=%d, requested=%d, read=%d, ret=0x%08x\n", buffer->written, buffer->allocated, len, read, hr); + TRACE("written=%d, alloc=%d, requested=%ld, read=%ld, ret=%#lx\n", buffer->written, buffer->allocated, len, read, hr); readerinput->pending = hr == E_PENDING; if (FAILED(hr)) return hr; buffer->written += read; @@ -2579,7 +2579,7 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) /* try to detect encoding by BOM or data and set input code page */ hr = readerinput_detectencoding(reader->input, &enc); - TRACE("detected encoding %s, 0x%08x\n", enc == XmlEncoding_Unknown ? "(unknown)" : + TRACE("detected encoding %s, %#lx.\n", enc == XmlEncoding_Unknown ? "(unknown)" : debugstr_w(xml_encoding_map[enc].name), hr); if (FAILED(hr)) return hr; @@ -2679,9 +2679,9 @@ static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, v static ULONG WINAPI xmlreader_AddRef(IXmlReader *iface) { - xmlreader *This = impl_from_IXmlReader(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + xmlreader *reader = impl_from_IXmlReader(iface); + ULONG ref = InterlockedIncrement(&reader->ref); + TRACE("%p, refcount %ld.\n", iface, ref); return ref; } @@ -2725,7 +2725,7 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface) xmlreader *This = impl_from_IXmlReader(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("%p, refcount %ld.\n", iface, ref); if (ref == 0) { @@ -2841,7 +2841,7 @@ static HRESULT WINAPI xmlreader_SetProperty(IXmlReader* iface, UINT property, LO { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p)->(%s 0x%lx)\n", This, debugstr_reader_prop(property), value); + TRACE("%p, %s, %Ix.\n", iface, debugstr_reader_prop(property), value); switch (property) { @@ -3590,9 +3590,9 @@ static HRESULT WINAPI xmlreaderinput_QueryInterface(IXmlReaderInput *iface, REFI static ULONG WINAPI xmlreaderinput_AddRef(IXmlReaderInput *iface) { - xmlreaderinput *This = impl_from_IXmlReaderInput(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + xmlreaderinput *input = impl_from_IXmlReaderInput(iface); + ULONG ref = InterlockedIncrement(&input->ref); + TRACE("%p, refcount %ld.\n", iface, ref); return ref; } @@ -3601,7 +3601,7 @@ static ULONG WINAPI xmlreaderinput_Release(IXmlReaderInput *iface) xmlreaderinput *This = impl_from_IXmlReaderInput(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("%p, refcount %ld.\n", iface, ref); if (ref == 0) { @@ -3662,7 +3662,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) hr = IXmlReader_QueryInterface(&reader->IXmlReader_iface, riid, obj); IXmlReader_Release(&reader->IXmlReader_iface); - TRACE("returning iface %p, hr %#x\n", *obj, hr); + TRACE("returning iface %p, hr %#lx.\n", *obj, hr); return hr; } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index e4553ccf01d..ac02bd4c200 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -549,7 +549,7 @@ static HRESULT writeroutput_flush_stream(xmlwriteroutput *output) written = 0; hr = ISequentialStream_Write(output->stream, buffer->data + offset, buffer->written, &written); if (FAILED(hr)) { - WARN("write to stream failed (0x%08x)\n", hr); + WARN("write to stream failed %#lx.\n", hr); buffer->written = 0; return hr; } @@ -700,28 +700,30 @@ static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, v static ULONG WINAPI xmlwriter_AddRef(IXmlWriter *iface) { - xmlwriter *This = impl_from_IXmlWriter(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + xmlwriter *writer = impl_from_IXmlWriter(iface); + ULONG ref = InterlockedIncrement(&writer->ref); + TRACE("%p, refcount %lu.\n", iface, ref); return ref; } static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) { - xmlwriter *This = impl_from_IXmlWriter(iface); - ULONG ref = InterlockedDecrement(&This->ref); + xmlwriter *writer = impl_from_IXmlWriter(iface); + ULONG ref = InterlockedDecrement(&writer->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("%p, refcount %lu.\n", iface, ref); - if (ref == 0) { - IMalloc *imalloc = This->imalloc; + if (!ref) + { + IMalloc *imalloc = writer->imalloc; - writeroutput_flush_stream(This->output); - if (This->output) IUnknown_Release(&This->output->IXmlWriterOutput_iface); + writeroutput_flush_stream(writer->output); + if (writer->output) + IUnknown_Release(&writer->output->IXmlWriterOutput_iface); - writer_free_element_stack(This); + writer_free_element_stack(writer); - writer_free(This, This); + writer_free(writer, writer); if (imalloc) IMalloc_Release(imalloc); } @@ -812,20 +814,20 @@ static HRESULT WINAPI xmlwriter_GetProperty(IXmlWriter *iface, UINT property, LO static HRESULT WINAPI xmlwriter_SetProperty(IXmlWriter *iface, UINT property, LONG_PTR value) { - xmlwriter *This = impl_from_IXmlWriter(iface); + xmlwriter *writer = impl_from_IXmlWriter(iface); - TRACE("(%p)->(%s %lu)\n", This, debugstr_writer_prop(property), value); + TRACE("%p, %s, %Id.\n", iface, debugstr_writer_prop(property), value); switch (property) { case XmlWriterProperty_Indent: - This->indent = !!value; + writer->indent = !!value; break; case XmlWriterProperty_ByteOrderMark: - This->bom = !!value; + writer->bom = !!value; break; case XmlWriterProperty_OmitXmlDeclaration: - This->omitxmldecl = !!value; + writer->omitxmldecl = !!value; break; default: FIXME("Unimplemented property (%u)\n", property); @@ -1822,9 +1824,9 @@ static HRESULT WINAPI xmlwriteroutput_QueryInterface(IXmlWriterOutput *iface, RE static ULONG WINAPI xmlwriteroutput_AddRef(IXmlWriterOutput *iface) { - xmlwriteroutput *This = impl_from_IXmlWriterOutput(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + xmlwriteroutput *output = impl_from_IXmlWriterOutput(iface); + ULONG ref = InterlockedIncrement(&output->ref); + TRACE("%p, refcount %ld.\n", iface, ref); return ref; } @@ -1833,7 +1835,7 @@ static ULONG WINAPI xmlwriteroutput_Release(IXmlWriterOutput *iface) xmlwriteroutput *This = impl_from_IXmlWriterOutput(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("%p, refcount %ld.\n", iface, ref); if (ref == 0) { @@ -1884,7 +1886,7 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) hr = IXmlWriter_QueryInterface(&writer->IXmlWriter_iface, riid, obj); IXmlWriter_Release(&writer->IXmlWriter_iface); - TRACE("returning iface %p, hr %#x\n", *obj, hr); + TRACE("returning iface %p, hr %#lx.\n", *obj, hr); return hr; }

1 0

Eric Pouech : oledb32: Use correct integral type.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

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 : kernelbase: Removed useless casts to long.
by Alexandre Julliard Feb. 1, 2022

Feb. 1, 2022

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