wine-commits January 2022

wine-commits@winehq.org

2 participants
726 discussions

Rémi Bernon : mf/tests: Add some WMA encoder ProcessInput tests.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 32cfcd66a9edb36200fe354a59f3b2bc1a364068 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32cfcd66a9edb36200fe354a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 24 10:55:34 2022 +0100 mf/tests: Add some WMA encoder ProcessInput tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/Makefile.in | 2 +- dlls/mf/tests/mf.c | 110 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 110 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/Makefile.in b/dlls/mf/tests/Makefile.in index 614eb4fbc9e..0b89107e1b4 100644 --- a/dlls/mf/tests/Makefile.in +++ b/dlls/mf/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mf.dll -IMPORTS = mf mfplat mfuuid ole32 user32 +IMPORTS = mf mfplat mfuuid ole32 user32 propsys C_SRCS = \ mf.c diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 9768491650a..d1d68830176 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -110,6 +110,7 @@ typedef struct attribute_desc media_type_desc[32]; #define ATTR_GUID(k, g) {.key = &k, .name = #k, {.vt = VT_CLSID, .puuid = (GUID *)&g}} #define ATTR_UINT32(k, v) {.key = &k, .name = #k, {.vt = VT_UI4, .ulVal = v}} +#define ATTR_BLOB(k, p, n) {.key = &k, .name = #k, {.vt = VT_VECTOR | VT_UI1, .caub = {.pElems = (void *)p, .cElems = n}}} static HWND create_window(void) { @@ -5420,6 +5421,43 @@ static BOOL create_transform(GUID category, MFT_REGISTER_TYPE_INFO *input_type, return TRUE; } +static IMFSample *create_sample(const BYTE *data, ULONG size) +{ + IMFMediaBuffer *media_buffer; + IMFSample *sample; + DWORD length; + BYTE *buffer; + HRESULT hr; + ULONG ret; + + hr = MFCreateSample(&sample); + ok(hr == S_OK, "MFCreateSample returned %#x\n", hr); + hr = MFCreateMemoryBuffer(size, &media_buffer); + ok(hr == S_OK, "MFCreateMemoryBuffer returned %#x\n", hr); + if (data) + { + hr = IMFMediaBuffer_SetCurrentLength(media_buffer, size); + ok(hr == S_OK, "SetCurrentLength returned %#x\n", hr); + hr = IMFMediaBuffer_Lock(media_buffer, &buffer, NULL, &length); + ok(hr == S_OK, "Lock returned %#x\n", hr); + ok(length == size, "got size %u\n", length); + if (!data) memset(buffer, 0xcd, length); + else memcpy(buffer, data, length); + hr = IMFMediaBuffer_Unlock(media_buffer); + ok(hr == S_OK, "Unlock returned %#x\n", hr); + } + hr = IMFSample_AddBuffer(sample, media_buffer); + ok(hr == S_OK, "AddBuffer returned %#x\n", hr); + ret = IMFMediaBuffer_Release(media_buffer); + ok(ret == 1, "Release returned %u\n", ret); + + return sample; +} + +static const BYTE wma_codec_data[10] = {0, 0x44, 0, 0, 0x17, 0, 0, 0, 0, 0}; +static const BYTE wma_decoded_data[0x4000] = {0}; +static const ULONG wma_block_size = 1487; + static void test_wma_encoder(void) { static const media_type_desc transform_inputs[] = @@ -5449,12 +5487,39 @@ static void test_wma_encoder(void) }, }; + static const struct attribute_desc input_type_desc[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_Float), + ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 32), + ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 2), + ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 22050), + ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 176400), + ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, 8), + {0}, + }; + const struct attribute_desc output_type_desc[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_WMAudioV8), + ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 2), + ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 22050), + ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 4003), + ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, wma_block_size), + ATTR_BLOB(MF_MT_USER_DATA, wma_codec_data, sizeof(wma_codec_data)), + {0}, + }; + MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Audio, MFAudioFormat_WMAudioV8}; MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Audio, MFAudioFormat_Float}; + MFT_OUTPUT_STREAM_INFO output_info; + MFT_INPUT_STREAM_INFO input_info; + IMFMediaType *media_type; IMFTransform *transform; + IMFSample *sample; GUID class_id; + ULONG i, ret; HRESULT hr; - ULONG ret; hr = CoInitialize(NULL); ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); @@ -5466,6 +5531,49 @@ static void test_wma_encoder(void) check_interface(transform, &IID_IMediaObject, TRUE); + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "MFCreateMediaType returned %#x\n", hr); + init_media_type(media_type, input_type_desc, -1); + hr = IMFTransform_SetInputType(transform, 0, media_type, 0); + ok(hr == S_OK, "SetInputType returned %#x.\n", hr); + init_media_type(media_type, output_type_desc, -1); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); + ok(hr == S_OK, "SetOutputType returned %#x.\n", hr); + ret = IMFMediaType_Release(media_type); + ok(ret == 0, "Release returned %u\n", ret); + + memset(&input_info, 0xcd, sizeof(input_info)); + hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); + ok(hr == S_OK, "GetInputStreamInfo returned %#x\n", hr); + ok(input_info.hnsMaxLatency == 19969161, "got hnsMaxLatency %s\n", + wine_dbgstr_longlong(input_info.hnsMaxLatency)); + ok(input_info.dwFlags == 0, "got dwFlags %#x\n", input_info.dwFlags); + ok(input_info.cbSize == 8, "got cbSize %u\n", input_info.cbSize); + ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#x\n", input_info.cbMaxLookahead); + ok(input_info.cbAlignment == 1, "got cbAlignment %#x\n", input_info.cbAlignment); + + memset(&output_info, 0xcd, sizeof(output_info)); + hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); + ok(hr == S_OK, "GetOutputStreamInfo returned %#x\n", hr); + ok(output_info.dwFlags == 0, "got dwFlags %#x\n", output_info.dwFlags); + ok(output_info.cbSize == wma_block_size, "got cbSize %#x\n", output_info.cbSize); + ok(output_info.cbAlignment == 1, "got cbAlignment %#x\n", output_info.cbAlignment); + + i = 0; + sample = create_sample(wma_decoded_data, sizeof(wma_decoded_data)); + while (SUCCEEDED(hr = IMFTransform_ProcessInput(transform, 0, sample, 0))) + { + ok(hr == S_OK, "ProcessInput returned %#x\n", hr); + i += sizeof(wma_decoded_data); + } + ok(hr == MF_E_NOTACCEPTING, "ProcessInput returned %#x\n", hr); + ok(i == 0x204000, "ProcessInput consumed %#x bytes\n", i); + + hr = IMFTransform_ProcessMessage(transform, MFT_MESSAGE_COMMAND_DRAIN, 0); + ok(hr == S_OK, "ProcessMessage returned %#x\n", hr); + hr = IMFTransform_ProcessInput(transform, 0, sample, 0); + ok(hr == MF_E_NOTACCEPTING, "ProcessInput returned %#x\n", hr); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret);

1 0

Rémi Bernon : mf/tests: Add some WMA encoder creation tests.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 22f6b279256bc11fb66d8c6cc4ce3c66269877fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=22f6b279256bc11fb66d8c6c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 24 10:55:33 2022 +0100 mf/tests: Add some WMA encoder creation tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 1ba1bc4691d..9768491650a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5420,6 +5420,59 @@ static BOOL create_transform(GUID category, MFT_REGISTER_TYPE_INFO *input_type, return TRUE; } +static void test_wma_encoder(void) +{ + static const media_type_desc transform_inputs[] = + { + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_PCM), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_Float), + }, + }; + static const media_type_desc transform_outputs[] = + { + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_WMAudioV8), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_WMAudioV9), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_WMAudio_Lossless), + }, + }; + + MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Audio, MFAudioFormat_WMAudioV8}; + MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Audio, MFAudioFormat_Float}; + IMFTransform *transform; + GUID class_id; + HRESULT hr; + ULONG ret; + + hr = CoInitialize(NULL); + ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + + if (!create_transform(MFT_CATEGORY_AUDIO_ENCODER, &input_type, &output_type, L"WMAudio Encoder MFT", + transform_inputs, ARRAY_SIZE(transform_inputs), transform_outputs, ARRAY_SIZE(transform_outputs), + &transform, &class_id)) + goto failed; + + check_interface(transform, &IID_IMediaObject, TRUE); + + ret = IMFTransform_Release(transform); + ok(ret == 0, "Release returned %u\n", ret); + +failed: + CoUninitialize(); +} + static void test_wma_decoder(void) { static const media_type_desc transform_inputs[] = @@ -5511,5 +5564,6 @@ START_TEST(mf) test_sample_copier_output_processing(); test_MFGetTopoNodeCurrentType(); test_MFRequireProtectedEnvironment(); + test_wma_encoder(); test_wma_decoder(); }

1 0

Alistair Leslie-Hughes : msdasql: Implement ICommandPrepare Prepare.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 7491a7f13f776bf9f1a4d384183259e9c9d5081a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7491a7f13f776bf9f1a4d384… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 25 15:48:27 2022 +1100 msdasql: Implement ICommandPrepare Prepare. 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 | 4 ++-- dlls/msdasql/msdasql_private.h | 3 ++- dlls/msdasql/session.c | 31 ++++++++++++++++++++++++++++++- dlls/msdasql/tests/provider.c | 14 ++++++++++++++ 4 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 0d0a60ab7a2..d6c833c4c14 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -43,7 +43,7 @@ DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0 DEFINE_GUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); -static void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle) +void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle) { SQLCHAR state[6], msg[SQL_MAX_MESSAGE_LENGTH]; SQLINTEGER native; @@ -611,7 +611,7 @@ static HRESULT WINAPI dbsess_CreateSession(IDBCreateSession *iface, IUnknown *ou if (outer) FIXME("outer currently not supported.\n"); - hr = create_db_session(riid, &provider->MSDASQL_iface, (void**)session); + hr = create_db_session(riid, &provider->MSDASQL_iface, provider->hdbc, (void**)session); return hr; } diff --git a/dlls/msdasql/msdasql_private.h b/dlls/msdasql/msdasql_private.h index 7d7f67c2c78..42bb8697030 100644 --- a/dlls/msdasql/msdasql_private.h +++ b/dlls/msdasql/msdasql_private.h @@ -16,4 +16,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) DECLSPEC_HIDDEN; +HRESULT create_db_session(REFIID riid, IUnknown *datasource, HDBC hdbc, void **unk) DECLSPEC_HIDDEN; +void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle) DECLSPEC_HIDDEN; diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index b4239c59037..f0e915ca710 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -30,6 +30,7 @@ #include "msdasql.h" #include "oledberr.h" +#include "sqlucode.h" #include "msdasql_private.h" @@ -45,6 +46,8 @@ struct msdasql_session LONG refs; IUnknown *datasource; + + HDBC hdbc; }; static inline struct msdasql_session *impl_from_IUnknown( IUnknown *iface ) @@ -305,6 +308,8 @@ struct command LONG refs; WCHAR *query; IUnknown *session; + HDBC hdbc; + SQLHSTMT hstmt; }; static inline struct command *impl_from_ICommandText( ICommandText *iface ) @@ -424,6 +429,10 @@ static ULONG WINAPI command_Release(ICommandText *iface) TRACE( "destroying %p\n", command ); if (command->session) IUnknown_Release(command->session); + + if (command->hstmt) + SQLFreeHandle(SQL_HANDLE_STMT, command->hstmt); + heap_free( command->query ); heap_free( command ); } @@ -1051,7 +1060,24 @@ static ULONG WINAPI commandprepare_Release(ICommandPrepare *iface) static HRESULT WINAPI commandprepare_Prepare(ICommandPrepare *iface, ULONG runs) { struct command *command = impl_from_ICommandPrepare( iface ); + RETCODE ret; + TRACE("%p, %u\n", command, runs); + + if (!command->query) + return DB_E_NOCOMMAND; + + if (command->hstmt) + SQLFreeHandle(SQL_HANDLE_STMT, command->hstmt); + + SQLAllocHandle(SQL_HANDLE_STMT, command->hdbc, &command->hstmt); + + ret = SQLPrepareW(command->hstmt, command->query, SQL_NTS); + if (ret != SQL_SUCCESS) + { + dump_sql_diag_records(SQL_HANDLE_STMT, command->hstmt); + return E_FAIL; + } return S_OK; } @@ -1147,6 +1173,8 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->ICommandWithParameters_iface.lpVtbl = &command_with_params_vtbl; command->refs = 1; command->query = NULL; + command->hdbc = session->hdbc; + command->hstmt = NULL; IUnknown_QueryInterface(&session->session_iface, &IID_IUnknown, (void**)&command->session); @@ -1163,7 +1191,7 @@ static const IDBCreateCommandVtbl createcommandVtbl = createcommand_CreateCommand }; -HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) +HRESULT create_db_session(REFIID riid, IUnknown *datasource, HDBC hdbc, void **unk) { struct msdasql_session *session; HRESULT hr; @@ -1179,6 +1207,7 @@ HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) session->IDBCreateCommand_iface.lpVtbl = &createcommandVtbl; IUnknown_QueryInterface(datasource, &IID_IUnknown, (void**)&session->datasource); session->refs = 1; + session->hdbc = hdbc; hr = IUnknown_QueryInterface(&session->session_iface, riid, unk); IUnknown_Release(&session->session_iface); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index ce3573fbfd7..eefddbf6dcb 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -354,6 +354,7 @@ static void test_rowset_interfaces(IRowset *rowset, ICommandText *commandtext) static void test_command_rowset(IUnknown *cmd) { ICommandText *command_text; + ICommandPrepare *commandprepare; HRESULT hr; IUnknown *unk = NULL; IRowset *rowset; @@ -362,9 +363,22 @@ static void test_command_rowset(IUnknown *cmd) hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandPrepare, (void**)&commandprepare); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICommandPrepare_Prepare(commandprepare, 1); + ok(hr == DB_E_NOCOMMAND, "got 0x%08x\n", hr); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"CREATE TABLE testing (col1 INT, col2 SHORT)"); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = ICommandPrepare_Prepare(commandprepare, 1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ICommandPrepare_Release(commandprepare); + affected = 9999; hr = ICommandText_Execute(command_text, NULL, &IID_IRowset, NULL, &affected, &unk); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Alistair Leslie-Hughes : msdasql: Fix logic when dumping diagnostics records.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 1636530c816ebc77234e32ad0f9f24b47efc7484 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1636530c816ebc77234e32ad… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 25 15:48:26 2022 +1100 msdasql: Fix logic when dumping diagnostics records. 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index cf69195baf7..0d0a60ab7a2 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -52,7 +52,7 @@ static void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle) if (!TRACE_ON(msdasql)) return; - while(SQLGetDiagRec(type, handle, i, state, &native, msg, sizeof(msg), &len) != SQL_SUCCESS) + while(SQLGetDiagRec(type, handle, i, state, &native, msg, sizeof(msg), &len) == SQL_SUCCESS) { WARN("%d: %s: %s\n", i, state, msg); i++;

1 0

Alexandre Julliard : server: Don't depend on the TOKEN_GROUPS structure on the server side.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 868af0c500225c09dea150edabcc3c923c650131 URL: https://source.winehq.org/git/wine.git/?a=commit;h=868af0c500225c09dea150ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 25 12:35:48 2022 +0100 server: Don't depend on the TOKEN_GROUPS structure on the server side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/security.c | 33 ++++++++++------------ include/wine/server_protocol.h | 14 +++------- server/protocol.def | 13 +++------ server/request.h | 3 +- server/token.c | 38 ++++++------------------- server/trace.c | 63 +++++++++++++++++------------------------- 6 files changed, 58 insertions(+), 106 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=868af0c500225c09dea1…

1 0

Alexandre Julliard : server: Define a server-side structure for SID.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 990cc1c64ba48c0dfc3d01b610b5d56c50064b83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=990cc1c64ba48c0dfc3d01b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 25 12:27:28 2022 +0100 server: Define a server-side structure for SID. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 14 +- server/change.c | 4 +- server/file.c | 42 +++--- server/file.h | 4 +- server/handle.c | 2 +- server/object.c | 6 +- server/process.c | 16 ++- server/protocol.def | 18 ++- server/registry.c | 32 ++--- server/security.h | 59 +++++---- server/token.c | 286 ++++++++++++++++------------------------- server/trace.c | 54 ++++---- 12 files changed, 241 insertions(+), 296 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=990cc1c64ba48c0dfc3d…

1 0

Alexandre Julliard : server: Define a server-side structure for ACE.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 841b8862fb4e2b8e147d0e62fec8bfd87e254ddc URL: https://source.winehq.org/git/wine.git/?a=commit;h=841b8862fb4e2b8e147d0e62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 25 12:21:14 2022 +0100 server: Define a server-side structure for ACE. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/file.c | 94 +++++++++---------------------- server/process.c | 22 ++------ server/registry.c | 20 ++----- server/security.h | 32 ++++++++++- server/token.c | 165 ++++++++++++++++++------------------------------------ server/trace.c | 63 +++++++-------------- 6 files changed, 143 insertions(+), 253 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=841b8862fb4e2b8e147d…

1 0

Alexandre Julliard : server: Define a server-side structure for ACL.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: c36f81fa750591fc395a66d5323ff032e85b762b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c36f81fa750591fc395a66d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 25 12:10:40 2022 +0100 server: Define a server-side structure for ACL. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 15 ++++- server/file.c | 24 ++++---- server/handle.c | 6 +- server/object.c | 10 ++-- server/process.c | 16 +++--- server/protocol.def | 17 ++++-- server/registry.c | 16 +++--- server/security.h | 14 ++--- server/token.c | 125 +++++++++++++++++++++-------------------- server/trace.c | 21 +++---- 10 files changed, 144 insertions(+), 120 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c36f81fa750591fc395a…

1 0

Alexandre Julliard : server: Define a server-side structure for SID_AND_ATTRIBUTES.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: bf3442fab68938010be63340c7955d09d62cbb62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf3442fab68938010be63340… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 25 12:03:14 2022 +0100 server: Define a server-side structure for SID_AND_ATTRIBUTES. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/token.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/server/token.c b/server/token.c index f9aea331329..b940df61aef 100644 --- a/server/token.c +++ b/server/token.c @@ -64,6 +64,12 @@ const struct luid SeManageVolumePrivilege = { 28, 0 }; const struct luid SeImpersonatePrivilege = { 29, 0 }; const struct luid SeCreateGlobalPrivilege = { 30, 0 }; +struct sid_attrs +{ + const SID *sid; + unsigned int attrs; +}; + #define SID_N(n) struct /* same fields as struct SID */ \ { \ BYTE Revision; \ @@ -86,9 +92,6 @@ static const SID_N(3) builtin_logon_sid = { SID_REVISION, 3, { SECURITY_NT_AUTHO static const SID_N(5) domain_users_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0, DOMAIN_GROUP_RID_USERS } }; const PSID security_world_sid = (PSID)&world_sid; -static const PSID security_local_sid = (PSID)&local_sid; -static const PSID security_interactive_sid = (PSID)&interactive_sid; -static const PSID security_authenticated_user_sid = (PSID)&authenticated_user_sid; const PSID security_local_system_sid = (PSID)&local_system_sid; const PSID security_local_user_sid = (PSID)&local_user_sid; const PSID security_builtin_admins_sid = (PSID)&builtin_admins_sid; @@ -541,7 +544,7 @@ static void token_destroy( struct object *obj ) * allocated. */ static struct token *create_token( unsigned int primary, unsigned int session_id, const SID *user, - const SID_AND_ATTRIBUTES *groups, unsigned int group_count, + const struct sid_attrs *groups, unsigned int group_count, const struct luid_attr *privs, unsigned int priv_count, const ACL *default_dacl, TOKEN_SOURCE source, const struct luid *modified_id, @@ -581,7 +584,7 @@ static struct token *create_token( unsigned int primary, unsigned int session_id /* copy groups */ for (i = 0; i < group_count; i++) { - size_t size = FIELD_OFFSET( struct group, sid.SubAuthority[((const SID *)groups[i].Sid)->SubAuthorityCount] ); + size_t size = FIELD_OFFSET( struct group, sid.SubAuthority[groups[i].sid->SubAuthorityCount] ); struct group *group = mem_alloc( size ); if (!group) @@ -589,12 +592,12 @@ static struct token *create_token( unsigned int primary, unsigned int session_id release_object( token ); return NULL; } - memcpy( &group->sid, groups[i].Sid, security_sid_len( groups[i].Sid )); + memcpy( &group->sid, groups[i].sid, security_sid_len( groups[i].sid )); group->enabled = TRUE; group->def = TRUE; - group->logon = (groups[i].Attributes & SE_GROUP_LOGON_ID) != 0; - group->mandatory = (groups[i].Attributes & SE_GROUP_MANDATORY) != 0; - group->owner = (groups[i].Attributes & SE_GROUP_OWNER) != 0; + group->logon = (groups[i].attrs & SE_GROUP_LOGON_ID) != 0; + group->mandatory = (groups[i].attrs & SE_GROUP_MANDATORY) != 0; + group->owner = (groups[i].attrs & SE_GROUP_OWNER) != 0; group->resource = FALSE; group->deny_only = FALSE; list_add_tail( &token->groups, &group->entry ); @@ -878,13 +881,13 @@ struct token *token_create_admin( unsigned primary, int impersonation_level, int }; /* note: we don't include non-builtin groups here for the user - * telling us these is the job of a client-side program */ - const SID_AND_ATTRIBUTES admin_groups[] = + const struct sid_attrs admin_groups[] = { - { security_world_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, - { security_local_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, - { security_interactive_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, - { security_authenticated_user_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, - { security_domain_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_OWNER }, + { &world_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, + { &local_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, + { &interactive_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, + { &authenticated_user_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, + { (SID *)&domain_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_OWNER }, { alias_admins_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_OWNER }, { alias_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, { logon_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_LOGON_ID },

1 0

Alexandre Julliard : server: Define a server-side structure for LUID_AND_ATTRIBUTES.
by Alexandre Julliard 25 Jan '22

25 Jan '22

Module: wine Branch: master Commit: 7d7322671ca51feecfede56ad12650c0b211f65d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d7322671ca51feecfede56a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 25 11:55:40 2022 +0100 server: Define a server-side structure for LUID_AND_ATTRIBUTES. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 32 ++++---- server/protocol.def | 30 ++++--- server/registry.c | 6 +- server/request.h | 2 +- server/security.h | 50 ++++++------ server/token.c | 172 ++++++++++++++++++----------------------- server/trace.c | 23 +++--- tools/make_requests | 2 +- 8 files changed, 154 insertions(+), 163 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7d7322671ca51feecfed…

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2022