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

Dmitry Timoshkov : mstask: When writing triggers access the trigger data directly to avoid noise in the traces.
by Alexandre Julliard 15 May '18

15 May '18

Module: wine Branch: master Commit: 8622493dd3b6086206fdcb764d6c3b9085e84e18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8622493dd3b6086206fdcb76… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 15 16:26:50 2018 +0800 mstask: When writing triggers access the trigger data directly to avoid noise in the traces. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 5129d9a..4bf9166 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1311,46 +1311,41 @@ static BOOL write_user_data(HANDLE hfile, BYTE *data, WORD data_size) return WriteFile(hfile, data, data_size, &size, NULL); } -static HRESULT write_triggers(ITask *task, HANDLE hfile) +static HRESULT write_triggers(TaskImpl *This, HANDLE hfile) { WORD count, i, idx = 0xffff; DWORD size; - HRESULT hr; + HRESULT hr = S_OK; ITaskTrigger *trigger; - hr = ITask_GetTriggerCount(task, &count); - if (hr != S_OK) return hr; + count = This->trigger_count; /* Windows saves a .job with at least 1 trigger */ if (!count) { - hr = ITask_CreateTrigger(task, &idx, &trigger); + hr = ITask_CreateTrigger(&This->ITask_iface, &idx, &trigger); if (hr != S_OK) return hr; ITaskTrigger_Release(trigger); count = 1; } - if (!WriteFile(hfile, &count, sizeof(count), &size, NULL)) - return HRESULT_FROM_WIN32(GetLastError()); - - for (i = 0; i < count; i++) + if (WriteFile(hfile, &count, sizeof(count), &size, NULL)) { - TASK_TRIGGER task_trigger; - - hr = ITask_GetTrigger(task, i, &trigger); - if (hr != S_OK) return hr; - - hr = ITaskTrigger_GetTrigger(trigger, &task_trigger); - ITaskTrigger_Release(trigger); - if (hr != S_OK) break; - - if (!WriteFile(hfile, &task_trigger, sizeof(task_trigger), &size, NULL)) - return HRESULT_FROM_WIN32(GetLastError()); + for (i = 0; i < count; i++) + { + if (!WriteFile(hfile, &This->trigger[i], sizeof(This->trigger[0]), &size, NULL)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + break; + } + } } + else + hr = HRESULT_FROM_WIN32(GetLastError()); if (idx != 0xffff) - ITask_DeleteTrigger(task, idx); + ITask_DeleteTrigger(&This->ITask_iface, idx); return hr; } @@ -1508,7 +1503,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta } /* Triggers */ - hr = write_triggers(task, hfile); + hr = write_triggers(This, hfile); if (hr != S_OK) goto failed;

1 0

Dmitry Timoshkov : mstask: Implement ITask::GetExitCode().
by Alexandre Julliard 15 May '18

15 May '18

Module: wine Branch: master Commit: 47f3dd05650c81fca53308a53646c23302a94383 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47f3dd05650c81fca53308a5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 15 16:26:52 2018 +0800 mstask: Implement ITask::GetExitCode(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 4bf9166..d487aeb 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -59,10 +59,9 @@ typedef struct ITaskDefinition *task; IExecAction *action; LPWSTR task_name; - UINT flags; HRESULT status; WORD idle_minutes, deadline_minutes; - DWORD priority, maxRunTime; + DWORD flags, priority, maxRunTime, exit_code; LPWSTR accountName; DWORD trigger_count; TASK_TRIGGER *trigger; @@ -492,10 +491,12 @@ static HRESULT WINAPI MSTASK_ITask_GetStatus(ITask *iface, HRESULT *status) static HRESULT WINAPI MSTASK_ITask_GetExitCode(ITask *iface, DWORD *exit_code) { - FIXME("(%p, %p): stub\n", iface, exit_code); + TaskImpl *This = impl_from_ITask(iface); - *exit_code = 0; - return SCHED_S_TASK_HAS_NOT_RUN; + TRACE("(%p, %p)\n", iface, exit_code); + + *exit_code = This->exit_code; + return SCHED_S_TASK_HAS_NOT_RUN; /* FIXME */ } static HRESULT WINAPI MSTASK_ITask_SetComment(ITask *iface, LPCWSTR comment) @@ -1073,6 +1074,7 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) TRACE("maximum_runtime %u\n", fixed->maximum_runtime); This->maxRunTime = fixed->maximum_runtime; TRACE("exit_code %#x\n", fixed->exit_code); + This->exit_code = fixed->exit_code; TRACE("status %08x\n", fixed->status); This->status = fixed->status; TRACE("flags %08x\n", fixed->flags); @@ -1428,7 +1430,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta fixed.idle_deadline = This->deadline_minutes; fixed.priority = This->priority; fixed.maximum_runtime = This->maxRunTime; - fixed.exit_code = 0; + fixed.exit_code = This->exit_code; if (This->status == SCHED_S_TASK_NOT_SCHEDULED && This->trigger_count) This->status = SCHED_S_TASK_HAS_NOT_RUN; fixed.status = This->status; @@ -1656,6 +1658,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->task_name = heap_strdupW(task_name); This->flags = 0; This->status = SCHED_S_TASK_NOT_SCHEDULED; + This->exit_code = 0; This->idle_minutes = 10; This->deadline_minutes = 60; This->priority = NORMAL_PRIORITY_CLASS;

1 0

Huw Davies : user32: Simplify CheckMenuRadioItem().
by Alexandre Julliard 15 May '18

15 May '18

Module: wine Branch: master Commit: 5fefb108c4ce84625dbd647da37c709cfd2ec2ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fefb108c4ce84625dbd647d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 15 09:36:02 2018 +0100 user32: Simplify CheckMenuRadioItem(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 5b83703..8c541cc 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -5253,27 +5253,19 @@ BOOL WINAPI InsertMenuItemW(HMENU hMenu, UINT uItem, BOOL bypos, BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, UINT first, UINT last, UINT check, UINT flags) { - POPUPMENU *first_menu = NULL, *check_menu = NULL; - UINT i, first_pos, check_pos; + POPUPMENU *first_menu = NULL, *check_menu; + UINT i, check_pos; BOOL done = FALSE; for (i = first; i <= last; i++) { MENUITEM *item; - if (!first_menu) - { - if (!(first_menu = find_menu_item(hMenu, i, flags, &first_pos))) - continue; + if (!(check_menu = find_menu_item(hMenu, i, flags, &check_pos))) + continue; - check_pos = first_pos; - check_menu = grab_menu_ptr(first_menu->obj.handle); - } - else - { - if (!(check_menu = find_menu_item(hMenu, i, flags, &check_pos))) - continue; - } + if (!first_menu) + first_menu = grab_menu_ptr(check_menu->obj.handle); if (first_menu != check_menu) {

1 0

Zebediah Figura : msi/tests: More accurately calculate estimated size.
by Alexandre Julliard 15 May '18

15 May '18

Module: wine Branch: master Commit: 40b211b6c2d61effba333cb64fb30289d3a18ee1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40b211b6c2d61effba333cb6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 14 10:01:30 2018 -0500 msi/tests: More accurately calculate estimated size. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 113 +++++++++++------------------------------------- 1 file changed, 26 insertions(+), 87 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 8e72ff4..849975d 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2321,45 +2321,6 @@ static void check_reg_dword(HKEY prodkey, LPCSTR name, DWORD expected, DWORD lin ok_(__FILE__, line)(val == expected, "Expected %d, got %d\n", expected, val); } -static void check_reg_dword4(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, - DWORD expected4, DWORD line) -{ - DWORD val, size, type; - LONG res; - - size = sizeof(DWORD); - res = RegQueryValueExA(prodkey, name, NULL, &type, (LPBYTE)&val, &size); - - if (res != ERROR_SUCCESS || type != REG_DWORD) - { - ok_(__FILE__, line)(FALSE, "Key doesn't exist or wrong type\n"); - return; - } - - ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3 || val == expected4, - "Expected %d, %d, %d or %d, got %d\n", expected1, expected2, expected3, expected4, val); -} - -static void check_reg_dword5(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, - DWORD expected4, DWORD expected5, DWORD line) -{ - DWORD val, size, type; - LONG res; - - size = sizeof(DWORD); - res = RegQueryValueExA(prodkey, name, NULL, &type, (LPBYTE)&val, &size); - - if (res != ERROR_SUCCESS || type != REG_DWORD) - { - ok_(__FILE__, line)(FALSE, "Key doesn't exist or wrong type\n"); - return; - } - - ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3 || val == expected4 || - val == expected5, - "Expected %d, %d, %d, %d or %d, got %d\n", expected1, expected2, expected3, expected4, expected5, val); -} - #define CHECK_REG_STR(prodkey, name, expected) \ check_reg_str(prodkey, name, expected, TRUE, __LINE__); @@ -2387,24 +2348,6 @@ static void check_reg_dword5(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD e RegDeleteValueA(prodkey, name); \ } while(0) -#define CHECK_REG_DWORD2(prodkey, name, expected1, expected2) \ - check_reg_dword2(prodkey, name, expected1, expected2, __LINE__); - -#define CHECK_DEL_REG_DWORD2(prodkey, name, expected1, expected2) \ - do { \ - check_reg_dword2(prodkey, name, expected1, expected2, __LINE__); \ - RegDeleteValueA(prodkey, name); \ - } while(0) - -#define CHECK_REG_DWORD4(prodkey, name, expected1, expected2, expected3, expected4) \ - check_reg_dword4(prodkey, name, expected1, expected2, expected3, expected4, __LINE__); - -#define CHECK_DEL_REG_DWORD5(prodkey, name, expected1, expected2, expected3, expected4 ,expected5) \ - do { \ - check_reg_dword5(prodkey, name, expected1, expected2, expected3, expected4, expected5, __LINE__); \ - RegDeleteValueA(prodkey, name); \ - } while(0) - static void get_date_str(LPSTR date) { SYSTEMTIME systime; @@ -2414,6 +2357,22 @@ static void get_date_str(LPSTR date) sprintf(date, date_fmt, systime.wYear, systime.wMonth, systime.wDay); } +/* EstimatedSize is the size in KiB of .msi + installed files, rounded up to page size. */ +static DWORD get_estimated_size(void) +{ + SYSTEM_INFO si; + HANDLE file; + DWORD size; + + GetSystemInfo(&si); + + file = CreateFileA(msifile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + size = ((GetFileSize(file, NULL) + si.dwPageSize - 1) / si.dwPageSize + 1); + size = size * si.dwPageSize / 1024; + CloseHandle(file); + return size; +} + static void test_register_product(void) { UINT r; @@ -2505,9 +2464,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(hkey, "VersionMinor", 1); CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1); todo_wine - { - CHECK_DEL_REG_DWORD5(hkey, "EstimatedSize", 12, -12, 4, 10, 24); - } + CHECK_DEL_REG_DWORD(hkey, "EstimatedSize", get_estimated_size()); delete_key(hkey, "", access); RegCloseKey(hkey); @@ -2547,9 +2504,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(props, "VersionMinor", 1); CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1); todo_wine - { - CHECK_DEL_REG_DWORD5(props, "EstimatedSize", 12, -12, 4, 10, 24); - } + CHECK_DEL_REG_DWORD(props, "EstimatedSize", get_estimated_size()); delete_key(props, "", access); RegCloseKey(props); @@ -2616,9 +2571,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(hkey, "VersionMinor", 1); CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1); todo_wine - { - CHECK_DEL_REG_DWORD5(hkey, "EstimatedSize", 12, -12, 4, 10, 24); - } + CHECK_DEL_REG_DWORD(hkey, "EstimatedSize", get_estimated_size()); delete_key(hkey, "", access); RegCloseKey(hkey); @@ -2658,9 +2611,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(props, "VersionMinor", 1); CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1); todo_wine - { - CHECK_DEL_REG_DWORD5(props, "EstimatedSize", 12, -12, 4, 10, 24); - } + CHECK_DEL_REG_DWORD(props, "EstimatedSize", get_estimated_size()); delete_key(props, "", access); RegCloseKey(props); @@ -3525,9 +3476,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); @@ -3631,9 +3580,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); @@ -3714,9 +3661,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); @@ -3774,9 +3719,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); @@ -3834,9 +3777,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -20, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); @@ -3917,9 +3858,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey);

1 0

Andrey Gusev : shell32: Check array index limit first.
by Alexandre Julliard 15 May '18

15 May '18

Module: wine Branch: master Commit: 0dddf2a1ac2151f0e3369de918d041bd83cd601d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dddf2a1ac2151f0e3369de9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 14 14:20:35 2018 +0300 shell32: Check array index limit first. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelllink.c | 2 +- dlls/shell32/xdg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 07c83d1..0380ac9 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -613,7 +613,7 @@ static LPWSTR Stream_LoadPath( LPCSTR p, DWORD maxlen ) int len = 0, wlen; LPWSTR path; - while( p[len] && (len < maxlen) ) + while( (len < maxlen) && p[len] ) len++; wlen = MultiByteToWideChar(CP_ACP, 0, p, len, NULL, 0); diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index 622ef34..781902a 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -341,7 +341,7 @@ static int dskentry_decode(const char *value, int len, char *output) while (pos<len) { char c; - if (value[pos] == '\\' && pos<len-1) + if (pos<len-1 && value[pos] == '\\') { pos++; switch (value[pos])

1 0

Michael Müller : secur32: Set output buffer size to zero during handshake when no data needs to be sent.
by Alexandre Julliard 15 May '18

15 May '18

Module: wine Branch: master Commit: 4ece6abdb58c39f6100e8e11c725488b5aad2b10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ece6abdb58c39f6100e8e11… Author: Michael Müller <michael(a)fds-team.de> Date: Mon May 14 04:52:04 2018 +0000 secur32: Set output buffer size to zero during handshake when no data needs to be sent. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 0

Alexandre Julliard : winecfg: Constrain DPI values to the commonly supported ones.
by Alexandre Julliard 15 May '18

15 May '18

Module: wine Branch: master Commit: 7d7eee09b570b10988a85a3d7e48b37ba4c5d9b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d7eee09b570b10988a85a3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 15 12:37:28 2018 +0200 winecfg: Constrain DPI values to the commonly supported ones. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/winecfg.h | 2 ++ programs/winecfg/x11drvdlg.c | 21 ++++++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index 110856a..f2c24a2 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -38,6 +38,8 @@ #define IS_OPTION_FALSE(ch) \ ((ch) == 'n' || (ch) == 'N' || (ch) == 'f' || (ch) == 'F' || (ch) == '0') +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + extern WCHAR* current_app; /* NULL means editing global settings */ /* Use get_reg_key and set_reg_key to alter registry settings. The changes made through diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index 2be6832..fbc6716 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -53,6 +53,7 @@ static const WCHAR explorerW[] = {'E','x','p','l','o','r','e','r',0}; static const WCHAR explorer_desktopsW[] = {'E','x','p','l','o','r','e','r','\\', 'D','e','s','k','t','o','p','s',0}; +static const UINT dpi_values[] = { 96, 120, 144, 168, 192, 216, 240, 288, 336, 384, 432, 480 }; static BOOL updating_ui; @@ -258,6 +259,15 @@ static void init_dpi_editbox(HWND hDlg) updating_ui = FALSE; } +static int get_trackbar_pos( UINT dpi ) +{ + UINT i; + + for (i = 0; i < ARRAY_SIZE(dpi_values) - 1; i++) + if ((dpi_values[i] + dpi_values[i + 1]) / 2 >= dpi) break; + return i; +} + static void init_trackbar(HWND hDlg) { HWND hTrackBar = GetDlgItem(hDlg, IDC_RES_TRACKBAR); @@ -267,8 +277,9 @@ static void init_trackbar(HWND hDlg) dwLogpixels = read_logpixels_reg(); - SendMessageW(hTrackBar, TBM_SETRANGE, TRUE, MAKELONG(MINDPI, MAXDPI)); - SendMessageW(hTrackBar, TBM_SETPOS, TRUE, dwLogpixels); + SendMessageW(hTrackBar, TBM_SETRANGE, TRUE, MAKELONG(0, ARRAY_SIZE(dpi_values)-1)); + SendMessageW(hTrackBar, TBM_SETPAGESIZE, 0, 1); + SendMessageW(hTrackBar, TBM_SETPOS, TRUE, get_trackbar_pos(dwLogpixels)); updating_ui = FALSE; } @@ -297,7 +308,7 @@ static void update_dpi_trackbar_from_edit(HWND hDlg, BOOL fix) if (dpi >= MINDPI && dpi <= MAXDPI) { - SendDlgItemMessageW(hDlg, IDC_RES_TRACKBAR, TBM_SETPOS, TRUE, dpi); + SendDlgItemMessageW(hDlg, IDC_RES_TRACKBAR, TBM_SETPOS, TRUE, get_trackbar_pos(dpi)); set_reg_key_dwordW(HKEY_CURRENT_USER, logpixels_reg, logpixels, dpi); } @@ -416,9 +427,9 @@ GraphDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) switch (wParam) { default: { int i = SendMessageW(GetDlgItem(hDlg, IDC_RES_TRACKBAR), TBM_GETPOS, 0, 0); - SetDlgItemInt(hDlg, IDC_RES_DPIEDIT, i, TRUE); + SetDlgItemInt(hDlg, IDC_RES_DPIEDIT, dpi_values[i], TRUE); update_font_preview(hDlg); - set_reg_key_dwordW(HKEY_CURRENT_USER, logpixels_reg, logpixels, i); + set_reg_key_dwordW(HKEY_CURRENT_USER, logpixels_reg, logpixels, dpi_values[i]); break; } }

1 0

Jacek Caban : jscript: Support accessor properties in getOwnPropertyDescriptor.
by Alexandre Julliard 15 May '18

15 May '18

Module: wine Branch: master Commit: d8aa26f660a7fe59272549ca1184094d44e75643 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8aa26f660a7fe59272549ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 15 13:26:10 2018 +0200 jscript: Support accessor properties in getOwnPropertyDescriptor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 9 +++++++++ dlls/mshtml/tests/es5.js | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 4eb3a8b..a1298eb 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1623,6 +1623,15 @@ HRESULT jsdisp_get_own_property(jsdisp_t *obj, const WCHAR *name, BOOL flags_onl return hres; } break; + case PROP_ACCESSOR: + desc->explicit_getter = desc->explicit_setter = TRUE; + if(!flags_only) { + desc->getter = prop->u.accessor.getter + ? jsdisp_addref(prop->u.accessor.getter) : NULL; + desc->setter = prop->u.accessor.setter + ? jsdisp_addref(prop->u.accessor.setter) : NULL; + } + break; default: return DISP_E_UNKNOWNNAME; } diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index d96803a..df5b7c7 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -204,6 +204,19 @@ function test_getOwnPropertyDescriptor() { } function test_defineProperty() { + function test_accessor_prop_desc(obj, prop, orig_desc) { + var expected_enumerable = "enumerable" in orig_desc && !!orig_desc.enumerable; + var expected_configurable = "configurable" in orig_desc && !!orig_desc.configurable; + + var desc = Object.getOwnPropertyDescriptor(obj, prop); + ok(desc.enumerable === expected_enumerable, "desc.enumerable = " + desc.enumerable + + " expected " + expected_enumerable); + ok(desc.configurable === expected_configurable, "desc.configurable = " + desc.configurable + + " expected " + expected_configurable); + ok(desc.get === orig_desc.get, "desc.get = " + desc.get); + ok(desc.set === orig_desc.set, "desc.set = " + desc.set); + } + function expect_exception(func, expected_number) { try { func(); @@ -242,6 +255,7 @@ function test_defineProperty() { } }; Object.defineProperty(obj, "getsetprop", desc); + test_accessor_prop_desc(obj, "getsetprop", desc); Object.defineProperty(obj, "notConf", {writable: true, enumerable: true, configurable: false, value: 1}); test_own_data_prop_desc(obj, "notConf", true, true, false); @@ -304,6 +318,7 @@ function test_defineProperty() { configurable: false }; Object.defineProperty(obj, "notConfAcc", desc); + test_accessor_prop_desc(obj, "notConfAcc", desc); expect_exception(function() { Object.defineProperty(obj, "notConfAcc", {value: 1}); @@ -322,10 +337,13 @@ function test_defineProperty() { }, JS_E_NONCONFIGURABLE_REDEFINED); Object.defineProperty(obj, "notConfAcc", {get: desc.get}); + test_accessor_prop_desc(obj, "notConfAcc", desc); Object.defineProperty(obj, "notConfAcc", {set: desc.set}); + test_accessor_prop_desc(obj, "notConfAcc", desc); Object.defineProperty(obj, "notConfAcc", {configurable: false}); + test_accessor_prop_desc(obj, "notConfAcc", desc); desc = { get: function() { @@ -337,15 +355,18 @@ function test_defineProperty() { configurable: true }; Object.defineProperty(obj, "confAcc", desc); + test_accessor_prop_desc(obj, "confAcc", desc); Object.defineProperty(obj, "confAcc", {writable: 1}); test_own_data_prop_desc(obj, "confAcc", true, false, true); Object.defineProperty(obj, "confAcc", desc); + test_accessor_prop_desc(obj, "confAcc", desc); desc.get = function() {}; desc.set = undefined; Object.defineProperty(obj, "confAcc", desc); + test_accessor_prop_desc(obj, "confAcc", desc); expect_exception(function() { Object.defineProperty(obj, "invaliddesc", {get: undefined, value: 1}); @@ -371,6 +392,7 @@ function test_defineProperty() { ok(Object.getOwnPropertyDescriptor(obj, "parent_accessor") === undefined, "getOwnPropertyDescriptor(parent_accessor) did not return undefined"); + test_accessor_prop_desc(child.prototype, "parent_accessor", desc); next_test(); }

1 0

Jacek Caban : jscript: Support getting value of accessor property.
by Alexandre Julliard 15 May '18

15 May '18

Module: wine Branch: master Commit: fd91fe52b779f91f8e62ebdacc2e52ac358929f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd91fe52b779f91f8e62ebda… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 15 13:26:25 2018 +0200 jscript: Support getting value of accessor property. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 20 ++++++++++++++------ dlls/mshtml/tests/es5.js | 10 ++++++++++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index a1298eb..2557471 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -434,8 +434,14 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, jsval_t *r) { + jsdisp_t *prop_obj = This; HRESULT hres; + while(prop->type == PROP_PROTREF) { + prop_obj = prop_obj->prototype; + prop = prop_obj->props + prop->u.ref; + } + switch(prop->type) { case PROP_BUILTIN: if(prop->u.p->getter) { @@ -456,18 +462,20 @@ static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, jsval_t *r) *r = jsval_obj(obj); } break; - case PROP_PROTREF: - hres = prop_get(This->prototype, This->prototype->props + prop->u.ref, r); - break; case PROP_JSVAL: hres = jsval_copy(prop->u.val, r); break; case PROP_ACCESSOR: - FIXME("not supported on accessor property\n"); - hres = E_NOTIMPL; + if(prop->u.accessor.getter) { + hres = jsdisp_call_value(prop->u.accessor.getter, to_disp(This), + DISPATCH_METHOD, 0, NULL, r); + }else { + *r = jsval_undefined(); + hres = S_OK; + } break; case PROP_IDX: - hres = This->builtin_info->idx_get(This, prop->u.idx, r); + hres = prop_obj->builtin_info->idx_get(prop_obj, prop->u.idx, r); break; default: ERR("type %d\n", prop->type); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index df5b7c7..4e7b83b 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -257,6 +257,8 @@ function test_defineProperty() { Object.defineProperty(obj, "getsetprop", desc); test_accessor_prop_desc(obj, "getsetprop", desc); + ok(obj.getsetprop === 1, "getsetprop = " + obj.getsetprop); + Object.defineProperty(obj, "notConf", {writable: true, enumerable: true, configurable: false, value: 1}); test_own_data_prop_desc(obj, "notConf", true, true, false); @@ -379,9 +381,11 @@ function test_defineProperty() { function child() {} desc = { get: function() { + ok(this === obj, "this != obj"); return getsetprop_value; }, set: function(v) { + ok(this === obj, "this != obj"); getsetprop_value = v; }, configurable: true @@ -389,11 +393,17 @@ function test_defineProperty() { Object.defineProperty(child.prototype, "parent_accessor", desc); obj = new child(); + getsetprop_value = 6; + ok(obj.parent_accessor === 6, "parent_accessor = " + obj.parent_accessor); ok(Object.getOwnPropertyDescriptor(obj, "parent_accessor") === undefined, "getOwnPropertyDescriptor(parent_accessor) did not return undefined"); test_accessor_prop_desc(child.prototype, "parent_accessor", desc); + desc.get = undefined; + Object.defineProperty(child.prototype, "parent_accessor", desc); + ok(obj.parent_accessor === undefined, "parent_accessor = " + obj.parent_accessor); + next_test(); }

1 0

Jacek Caban : jscript: Move handling PROPF_WRITABLE to property type specific code.
by Alexandre Julliard 15 May '18

15 May '18

Module: wine Branch: master Commit: 887840a888d26f1d4cfc554d3e408f81d3858ea2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=887840a888d26f1d4cfc554d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 15 13:26:38 2018 +0200 jscript: Move handling PROPF_WRITABLE to property type specific code. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 2557471..e6835db 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -495,28 +495,34 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) { HRESULT hres; - if(!(prop->flags & PROPF_WRITABLE) && prop->type != PROP_PROTREF) - return S_OK; switch(prop->type) { case PROP_BUILTIN: - if(prop->u.p->setter) - return prop->u.p->setter(This->ctx, This, val); - - if(prop->u.p->setter) { - FIXME("getter with no setter\n"); - return E_FAIL; + if(!prop->u.p->setter) { + TRACE("getter with no setter\n"); + return S_OK; } - /* fall through */ + return prop->u.p->setter(This->ctx, This, val); case PROP_PROTREF: + case PROP_DELETED: prop->type = PROP_JSVAL; prop->flags = PROPF_ENUMERABLE | PROPF_CONFIGURABLE | PROPF_WRITABLE; prop->u.val = jsval_undefined(); break; case PROP_JSVAL: + if(!(prop->flags & PROPF_WRITABLE)) + return S_OK; + jsval_release(prop->u.val); break; + case PROP_ACCESSOR: + FIXME("not supported for accessor properties\n"); + return E_NOTIMPL; case PROP_IDX: + if(!This->builtin_info->idx_put) { + TRACE("no put_idx\n"); + return S_OK; + } return This->builtin_info->idx_put(This, prop->u.idx, val); default: ERR("type %d\n", prop->type);

1 0