April 2020 - Wine-commits - list.winehq.org

Brendan Shanks : dinput8/tests: Test injecting keyboard events.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: f042ba4991a709c973ec5de162a9c79af5d19449 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f042ba4991a709c973ec5de1… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Sun Apr 12 16:40:16 2020 -0700 dinput8/tests: Test injecting keyboard events. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/device.c | 108 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index f3e7b54235..ea5ab75109 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -742,6 +742,113 @@ static void test_mouse_keyboard(void) DestroyWindow(hwnd); } +static void test_keyboard_events(void) +{ + HRESULT hr; + HWND hwnd = INVALID_HANDLE_VALUE; + IDirectInput8A *di; + IDirectInputDevice8A *di_keyboard; + DIPROPDWORD dp; + DIDEVICEOBJECTDATA obj_data[10]; + DWORD data_size; + BYTE kbdata[256]; + + hr = CoCreateInstance(&CLSID_DirectInput8, 0, CLSCTX_INPROC_SERVER, &IID_IDirectInput8A, (LPVOID*)&di); + if (hr == DIERR_OLDDIRECTINPUTVERSION || + hr == DIERR_BETADIRECTINPUTVERSION || + hr == REGDB_E_CLASSNOTREG) + { + win_skip("test_keyboard_events requires dinput8\n"); + return; + } + ok(SUCCEEDED(hr), "DirectInput8Create failed: %08x\n", hr); + + hr = IDirectInput8_Initialize(di, GetModuleHandleA(NULL), DIRECTINPUT_VERSION); + if (hr == DIERR_OLDDIRECTINPUTVERSION || hr == DIERR_BETADIRECTINPUTVERSION) + { + win_skip("test_keyboard_events requires dinput8\n"); + IDirectInput8_Release(di); + return; + } + ok(SUCCEEDED(hr), "IDirectInput8_Initialize failed: %08x\n", hr); + + hwnd = CreateWindowExA(WS_EX_TOPMOST, "static", "dinput", WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowExA failed\n"); + + hr = IDirectInput8_CreateDevice(di, &GUID_SysKeyboard, &di_keyboard, NULL); + ok(SUCCEEDED(hr), "IDirectInput8_CreateDevice failed: %08x\n", hr); + hr = IDirectInputDevice8_SetCooperativeLevel(di_keyboard, hwnd, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE); + ok(SUCCEEDED(hr), "IDirectInput8_SetCooperativeLevel failed: %08x\n", hr); + hr = IDirectInputDevice8_SetDataFormat(di_keyboard, &c_dfDIKeyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice8_SetDataFormat failed: %08x\n", hr); + dp.diph.dwSize = sizeof(DIPROPDWORD); + dp.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dp.diph.dwObj = 0; + dp.diph.dwHow = DIPH_DEVICE; + dp.dwData = ARRAY_SIZE(obj_data); + IDirectInputDevice8_SetProperty(di_keyboard, DIPROP_BUFFERSIZE, &(dp.diph)); + + hr = IDirectInputDevice8_Acquire(di_keyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice8_Acquire failed: %08x\n", hr); + + /* Test injecting keyboard events with both VK and scancode given. */ + keybd_event(VK_SPACE, DIK_SPACE, 0, 0); + flush_events(); + IDirectInputDevice8_Poll(di_keyboard); + data_size = ARRAY_SIZE(obj_data); + hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); + ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); + todo_wine + ok(data_size == 1, "Expected 1 element, received %d\n", data_size); + + hr = IDirectInputDevice8_GetDeviceState(di_keyboard, sizeof(kbdata), kbdata); + ok(SUCCEEDED(hr), "IDirectInputDevice8_GetDeviceState failed: %08x\n", hr); + todo_wine + ok(kbdata[DIK_SPACE], "Expected DIK_SPACE key state down\n"); + + keybd_event(VK_SPACE, DIK_SPACE, KEYEVENTF_KEYUP, 0); + flush_events(); + IDirectInputDevice8_Poll(di_keyboard); + data_size = ARRAY_SIZE(obj_data); + hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); + ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); + todo_wine + ok(data_size == 1, "Expected 1 element, received %d\n", data_size); + + /* Test injecting keyboard events with scancode=0. + * Windows DInput ignores the VK, sets scancode 0 to be pressed, and GetDeviceData returns no elements. */ + keybd_event(VK_SPACE, 0, 0, 0); + flush_events(); + IDirectInputDevice8_Poll(di_keyboard); + data_size = ARRAY_SIZE(obj_data); + hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); + ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); + todo_wine + ok(data_size == 0, "Expected 0 elements, received %d\n", data_size); + + hr = IDirectInputDevice8_GetDeviceState(di_keyboard, sizeof(kbdata), kbdata); + ok(SUCCEEDED(hr), "IDirectInputDevice8_GetDeviceState failed: %08x\n", hr); + todo_wine + ok(kbdata[0], "Expected key 0 state down\n"); + + keybd_event(VK_SPACE, 0, KEYEVENTF_KEYUP, 0); + flush_events(); + IDirectInputDevice8_Poll(di_keyboard); + data_size = ARRAY_SIZE(obj_data); + hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); + ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); + todo_wine + ok(data_size == 0, "Expected 0 elements, received %d\n", data_size); + + hr = IDirectInputDevice8_Unacquire(di_keyboard); + ok(SUCCEEDED(hr), "IDirectInputDevice8_Unacquire failed: %08x\n", hr); + + IDirectInputDevice8_Release(di_keyboard); + IDirectInput8_Release(di); + + DestroyWindow(hwnd); +} + START_TEST(device) { CoInitialize(NULL); @@ -749,6 +856,7 @@ START_TEST(device) test_action_mapping(); test_save_settings(); test_mouse_keyboard(); + test_keyboard_events(); CoUninitialize(); }

1 0

Vijay Kiran Kamuju : winspool.drv/tests: Remove win9x checks and enable some tests.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 0fa21125d4a313b4517fc67828f4f794c8f8b371 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fa21125d4a313b4517fc678… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Apr 13 09:52:54 2020 +0200 winspool.drv/tests: Remove win9x checks and enable some tests. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/tests/info.c | 53 +++++++++++------------------------------- 1 file changed, 13 insertions(+), 40 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index f102bb11d9..53aa67ba03 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -120,22 +120,6 @@ static BOOL is_access_denied(DWORD res, DWORD lasterror) return FALSE; } -static BOOL on_win9x = FALSE; - -static BOOL check_win9x(void) -{ - if (pGetPrinterW) - { - SetLastError(0xdeadbeef); - pGetPrinterW(NULL, 0, NULL, 0, NULL); - return (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED); - } - else - { - return TRUE; - } -} - static void find_default_printer(VOID) { static char buffer[DEFAULT_PRINTER_SIZE]; @@ -333,8 +317,6 @@ static void test_AddMonitor(void) "returned %d with %d (expected '0' with ERROR_INVALID_LEVEL)\n", res, GetLastError()); - if (0) - { /* This test crashes win9x on vmware (works with win9x on qemu 0.8.1) */ SetLastError(MAGIC_DEAD); res = AddMonitorA(NULL, 2, NULL); @@ -344,7 +326,6 @@ static void test_AddMonitor(void) (GetLastError() == ERROR_PRIVILEGE_NOT_HELD)), "returned %d with %d (expected '0' with: MAGIC_DEAD or " "ERROR_PRIVILEGE_NOT_HELD)\n", res, GetLastError()); - } ZeroMemory(&mi2a, sizeof(MONITOR_INFO_2A)); SetLastError(MAGIC_DEAD); @@ -1219,7 +1200,7 @@ static void test_EnumPrinterDrivers(void) } /* EnumPrinterDriversA returns the same number of bytes as EnumPrinterDriversW */ - if (!on_win9x && pEnumPrinterDriversW) + if (pEnumPrinterDriversW) { DWORD double_needed; DWORD double_returned; @@ -1407,15 +1388,14 @@ static void test_EnumPrintProcessors(void) /* failure-Codes for NULL */ - if (0) { - /* this test crashes on win98se */ - SetLastError(0xdeadbeef); - pcbNeeded = 0xdeadbeef; - pcReturned = 0xdeadbeef; - res = EnumPrintProcessorsA(NULL, NULL, 1, NULL, cbBuf, &pcbNeeded, &pcReturned); - ok( !res && (GetLastError() == ERROR_INVALID_USER_BUFFER) , - "got %u with %u (expected '0' with ERROR_INVALID_USER_BUFFER)\n", - res, GetLastError()); + SetLastError(0xdeadbeef); + pcbNeeded = 0xdeadbeef; + pcReturned = 0xdeadbeef; + res = EnumPrintProcessorsA(NULL, NULL, 1, NULL, cbBuf, &pcbNeeded, &pcReturned); + todo_wine { + ok( !res && (GetLastError() == ERROR_INVALID_USER_BUFFER) , + "got %u with %u (expected '0' with ERROR_INVALID_USER_BUFFER)\n", + res, GetLastError()); } SetLastError(0xdeadbeef); @@ -1982,7 +1962,7 @@ static void test_SetDefaultPrinter(void) } if (!pSetDefaultPrinterA) return; - /* only supported on win2k and above */ + /* only supported on win2k and above */ /* backup the original value */ org_value[0] = '\0'; @@ -2356,7 +2336,7 @@ static void test_GetPrinter(void) ok(needed > 0,"not expected needed buffer size %d\n", needed); /* GetPrinterA returns the same number of bytes as GetPrinterW */ - if (!on_win9x && !ret && pGetPrinterW && level != 6 && level != 7) + if (!ret && pGetPrinterW && level != 6 && level != 7) { DWORD double_needed; ret = pGetPrinterW(hprn, level, NULL, 0, &double_needed); @@ -2408,9 +2388,6 @@ static void test_GetPrinterData(void) res = OpenPrinterA(NULL, &hprn, NULL); if (!res) { - /* printserver not available on win9x */ - if (!on_win9x) - win_skip("Unable to open the printserver: %d\n", GetLastError()); return; } @@ -2593,7 +2570,7 @@ static void test_GetPrinterDriver(void) } /* GetPrinterDriverA returns the same number of bytes as GetPrinterDriverW */ - if (!on_win9x && !ret && pGetPrinterDriverW) + if (!ret && pGetPrinterDriverW) { DWORD double_needed; ret = pGetPrinterDriverW(hprn, NULL, level, NULL, 0, &double_needed); @@ -2961,7 +2938,7 @@ static void test_OpenPrinter_defaults(void) ret = GetJobA( printer, add_job->JobId, 2, (BYTE *)job_info, needed, &needed ); ok( ret, "GetJobA() failed le=%d\n", GetLastError() ); -todo_wine + todo_wine ok( job_info->pDevMode != NULL, "got NULL DEVMODEA\n"); if (job_info->pDevMode) ok( job_info->pDevMode->u1.s1.dmPaperSize == default_size, "got %d default %d\n", @@ -3081,10 +3058,6 @@ START_TEST(info) pSetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "SetDefaultPrinterA"); pXcvDataW = (void *) GetProcAddress(hwinspool, "XcvDataW"); - on_win9x = check_win9x(); - if (on_win9x) - win_skip("Several W-functions are not available on Win9x/WinMe\n"); - find_default_printer(); find_local_server(); find_tempfile();

1 0

Dmitry Timoshkov : adsldp: Fix mapping for 1.3.6.1.4.1.1466.115.121.1.26.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 7b138e929d48366aaafeef4587d880ae586b0ec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b138e929d48366aaafeef45… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 13 18:07:08 2020 +0800 adsldp: Fix mapping for 1.3.6.1.4.1.1466.115.121.1.26. According to rfc4517 1.3.6.1.4.1.1466.115.121.1.26 is IA5 String, and in an AD DC managed by Samba it's used for LDAP attributes "loginShell" and "unixHomeDirectory", so I assumed that a proper type for it is ADSTYPE_CASE_EXACT_STRING. However testing under Windows 10 shows that it's ADSTYPE_CASE_IGNORE_STRING there. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/schema.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 0611dc2920..63c95bdae6 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -96,7 +96,7 @@ ADSTYPEENUM get_schema_type(const WCHAR *name, const struct attribute_type *at, if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.24")) return ADSTYPE_UTC_TIME; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.26")) - return ADSTYPE_CASE_EXACT_STRING; + return ADSTYPE_CASE_IGNORE_STRING; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.27")) return ADSTYPE_INTEGER; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.38"))

1 0

Dmitry Timoshkov : adsldp: Fix IDirectorySearch::FreeColumn() for ADSTYPE_NT_SECURITY_DESCRIPTOR.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 125414193f07ec75e956b92c936c33ae3413551d URL: https://source.winehq.org/git/wine.git/?a=commit;h=125414193f07ec75e956b92c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 13 18:07:13 2020 +0800 adsldp: Fix IDirectorySearch::FreeColumn() for ADSTYPE_NT_SECURITY_DESCRIPTOR. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index de88ee994c..792a3bc034 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1758,7 +1758,7 @@ static HRESULT WINAPI search_FreeColumn(IDirectorySearch *iface, PADS_SEARCH_COL if (col->hReserved) { - if (col->dwADsType == ADSTYPE_OCTET_STRING) + if (col->dwADsType == ADSTYPE_OCTET_STRING || col->dwADsType == ADSTYPE_NT_SECURITY_DESCRIPTOR) ldap_value_free_len(col->hReserved); else ldap_value_freeW(col->hReserved);

1 0

Dmitry Timoshkov : adsldp: Add support for searching of deleted objects.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: b579f04998e9c26d743ba50da8a9567b4e97acd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b579f04998e9c26d743ba50d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 13 18:07:21 2020 +0800 adsldp: Add support for searching of deleted objects. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 15 ++++++++++++++- dlls/adsldp/tests/ldap.c | 19 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 792a3bc034..dce462d685 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1286,6 +1286,7 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); ULONG err, i; WCHAR **props; + LDAPControlW **ctrls = NULL, *ctrls_a[2], tombstone; struct ldap_search_context *ldap_ctx; TRACE("%p,%s,%p,%u,%p\n", iface, debugstr_w(filter), names, count, res); @@ -1317,7 +1318,19 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte props[count] = NULL; } - err = ldap_search_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, ldap->search.attribtypes_only, &ldap_ctx->res); + if (ldap->search.tombstone) + { + tombstone.ldctl_oid = (WCHAR *)L"1.2.840.113556.1.4.417"; + tombstone.ldctl_iscritical = TRUE; + tombstone.ldctl_value.bv_val = NULL; + tombstone.ldctl_value.bv_len = 0; + ctrls_a[0] = &tombstone; + ctrls_a[1] = NULL; + ctrls = ctrls_a; + } + + err = ldap_search_ext_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, + ldap->search.attribtypes_only, ctrls, NULL, NULL, 0, &ldap_ctx->res); heap_free(props); if (err != LDAP_SUCCESS) { diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index e76bd2e0b6..c43d2989e6 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -515,6 +515,25 @@ todo_wine hr = IDirectorySearch_CloseSearchHandle(ds, sh); ok(hr == S_OK, "got %#x\n", hr); + pref[0].dwSearchPref = ADS_SEARCHPREF_TOMBSTONE; + pref[0].vValue.dwType = ADSTYPE_BOOLEAN; + pref[0].vValue.Integer = 1; + pref[0].dwStatus = 0xdeadbeef; + hr = IDirectorySearch_SetSearchPreference(ds, pref, 1); + ok(hr == S_OK, "got %#x\n", hr); + ok(pref[0].dwStatus == ADS_STATUS_S_OK, "got %d\n", pref[0].dwStatus); + + hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, &sh); + ok(hr == HRESULT_FROM_WIN32(ERROR_DS_UNAVAILABLE_CRIT_EXTENSION) || broken(hr == S_OK) /* XP */, "got %#x\n", hr); + if (hr == S_OK) + { + hr = IDirectorySearch_GetNextRow(ds, sh); + ok(hr == HRESULT_FROM_WIN32(ERROR_DS_UNAVAILABLE_CRIT_EXTENSION), "got %#x\n", hr); + + hr = IDirectorySearch_CloseSearchHandle(ds, sh); + ok(hr == S_OK, "got %#x\n", hr); + } + IDirectorySearch_Release(ds); IDirectoryObject_Release(dirobj); }

1 0

Dmitry Timoshkov : adsldp/tests: Add one more skip() to catch ERROR_DS_SERVER_DOWN.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 6bcdf9587b75082954229a8cf889dfadd7d596a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bcdf9587b75082954229a8c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 13 18:25:11 2020 +0800 adsldp/tests: Add one more skip() to catch ERROR_DS_SERVER_DOWN. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/tests/ldap.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index c43d2989e6..01a3aec90e 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -350,6 +350,11 @@ static void test_DirectorySearch(void) ok(hr == E_NOINTERFACE, "got %#x\n", hr); hr = ADsGetObject(L"LDAP://ldap.forumsys.com/rootDSE", &IID_IDirectorySearch, (void **)&ds); + if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) + { + skip("server is down\n"); + return; + } ok(hr == E_NOINTERFACE, "got %#x\n", hr); hr = ADsGetObject(L"LDAP://ldap.forumsys.com", &IID_IDirectorySearch, (void **)&ds);

1 0

Serge Gautherie : winapi_test: Tests.dat needs timezoneapi.h.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 867a0bd6cda791a31016dd22c98a48e0dba38144 URL: https://source.winehq.org/git/wine.git/?a=commit;h=867a0bd6cda791a31016dd22… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sun Apr 12 19:13:27 2020 +0200 winapi_test: Tests.dat needs timezoneapi.h. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/generated.c | 184 ++++++++++++++++++++-------------------- tools/winapi/tests.dat | 1 + 2 files changed, 93 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=867a0bd6cda791a31016…

1 0

Serge Gautherie : winapi_test: Add DYNAMIC_TIME_ZONE_INFORMATION to tests.dat.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 930ff8786fd52287732c0286dd050004ac7c003d URL: https://source.winehq.org/git/wine.git/?a=commit;h=930ff8786fd52287732c0286… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sun Apr 12 19:13:43 2020 +0200 winapi_test: Add DYNAMIC_TIME_ZONE_INFORMATION to tests.dat. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/generated.c | 88 +++++++++++++++++++++++++++++++++++++++++ tools/winapi/tests.dat | 2 + 2 files changed, 90 insertions(+) diff --git a/dlls/kernel32/tests/generated.c b/dlls/kernel32/tests/generated.c index 09ce14698a..7606580fa4 100644 --- a/dlls/kernel32/tests/generated.c +++ b/dlls/kernel32/tests/generated.c @@ -1882,6 +1882,40 @@ static void test_pack_WIN32_STREAM_ID(void) TEST_FIELD_OFFSET(WIN32_STREAM_ID, cStreamName, 20) } +static void test_pack_DYNAMIC_TIME_ZONE_INFORMATION(void) +{ + /* DYNAMIC_TIME_ZONE_INFORMATION */ + TEST_TYPE_SIZE (DYNAMIC_TIME_ZONE_INFORMATION, 432) + TEST_TYPE_ALIGN (DYNAMIC_TIME_ZONE_INFORMATION, 4) + TEST_FIELD_SIZE (DYNAMIC_TIME_ZONE_INFORMATION, Bias, 4) + TEST_FIELD_ALIGN (DYNAMIC_TIME_ZONE_INFORMATION, Bias, 4) + TEST_FIELD_OFFSET(DYNAMIC_TIME_ZONE_INFORMATION, Bias, 0) + TEST_FIELD_SIZE (DYNAMIC_TIME_ZONE_INFORMATION, StandardName, 64) + TEST_FIELD_ALIGN (DYNAMIC_TIME_ZONE_INFORMATION, StandardName, 2) + TEST_FIELD_OFFSET(DYNAMIC_TIME_ZONE_INFORMATION, StandardName, 4) + TEST_FIELD_SIZE (DYNAMIC_TIME_ZONE_INFORMATION, StandardDate, 16) + TEST_FIELD_ALIGN (DYNAMIC_TIME_ZONE_INFORMATION, StandardDate, 2) + TEST_FIELD_OFFSET(DYNAMIC_TIME_ZONE_INFORMATION, StandardDate, 68) + TEST_FIELD_SIZE (DYNAMIC_TIME_ZONE_INFORMATION, StandardBias, 4) + TEST_FIELD_ALIGN (DYNAMIC_TIME_ZONE_INFORMATION, StandardBias, 4) + TEST_FIELD_OFFSET(DYNAMIC_TIME_ZONE_INFORMATION, StandardBias, 84) + TEST_FIELD_SIZE (DYNAMIC_TIME_ZONE_INFORMATION, DaylightName, 64) + TEST_FIELD_ALIGN (DYNAMIC_TIME_ZONE_INFORMATION, DaylightName, 2) + TEST_FIELD_OFFSET(DYNAMIC_TIME_ZONE_INFORMATION, DaylightName, 88) + TEST_FIELD_SIZE (DYNAMIC_TIME_ZONE_INFORMATION, DaylightDate, 16) + TEST_FIELD_ALIGN (DYNAMIC_TIME_ZONE_INFORMATION, DaylightDate, 2) + TEST_FIELD_OFFSET(DYNAMIC_TIME_ZONE_INFORMATION, DaylightDate, 152) + TEST_FIELD_SIZE (DYNAMIC_TIME_ZONE_INFORMATION, DaylightBias, 4) + TEST_FIELD_ALIGN (DYNAMIC_TIME_ZONE_INFORMATION, DaylightBias, 4) + TEST_FIELD_OFFSET(DYNAMIC_TIME_ZONE_INFORMATION, DaylightBias, 168) + TEST_FIELD_SIZE (DYNAMIC_TIME_ZONE_INFORMATION, TimeZoneKeyName, 256) + TEST_FIELD_ALIGN (DYNAMIC_TIME_ZONE_INFORMATION, TimeZoneKeyName, 2) + TEST_FIELD_OFFSET(DYNAMIC_TIME_ZONE_INFORMATION, TimeZoneKeyName, 172) + TEST_FIELD_SIZE (DYNAMIC_TIME_ZONE_INFORMATION, DynamicDaylightTimeDisabled, 1) + TEST_FIELD_ALIGN (DYNAMIC_TIME_ZONE_INFORMATION, DynamicDaylightTimeDisabled, 1) + TEST_FIELD_OFFSET(DYNAMIC_TIME_ZONE_INFORMATION, DynamicDaylightTimeDisabled, 428) +} + static void test_pack_LPTIME_ZONE_INFORMATION(void) { /* LPTIME_ZONE_INFORMATION */ @@ -1891,6 +1925,15 @@ static void test_pack_LPTIME_ZONE_INFORMATION(void) TEST_TARGET_ALIGN(LPTIME_ZONE_INFORMATION, 4) } +static void test_pack_PDYNAMIC_TIME_ZONE_INFORMATION(void) +{ + /* PDYNAMIC_TIME_ZONE_INFORMATION */ + TEST_TYPE_SIZE (PDYNAMIC_TIME_ZONE_INFORMATION, 8) + TEST_TYPE_ALIGN (PDYNAMIC_TIME_ZONE_INFORMATION, 8) + TEST_TARGET_SIZE (PDYNAMIC_TIME_ZONE_INFORMATION, 432) + TEST_TARGET_ALIGN(PDYNAMIC_TIME_ZONE_INFORMATION, 4) +} + static void test_pack_PTIME_ZONE_INFORMATION(void) { /* PTIME_ZONE_INFORMATION */ @@ -3739,6 +3782,40 @@ static void test_pack_WIN32_STREAM_ID(void) TEST_FIELD_OFFSET(WIN32_STREAM_ID, cStreamName, 20) } +static void test_pack_DYNAMIC_TIME_ZONE_INFORMATION(void) +{ + /* DYNAMIC_TIME_ZONE_INFORMATION */ + TEST_TYPE_SIZE (DYNAMIC_TIME_ZONE_INFORMATION, 432) + TEST_TYPE_ALIGN (DYNAMIC_TIME_ZONE_INFORMATION, 4) + TEST_FIELD_SIZE (DYNAMIC_TIME_ZONE_INFORMATION, Bias, 4) + TEST_FIELD_ALIGN (DYNAMIC_TIME_ZONE_INFORMATION, Bias, 4) + TEST_FIELD_OFFSET(DYNAMIC_TIME_ZONE_INFORMATION, Bias, 0) + TEST_FIELD_SIZE (DYNAMIC_TIME_ZONE_INFORMATION, StandardName, 64) + TEST_FIELD_ALIGN (DYNAMIC_TIME_ZONE_INFORMATION, StandardName, 2) + TEST_FIELD_OFFSET(DYNAMIC_TIME_ZONE_INFORMATION, StandardName, 4) + TEST_FIELD_SIZE (DYNAMIC_TIME_ZONE_INFORMATION, StandardDate, 16) + TEST_FIELD_ALIGN (DYNAMIC_TIME_ZONE_INFORMATION, StandardDate, 2) + TEST_FIELD_OFFSET(DYNAMIC_TIME_ZONE_INFORMATION, StandardDate, 68) + TEST_FIELD_SIZE (DYNAMIC_TIME_ZONE_INFORMATION, StandardBias, 4) + TEST_FIELD_ALIGN (DYNAMIC_TIME_ZONE_INFORMATION, StandardBias, 4) + TEST_FIELD_OFFSET(DYNAMIC_TIME_ZONE_INFORMATION, StandardBias, 84) + TEST_FIELD_SIZE (DYNAMIC_TIME_ZONE_INFORMATION, DaylightName, 64) + TEST_FIELD_ALIGN (DYNAMIC_TIME_ZONE_INFORMATION, DaylightName, 2) + TEST_FIELD_OFFSET(DYNAMIC_TIME_ZONE_INFORMATION, DaylightName, 88) + TEST_FIELD_SIZE (DYNAMIC_TIME_ZONE_INFORMATION, DaylightDate, 16) + TEST_FIELD_ALIGN (DYNAMIC_TIME_ZONE_INFORMATION, DaylightDate, 2) + TEST_FIELD_OFFSET(DYNAMIC_TIME_ZONE_INFORMATION, DaylightDate, 152) + TEST_FIELD_SIZE (DYNAMIC_TIME_ZONE_INFORMATION, DaylightBias, 4) + TEST_FIELD_ALIGN (DYNAMIC_TIME_ZONE_INFORMATION, DaylightBias, 4) + TEST_FIELD_OFFSET(DYNAMIC_TIME_ZONE_INFORMATION, DaylightBias, 168) + TEST_FIELD_SIZE (DYNAMIC_TIME_ZONE_INFORMATION, TimeZoneKeyName, 256) + TEST_FIELD_ALIGN (DYNAMIC_TIME_ZONE_INFORMATION, TimeZoneKeyName, 2) + TEST_FIELD_OFFSET(DYNAMIC_TIME_ZONE_INFORMATION, TimeZoneKeyName, 172) + TEST_FIELD_SIZE (DYNAMIC_TIME_ZONE_INFORMATION, DynamicDaylightTimeDisabled, 1) + TEST_FIELD_ALIGN (DYNAMIC_TIME_ZONE_INFORMATION, DynamicDaylightTimeDisabled, 1) + TEST_FIELD_OFFSET(DYNAMIC_TIME_ZONE_INFORMATION, DynamicDaylightTimeDisabled, 428) +} + static void test_pack_LPTIME_ZONE_INFORMATION(void) { /* LPTIME_ZONE_INFORMATION */ @@ -3748,6 +3825,15 @@ static void test_pack_LPTIME_ZONE_INFORMATION(void) TEST_TARGET_ALIGN(LPTIME_ZONE_INFORMATION, 4) } +static void test_pack_PDYNAMIC_TIME_ZONE_INFORMATION(void) +{ + /* PDYNAMIC_TIME_ZONE_INFORMATION */ + TEST_TYPE_SIZE (PDYNAMIC_TIME_ZONE_INFORMATION, 4) + TEST_TYPE_ALIGN (PDYNAMIC_TIME_ZONE_INFORMATION, 4) + TEST_TARGET_SIZE (PDYNAMIC_TIME_ZONE_INFORMATION, 432) + TEST_TARGET_ALIGN(PDYNAMIC_TIME_ZONE_INFORMATION, 4) +} + static void test_pack_PTIME_ZONE_INFORMATION(void) { /* PTIME_ZONE_INFORMATION */ @@ -3806,6 +3892,7 @@ static void test_pack(void) test_pack_CRITICAL_SECTION_DEBUG(); test_pack_DCB(); test_pack_DEBUG_EVENT(); + test_pack_DYNAMIC_TIME_ZONE_INFORMATION(); test_pack_ENUMRESLANGPROCA(); test_pack_ENUMRESLANGPROCW(); test_pack_ENUMRESNAMEPROCA(); @@ -3881,6 +3968,7 @@ static void test_pack(void) test_pack_PCACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA(); test_pack_PCRITICAL_SECTION(); test_pack_PCRITICAL_SECTION_DEBUG(); + test_pack_PDYNAMIC_TIME_ZONE_INFORMATION(); test_pack_PFIBER_START_ROUTINE(); test_pack_PHKEY(); test_pack_POFSTRUCT(); diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 254711bc75..3f470d48e7 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -497,6 +497,7 @@ CRITICAL_SECTION CRITICAL_SECTION_DEBUG DCB DEBUG_EVENT +DYNAMIC_TIME_ZONE_INFORMATION ENUMRESLANGPROCA ENUMRESLANGPROCW ENUMRESNAMEPROCA @@ -578,6 +579,7 @@ PCACTCTX_SECTION_KEYED_DATA_2600 PCACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA PCRITICAL_SECTION PCRITICAL_SECTION_DEBUG +PDYNAMIC_TIME_ZONE_INFORMATION PFIBER_START_ROUTINE !PFILETIME # FIXME: 20040821: Mishandled by winapi_test PHKEY

1 0

Thomas Faber : gdiplus/tests: Disable double-freeing test.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 65c72c93ce258bb2aabdfd870a51a6e96fde388d URL: https://source.winehq.org/git/wine.git/?a=commit;h=65c72c93ce258bb2aabdfd87… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Apr 11 16:53:18 2020 +0200 gdiplus/tests: Disable double-freeing test. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 0b4ae3cd9c..145eadbfd3 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3488,8 +3488,11 @@ static void test_dispose(void) stat = GdipDisposeImage(image); expect(Ok, stat); + if (0) { + /* Can crash with page heap or if the heap region is decommitted. */ stat = GdipDisposeImage(image); expect(ObjectBusy, stat); + } memset(invalid_image, 0, 256); stat = GdipDisposeImage((GpImage*)invalid_image);

1 0

Hans Leidekker : secur32: Add application protocol stubs for macOS.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 341fe50c287b0f421de16aa138af724f559dd880 URL: https://source.winehq.org/git/wine.git/?a=commit;h=341fe50c287b0f421de16aa1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 22:18:33 2020 +0200 secur32: Add application protocol stubs for macOS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_macosx.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index f86a561cf8..d725c9d22c 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -1194,6 +1194,18 @@ void schan_imp_free_certificate_credentials(schan_credentials *c) { } +void schan_imp_set_application_protocols(schan_imp_session session, unsigned char *buffer, unsigned int buflen) +{ + FIXME("no support for application protocols on this platform\n"); +} + +SECURITY_STATUS schan_imp_get_application_protocol(schan_imp_session session, + SecPkgContext_ApplicationProtocol *protocol) +{ + FIXME("no support for application protocols on this platform\n"); + return SEC_E_UNSUPPORTED_FUNCTION; +} + BOOL schan_imp_init(void) { TRACE("()\n");

1 0