wine-commits October 2019

wine-commits@winehq.org

2 participants
614 discussions

Zebediah Figura : quartz/tests: Add more tests for seeking.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: 88c41a3999001cec76b46825d028192809a2b5cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=88c41a3999001cec76b46825… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 19 10:48:22 2019 -0500 quartz/tests: Add more tests for seeking. Partly to further prove incorrect the patches currently in Staging. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 162 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 148 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=88c41a3999001cec76b4…

1 0

Zebediah Figura : quartz/tests: Add more tests for stream start time.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: 445d2d9617b3fa298f54c12ee06583ab715be04e URL: https://source.winehq.org/git/wine.git/?a=commit;h=445d2d9617b3fa298f54c12e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 19 10:48:21 2019 -0500 quartz/tests: Add more tests for stream start time. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 842f3168cb..3d6571c789 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3114,6 +3114,16 @@ todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Paused); + hr = IMediaFilter_Run(filter, 0xdeadf00d); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Running); + ok(source.start_time == 0xdeadf00d, "Got time %s.\n", wine_dbgstr_longlong(source.start_time)); + ok(sink.start_time == 0xdeadf00d, "Got time %s.\n", wine_dbgstr_longlong(sink.start_time)); + + hr = IMediaFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Paused); + hr = IMediaFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Stopped); @@ -3130,6 +3140,35 @@ todo_wine ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); + Sleep(600); + hr = IMediaFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Paused); + + hr = IMediaFilter_Run(filter, 0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Running); + ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, + "Expected time near %s, got %s.\n", + wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); + ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", + wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); + + hr = IMediaFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Paused); + Sleep(600); + + start_time += 600 * 10000; + hr = IMediaFilter_Run(filter, 0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Running); + ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, + "Expected time near %s, got %s.\n", + wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); + ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", + wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); + hr = IMediaFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Stopped);

1 0

Alistair Leslie-Hughes : wmvcore: IWMProfile3 GetStreamCount return zero streams.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: 877f8aa32ce29b7a8c41f16815c4639408698078 URL: https://source.winehq.org/git/wine.git/?a=commit;h=877f8aa32ce29b7a8c41f168… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Oct 19 09:50:03 2019 +0000 wmvcore: IWMProfile3 GetStreamCount return zero streams. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/reader.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/reader.c b/dlls/wmvcore/reader.c index 6945f10a65..68e35cfd48 100644 --- a/dlls/wmvcore/reader.c +++ b/dlls/wmvcore/reader.c @@ -1756,7 +1756,12 @@ static HRESULT WINAPI profile3_GetStreamCount(IWMProfile3 *iface, DWORD *count) { WMReader *This = impl_from_IWMProfile3(iface); FIXME("%p, %p\n", This, count); - return E_NOTIMPL; + + if (!count) + return E_INVALIDARG; + + *count = 0; + return S_OK; } static HRESULT WINAPI profile3_GetStream(IWMProfile3 *iface, DWORD index, IWMStreamConfig **config)

1 0

Alistair Leslie-Hughes : wmvcore: IWMReader GetOutputCount return zero outputs.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: 7891e1d7141ba53124278ab18433a3727c2194bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=7891e1d7141ba53124278ab1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Oct 19 09:50:01 2019 +0000 wmvcore: IWMReader GetOutputCount return zero outputs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/reader.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/reader.c b/dlls/wmvcore/reader.c index 6041c567e9..6945f10a65 100644 --- a/dlls/wmvcore/reader.c +++ b/dlls/wmvcore/reader.c @@ -176,7 +176,12 @@ static HRESULT WINAPI WMReader_GetOutputCount(IWMReader *iface, DWORD *outputs) { WMReader *This = impl_from_IWMReader(iface); FIXME("(%p)->(%p)\n", This, outputs); - return E_NOTIMPL; + + if(!outputs) + return E_INVALIDARG; + + *outputs = 0; + return S_OK; } static HRESULT WINAPI WMReader_GetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps **output)

1 0

Nikolay Sivov : comdlg32/tests: Use win_skip() instead when appropriate.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: 3dc3d4998e00dfca6a6af0bbacbeba65872bc817 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dc3d4998e00dfca6a6af0bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 20 23:44:05 2019 +0300 comdlg32/tests: Use win_skip() instead when appropriate. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/tests/itemdlg.c | 2 +- dlls/comdlg32/tests/printdlg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 787c4e48e8..6ee0d5fc3d 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -441,7 +441,7 @@ static BOOL test_instantiation(void) &IID_IFileSaveDialog, (void**)&pfsd); if(FAILED(hr)) { - skip("Could not instantiate the FileSaveDialog.\n"); + win_skip("Could not instantiate the FileSaveDialog.\n"); return FALSE; } ok(hr == S_OK, "got 0x%08x.\n", hr); diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 4c6a47355c..0376872e67 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -375,7 +375,7 @@ static void test_PrintDlgExW(void) /* PrintDlgEx not present before w2k */ if (!pPrintDlgExW) { - skip("PrintDlgExW not available\n"); + win_skip("PrintDlgExW not available\n"); return; }

1 0

Nikolay Sivov : t2embed/tests: Fix some test failures on Win10.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: 5ce743d53bcc12493e28497ff7c12d41023d67f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ce743d53bcc12493e28497f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 20 16:35:43 2019 +0300 t2embed/tests: Fix some test failures on Win10. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/t2embed/tests/t2embed.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/t2embed/tests/t2embed.c b/dlls/t2embed/tests/t2embed.c index 9f278a57d1..4ffc3daed1 100644 --- a/dlls/t2embed/tests/t2embed.c +++ b/dlls/t2embed/tests/t2embed.c @@ -43,19 +43,22 @@ static int CALLBACK enum_font_proc(ENUMLOGFONTEXA *enumlf, NEWTEXTMETRICEXA *ntm UINT fsType = otm.otmfsType & 0xf; ret = TTGetEmbeddingType(hdc, &status); - ok(ret == E_NONE, "got %d\n", ret); - - if (fsType == LICENSE_INSTALLABLE) - expected = EMBED_INSTALLABLE; - else if (fsType & LICENSE_EDITABLE) - expected = EMBED_EDITABLE; - else if (fsType & LICENSE_PREVIEWPRINT) - expected = EMBED_PREVIEWPRINT; - else if (fsType & LICENSE_NOEMBEDDING) - expected = EMBED_NOEMBEDDING; - - ok(expected == status, "%s: status %d, expected %d, fsType %#x\n", enumlf->elfLogFont.lfFaceName, status, - expected, otm.otmfsType); + ok(ret == E_NONE || ret == E_NOTATRUETYPEFONT, "Unexpected return value %#x.\n", ret); + + if (ret == E_NONE) + { + if (fsType == LICENSE_INSTALLABLE) + expected = EMBED_INSTALLABLE; + else if (fsType & LICENSE_EDITABLE) + expected = EMBED_EDITABLE; + else if (fsType & LICENSE_PREVIEWPRINT) + expected = EMBED_PREVIEWPRINT; + else if (fsType & LICENSE_NOEMBEDDING) + expected = EMBED_NOEMBEDDING; + + ok(expected == status, "%s: status %d, expected %d, fsType %#x\n", enumlf->elfLogFont.lfFaceName, status, + expected, otm.otmfsType); + } } else { @@ -170,14 +173,6 @@ static void test_TTIsEmbeddingEnabled(void) hdc = CreateCompatibleDC(0); - ret = TTIsEmbeddingEnabled(hdc, NULL); - ok(ret == E_ERRORACCESSINGFACENAME, "got %#x\n", ret); - - status = 123; - ret = TTIsEmbeddingEnabled(hdc, &status); - ok(ret == E_ERRORACCESSINGFACENAME, "got %#x\n", ret); - ok(status == 123, "got %u\n", status); - memset(&logfont, 0, sizeof(logfont)); logfont.lfHeight = 12; logfont.lfWeight = FW_NORMAL; @@ -187,6 +182,9 @@ static void test_TTIsEmbeddingEnabled(void) old_font = SelectObject(hdc, hfont); + ret = TTIsEmbeddingEnabled(hdc, NULL); + ok(ret == E_PBENABLEDINVALID, "Unexpected return value %#x.\n", ret); + status = 123; ret = TTIsEmbeddingEnabled(hdc, &status); ok(ret == E_NONE, "got %#x\n", ret);

1 0

Nikolay Sivov : dwrite/tests: Relax tests that fail on some Win10 versions.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: f83d141454f437d5f6a46cdb7a237fb245c1e6fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f83d141454f437d5f6a46cdb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 20 15:21:55 2019 +0300 dwrite/tests: Relax tests that fail on some Win10 versions. GetString() return value contradicts other methods,and partially buffer writes don't happen elsewhere. It's not worth to replicate this. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 32156fdedd..c2f9dc0b1f 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1738,7 +1738,7 @@ static void test_GetFamilyNames(void) ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); hr = IDWriteLocalizedStrings_GetString(names, 10, NULL, 0); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); if (0) hr = IDWriteLocalizedStrings_GetString(names, 0, NULL, 100); @@ -1751,12 +1751,12 @@ static void test_GetFamilyNames(void) buffer[0] = 1; hr = IDWriteLocalizedStrings_GetString(names, 0, buffer, len-1); ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); - ok(buffer[0] == 0, "got %x\n", buffer[0]); + ok(buffer[0] == 0 || broken(buffer[0] == 'T'), "Unexpected buffer contents, %#x.\n", buffer[0]); buffer[0] = 1; hr = IDWriteLocalizedStrings_GetString(names, 0, buffer, len); ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); - ok(buffer[0] == 0, "got %x\n", buffer[0]); + ok(buffer[0] == 0 || broken(buffer[0] == 'T'), "Unexpected buffer contents, %#x.\n", buffer[0]); buffer[0] = 0; hr = IDWriteLocalizedStrings_GetString(names, 0, buffer, len+1);

1 0

Alistair Leslie-Hughes : dpnet: Initialize size before call to RegGetValueW (Coverity).
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: 96b1c96c88e770794bea5f8082a8691d41ff6fd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96b1c96c88e770794bea5f80… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Oct 20 10:26:58 2019 +0000 dpnet: Initialize size before call to RegGetValueW (Coverity). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/peer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index f935b2a313..7536af6796 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -157,6 +157,7 @@ HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER next_key = RegEnumKeyW( key, index, provider, MAX_PATH); while(next_key == ERROR_SUCCESS) { + size = 0; res = RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, NULL, &size); if(res == ERROR_SUCCESS) { @@ -198,6 +199,7 @@ HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER next_key = RegEnumKeyW( key, index, provider, MAX_PATH); while(next_key == ERROR_SUCCESS) { + size = 0; res = RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, NULL, &size); if(res == ERROR_SUCCESS) {

1 0

Alistair Leslie-Hughes : dplayx: Copy the correct Short name variable.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: 982137f73f7be7bde9e7de93be55ef03c54f5adf URL: https://source.winehq.org/git/wine.git/?a=commit;h=982137f73f7be7bde9e7de93… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Oct 20 10:26:56 2019 +0000 dplayx: Copy the correct Short name variable. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index e7d6edc6a0..e2464f8013 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -2709,7 +2709,7 @@ static HRESULT DP_IF_GetGroupName( IDirectPlayImpl *This, DPID idGroup, void *lp if( lpGData->name.u1.lpszShortNameA ) { strcpy( ((char*)lpName)+lpGData->name.dwSize, - lpGData->name.u2.lpszLongNameA ); + lpGData->name.u1.lpszShortNameA ); } else {

1 0

Zebediah Figura : advapi32/tests: Use unique names for each created service.
by Alexandre Julliard 21 Oct '19

21 Oct '19

Module: wine Branch: master Commit: 7d35a261bad7db68b5fc13e4916a58e0cb8762fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d35a261bad7db68b5fc13e4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 19 15:31:28 2019 -0500 advapi32/tests: Use unique names for each created service. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 38 ++++++-------------------------------- 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index f91ea185ae..6c78900bd4 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -199,7 +199,7 @@ static void test_create_delete_svc(void) CHAR username[UNLEN + 1], domain[MAX_PATH]; DWORD user_size = UNLEN + 1; CHAR account[UNLEN + 3]; - static const CHAR servicename [] = "Winetest"; + static const CHAR servicename [] = "winetest_create_delete"; static const CHAR pathname [] = "we_dont_care.exe"; static const CHAR empty [] = ""; static const CHAR password [] = "secret"; @@ -428,12 +428,6 @@ static void test_create_delete_svc(void) CloseServiceHandle(svc_handle1); CloseServiceHandle(scm_handle); - /* Wait a while. One of the following tests also does a CreateService for the - * same servicename and this would result in an ERROR_SERVICE_MARKED_FOR_DELETE - * error if we do this too quickly. Vista seems more picky than the others. - */ - Sleep(1000); - /* And a final NULL check */ SetLastError(0xdeadbeef); ret = DeleteService(NULL); @@ -453,7 +447,7 @@ static void test_get_displayname(void) static const WCHAR spoolerW[] = {'S','p','o','o','l','e','r',0}; static const WCHAR deadbeefW[] = {'D','e','a','d','b','e','e','f',0}; static const WCHAR abcW[] = {'A','B','C',0}; - static const CHAR servicename[] = "Winetest"; + static const CHAR servicename[] = "winetest_displayname"; static const CHAR pathname[] = "we_dont_care.exe"; /* Having NULL for the size of the buffer will crash on W2K3 */ @@ -725,9 +719,6 @@ static void test_get_displayname(void) CloseServiceHandle(svc_handle); CloseServiceHandle(scm_handle); - - /* Wait a while. Just in case one of the following tests does a CreateService again */ - Sleep(1000); } static void test_get_servicekeyname(void) @@ -1861,7 +1852,7 @@ static void test_sequence(void) BOOL ret, is_nt4; QUERY_SERVICE_CONFIGA *config; DWORD given, needed; - static const CHAR servicename [] = "Winetest"; + static const CHAR servicename [] = "winetest_sequence"; static const CHAR displayname [] = "Winetest dummy service"; static const CHAR displayname2[] = "Winetest dummy service (2)"; static const CHAR pathname [] = "we_dont_care.exe"; @@ -2029,10 +2020,6 @@ static void test_sequence(void) ret = DeleteService(svc_handle); ok(ret, "Expected success, got error %u\n", GetLastError()); CloseServiceHandle(svc_handle); - - /* Wait a while. The following test does a CreateService again */ - Sleep(1000); - CloseServiceHandle(scm_handle); HeapFree(GetProcessHeap(), 0, config); } @@ -2046,7 +2033,7 @@ static void test_queryconfig2(void) LPSERVICE_DESCRIPTIONA pConfig = (LPSERVICE_DESCRIPTIONA)buffer; LPSERVICE_DESCRIPTIONW pConfigW = (LPSERVICE_DESCRIPTIONW)buffer; SERVICE_PRESHUTDOWN_INFO preshutdown_info; - static const CHAR servicename [] = "Winetest"; + static const CHAR servicename [] = "winetest_query_config2"; static const CHAR displayname [] = "Winetest dummy service"; static const CHAR pathname [] = "we_dont_care.exe"; static const CHAR dependencies[] = "Master1\0Master2\0+MasterGroup1\0"; @@ -2304,12 +2291,7 @@ static void test_queryconfig2(void) cleanup: DeleteService(svc_handle); - CloseServiceHandle(svc_handle); - - /* Wait a while. The following test does a CreateService again */ - Sleep(1000); - CloseServiceHandle(scm_handle); } @@ -2512,7 +2494,7 @@ static void test_start_stop(void) BOOL ret; SC_HANDLE scm_handle, svc_handle; DWORD le, is_nt4; - static const char servicename[] = "Winetest"; + static const char servicename[] = "winetest_start_stop"; char cmd[MAX_PATH+20]; const char* displayname; @@ -2592,17 +2574,13 @@ cleanup: DeleteService(svc_handle); CloseServiceHandle(svc_handle); } - - /* Wait a while. The following test does a CreateService again */ - Sleep(1000); - CloseServiceHandle(scm_handle); } static void test_refcount(void) { SC_HANDLE scm_handle, svc_handle1, svc_handle2, svc_handle3, svc_handle4, svc_handle5; - static const CHAR servicename [] = "Winetest"; + static const CHAR servicename [] = "winetest_refcount"; static const CHAR pathname [] = "we_dont_care.exe"; BOOL ret; @@ -2681,10 +2659,6 @@ static void test_refcount(void) /* Delete the service */ ret = DeleteService(svc_handle5); ok(ret, "Expected success (err=%d)\n", GetLastError()); - - /* Wait a while. Just in case one of the following tests does a CreateService again */ - Sleep(1000); - CloseServiceHandle(svc_handle5); CloseServiceHandle(scm_handle); }

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
62
Older →

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 October 2019