November 2021 - Wine-commits

Jinoh Kang : winedbg: Report current thread ID to GDB for all stop replies.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 829c06741bacfedb815d340e106371f6140bb79f URL: https://source.winehq.org/git/wine.git/?a=commit;h=829c06741bacfedb815d340e… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Nov 17 01:37:42 2021 +0900 winedbg: Report current thread ID to GDB for all stop replies. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 522e4fdb506..a4f5bd1387e 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -867,6 +867,22 @@ static void packet_reply_status_xpoints(struct gdb_context* gdbctx, struct dbg_t } } +static void packet_reply_begin_stop_reply(struct gdb_context* gdbctx, unsigned char signal) +{ + packet_reply_add(gdbctx, "T"); + packet_reply_val(gdbctx, signal, 1); + + /* We should always report the current thread ID for all stop replies. + * Otherwise, GDB complains with the following message: + * + * Warning: multi-threaded target stopped without sending a thread-id, + * using first non-exited thread + */ + packet_reply_add(gdbctx, "thread:"); + packet_reply_val(gdbctx, gdbctx->de.dwThreadId, 4); + packet_reply_add(gdbctx, ";"); +} + static enum packet_return packet_reply_status(struct gdb_context* gdbctx) { struct dbg_process *process = gdbctx->process; @@ -885,11 +901,7 @@ static enum packet_return packet_reply_status(struct gdb_context* gdbctx) return packet_error; packet_reply_open(gdbctx); - packet_reply_add(gdbctx, "T"); - packet_reply_val(gdbctx, signal_from_debug_event(&gdbctx->de), 1); - packet_reply_add(gdbctx, "thread:"); - packet_reply_val(gdbctx, gdbctx->de.dwThreadId, 4); - packet_reply_add(gdbctx, ";"); + packet_reply_begin_stop_reply(gdbctx, signal_from_debug_event(&gdbctx->de)); packet_reply_status_xpoints(gdbctx, thread, &ctx); for (i = 0; i < backend->gdb_num_regs; i++) @@ -913,8 +925,7 @@ static enum packet_return packet_reply_status(struct gdb_context* gdbctx) case LOAD_DLL_DEBUG_EVENT: case UNLOAD_DLL_DEBUG_EVENT: packet_reply_open(gdbctx); - packet_reply_add(gdbctx, "T"); - packet_reply_val(gdbctx, HOST_SIGTRAP, 1); + packet_reply_begin_stop_reply(gdbctx, HOST_SIGTRAP); packet_reply_add(gdbctx, "library:;"); packet_reply_close(gdbctx); return packet_done;

1 0

Jinoh Kang : winedbg: Set reuseaddr flag for gdb remote socket.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 820a866f0d8e997c3d03ea528e5643b79bc7c396 URL: https://source.winehq.org/git/wine.git/?a=commit;h=820a866f0d8e997c3d03ea52… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Nov 17 01:38:17 2021 +0900 winedbg: Set reuseaddr flag for gdb remote socket. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index a4f5bd1387e..cd736532dcf 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -2157,6 +2157,7 @@ static BOOL gdb_exec(unsigned port, unsigned flags) static BOOL gdb_startup(struct gdb_context* gdbctx, unsigned flags, unsigned port) { SOCKET sock; + BOOL reuseaddr = TRUE; struct sockaddr_in s_addrs = {0}; int s_len = sizeof(s_addrs); fd_set read_fds; @@ -2172,6 +2173,8 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, unsigned flags, unsigned por return FALSE; } + setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char*)&reuseaddr, sizeof(reuseaddr)); + s_addrs.sin_family = AF_INET; s_addrs.sin_addr.S_un.S_addr = INADDR_ANY; s_addrs.sin_port = htons(port);

1 0

Alistair Leslie-Hughes : msdasql: Return S_OK in ICommandPrepare Un/Prepare.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 422caf216171c23a38c5d4d059f2babca0fea11d URL: https://source.winehq.org/git/wine.git/?a=commit;h=422caf216171c23a38c5d4d0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 17 21:23:24 2021 +1100 msdasql: Return S_OK in ICommandPrepare Un/Prepare. These functions are to attempt to optimize the query that is about to be run. We can safely ignore these calls. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 196fd1c6b81..df394264bf7 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -1096,15 +1096,15 @@ static ULONG WINAPI commandprepare_Release(ICommandPrepare *iface) static HRESULT WINAPI commandprepare_Prepare(ICommandPrepare *iface, ULONG runs) { struct command *command = impl_from_ICommandPrepare( iface ); - FIXME("%p, %u\n", command, runs); - return E_NOTIMPL; + TRACE("%p, %u\n", command, runs); + return S_OK; } static HRESULT WINAPI commandprepare_Unprepare(ICommandPrepare *iface) { struct command *command = impl_from_ICommandPrepare( iface ); - FIXME("%p\n", command); - return E_NOTIMPL; + TRACE("%p\n", command); + return S_OK; } struct ICommandPrepareVtbl commandprepareVtbl =

1 0

Alistair Leslie-Hughes : msdasql: Move ICommandWithParameters to the correct interface.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: fbca126660c86039b1cd6a576c7d77963e6d3d07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbca126660c86039b1cd6a57… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 17 21:23:25 2021 +1100 msdasql: Move ICommandWithParameters to the correct 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 | 126 ++++++++++++++++++++++++------------------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index df394264bf7..44f36f0e591 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -293,6 +293,7 @@ struct command IColumnsInfo IColumnsInfo_iface; IConvertType IConvertType_iface; ICommandPrepare ICommandPrepare_iface; + ICommandWithParameters ICommandWithParameters_iface; LONG refs; WCHAR *query; IUnknown *session; @@ -323,6 +324,11 @@ static inline struct command *impl_from_ICommandPrepare( ICommandPrepare *iface return CONTAINING_RECORD( iface, struct command, ICommandPrepare_iface ); } +static inline struct command *impl_from_ICommandWithParameters( ICommandWithParameters *iface ) +{ + return CONTAINING_RECORD( iface, struct command, ICommandWithParameters_iface ); +} + static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, void **ppv) { struct command *command = impl_from_ICommandText( iface ); @@ -352,6 +358,10 @@ static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, v { *ppv = &command->ICommandPrepare_iface; } + else if(IsEqualGUID(&IID_ICommandWithParameters, riid)) + { + *ppv = &command->ICommandWithParameters_iface; + } if(*ppv) { @@ -426,7 +436,6 @@ struct msdasql_rowset IColumnsInfo IColumnsInfo_iface; IAccessor IAccessor_iface; IColumnsRowset IColumnsRowset_iface; - ICommandWithParameters ICommandWithParameters_iface; IUnknown *caller; LONG refs; }; @@ -456,11 +465,6 @@ static inline struct msdasql_rowset *impl_from_IColumnsRowset ( IColumnsRowset * return CONTAINING_RECORD( iface, struct msdasql_rowset, IColumnsRowset_iface ); } -static inline struct msdasql_rowset *impl_from_ICommandWithParameters( ICommandWithParameters *iface ) -{ - return CONTAINING_RECORD( iface, struct msdasql_rowset, ICommandWithParameters_iface ); -} - static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); @@ -489,10 +493,6 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IColumnsRowset_iface; } - else if(IsEqualGUID(&IID_ICommandWithParameters, riid)) - { - *ppv = &rowset->ICommandWithParameters_iface; - } else if (IsEqualGUID(&IID_IRowsetChange, riid)) { TRACE("IID_IRowsetChange not supported\n"); @@ -801,58 +801,6 @@ struct IColumnsRowsetVtbl columnrs_rs_vtbl = column_rs_GetColumnsRowset }; -static HRESULT WINAPI cmd_with_params_QueryInterface(ICommandWithParameters *iface, REFIID riid, void **out) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - return IRowset_QueryInterface(&rowset->IRowset_iface, riid, out); -} - -static ULONG WINAPI cmd_with_params_AddRef(ICommandWithParameters *iface) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - return IRowset_AddRef(&rowset->IRowset_iface); -} - -static ULONG WINAPI cmd_with_params_Release(ICommandWithParameters *iface) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - return IRowset_Release(&rowset->IRowset_iface); -} - -static HRESULT WINAPI cmd_with_params_GetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS *uparams, - DBPARAMINFO **info, OLECHAR **buffer) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - FIXME("%p, %p, %p, %p\n", rowset, uparams, info, buffer); - return E_NOTIMPL; -} - -static HRESULT WINAPI cmd_with_params_MapParameterNames(ICommandWithParameters *iface, DB_UPARAMS uparams, - LPCWSTR names[], DB_LPARAMS ordinals[]) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - FIXME("%p, %ld, %p, %p\n", rowset, uparams, names, ordinals); - return E_NOTIMPL; -} - -static HRESULT WINAPI cmd_with_params_SetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS uparams, - const DB_UPARAMS ordinals[], const DBPARAMBINDINFO bindinfo[]) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - FIXME("%p, %ld, %p, %p\n", rowset, uparams, ordinals, bindinfo); - return E_NOTIMPL; -} - -struct ICommandWithParametersVtbl command_with_params_vtbl = -{ - cmd_with_params_QueryInterface, - cmd_with_params_AddRef, - cmd_with_params_Release, - cmd_with_params_GetParameterInfo, - cmd_with_params_MapParameterNames, - cmd_with_params_SetParameterInfo -}; - static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) { @@ -871,7 +819,6 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI msrowset->IColumnsInfo_iface.lpVtbl = &rowset_columninfo_vtbll; msrowset->IAccessor_iface.lpVtbl = &accessor_vtbl; msrowset->IColumnsRowset_iface.lpVtbl = &columnrs_rs_vtbl; - msrowset->ICommandWithParameters_iface.lpVtbl = &command_with_params_vtbl; msrowset->refs = 1; ICommandText_QueryInterface(iface, &IID_IUnknown, (void**)&msrowset->caller); @@ -1116,6 +1063,58 @@ struct ICommandPrepareVtbl commandprepareVtbl = commandprepare_Unprepare }; +static HRESULT WINAPI cmd_with_params_QueryInterface(ICommandWithParameters *iface, REFIID riid, void **out) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + return ICommandText_QueryInterface(&command->ICommandText_iface, riid, out); +} + +static ULONG WINAPI cmd_with_params_AddRef(ICommandWithParameters *iface) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + return ICommandText_AddRef(&command->ICommandText_iface); +} + +static ULONG WINAPI cmd_with_params_Release(ICommandWithParameters *iface) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + return ICommandText_Release(&command->ICommandText_iface); +} + +static HRESULT WINAPI cmd_with_params_GetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS *uparams, + DBPARAMINFO **info, OLECHAR **buffer) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %p, %p, %p\n", command, uparams, info, buffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI cmd_with_params_MapParameterNames(ICommandWithParameters *iface, DB_UPARAMS uparams, + LPCWSTR names[], DB_LPARAMS ordinals[]) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %ld, %p, %p\n", command, uparams, names, ordinals); + return E_NOTIMPL; +} + +static HRESULT WINAPI cmd_with_params_SetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS uparams, + const DB_UPARAMS ordinals[], const DBPARAMBINDINFO bindinfo[]) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %ld, %p, %p\n", command, uparams, ordinals, bindinfo); + return E_NOTIMPL; +} + +struct ICommandWithParametersVtbl command_with_params_vtbl = +{ + cmd_with_params_QueryInterface, + cmd_with_params_AddRef, + cmd_with_params_Release, + cmd_with_params_GetParameterInfo, + cmd_with_params_MapParameterNames, + cmd_with_params_SetParameterInfo +}; + static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnknown *outer, REFIID riid, IUnknown **out) { @@ -1137,6 +1136,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->IColumnsInfo_iface.lpVtbl = &columninfoVtbl; command->IConvertType_iface.lpVtbl = &converttypeVtbl; command->ICommandPrepare_iface.lpVtbl = &commandprepareVtbl; + command->ICommandWithParameters_iface.lpVtbl = &command_with_params_vtbl; command->refs = 1; command->query = NULL;

1 0

Alistair Leslie-Hughes : msdasql: Implement IGetDataSource GetDataSource.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 109db990b9b3a2e3f27570b5c3d919ed48877804 URL: https://source.winehq.org/git/wine.git/?a=commit;h=109db990b9b3a2e3f27570b5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 17 21:23:26 2021 +1100 msdasql: Implement IGetDataSource GetDataSource. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/msdasql_main.c | 2 +- dlls/msdasql/msdasql_private.h | 2 +- dlls/msdasql/session.c | 15 ++++++++++++--- dlls/msdasql/tests/provider.c | 7 ++++++- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index e98945b9777..bc208a74cc5 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -559,7 +559,7 @@ static HRESULT WINAPI dbsess_CreateSession(IDBCreateSession *iface, IUnknown *ou if (outer) FIXME("outer currently not supported.\n"); - hr = create_db_session(riid, (void**)session); + hr = create_db_session(riid, &provider->MSDASQL_iface, (void**)session); return hr; } diff --git a/dlls/msdasql/msdasql_private.h b/dlls/msdasql/msdasql_private.h index a3d73498fe9..7d7f67c2c78 100644 --- a/dlls/msdasql/msdasql_private.h +++ b/dlls/msdasql/msdasql_private.h @@ -16,4 +16,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT create_db_session(REFIID riid, void **unk) DECLSPEC_HIDDEN; +HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) DECLSPEC_HIDDEN; diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 44f36f0e591..b4239c59037 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -43,6 +43,8 @@ struct msdasql_session ISessionProperties ISessionProperties_iface; IDBCreateCommand IDBCreateCommand_iface; LONG refs; + + IUnknown *datasource; }; static inline struct msdasql_session *impl_from_IUnknown( IUnknown *iface ) @@ -139,6 +141,8 @@ static ULONG WINAPI session_Release(IUnknown *iface) if (!refs) { TRACE( "destroying %p\n", session ); + + IUnknown_Release(session->datasource); heap_free( session ); } return refs; @@ -173,9 +177,13 @@ ULONG WINAPI datasource_Release(IGetDataSource *iface) HRESULT WINAPI datasource_GetDataSource(IGetDataSource *iface, REFIID riid, IUnknown **datasource) { struct msdasql_session *session = impl_from_IGetDataSource( iface ); - FIXME("%p, %s, %p stub\n", session, debugstr_guid(riid), datasource); - return E_NOTIMPL; + TRACE("%p, %s, %p stub\n", session, debugstr_guid(riid), datasource); + + if (!datasource) + return E_INVALIDARG; + + return IUnknown_QueryInterface(session->datasource, riid, (void**)datasource); } static const IGetDataSourceVtbl datasourceVtbl = @@ -1155,7 +1163,7 @@ static const IDBCreateCommandVtbl createcommandVtbl = createcommand_CreateCommand }; -HRESULT create_db_session(REFIID riid, void **unk) +HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) { struct msdasql_session *session; HRESULT hr; @@ -1169,6 +1177,7 @@ HRESULT create_db_session(REFIID riid, void **unk) session->IOpenRowset_iface.lpVtbl = &openrowsetVtbl; session->ISessionProperties_iface.lpVtbl = &propertiesVtbl; session->IDBCreateCommand_iface.lpVtbl = &createcommandVtbl; + IUnknown_QueryInterface(datasource, &IID_IUnknown, (void**)&session->datasource); session->refs = 1; hr = IUnknown_QueryInterface(&session->session_iface, riid, unk); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index a0b11194f2b..b520b127d67 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -399,7 +399,7 @@ static void test_command_rowset(IUnknown *cmd) static void test_sessions(void) { - IDBProperties *props; + IDBProperties *props, *dsource = NULL; IDBInitialize *dbinit = NULL; IDataInitialize *datainit; IDBCreateSession *dbsession = NULL; @@ -456,6 +456,11 @@ static void test_sessions(void) hr = IUnknown_QueryInterface(session, &IID_IGetDataSource, (void**)&datasource); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IGetDataSource_GetDataSource(datasource, &IID_IDBProperties, (IUnknown**)&dsource); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dsource == props, "different pointers\n"); + IDBProperties_Release(dsource); IGetDataSource_Release(datasource); hr = IUnknown_QueryInterface(session, &IID_ITransactionJoin, (void**)&join);

1 0

Nikolay Sivov : d3d10core/tests: Add a test for DXGI_FORMAT_R8G8_UINT support in vertex buffers.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: c536da7fe0c3f4d6e67e28792562be18e405a9a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c536da7fe0c3f4d6e67e2879… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 17 15:00:08 2021 +0300 d3d10core/tests: Add a test for DXGI_FORMAT_R8G8_UINT support in vertex buffers. 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 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index b8338152bb7..73151f2296c 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -13645,6 +13645,10 @@ static void test_format_support(void) {DXGI_FORMAT_R32_UINT}, {DXGI_FORMAT_R16_UINT}, }; + static const struct format_support vertex_buffers[] = + { + {DXGI_FORMAT_R8G8_UINT}, + }; if (!(device = create_device())) { @@ -13685,6 +13689,9 @@ static void test_format_support(void) check_format_support(format_support, index_buffers, ARRAY_SIZE(index_buffers), D3D10_FORMAT_SUPPORT_IA_INDEX_BUFFER, "index buffer"); + check_format_support(format_support, vertex_buffers, ARRAY_SIZE(vertex_buffers), + D3D10_FORMAT_SUPPORT_IA_VERTEX_BUFFER, "vertex buffer"); + check_format_support(format_support, display_format_support, ARRAY_SIZE(display_format_support), D3D10_FORMAT_SUPPORT_DISPLAY, "display");

1 0

Nikolay Sivov : d3d11/tests: Add a test for DXGI_FORMAT_R8G8_UINT support in vertex buffers.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 80b957d529efc536198e70d2144efc6152cbff3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=80b957d529efc536198e70d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 17 15:00:09 2021 +0300 d3d11/tests: Add a test for DXGI_FORMAT_R8G8_UINT support in vertex buffers. 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/d3d11/tests/d3d11.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 561a38ec5aa..140e7cc195c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -20619,6 +20619,11 @@ static void test_format_support(const D3D_FEATURE_LEVEL feature_level) {DXGI_FORMAT_R16_UINT, D3D_FEATURE_LEVEL_9_1}, }; + static const struct format_support vertex_buffers[] = + { + {DXGI_FORMAT_R8G8_UINT, D3D_FEATURE_LEVEL_10_0}, + }; + device_desc.feature_level = &feature_level; device_desc.flags = 0; if (!(device = create_device(&device_desc))) @@ -20684,6 +20689,10 @@ static void test_format_support(const D3D_FEATURE_LEVEL feature_level) index_buffers, ARRAY_SIZE(index_buffers), D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER, "index buffer"); + check_format_support(format_support, feature_level, + vertex_buffers, ARRAY_SIZE(vertex_buffers), + D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER, "vertex buffer"); + check_format_support(format_support, feature_level, display_format_support, ARRAY_SIZE(display_format_support), D3D11_FORMAT_SUPPORT_DISPLAY, "display");

1 0

Nikolay Sivov : wined3d: Add R8G8_UINT to vertex formats list.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 0d9fdd02e5ea98c2291cacbc024a485fc2f606af URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d9fdd02e5ea98c2291cacbc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 17 15:00:10 2021 +0300 wined3d: Add R8G8_UINT to vertex formats list. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52051 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/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 098b07ae35b..1b0d7cc6eba 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -726,6 +726,7 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R8_UNORM, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, {WINED3DFMT_R8_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, {WINED3DFMT_R8_SINT, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, + {WINED3DFMT_R8G8_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, {WINED3DFMT_R16_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_SHORT}, {WINED3DFMT_R16_SINT, WINED3D_FFP_EMIT_INVALID, GL_SHORT}, {WINED3DFMT_R32_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT},

1 0

Alexandre Julliard : winegcc: Don't link directly to ntdll or ntoskrnl import libraries.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: a7074ea2a3ab384a9360979b933e92a078179d0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7074ea2a3ab384a9360979b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 14:56:38 2021 +0100 winegcc: Don't link directly to ntdll or ntoskrnl import libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 38900103a97..940eaeb5279 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1408,18 +1408,28 @@ static void build(struct options* opts) strarray_add(&link_args, name); break; case 'a': - if (is_pe && !opts->use_msvcrt && !opts->lib_suffix && strchr(name, '/')) + if (!opts->use_msvcrt && !opts->lib_suffix && strchr(name, '/')) { /* turn the path back into -Ldir -lfoo options * this makes sure that we use the specified libs even * when mingw adds its own import libs to the link */ const char *p = get_basename( name ); - if (!strncmp( p, "lib", 3 ) && strcmp( p, "libmsvcrt.a" )) + if (is_pe) { - strarray_add(&link_args, strmake("-L%s", get_dirname(name) )); - strarray_add(&link_args, strmake("-l%s", get_basename_noext( p + 3 ))); - break; + if (!strncmp( p, "lib", 3 ) && strcmp( p, "libmsvcrt.a" )) + { + strarray_add(&link_args, strmake("-L%s", get_dirname(name) )); + strarray_add(&link_args, strmake("-l%s", get_basename_noext( p + 3 ))); + break; + } + } + else + { + /* don't link to ntdll or ntoskrnl in non-msvcrt mode + * since they export CRT functions */ + if (!strcmp( p, "libntdll.a" )) break; + if (!strcmp( p, "libntoskrnl.a" )) break; } } strarray_add(&link_args, name);

1 0

Alexandre Julliard : winebuild: Avoid resolving standard C functions with static importlibs.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 414e1c8ad5f5c39ef7caa71f5ff8f7735cf91d1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=414e1c8ad5f5c39ef7caa71f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 14:57:08 2021 +0100 winebuild: Avoid resolving standard C functions with static importlibs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 8e285b19872..ab15e01b53c 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -492,6 +492,8 @@ static void add_undef_import( const char *name, int is_ordinal ) while (*name >= '0' && *name <= '9') ordinal = 10 * ordinal + *name++ - '0'; if (*name++ != '$') return; + if (!use_msvcrt && find_name( name, stdc_functions )) return; + import = add_static_import_dll( dll_name ); if (is_ordinal) add_import_func( import, NULL, xstrdup( name ), ordinal, 0 );

1 0