wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

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

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

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: 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: 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

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

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

Mingcong Bai : po: Update Simplified Chinese translation.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: a585d8f2f8e167b81f446972de814dc1cd162d76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a585d8f2f8e167b81f446972… Author: Mingcong Bai <jeffbai(a)aosc.xyz> Date: Sun Apr 12 22:01:08 2020 +0800 po: Update Simplified Chinese translation. Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 184 ++++++++++++++++++------------------------------------------ 1 file changed, 54 insertions(+), 130 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 542e55e0cc..3fff00c9a6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -614,7 +614,7 @@ msgstr "自定义颜色(&C)：" #: comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|纯色(&O)" #: comdlg32.rc:290 msgid "&Red:" @@ -651,11 +651,9 @@ msgid "&Define Custom Colors >>" msgstr "定义自定义颜色(&D) >>" #: comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "否(&N)" +msgstr "&o" #: comdlg32.rc:318 regedit.rc:275 regedit.rc:285 msgid "Find" @@ -3659,17 +3657,15 @@ msgstr "期望 '@'" #: jscript.rc:75 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Microsoft JScript 编译错误" #: jscript.rc:76 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Microsoft JScript 运行时错误" #: jscript.rc:77 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "未知错误" +msgstr "未知运行时错误" #: jscript.rc:54 msgid "Number expected" @@ -3717,7 +3713,7 @@ msgstr "正则表达式中出现语法错误" #: jscript.rc:63 msgid "Exception thrown and not caught" -msgstr "" +msgstr "发生异常且未被捕捉" #: jscript.rc:65 msgid "URI to be encoded contains invalid characters" @@ -6791,10 +6787,8 @@ msgid "Sink has not been finalized.\n" msgstr "池尚未完成。\n" #: mferror.mc:732 -#, fuzzy -#| msgid "Sink was already stopped.\n" msgid "Clock was stopped\n" -msgstr "池已被停止。\n" +msgstr "时钟已停止\n" #: mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7173,10 +7167,8 @@ msgid "Clock state was already set.\n" msgstr "已设置时钟状态。\n" #: mferror.mc:725 -#, fuzzy -#| msgid "Clock is not available.\n" msgid "Clock is not simple\n" -msgstr "时钟不可用。\n" +msgstr "非简单时钟\n" #: mpr.rc:35 wininet.rc:37 msgid "Enter Network Password" @@ -8266,206 +8258,158 @@ msgid "Off" msgstr "关" #: version.rc:56 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "视频" +msgstr "提供者" #: version.rc:59 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "选择您希望使用的格式：" +msgstr "选择您想要连接的数据源：" #: version.rc:66 -#, fuzzy -#| msgid "Connections" msgid "Connection" msgstr "连接" #: version.rc:69 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Specify the following to connect to ODBC data:" -msgstr "选择您希望使用的格式：" +msgstr "指定以下内容以连接到 ODBC 数据源：" #: version.rc:70 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. 指定数据源：" #: version.rc:71 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "请输入你的名字" +msgstr "使用数据源名称(&D)" #: version.rc:74 -#, fuzzy -#| msgid "Reset Connections" msgid "Use c&onnection string" -msgstr "连接重置次数" +msgstr "使用连接字符串(&O)" #: version.rc:75 -#, fuzzy -#| msgid "Connections" msgid "&Connection string:" -msgstr "连接" +msgstr "连接字符串(&C)：" #: version.rc:77 -#, fuzzy -#| msgid "A&dd..." msgid "B&uild..." -msgstr "添加(&D)..." +msgstr "构建(&U)..." #: version.rc:78 msgid "2. Enter information to log on to the server" -msgstr "" +msgstr "2. 输入服务器登录信息" #: version.rc:79 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" -msgstr "用户名(&U)：" +msgstr "用户名(&N)：" #: version.rc:83 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "空白页面(&B)" +msgstr "空密码(&B)" #: version.rc:84 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "密码错误。\n" +msgstr "允许保存密码(&S)" #: version.rc:85 msgid "3. Enter the &initial catalog to use:" -msgstr "" +msgstr "3. 输入要使用的初始目录：" #: version.rc:87 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "连接重置次数" +msgstr "测试连接(&T)" #: version.rc:92 winemine.rc:65 msgid "Advanced" msgstr "高级" #: version.rc:95 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "网络共享文件夹" +msgstr "网络设置" #: version.rc:96 -#, fuzzy -#| msgid "Bad impersonation level.\n" msgid "&Impersonation level:" -msgstr "无效的模拟级别。\n" +msgstr "模拟级别(&I)：" #: version.rc:98 msgid "P&rotection level:" -msgstr "" +msgstr "保护级别(&R)：" #: version.rc:101 -#, fuzzy -#| msgid "Connected" msgid "Connect:" -msgstr "已连接" +msgstr "连接：" #: version.rc:103 -#, fuzzy -#| msgid "seconds" msgid "seconds." -msgstr "秒" +msgstr "秒。" #: version.rc:104 -#, fuzzy -#| msgid "Success" msgid "A&ccess:" -msgstr "成功" +msgstr "访问(&A)：" #: version.rc:110 -#, fuzzy -#| msgid "&All" msgid "All" -msgstr "全部(&A)" +msgstr "全部" #: version.rc:114 msgid "" "These are the initialization properties for this type of data. To edit a " "value, select a property, then choose Edit Value below." msgstr "" +"该数据类型定义了数种初始化属性。要编辑属性值，选择一项属性，然后点选“编辑数" +"据”。" #: version.rc:115 -#, fuzzy -#| msgid "&Edit..." msgid "&Edit Value..." -msgstr "编辑(&E)..." +msgstr "编辑数据(&E)..." #: version.rc:49 -#, fuzzy -#| msgid "Properties" msgid "Data Link Error" -msgstr "属性" +msgstr "数据链错误" #: version.rc:50 -#, fuzzy -#| msgid "Please select a file." msgid "Please select a provider." -msgstr "请选择一个文件。" +msgstr "请选择提供者。" #: version.rc:51 msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." -msgstr "" +msgstr "提供者已不再可用。请确保提供者已正确安装。" #: version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "属性" +msgstr "数据链路属性" #: version.rc:37 msgid "OLE DB Provider(s)" -msgstr "" +msgstr "OLE DB 提供者" #: version.rc:41 -#, fuzzy -#| msgid "Ready" msgid "Read" -msgstr "待命" +msgstr "读取" #: version.rc:42 -#, fuzzy -#| msgid "Readme:" msgid "ReadWrite" -msgstr "产品说明：" +msgstr "读写" #: version.rc:43 msgid "Share Deny None" -msgstr "" +msgstr "共享拒绝无" #: version.rc:44 msgid "Share Deny Read" -msgstr "" +msgstr "共享拒绝可读" #: version.rc:45 msgid "Share Deny Write" -msgstr "" +msgstr "共享拒绝可写" #: version.rc:46 msgid "Share Exclusive" -msgstr "" +msgstr "共享互斥锁" #: version.rc:47 -#, fuzzy -#| msgid "I/O Writes" msgid "Write" -msgstr "I/O 写入" +msgstr "写入" #: oledlg.rc:55 msgid "Insert Object" @@ -9644,16 +9588,12 @@ msgid "Cape Verde Daylight Time" msgstr "佛得角夏令时" #: tzres.rc:120 -#, fuzzy -#| msgid "Hawaiian Standard Time" msgid "Haiti Standard Time" -msgstr "夏威夷标准时间" +msgstr "海地标准时间" #: tzres.rc:121 -#, fuzzy -#| msgid "Hawaiian Daylight Time" msgid "Haiti Daylight Time" -msgstr "夏威夷夏令时" +msgstr "海地夏令时" #: tzres.rc:78 msgid "Central European Standard Time" @@ -9864,16 +9804,12 @@ msgid "Argentina Daylight Time" msgstr "阿根廷夏令时" #: tzres.rc:142 -#, fuzzy -#| msgid "Mauritius Standard Time" msgid "Marquesas Standard Time" -msgstr "毛里求斯标准时间" +msgstr "马克萨斯标准时间" #: tzres.rc:143 -#, fuzzy -#| msgid "Mauritius Daylight Time" msgid "Marquesas Daylight Time" -msgstr "毛里求斯夏令时" +msgstr "马克萨斯夏令时" #: tzres.rc:156 msgid "Myanmar Standard Time" @@ -10248,16 +10184,12 @@ msgid "Venezuela Daylight Time" msgstr "委内瑞拉夏令时" #: tzres.rc:60 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Bougainville Standard Time" -msgstr "山地标准时间" +msgstr "布干维尔标准时间" #: tzres.rc:61 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Bougainville Daylight Time" -msgstr "山地夏令时" +msgstr "布干维尔夏令时" #: tzres.rc:122 msgid "Hawaiian Standard Time" @@ -10284,16 +10216,12 @@ msgid "New Zealand Daylight Time" msgstr "新西兰夏令时" #: tzres.rc:34 -#, fuzzy -#| msgid "Argentina Standard Time" msgid "Aleutian Standard Time" -msgstr "阿根廷标准时间" +msgstr "阿留申标准时间" #: tzres.rc:35 -#, fuzzy -#| msgid "Argentina Daylight Time" msgid "Aleutian Daylight Time" -msgstr "阿根廷夏令时" +msgstr "阿留申夏令时" #: tzres.rc:74 msgid "Central Brazilian Standard Time" @@ -10376,16 +10304,12 @@ msgid "Korea Daylight Time" msgstr "韩国夏令时" #: tzres.rc:86 -#, fuzzy -#| msgid "Easter Island Standard Time" msgid "Chatham Islands Standard Time" -msgstr "复活节岛标准时间" +msgstr "查塔姆标准时间" #: tzres.rc:87 -#, fuzzy -#| msgid "Easter Island Daylight Time" msgid "Chatham Islands Daylight Time" -msgstr "复活节岛夏令时" +msgstr "查塔姆夏令时" #: tzres.rc:92 msgid "E. Africa Standard Time"

1 0

Jacek Caban : ntdll: Directly use server_select in send_debug_event.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 0308c9599d044e4c0671f778971fb13e85df72a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0308c9599d044e4c0671f778… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 10 01:05:47 2020 +0200 ntdll: Directly use server_select in send_debug_event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 4d0ef72e10..7854ad97c6 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -183,7 +183,7 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *con select_op.wait.op = SELECT_WAIT; select_op.wait.handles[0] = handle; - server_wait( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, NULL ); + server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, TIMEOUT_INFINITE, NULL ); SERVER_START_REQ( get_exception_status ) {

1 0

Jacek Caban : ntdll: Directly use server_select in wait_suspend.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 0ab9e00ef65681cab0218616e4ce83b494a8a960 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ab9e00ef65681cab0218616… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 10 01:05:38 2020 +0200 ntdll: Directly use server_select in wait_suspend. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 7bd7baa135..4d0ef72e10 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -111,7 +111,6 @@ static ULONG remove_vectored_handler( struct list *handler_list, VECTORED_HANDLE */ void wait_suspend( CONTEXT *context ) { - LARGE_INTEGER timeout; int saved_errno = errno; context_t server_context; DWORD flags = context->ContextFlags; @@ -127,8 +126,7 @@ void wait_suspend( CONTEXT *context ) SERVER_END_REQ; /* wait with 0 timeout, will only return once the thread is no longer suspended */ - timeout.QuadPart = 0; - server_wait( NULL, 0, SELECT_INTERRUPTIBLE, &timeout ); + server_select( NULL, 0, SELECT_INTERRUPTIBLE, 0, NULL ); /* retrieve the new context */ SERVER_START_REQ( get_suspend_context )

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2020