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

Vijay Kiran Kamuju : winspool.drv/tests: Remove win9x checks and enable some tests.
by Alexandre Julliard April 13, 2020

April 13, 2020

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

Jacek Caban : ntdll: Directly use server_select in wait_suspend.
by Alexandre Julliard April 13, 2020

April 13, 2020

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

Dmitry Timoshkov : adsldp: Add support for searching of deleted objects.
by Alexandre Julliard April 13, 2020

April 13, 2020

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

Serge Gautherie : winapi_test: Add DYNAMIC_TIME_ZONE_INFORMATION to tests.dat.
by Alexandre Julliard April 13, 2020

April 13, 2020

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

Dmitry Timoshkov : adsldp/tests: Add one more skip() to catch ERROR_DS_SERVER_DOWN.
by Alexandre Julliard April 13, 2020

April 13, 2020

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

Zebediah Figura : ntdll: Factor out object_is_finished().
by Alexandre Julliard April 13, 2020

April 13, 2020

Module: wine Branch: master Commit: 74d830755c2e43771e79bec482bb4ff704ef22db URL: https://source.winehq.org/git/wine.git/?a=commit;h=74d830755c2e43771e79bec4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 11 00:16:25 2020 -0500 ntdll: Factor out object_is_finished(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 4b4bdf2cd7..a6e4749e10 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -2023,6 +2023,17 @@ static void tp_object_cancel( struct threadpool_object *object ) tp_object_release( object ); } +static BOOL object_is_finished( struct threadpool_object *object, BOOL group ) +{ + if (object->num_pending_callbacks) + return FALSE; + + if (group) + return !object->num_running_callbacks; + else + return !object->num_associated_callbacks; +} + /*********************************************************************** * tp_object_wait (internal) * @@ -2034,14 +2045,11 @@ static void tp_object_wait( struct threadpool_object *object, BOOL group_wait ) struct threadpool *pool = object->pool; RtlEnterCriticalSection( &pool->cs ); - if (group_wait) + while (!object_is_finished( object, group_wait )) { - while (object->num_pending_callbacks || object->num_running_callbacks) + if (group_wait) RtlSleepConditionVariableCS( &object->group_finished_event, &pool->cs, NULL ); - } - else - { - while (object->num_pending_callbacks || object->num_associated_callbacks) + else RtlSleepConditionVariableCS( &object->finished_event, &pool->cs, NULL ); } RtlLeaveCriticalSection( &pool->cs ); @@ -2261,13 +2269,13 @@ static void CALLBACK threadpool_worker_proc( void *param ) } object->num_running_callbacks--; - if (!object->num_pending_callbacks && !object->num_running_callbacks) + if (object_is_finished( object, TRUE )) RtlWakeAllConditionVariable( &object->group_finished_event ); if (instance.associated) { object->num_associated_callbacks--; - if (!object->num_pending_callbacks && !object->num_associated_callbacks) + if (object_is_finished( object, FALSE )) RtlWakeAllConditionVariable( &object->finished_event ); } @@ -2567,7 +2575,7 @@ VOID WINAPI TpDisassociateCallback( TP_CALLBACK_INSTANCE *instance ) RtlEnterCriticalSection( &pool->cs ); object->num_associated_callbacks--; - if (!object->num_pending_callbacks && !object->num_associated_callbacks) + if (object_is_finished( object, FALSE )) RtlWakeAllConditionVariable( &object->finished_event ); RtlLeaveCriticalSection( &pool->cs );

1 0

Serge Gautherie : winapi_test: Tests.dat needs timezoneapi.h.
by Alexandre Julliard April 13, 2020

April 13, 2020

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

Marcus Meissner : ws2_32: Add IPPROTO_IPIP mapping.
by Alexandre Julliard April 13, 2020

April 13, 2020

Module: wine Branch: master Commit: 8bce44e4eabe1e9fc58cb30efa0dba9081c754c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bce44e4eabe1e9fc58cb30e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Apr 12 11:47:05 2020 +0200 ws2_32: Add IPPROTO_IPIP mapping. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 1 + include/winsock.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5b62767795..d688994e62 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -761,6 +761,7 @@ static const int ws_proto_map[][2] = MAP_OPTION( IPPROTO_ICMP ), MAP_OPTION( IPPROTO_IGMP ), MAP_OPTION( IPPROTO_RAW ), + MAP_OPTION( IPPROTO_IPIP ), {FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO}, }; diff --git a/include/winsock.h b/include/winsock.h index 891fa9de23..a8bb35a4c4 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -257,6 +257,7 @@ extern "C" { #define IPPROTO_ICMP 1 #define IPPROTO_IGMP 2 #define IPPROTO_GGP 3 +#define IPPROTO_IPIP 4 #define IPPROTO_TCP 6 #define IPPROTO_UDP 17 #define IPPROTO_IDP 22 @@ -270,6 +271,7 @@ extern "C" { #define WS_IPPROTO_ICMP 1 #define WS_IPPROTO_IGMP 2 #define WS_IPPROTO_GGP 3 +#define WS_IPPROTO_IPIP 4 #define WS_IPPROTO_TCP 6 #define WS_IPPROTO_UDP 17 #define WS_IPPROTO_IDP 22

1 0

Zebediah Figura : devenum: Pass moniker fields to moniker_create().
by Alexandre Julliard April 13, 2020

April 13, 2020

Module: wine Branch: master Commit: 8cabd4785fe18c45421fd48063a5dd985da32716 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cabd4785fe18c45421fd480… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 11 10:49:43 2020 -0500 devenum: Pass moniker fields to moniker_create(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/devenum_private.h | 4 +- dlls/devenum/mediacatenum.c | 89 ++++++++++++++++++++++++----------------- dlls/devenum/parsedisplayname.c | 41 +++++++++---------- 3 files changed, 73 insertions(+), 61 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index bdb5fb7b01..cb274d6c11 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -68,7 +68,9 @@ struct moniker }; }; -struct moniker *moniker_create(void) DECLSPEC_HIDDEN; +struct moniker *dmo_moniker_create(const GUID class, const GUID clsid) DECLSPEC_HIDDEN; +struct moniker *codec_moniker_create(const GUID *class, const WCHAR *name) DECLSPEC_HIDDEN; +struct moniker *filter_moniker_create(const GUID *class, const WCHAR *name) DECLSPEC_HIDDEN; HRESULT enum_moniker_create(REFCLSID class, IEnumMoniker **enum_mon) DECLSPEC_HIDDEN; extern ICreateDevEnum devenum_factory DECLSPEC_HIDDEN; diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 860eef7603..4a5ae45e8b 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -768,7 +768,7 @@ static const IMonikerVtbl IMoniker_Vtbl = moniker_IsSystemMoniker, }; -struct moniker *moniker_create(void) +struct moniker *filter_moniker_create(const GUID *class, const WCHAR *name) { struct moniker *object; @@ -777,6 +777,49 @@ struct moniker *moniker_create(void) object->IMoniker_iface.lpVtbl = &IMoniker_Vtbl; object->ref = 1; + object->type = DEVICE_FILTER; + if (class) + object->class = *class; + object->has_class = !!class; + object->name = wcsdup(name); + + DEVENUM_LockModule(); + + return object; +} + +struct moniker *codec_moniker_create(const GUID *class, const WCHAR *name) +{ + struct moniker *object; + + if (!(object = calloc(1, sizeof(*object)))) + return NULL; + + object->IMoniker_iface.lpVtbl = &IMoniker_Vtbl; + object->ref = 1; + object->type = DEVICE_CODEC; + if (class) + object->class = *class; + object->has_class = !!class; + object->name = wcsdup(name); + + DEVENUM_LockModule(); + + return object; +} + +struct moniker *dmo_moniker_create(const GUID class, const GUID clsid) +{ + struct moniker *object; + + if (!(object = calloc(1, sizeof(*object)))) + return NULL; + + object->IMoniker_iface.lpVtbl = &IMoniker_Vtbl; + object->ref = 1; + object->type = DEVICE_DMO; + object->class = class; + object->clsid = clsid; DEVENUM_LockModule(); @@ -842,11 +885,11 @@ static HRESULT WINAPI enum_moniker_Next(IEnumMoniker *iface, ULONG celt, IMonike { EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); WCHAR buffer[MAX_PATH + 1]; - struct moniker *pMoniker; + struct moniker *moniker; LONG res; ULONG fetched = 0; - CLSID clsid; HRESULT hr; + GUID clsid; HKEY hkey; TRACE("(%p)->(%d, %p, %p)\n", iface, celt, rgelt, pceltFetched); @@ -858,14 +901,7 @@ static HRESULT WINAPI enum_moniker_Next(IEnumMoniker *iface, ULONG celt, IMonike /* try DMOs */ if ((hr = IEnumDMO_Next(This->dmo_enum, 1, &clsid, NULL, NULL)) == S_OK) { - if (!(pMoniker = moniker_create())) - return E_OUTOFMEMORY; - - pMoniker->type = DEVICE_DMO; - pMoniker->clsid = clsid; - - StringFromGUID2(&clsid, buffer, CHARS_IN_GUID); - StringFromGUID2(&This->class, buffer + CHARS_IN_GUID - 1, CHARS_IN_GUID); + moniker = dmo_moniker_create(This->class, clsid); } /* try DirectShow filters */ else if (!(res = RegEnumKeyW(This->sw_key, This->sw_index, buffer, ARRAY_SIZE(buffer)))) @@ -874,17 +910,7 @@ static HRESULT WINAPI enum_moniker_Next(IEnumMoniker *iface, ULONG celt, IMonike if ((res = RegOpenKeyExW(This->sw_key, buffer, 0, KEY_QUERY_VALUE, &hkey))) break; - if (!(pMoniker = moniker_create())) - return E_OUTOFMEMORY; - - pMoniker->type = DEVICE_FILTER; - - if (!(pMoniker->name = CoTaskMemAlloc((lstrlenW(buffer) + 1) * sizeof(WCHAR)))) - { - IMoniker_Release(&pMoniker->IMoniker_iface); - return E_OUTOFMEMORY; - } - lstrcpyW(pMoniker->name, buffer); + moniker = filter_moniker_create(&This->class, buffer); } /* then try codecs */ else if (!(res = RegEnumKeyW(This->cm_key, This->cm_index, buffer, ARRAY_SIZE(buffer)))) @@ -894,26 +920,15 @@ static HRESULT WINAPI enum_moniker_Next(IEnumMoniker *iface, ULONG celt, IMonike if ((res = RegOpenKeyExW(This->cm_key, buffer, 0, KEY_QUERY_VALUE, &hkey))) break; - if (!(pMoniker = moniker_create())) - return E_OUTOFMEMORY; - - pMoniker->type = DEVICE_CODEC; - - if (!(pMoniker->name = CoTaskMemAlloc((lstrlenW(buffer) + 1) * sizeof(WCHAR)))) - { - IMoniker_Release(&pMoniker->IMoniker_iface); - return E_OUTOFMEMORY; - } - lstrcpyW(pMoniker->name, buffer); + moniker = codec_moniker_create(&This->class, buffer); } else break; - pMoniker->has_class = TRUE; - pMoniker->class = This->class; + if (!moniker) + return E_OUTOFMEMORY; - rgelt[fetched] = &pMoniker->IMoniker_iface; - fetched++; + rgelt[fetched++] = &moniker->IMoniker_iface; } TRACE("-- fetched %d\n", fetched); diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index ab0f7bf870..45a89f6993 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -68,10 +68,10 @@ static ULONG WINAPI devenum_parser_Release(IParseDisplayName *iface) static HRESULT WINAPI devenum_parser_ParseDisplayName(IParseDisplayName *iface, IBindCtx *pbc, LPOLESTR name, ULONG *eaten, IMoniker **ret) { + struct moniker *moniker; WCHAR buffer[MAX_PATH]; enum device_type type; - struct moniker *mon; - CLSID class; + GUID class, clsid; TRACE("(%p, %s, %p, %p)\n", pbc, debugstr_w(name), eaten, ret); @@ -102,47 +102,42 @@ static HRESULT WINAPI devenum_parser_ParseDisplayName(IParseDisplayName *iface, return MK_E_SYNTAX; } - if (!(mon = moniker_create())) - return E_OUTOFMEMORY; - if (type == DEVICE_DMO) { lstrcpynW(buffer, name, CHARS_IN_GUID); - if (FAILED(CLSIDFromString(buffer, &mon->clsid))) - { - IMoniker_Release(&mon->IMoniker_iface); + if (FAILED(CLSIDFromString(buffer, &clsid))) return MK_E_SYNTAX; - } lstrcpynW(buffer, name + CHARS_IN_GUID - 1, CHARS_IN_GUID); - if (FAILED(CLSIDFromString(buffer, &mon->class))) - { - IMoniker_Release(&mon->IMoniker_iface); + if (FAILED(CLSIDFromString(buffer, &class))) return MK_E_SYNTAX; - } + + moniker = dmo_moniker_create(class, clsid); } else { lstrcpynW(buffer, name, CHARS_IN_GUID); if (CLSIDFromString(buffer, &class) == S_OK) { - mon->has_class = TRUE; - mon->class = class; name += CHARS_IN_GUID; + if (type == DEVICE_FILTER) + moniker = filter_moniker_create(&class, name); + else + moniker = codec_moniker_create(&class, name); } - - if (!(mon->name = CoTaskMemAlloc((lstrlenW(name) + 1) * sizeof(WCHAR)))) + else { - IMoniker_Release(&mon->IMoniker_iface); - return E_OUTOFMEMORY; + if (type == DEVICE_FILTER) + moniker = filter_moniker_create(NULL, name); + else + moniker = codec_moniker_create(NULL, name); } - lstrcpyW(mon->name, name); } - mon->type = type; - - *ret = &mon->IMoniker_iface; + if (!moniker) + return E_OUTOFMEMORY; + *ret = &moniker->IMoniker_iface; return S_OK; }

1 0

Zebediah Figura : devenum: Don't bother creating the category key for codecs if there are no codecs to register.
by Alexandre Julliard April 13, 2020

April 13, 2020

Module: wine Branch: master Commit: cbfd33300a075f91bb75b958914150ed234fe48e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbfd33300a075f91bb75b958… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 11 10:49:39 2020 -0500 devenum: Don't bother creating the category key for codecs if there are no codecs to register. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 56 -------------------------------------------- 1 file changed, 56 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 8e82fcdeac..eba93f0fa0 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -52,7 +52,6 @@ static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a', static const WCHAR wszFilterData[] = {'F','i','l','t','e','r','D','a','t','a',0}; static ULONG WINAPI DEVENUM_ICreateDevEnum_AddRef(ICreateDevEnum * iface); -static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory); /********************************************************************** * DEVENUM_ICreateDevEnum_QueryInterface (also IUnknown) @@ -429,9 +428,6 @@ static void register_legacy_filters(void) hr = HRESULT_FROM_WIN32(lRet); } - if (SUCCEEDED(hr)) - hr = DEVENUM_CreateAMCategoryKey(&CLSID_LegacyAmFilterCategory); - if (SUCCEEDED(hr)) { for (i = 0; i < dwFilterSubkeys; i++) @@ -517,10 +513,6 @@ static BOOL CALLBACK register_dsound_devices(GUID *guid, const WCHAR *desc, cons VARIANT var; HRESULT hr; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(hr)) - return FALSE; - if (guid) { WCHAR *name = heap_alloc(sizeof(defaultW) + lstrlenW(desc) * sizeof(WCHAR)); @@ -578,9 +570,6 @@ static void register_waveout_devices(void) VARIANT var; HRESULT hr; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(hr)) return; - count = waveOutGetNumDevs(); for (i = -1; i < count; i++) @@ -627,9 +616,6 @@ static void register_wavein_devices(void) VARIANT var; HRESULT hr; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(hr)) return; - count = waveInGetNumDevs(); for (i = 0; i < count; i++) @@ -671,9 +657,6 @@ static void register_midiout_devices(void) VARIANT var; HRESULT hr; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(hr)) return; - count = midiOutGetNumDevs(); for (i = -1; i < count; i++) @@ -724,9 +707,6 @@ static void register_vfw_codecs(void) int i = 0; HIC hic; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(hr)) return; - while (ICInfo(ICTYPE_VIDEO, i++, &info)) { WCHAR name[5] = {LOBYTE(LOWORD(info.fccHandler)), HIBYTE(LOWORD(info.fccHandler)), @@ -784,10 +764,6 @@ static void register_avicap_devices(void) HRESULT hr; int i = 0; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_VideoInputDeviceCategory); - if (FAILED(hr)) - return; - for (i = 0; i < 10; ++i) { if (!capGetDriverDescriptionW(i, friendlyname, ARRAY_SIZE(friendlyname), @@ -896,35 +872,3 @@ static const ICreateDevEnumVtbl ICreateDevEnum_Vtbl = * static CreateDevEnum instance */ ICreateDevEnum DEVENUM_CreateDevEnum = { &ICreateDevEnum_Vtbl }; - -/********************************************************************** - * DEVENUM_CreateAMCategoryKey (INTERNAL) - * - * Creates a registry key for a category at HKEY_CURRENT_USER\Software\ - * Microsoft\ActiveMovie\devenum\{clsid} - */ -static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory) -{ - WCHAR wszRegKey[MAX_PATH]; - HRESULT res = S_OK; - HKEY hkeyDummy = NULL; - - lstrcpyW(wszRegKey, wszActiveMovieKey); - - if (!StringFromGUID2(clsidCategory, wszRegKey + lstrlenW(wszRegKey), ARRAY_SIZE(wszRegKey) - lstrlenW(wszRegKey))) - res = E_INVALIDARG; - - if (SUCCEEDED(res)) - { - LONG lRes = RegCreateKeyW(HKEY_CURRENT_USER, wszRegKey, &hkeyDummy); - res = HRESULT_FROM_WIN32(lRes); - } - - if (hkeyDummy) - RegCloseKey(hkeyDummy); - - if (FAILED(res)) - ERR("Failed to create key HKEY_CURRENT_USER\\%s\n", debugstr_w(wszRegKey)); - - return res; -}

1 0