May 2018 - Wine-Devel - list.winehq.org

[PATCH 4/7] mstask: ITaskTrigger::SetTrigger() should fail on NULL input.
by Dmitry Timoshkov May 14, 2018

May 14, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task_trigger.c | 2 ++ dlls/mstask/tests/task_trigger.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/dlls/mstask/task_trigger.c b/dlls/mstask/task_trigger.c index 888fb66a4f..6d11817e00 100644 --- a/dlls/mstask/task_trigger.c +++ b/dlls/mstask/task_trigger.c @@ -103,6 +103,8 @@ static HRESULT WINAPI MSTASK_ITaskTrigger_SetTrigger( TRACE("(%p, %p)\n", iface, pTrigger); + if (!pTrigger) return E_INVALIDARG; + /* Verify valid structure size */ if (pTrigger->cbTriggerSize != sizeof(*pTrigger)) return E_INVALIDARG; diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index 3e2762079d..e22b2ae2dd 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -136,6 +136,9 @@ static void test_SetTrigger_GetTrigger(void) hres = ITask_CreateTrigger(test_task, &idx, &test_trigger); ok(hres == S_OK, "got %#x\n", hres); + hres = ITaskTrigger_SetTrigger(test_trigger, NULL); + ok(hres == E_INVALIDARG, "got %#x\n", hres); + /* Setup a trigger with base values for this test run */ GetLocalTime(&time); empty_trigger_state.wStartHour = time.wHour; -- 2.16.3

1 0

[PATCH 3/7] mstask/tests: Make task trigger tests independent.
by Dmitry Timoshkov May 14, 2018

May 14, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/tests/task_trigger.c | 54 +++++++++------------------------------- 1 file changed, 12 insertions(+), 42 deletions(-) diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index ab081a74ca..3e2762079d 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -27,37 +27,6 @@ #include "wine/test.h" static ITaskScheduler *test_task_scheduler; -static ITask *test_task; -static ITaskTrigger *test_trigger; -static WORD trigger_index; - -static BOOL setup_trigger(void) -{ - HRESULT hres; - const WCHAR task_name[] = {'T','e','s','t','i','n','g', 0}; - - hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, - &CLSID_CTask, &IID_ITask, (IUnknown**)&test_task); - if(hres != S_OK) - { - ITaskScheduler_Release(test_task_scheduler); - return FALSE; - } - hres = ITask_CreateTrigger(test_task, &trigger_index, &test_trigger); - if(hres != S_OK) - { - ITask_Release(test_task); - ITaskScheduler_Release(test_task_scheduler); - return FALSE; - } - return TRUE; -} - -static void cleanup_trigger(void) -{ - ITaskTrigger_Release(test_trigger); - ITask_Release(test_task); -} static BOOL compare_trigger_state(TASK_TRIGGER found_state, TASK_TRIGGER expected_state) @@ -135,8 +104,11 @@ static BOOL compare_trigger_state(TASK_TRIGGER found_state, static void test_SetTrigger_GetTrigger(void) { - BOOL setup; + static const WCHAR task_name[] = { 'T','e','s','t','i','n','g',0 }; + ITask *test_task; + ITaskTrigger *test_trigger; HRESULT hres; + WORD idx; TASK_TRIGGER trigger_state; TASK_TRIGGER empty_trigger_state = { sizeof(trigger_state), 0, @@ -157,13 +129,12 @@ static void test_SetTrigger_GetTrigger(void) }; SYSTEMTIME time; - setup = setup_trigger(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hres == S_OK, "got %#x\n", hres); + + hres = ITask_CreateTrigger(test_task, &idx, &test_trigger); + ok(hres == S_OK, "got %#x\n", hres); /* Setup a trigger with base values for this test run */ GetLocalTime(&time); @@ -367,9 +338,8 @@ static void test_SetTrigger_GetTrigger(void) ok(compare_trigger_state(trigger_state, normal_trigger_state), "Invalid state\n"); - - cleanup_trigger(); - return; + ITaskTrigger_Release(test_trigger); + ITask_Release(test_task); } static void test_task_trigger(void) -- 2.16.3

1 0

[PATCH 2/7] mstask: Implement ITask::SetFlags().
by Dmitry Timoshkov May 14, 2018

May 14, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 11 +++++++---- dlls/mstask/tests/task.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 9cdf92e319..68452afa4f 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -491,11 +491,14 @@ static HRESULT WINAPI MSTASK_ITask_GetErrorRetryInterval(ITask *iface, WORD *int return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_SetFlags( - ITask* iface, - DWORD dwFlags) +static HRESULT WINAPI MSTASK_ITask_SetFlags(ITask *iface, DWORD flags) { - FIXME("(%p, 0x%08x): stub\n", iface, dwFlags); + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, 0x%08x)\n", iface, flags); + This->flags &= 0xffff8000; + This->flags |= flags & 0x7fff; + This->is_dirty = TRUE; return S_OK; } diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 58c102060b..0e2b4339ad 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -683,6 +683,43 @@ static void test_Run(void) ok(hr == S_OK, "got %#x\n", hr); } +static void test_SetFlags(void) +{ + HRESULT hr; + ITask *task; + DWORD flags; + + hr = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "got %#x\n", hr); + + hr = ITask_SetFlags(task, 0); + ok(hr == S_OK, "got %#x\n", hr); + + flags = 0xdeadbeef; + hr = ITask_GetFlags(task, &flags); + ok(hr == S_OK, "got %#x\n", hr); + ok(flags == 0, "got %#x\n", flags); + + hr = ITask_SetFlags(task, 0xffffffff); + ok(hr == S_OK, "got %#x\n", hr); + + flags = 0xdeadbeef; + hr = ITask_GetFlags(task, &flags); + ok(hr == S_OK, "got %#x\n", hr); + ok(flags == 0x7fff, "got %#x\n", flags); + + hr = ITask_SetFlags(task, 0x9234); + ok(hr == S_OK, "got %#x\n", hr); + + flags = 0xdeadbeef; + hr = ITask_GetFlags(task, &flags); + ok(hr == S_OK, "got %#x\n", hr); + ok(flags == 0x1234, "got %#x\n", flags); + + ITask_Release(task); +} + START_TEST(task) { HRESULT hr; @@ -700,6 +737,7 @@ START_TEST(task) test_SetAccountInformation_GetAccountInformation(); test_task_state(); test_Run(); + test_SetFlags(); ITaskScheduler_Release(scheduler); CoUninitialize(); -- 2.16.3

1 0

[PATCH 1/7] mstask/tests: Make task tests independent.
by Dmitry Timoshkov May 14, 2018

May 14, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/tests/task.c | 155 ++++++++++++++--------------------------------- 1 file changed, 46 insertions(+), 109 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 2e8ee93630..58c102060b 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -25,35 +25,10 @@ #include "mstask.h" #include "wine/test.h" -static ITaskScheduler *test_task_scheduler; -static ITask *test_task; +static ITaskScheduler *scheduler; +static const WCHAR task_name[] = {'T','e','s','t','i','n','g',0}; static const WCHAR empty[] = {0}; -static BOOL setup_task(void) -{ - HRESULT hres; - const WCHAR task_name[] = {'T','e','s','t','i','n','g', 0}; - - hres = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, - &IID_ITaskScheduler, (void **) &test_task_scheduler); - if(hres != S_OK) - return FALSE; - hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, - &IID_ITask, (IUnknown**)&test_task); - if(hres != S_OK) - { - ITaskScheduler_Release(test_task_scheduler); - return FALSE; - } - return TRUE; -} - -static void cleanup_task(void) -{ - ITask_Release(test_task); - ITaskScheduler_Release(test_task_scheduler); -} - static LPCWSTR path_resolve_name(LPCWSTR base_name) { static WCHAR buffer[MAX_PATH]; @@ -72,7 +47,7 @@ static LPCWSTR path_resolve_name(LPCWSTR base_name) static void test_SetApplicationName_GetApplicationName(void) { - BOOL setup; + ITask *test_task; HRESULT hres; LPWSTR stored_name; LPCWSTR full_name; @@ -82,13 +57,9 @@ static void test_SetApplicationName_GetApplicationName(void) 'n','o','t','e','p','a','d','.','e','x','e', 0}; const WCHAR notepad[] = {'n','o','t','e','p','a','d', 0}; - setup = setup_task(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hres = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hres == S_OK, "Failed to setup test_task\n"); /* Attempt getting before setting application name */ hres = ITask_GetApplicationName(test_task, &stored_name); @@ -176,54 +147,39 @@ static void test_SetApplicationName_GetApplicationName(void) CoTaskMemFree(stored_name); } - cleanup_task(); - return; + ITask_Release(test_task); } static void test_CreateTrigger(void) { - BOOL setup; + ITask *test_task; HRESULT hres; WORD trigger_index; ITaskTrigger *test_trigger; - setup = setup_task(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hres = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hres == S_OK, "Failed to setup test_task\n"); hres = ITask_CreateTrigger(test_task, &trigger_index, &test_trigger); ok(hres == S_OK, "Failed to create trigger: 0x%08x\n", hres); - if (hres != S_OK) - { - cleanup_task(); - return; - } ITaskTrigger_Release(test_trigger); - cleanup_task(); - return; + ITask_Release(test_task); } static void test_SetParameters_GetParameters(void) { - BOOL setup; + ITask *test_task; HRESULT hres; LPWSTR parameters; const WCHAR parameters_a[] = {'f','o','o','.','t','x','t', 0}; const WCHAR parameters_b[] = {'f','o','o','.','t','x','t',' ', 'b','a','r','.','t','x','t', 0}; - setup = setup_task(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hres = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hres == S_OK, "Failed to setup test_task\n"); /* Get parameters before setting them */ hres = ITask_GetParameters(test_task, &parameters); @@ -274,26 +230,21 @@ static void test_SetParameters_GetParameters(void) CoTaskMemFree(parameters); } - cleanup_task(); - return; + ITask_Release(test_task); } static void test_SetComment_GetComment(void) { - BOOL setup; + ITask *test_task; HRESULT hres; LPWSTR comment; const WCHAR comment_a[] = {'C','o','m','m','e','n','t','.', 0}; const WCHAR comment_b[] = {'L','o','n','g','e','r',' ', 'c','o','m','m','e','n','t','.', 0}; - setup = setup_task(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hres = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hres == S_OK, "Failed to setup test_task\n"); /* Get comment before setting it*/ hres = ITask_GetComment(test_task, &comment); @@ -344,23 +295,18 @@ static void test_SetComment_GetComment(void) CoTaskMemFree(comment); } - cleanup_task(); - return; + ITask_Release(test_task); } static void test_SetMaxRunTime_GetMaxRunTime(void) { - BOOL setup; + ITask *test_task; HRESULT hres; DWORD max_run_time; - setup = setup_task(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hres = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hres == S_OK, "Failed to setup test_task\n"); /* Default time is 3 days: * 3 days * 24 hours * 60 minutes * 60 seconds * 1000 ms = 259200000 */ @@ -401,13 +347,12 @@ static void test_SetMaxRunTime_GetMaxRunTime(void) ok(hres == S_OK, "Failed to get max runtime: 0x%08x\n", hres); ok(max_run_time == INFINITE, "Expected INFINITE: %d\n", max_run_time); - cleanup_task(); - return; + ITask_Release(test_task); } static void test_SetAccountInformation_GetAccountInformation(void) { - BOOL setup; + ITask *test_task; HRESULT hres; LPWSTR account_name; const WCHAR dummy_account_name[] = {'N', 'o', 'S', 'u', 'c', 'h', @@ -415,13 +360,9 @@ static void test_SetAccountInformation_GetAccountInformation(void) const WCHAR dummy_account_name_b[] = {'N', 'o', 'S', 'u', 'c', 'h', 'A', 'c', 'c', 'o', 'u', 'n', 't', 'B', 0}; - setup = setup_task(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hres = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hres == S_OK, "Failed to setup test_task\n"); /* Get account information before it is set */ hres = ITask_GetAccountInformation(test_task, &account_name); @@ -431,8 +372,7 @@ static void test_SetAccountInformation_GetAccountInformation(void) if (hres == SCHED_E_NO_SECURITY_SERVICES || hres == SCHED_E_SERVICE_NOT_RUNNING) { win_skip("Security services are not supported\n"); - cleanup_task(); - return; + ITask_Release(test_task); } ok(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hres == SCHED_E_CANNOT_OPEN_TASK, @@ -493,25 +433,20 @@ static void test_SetAccountInformation_GetAccountInformation(void) CoTaskMemFree(account_name); } - cleanup_task(); - return; + ITask_Release(test_task); } static void test_task_state(void) { - BOOL setup; + ITask *test_task; HRESULT hr, status; DWORD flags, val; WORD val1, val2; SYSTEMTIME st; - setup = setup_task(); - ok(setup, "Failed to setup test_task\n"); - if (!setup) - { - skip("Failed to create task. Skipping tests.\n"); - return; - } + hr = ITaskScheduler_NewWorkItem(scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&test_task); + ok(hr == S_OK, "Failed to setup test_task\n"); if (0) /* crashes under Windows */ hr = ITask_GetFlags(test_task, NULL); @@ -588,7 +523,7 @@ static void test_task_state(void) ok(st.wMinute == 0, "got %u\n", st.wMinute); ok(st.wSecond == 0, "got %u\n", st.wSecond); - cleanup_task(); + ITask_Release(test_task); } static void save_job(ITask *task) @@ -609,7 +544,6 @@ static void test_Run(void) { static const WCHAR wine_test_runW[] = { 'w','i','n','e','_','t','e','s','t','_','r','u','n',0 }; static const WCHAR cmdW[] = { 'c','m','d','.','e','x','e',0 }; - ITaskScheduler *scheduler; ITask *task; ITaskTrigger *trigger; WORD idx, i; @@ -617,10 +551,6 @@ static void test_Run(void) SYSTEMTIME st; HRESULT hr, status; - hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, - &IID_ITaskScheduler, (void **)&scheduler); - ok(hr == S_OK, "got %#x\n", hr); - /* cleanup after previous runs */ ITaskScheduler_Delete(scheduler, wine_test_runW); @@ -751,12 +681,17 @@ static void test_Run(void) hr = ITaskScheduler_Delete(scheduler, wine_test_runW); ok(hr == S_OK, "got %#x\n", hr); - ITaskScheduler_Release(scheduler); } START_TEST(task) { + HRESULT hr; + CoInitialize(NULL); + hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskScheduler, (void **)&scheduler); + ok(hr == S_OK, "failed to create task scheduler: %#x\n", hr); + test_SetApplicationName_GetApplicationName(); test_CreateTrigger(); test_SetParameters_GetParameters(); @@ -765,5 +700,7 @@ START_TEST(task) test_SetAccountInformation_GetAccountInformation(); test_task_state(); test_Run(); + + ITaskScheduler_Release(scheduler); CoUninitialize(); } -- 2.16.3

1 0

[PATCH] gdi32/tests: Check array index limit first.
by Andrey Gusev May 14, 2018

May 14, 2018

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/gdi32/tests/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 6243a6d339..2b214a07aa 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -202,7 +202,7 @@ static void check_font(const char* test, const LOGFONTA* lf, HFONT hfont) ret = GetObjectA(hfont, sizeof(getobj_lf), &getobj_lf); /* NT4 tries to be clever and only returns the minimum length */ - while (lf->lfFaceName[minlen] && minlen < LF_FACESIZE-1) + while (minlen < LF_FACESIZE-1 && lf->lfFaceName[minlen]) minlen++; minlen += FIELD_OFFSET(LOGFONTA, lfFaceName) + 1; ok(ret == sizeof(LOGFONTA) || ret == minlen, "%s: GetObject returned %d\n", test, ret); -- 2.14.3

3 2

[PATCH] Add PLATFORM_OPENBSD to winebuild.
by Daniel Dickman May 14, 2018

May 14, 2018

--- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 2 ++ tools/winebuild/utils.c | 3 +++ 3 files changed, 6 insertions(+) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 90e8e34e44..9596743406 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -150,6 +150,7 @@ enum target_platform PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_FREEBSD, + PLATFORM_OPENBSD, PLATFORM_SOLARIS, PLATFORM_WINDOWS }; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index f4656f9051..1188bf89fd 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -65,6 +65,8 @@ enum target_cpu target_cpu = CPU_ARM64; enum target_platform target_platform = PLATFORM_APPLE; #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) enum target_platform target_platform = PLATFORM_FREEBSD; +#elif defined(__OpenBSD__) +enum target_platform target_platform = PLATFORM_OPENBSD; #elif defined(__sun) enum target_platform target_platform = PLATFORM_SOLARIS; #elif defined(_WIN32) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 6e01f1a526..bcebdc08ad 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -445,6 +445,9 @@ struct strarray get_ld_command(void) case PLATFORM_FREEBSD: strarray_add( &args, "-m", (force_pointer_size == 8) ? "elf_x86_64_fbsd" : "elf_i386_fbsd", NULL ); break; + case PLATFORM_OPENBSD: + strarray_add( &args, "-m", (force_pointer_size == 8) ? "elf_x86_64_obsd" : "elf_i386_obsd", NULL ); + break; default: switch(target_cpu) { -- 2.16.2

1 0

[PATCH] secur32: Set output buffer size to zero during handshake when no data needs to be sent.
by Alistair Leslie-Hughes May 13, 2018

May 13, 2018

From: Michael Müller <michael(a)fds-team.de> Fixes: https://bugs.winehq.org/show_bug.cgi?id=40271 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/secur32/schannel.c | 19 ++++++++++++------- dlls/secur32/tests/schannel.c | 10 ++++++++-- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 90b9782..f0d271e 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -901,6 +901,18 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( /* Perform the TLS handshake */ ret = schan_imp_handshake(ctx->session); + out_buffers = &ctx->transport.out; + if (out_buffers->current_buffer_idx != -1) + { + SecBuffer *buffer = &out_buffers->desc->pBuffers[out_buffers->current_buffer_idx]; + buffer->cbBuffer = out_buffers->offset; + } + else if (out_buffers->desc && out_buffers->desc->cBuffers > 0) + { + SecBuffer *buffer = &out_buffers->desc->pBuffers[0]; + buffer->cbBuffer = 0; + } + if(ctx->transport.in.offset && ctx->transport.in.offset != pInput->pBuffers[0].cbBuffer) { if(pInput->cBuffers<2 || pInput->pBuffers[1].BufferType!=SECBUFFER_EMPTY) return SEC_E_INVALID_TOKEN; @@ -909,13 +921,6 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( pInput->pBuffers[1].cbBuffer = pInput->pBuffers[0].cbBuffer-ctx->transport.in.offset; } - out_buffers = &ctx->transport.out; - if (out_buffers->current_buffer_idx != -1) - { - SecBuffer *buffer = &out_buffers->desc->pBuffers[out_buffers->current_buffer_idx]; - buffer->cbBuffer = out_buffers->offset; - } - *pfContextAttr = 0; if (ctx->req_ctx_attr & ISC_REQ_REPLAY_DETECT) *pfContextAttr |= ISC_RET_REPLAY_DETECT; diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 21ebb62..1a37c52 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -772,7 +772,6 @@ todo_wine ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status); -todo_wine ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); buffers[0].pBuffers[0].cbBuffer = 0; @@ -782,9 +781,15 @@ todo_wine todo_wine ok(status == SEC_E_INSUFFICIENT_MEMORY || status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INSUFFICIENT_MEMORY or SEC_E_INVALID_TOKEN, got %08x\n", status); + ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); - buffers[0].pBuffers[0].cbBuffer = buf_size; + status = InitializeSecurityContextA(&cred_handle, NULL, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, NULL, 0, &context, NULL, &attrs, NULL); +todo_wine + ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status); + buffers[0].pBuffers[0].cbBuffer = buf_size; status = InitializeSecurityContextA(&cred_handle, NULL, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, NULL, 0, &context, &buffers[0], &attrs, NULL); @@ -859,6 +864,7 @@ todo_wine buffers[1].pBuffers[0].cbBuffer = buf_size; } + ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); ok(status == SEC_E_OK || broken(status == SEC_E_INVALID_TOKEN) /* WinNT */, "InitializeSecurityContext failed: %08x\n", status); if(status != SEC_E_OK) { -- 1.9.1

1 0

[PATCH] shell32: Choose return value for SHFileOperationA depending on windows version
by Alistair Leslie-Hughes May 13, 2018

May 13, 2018

Fixes: https://bugs.winehq.org/show_bug.cgi?id=37916 Based off patch by Michael Müller. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shlfileop.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 4507b72..c7bd54d 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -882,6 +882,10 @@ int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp) if (ForFree) { retCode = SHFileOperationW(&nFileOp); + /* Windows 95/98 returns S_OK for this case. */ + if (retCode == ERROR_ACCESS_DENIED && (GetVersion() & 0x80000000)) + retCode = S_OK; + heap_free(ForFree); /* we cannot use wString, it was changed */ break; } -- 1.9.1

1 0

[PATCH] po: Update Czech translation
by AsciiWolf May 13, 2018

May 13, 2018

Hello, I have updated the Czech translation. The last time it was updated was in 2013. Feel free to merge this patch. Regards, Daniel Rusek

2 2

[PATCH v2 1/2] mp3dmod/tests: Add some tests for decoding.
by Zebediah Figura May 13, 2018

May 13, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure | 1 + configure.ac | 1 + dlls/mp3dmod/tests/Makefile.in | 5 + dlls/mp3dmod/tests/mp3dmod.c | 233 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 240 insertions(+) create mode 100644 dlls/mp3dmod/tests/Makefile.in create mode 100644 dlls/mp3dmod/tests/mp3dmod.c diff --git a/configure b/configure index dbe5cd5..25ccf4c 100755 --- a/configure +++ b/configure @@ -18808,6 +18808,7 @@ wine_fn_config_makefile dlls/monodebg.vxd enable_win16 wine_fn_config_makefile dlls/mountmgr.sys enable_mountmgr_sys wine_fn_config_makefile dlls/mouse.drv16 enable_win16 wine_fn_config_makefile dlls/mp3dmod enable_mp3dmod +wine_fn_config_makefile dlls/mp3dmod/tests enable_tests wine_fn_config_makefile dlls/mpr enable_mpr wine_fn_config_makefile dlls/mpr/tests enable_tests wine_fn_config_makefile dlls/mprapi enable_mprapi diff --git a/configure.ac b/configure.ac index 2c4e05a..05c1cd0 100644 --- a/configure.ac +++ b/configure.ac @@ -3402,6 +3402,7 @@ WINE_CONFIG_MAKEFILE(dlls/monodebg.vxd,enable_win16) WINE_CONFIG_MAKEFILE(dlls/mountmgr.sys) WINE_CONFIG_MAKEFILE(dlls/mouse.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/mp3dmod) +WINE_CONFIG_MAKEFILE(dlls/mp3dmod/tests) WINE_CONFIG_MAKEFILE(dlls/mpr) WINE_CONFIG_MAKEFILE(dlls/mpr/tests) WINE_CONFIG_MAKEFILE(dlls/mprapi) diff --git a/dlls/mp3dmod/tests/Makefile.in b/dlls/mp3dmod/tests/Makefile.in new file mode 100644 index 0000000..3cbe4fe --- /dev/null +++ b/dlls/mp3dmod/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = mp3dmod.dll +IMPORTS = dmoguids ole32 strmiids uuid wmcodecdspuuid + +C_SRCS = \ + mp3dmod.c diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c new file mode 100644 index 0000000..966c991 --- /dev/null +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -0,0 +1,233 @@ +/* + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "windef.h" +#include "wingdi.h" +#include "mmreg.h" +#include "mmsystem.h" +#include "mediaerr.h" +#include "wmcodecdsp.h" +#include "uuids.h" +#include "wine/test.h" + +#include "initguid.h" +DEFINE_GUID(WMMEDIASUBTYPE_MP3, 0x00000055, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + +/* shorter aliases for flags */ +#define O_SYNCPOINT DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT +#define O_TIME DMO_OUTPUT_DATA_BUFFERF_TIME +#define O_TIMELENGTH DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH +#define O_INCOMPLETE DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE + +struct test_buffer { + IMediaBuffer IMediaBuffer_iface; + BYTE data[5000]; + DWORD len; + DWORD maxlen; +}; + +static inline struct test_buffer *impl_from_IMediaBuffer(IMediaBuffer *iface) +{ + return CONTAINING_RECORD(iface, struct test_buffer, IMediaBuffer_iface); +} + +static HRESULT WINAPI Buffer_QueryInterface(IMediaBuffer *iface, REFIID iid, void **obj) +{ + if (IsEqualIID(iid, &IID_IMediaBuffer) || IsEqualIID(iid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + ok(0, "Unexpected IID %s\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI Buffer_AddRef(IMediaBuffer *iface) +{ + return 2; +} + +static ULONG WINAPI Buffer_Release(IMediaBuffer *iface) +{ + return 1; +} + +static HRESULT WINAPI Buffer_SetLength(IMediaBuffer *iface, DWORD len) +{ + struct test_buffer *This = impl_from_IMediaBuffer(iface); + This->len = len; + return S_OK; +} + +static HRESULT WINAPI Buffer_GetMaxLength(IMediaBuffer *iface, DWORD *len) +{ + struct test_buffer *This = impl_from_IMediaBuffer(iface); + *len = This->maxlen; + return S_OK; +} + +static HRESULT WINAPI Buffer_GetBufferAndLength(IMediaBuffer *iface, BYTE **buf, DWORD *len) +{ + struct test_buffer *This = impl_from_IMediaBuffer(iface); + if (buf) *buf = This->data; + if (len) *len = This->len; + return S_OK; +} + +static IMediaBufferVtbl Buffer_vtbl = { + Buffer_QueryInterface, + Buffer_AddRef, + Buffer_Release, + Buffer_SetLength, + Buffer_GetMaxLength, + Buffer_GetBufferAndLength, +}; + +static void test_convert(void) +{ + static const BYTE mp3hdr[] = {0xff,0xfb,0x14,0xc4}; + struct test_buffer outbuf = {{&Buffer_vtbl}}; + struct test_buffer inbuf = {{&Buffer_vtbl}}; + DMO_MEDIA_TYPE in = {0}, out = {0}; + MPEGLAYER3WAVEFORMAT mp3fmt = {0}; + DMO_OUTPUT_DATA_BUFFER output; + WAVEFORMATEX wavfmt = {0}; + IMediaObject *dmo; + DWORD written; + DWORD status; + HRESULT hr; + int i; + + hr = CoCreateInstance(&CLSID_CMP3DecMediaObject, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaObject, (void **)&dmo); + ok(hr == S_OK, "got %#x\n", hr); + + mp3fmt.wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3; + mp3fmt.wfx.nChannels = 2; + mp3fmt.wfx.nSamplesPerSec = 48000; + in.majortype = MEDIATYPE_Audio; + in.subtype = WMMEDIASUBTYPE_MP3; + in.formattype = FORMAT_WaveFormatEx; + in.cbFormat = sizeof(mp3fmt); + in.pbFormat = (BYTE *)&mp3fmt; + + hr = IMediaObject_SetInputType(dmo, 0, &in, 0); + ok(hr == S_OK, "got %#x\n", hr); + + wavfmt.wFormatTag = WAVE_FORMAT_PCM; + wavfmt.nChannels = 1; + wavfmt.nSamplesPerSec = 48000; + wavfmt.nAvgBytesPerSec = 48000 * ((1 * 8) / 8); + wavfmt.nBlockAlign = (1 * 8) / 8; + wavfmt.wBitsPerSample = 8; + out.majortype = MEDIATYPE_Audio; + out.subtype = MEDIASUBTYPE_PCM; + out.formattype = FORMAT_WaveFormatEx; + out.cbFormat = sizeof(wavfmt); + out.pbFormat = (BYTE *)&wavfmt; + + hr = IMediaObject_SetOutputType(dmo, 0, &out, 0); + ok(hr == S_OK, "got %#x\n", hr); + + outbuf.len = 0; + outbuf.maxlen = sizeof(outbuf.data); + output.pBuffer = &outbuf.IMediaBuffer_iface; + output.dwStatus = 0xdeadbeef; + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_FALSE, "got %#x\n", hr); + ok(outbuf.len == 0, "got %u\n", outbuf.len); + ok(output.dwStatus == 0, "got %#x\n", output.dwStatus); + + /* write several frames of mp3 data */ + for (i = 0; i < 5; i++) + memcpy(inbuf.data + 96 * i, mp3hdr, 4); + inbuf.len = 96 * 5; + hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); + ok(hr == DMO_E_NOTACCEPTING, "got %#x\n", hr); + + outbuf.len = 0; + outbuf.maxlen = 0; + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_FALSE, "got %#x\n", hr); + ok(outbuf.len == 0, "got %u\n", outbuf.len); + ok(output.dwStatus == (O_SYNCPOINT | O_INCOMPLETE), "got %#x\n", output.dwStatus); + + /* implementations are inconsistent, but should write at least one frame of data */ + outbuf.len = 0; + outbuf.maxlen = 5000; + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_OK, "got %#x\n", hr); + written = outbuf.len; + ok(written > 1152 && written <= 5000, "got %u\n", written); +todo_wine + ok(output.dwStatus == (O_SYNCPOINT | O_TIME | O_TIMELENGTH | O_INCOMPLETE), + "got %#x\n", output.dwStatus); + + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_FALSE, "got %#x\n", hr); + ok(outbuf.len == written, "expected %u, got %u\n", written, outbuf.len); + ok(output.dwStatus == (O_SYNCPOINT | O_INCOMPLETE), "got %#x\n", output.dwStatus); + + hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); + ok(hr == DMO_E_NOTACCEPTING, "got %#x\n", hr); + + /* write the rest */ + outbuf.len = 0; + outbuf.maxlen = 5000; + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_OK, "got %#x\n", hr); + ok(written + outbuf.len == (1152 * 5) || + broken(written + outbuf.len == (1152 * 5) - 528), /* Win10 */ + "got %u, total %u\n", outbuf.len, written + outbuf.len); +todo_wine + ok(output.dwStatus == (O_SYNCPOINT | O_TIME | O_TIMELENGTH), "got %#x\n", output.dwStatus); + + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_FALSE, "got %#x\n", hr); + ok(output.dwStatus == 0, "got %#x\n", output.dwStatus); + + hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); + ok(hr == S_OK, "got %#x\n", hr); + + IMediaObject_Release(dmo); +} + +START_TEST(mp3dmod) +{ + IMediaObject *dmo; + HRESULT hr; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + hr = CoCreateInstance(&CLSID_CMP3DecMediaObject, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaObject, (void **)&dmo); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("CLSID_CMP3DecMediaObject not available\n"); + return; + } + IMediaObject_Release(dmo); + + test_convert(); + + CoUninitialize(); +} -- 2.7.4

1 1