October 2019 - Wine-commits

Zebediah Figura : comsvcs/tests: Increase the timeout in the implicit MTA test.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 80985a27d55ca376337536d0535cf4b941c553b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80985a27d55ca376337536d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 25 17:38:05 2019 -0500 comsvcs/tests: Increase the timeout in the implicit MTA test. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/tests/dispenser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comsvcs/tests/dispenser.c b/dlls/comsvcs/tests/dispenser.c index 98d2a91bf5..10bce8e849 100644 --- a/dlls/comsvcs/tests/dispenser.c +++ b/dlls/comsvcs/tests/dispenser.c @@ -186,7 +186,7 @@ static void create_dispenser(void) * actually initialize. */ Sleep(200); thread = CreateThread(NULL, 0, com_thread, NULL, 0, NULL); - ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); + ok(!WaitForSingleObject(thread, 20000), "wait failed\n"); GetExitCodeThread(thread, &ret); ok(ret == S_OK, "got unexpected hr %#x\n", ret);

1 0

Zebediah Figura : msctf/tests: Simplify ITfThreadMgrEventSink refcounting tests.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 9516ad1fc7a77861ae2944ce5dc3cbc81c5bbdf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9516ad1fc7a77861ae2944ce… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 26 12:00:22 2019 -0500 msctf/tests: Simplify ITfThreadMgrEventSink refcounting tests. Just use one static object, and don't depend on the thread manager never calling AddRef()/Release(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 48 ++++++--------------------------------- 1 file changed, 7 insertions(+), 41 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 1222085fe0..1d972ef0de 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -61,7 +61,6 @@ static BOOL test_ShouldActivate = FALSE; static BOOL test_ShouldDeactivate = FALSE; static DWORD tmSinkCookie; -static DWORD tmSinkRefCount; static DWORD dmSinkCookie; static DWORD documentStatus; static DWORD key_trace_sink_cookie, ui_element_sink_cookie, profile_activation_sink_cookie; @@ -484,11 +483,6 @@ static inline ThreadMgrEventSink *impl_from_ITfThreadMgrEventSink(ITfThreadMgrEv return CONTAINING_RECORD(iface, ThreadMgrEventSink, ITfThreadMgrEventSink_iface); } -static void ThreadMgrEventSink_Destructor(ThreadMgrEventSink *This) -{ - HeapFree(GetProcessHeap(),0,This); -} - static HRESULT WINAPI ThreadMgrEventSink_QueryInterface(ITfThreadMgrEventSink *iface, REFIID iid, LPVOID *ppvOut) { *ppvOut = NULL; @@ -510,20 +504,13 @@ static HRESULT WINAPI ThreadMgrEventSink_QueryInterface(ITfThreadMgrEventSink *i static ULONG WINAPI ThreadMgrEventSink_AddRef(ITfThreadMgrEventSink *iface) { ThreadMgrEventSink *This = impl_from_ITfThreadMgrEventSink(iface); - ok (tmSinkRefCount == This->refCount,"ThreadMgrEventSink refcount off %i vs %i\n",This->refCount,tmSinkRefCount); return InterlockedIncrement(&This->refCount); } static ULONG WINAPI ThreadMgrEventSink_Release(ITfThreadMgrEventSink *iface) { ThreadMgrEventSink *This = impl_from_ITfThreadMgrEventSink(iface); - ULONG ret; - - ok (tmSinkRefCount == This->refCount,"ThreadMgrEventSink refcount off %i vs %i\n",This->refCount,tmSinkRefCount); - ret = InterlockedDecrement(&This->refCount); - if (ret == 0) - ThreadMgrEventSink_Destructor(This); - return ret; + return InterlockedDecrement(&This->refCount); } static HRESULT WINAPI ThreadMgrEventSink_OnInitDocumentMgr(ITfThreadMgrEventSink *iface, @@ -613,20 +600,7 @@ static const ITfThreadMgrEventSinkVtbl ThreadMgrEventSink_ThreadMgrEventSinkVtbl ThreadMgrEventSink_OnPopContext }; -static HRESULT ThreadMgrEventSink_Constructor(IUnknown **ppOut) -{ - ThreadMgrEventSink *This; - - This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ThreadMgrEventSink)); - if (This == NULL) - return E_OUTOFMEMORY; - - This->ITfThreadMgrEventSink_iface.lpVtbl = &ThreadMgrEventSink_ThreadMgrEventSinkVtbl; - This->refCount = 1; - - *ppOut = (IUnknown*)&This->ITfThreadMgrEventSink_iface; - return S_OK; -} +static ThreadMgrEventSink thread_mgr_event_sink = {{&ThreadMgrEventSink_ThreadMgrEventSinkVtbl}, 1}; static HRESULT WINAPI TfKeyTraceEventSink_QueryInterface(ITfKeyTraceEventSink *iface, REFIID riid, void **ppv) { @@ -1224,27 +1198,18 @@ static void test_ThreadMgrAdviseSinks(void) { ITfSource *source = NULL; HRESULT hr; - IUnknown *sink; hr = ITfThreadMgr_QueryInterface(g_tm, &IID_ITfSource, (LPVOID*)&source); ok(SUCCEEDED(hr),"Failed to get IID_ITfSource for ThreadMgr\n"); if (!source) return; - hr = ThreadMgrEventSink_Constructor(&sink); - ok(hr == S_OK, "got %08x\n", hr); - if(FAILED(hr)) return; - - tmSinkRefCount = 1; tmSinkCookie = 0; - hr = ITfSource_AdviseSink(source,&IID_ITfThreadMgrEventSink, sink, &tmSinkCookie); + hr = ITfSource_AdviseSink(source,&IID_ITfThreadMgrEventSink, + (IUnknown *)&thread_mgr_event_sink.ITfThreadMgrEventSink_iface, &tmSinkCookie); ok(hr == S_OK, "Failed to Advise ITfThreadMgrEventSink\n"); ok(tmSinkCookie!=0,"Failed to get sink cookie\n"); - - /* Advising the sink adds a ref, Releasing here lets the object be deleted - when unadvised */ - tmSinkRefCount = 2; - IUnknown_Release(sink); + ok(thread_mgr_event_sink.refCount == 2, "Got %d references.\n", thread_mgr_event_sink.refCount); hr = ITfSource_AdviseSink(source, &IID_ITfKeyTraceEventSink, (IUnknown*)&TfKeyTraceEventSink, &key_trace_sink_cookie); @@ -1271,9 +1236,10 @@ static void test_ThreadMgrUnadviseSinks(void) if (!source) return; - tmSinkRefCount = 1; + ok(thread_mgr_event_sink.refCount == 2, "Got %d references.\n", thread_mgr_event_sink.refCount); hr = ITfSource_UnadviseSink(source, tmSinkCookie); ok(hr == S_OK, "Failed to unadvise ITfThreadMgrEventSink\n"); + ok(thread_mgr_event_sink.refCount == 1, "Got %d references.\n", thread_mgr_event_sink.refCount); hr = ITfSource_UnadviseSink(source, key_trace_sink_cookie); ok(hr == S_OK, "Failed to unadvise ITfKeyTraceEventSink\n");

1 0

Zebediah Figura : msctf/tests: Don't test calls to ITextStoreACP::GetStatus().
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 507abe4dcd6f2a2871d59491a579a2e78cef832c URL: https://source.winehq.org/git/wine.git/?a=commit;h=507abe4dcd6f2a2871d59491… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 26 12:00:23 2019 -0500 msctf/tests: Don't test calls to ITextStoreACP::GetStatus(). They vary across platforms, and in any case there's not much point testing methods that just query state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 1d972ef0de..c8202197e1 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -76,7 +76,6 @@ static INT test_OnPopContext = SINK_UNEXPECTED; static INT test_KEV_OnSetFocus = SINK_UNEXPECTED; static INT test_ACP_AdviseSink = SINK_UNEXPECTED; static INT test_ACP_UnadviseSink = SINK_UNEXPECTED; -static INT test_ACP_GetStatus = SINK_UNEXPECTED; static INT test_ACP_RequestLock = SINK_UNEXPECTED; static INT test_ACP_GetEndACP = SINK_UNEXPECTED; static INT test_ACP_GetSelection = SINK_UNEXPECTED; @@ -264,7 +263,6 @@ static HRESULT WINAPI TextStoreACP_RequestLock(ITextStoreACP *iface, static HRESULT WINAPI TextStoreACP_GetStatus(ITextStoreACP *iface, TS_STATUS *pdcs) { - sink_fire_ok(&test_ACP_GetStatus,"TextStoreACP_GetStatus"); pdcs->dwDynamicFlags = documentStatus; return S_OK; } @@ -2142,11 +2140,9 @@ static void test_TStoApplicationText(void) documentStatus = TS_SD_READONLY; hrSession = 0xfeedface; - test_ACP_GetStatus = SINK_EXPECTED; hr = ITfContext_RequestEditSession(cxt, tid, es, TF_ES_SYNC|TF_ES_READWRITE, &hrSession); ok(SUCCEEDED(hr),"ITfContext_RequestEditSession failed\n"); ok(hrSession == TS_E_READONLY,"Unexpected hrSession (%x)\n",hrSession); - sink_check_ok(&test_ACP_GetStatus,"GetStatus"); /* signal a change to allow readwrite sessions */ documentStatus = 0; @@ -2154,7 +2150,6 @@ static void test_TStoApplicationText(void) ITextStoreACPSink_OnStatusChange(ACPSink,documentStatus); sink_check_ok(&test_ACP_RequestLock,"RequestLock"); - test_ACP_GetStatus = SINK_EXPECTED; test_ACP_RequestLock = SINK_EXPECTED; test_DoEditSession = SINK_EXPECTED; hrSession = 0xfeedface; @@ -2163,7 +2158,6 @@ static void test_TStoApplicationText(void) ok(SUCCEEDED(hr),"ITfContext_RequestEditSession failed\n"); sink_check_ok(&test_OnEndEdit,"OnEndEdit"); sink_check_ok(&test_DoEditSession,"DoEditSession"); - sink_check_ok(&test_ACP_GetStatus,"GetStatus"); ok(hrSession == 0xdeadcafe,"Unexpected hrSession (%x)\n",hrSession); if (source) @@ -2288,11 +2282,9 @@ static void test_AssociateFocus(void) test_CurrentFocus = NULL; test_PrevFocus = dmorig; test_OnSetFocus = SINK_OPTIONAL; /* Doesn't always fire on Win7 */ - test_ACP_GetStatus = SINK_OPTIONAL; hr = ITfThreadMgr_SetFocus(g_tm,NULL); ok(SUCCEEDED(hr),"ITfThreadMgr_SetFocus failed\n"); sink_check_ok(&test_OnSetFocus,"OnSetFocus"); - test_ACP_GetStatus = SINK_UNEXPECTED; ITfDocumentMgr_Release(dmorig); hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&dm1); @@ -2400,7 +2392,6 @@ static void test_AssociateFocus(void) test_CurrentFocus = dmorig; test_PrevFocus = dm1; test_OnSetFocus = SINK_OPTIONAL; /* Doesn't always fire on Win7+ */ - test_ACP_GetStatus = SINK_IGNORE; ITfThreadMgr_SetFocus(g_tm,dmorig); sink_check_ok(&test_OnSetFocus,"OnSetFocus"); @@ -2435,7 +2426,6 @@ static void test_AssociateFocus(void) test_CurrentFocus = dmorig; test_PrevFocus = FOCUS_IGNORE; test_OnSetFocus = SINK_OPTIONAL; - test_ACP_GetStatus = SINK_IGNORE; ITfThreadMgr_SetFocus(g_tm,dmorig); sink_check_ok(&test_OnSetFocus,"OnSetFocus");

1 0

Zebediah Figura : msctf/tests: Trace method calls more completely and only when WINETEST_DEBUG is set.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 08cc7290df6e70168914b8468713cd163787a382 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08cc7290df6e70168914b846… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 26 12:00:24 2019 -0500 msctf/tests: Trace method calls more completely and only when WINETEST_DEBUG is set. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 138 ++++++++++++++++++++------------------ 1 file changed, 74 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08cc7290df6e70168914…

1 0

Zebediah Figura : ole32/tests: Adjust timing in test_CoWaitForMultipleHandles().
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 03224726a86f409f3617840060e7fd17ed1e8894 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03224726a86f409f36178400… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 26 22:47:51 2019 -0500 ole32/tests: Adjust timing in test_CoWaitForMultipleHandles(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 49faabdece..ea5ea35a11 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2450,7 +2450,6 @@ static DWORD CALLBACK release_semaphore_thread( LPVOID arg ) static DWORD CALLBACK send_message_thread(LPVOID arg) { HWND hWnd = arg; - Sleep(50); SendMessageA(hWnd, WM_DDE_FIRST, 0, 0); return 0; } @@ -2467,7 +2466,6 @@ static DWORD CALLBACK send_and_post_user_message_thread(void *arg) static DWORD CALLBACK post_message_thread(LPVOID arg) { HWND hWnd = arg; - Sleep(50); PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); return 0; } @@ -2931,7 +2929,7 @@ static void test_CoWaitForMultipleHandles(void) PostMessageA(hWnd, WM_QUIT, 42, 0); thread = CreateThread(NULL, 0, send_message_thread, hWnd, 0, &tid); ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); - hr = CoWaitForMultipleHandles(0, 100, 2, handles, &index); + hr = CoWaitForMultipleHandles(0, 500, 2, handles, &index); ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); ok(index == 0 || broken(index == 0xdeadbeef) /* Win 8 */, "expected index 0, got %u\n", index); success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE);

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 63674e8b0ebf525c82995296372f52cd894caf70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63674e8b0ebf525c82995296… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Oct 27 21:44:59 2019 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 422 ++++++++++++++++----------------------------------------------- 1 file changed, 106 insertions(+), 316 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=63674e8b0ebf525c8299…

1 0

Alex Henrie : ntoskrnl: Implement IoCreateUnprotectedSymbolicLink.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 380d31b17ae96d231d6d0e802d17bb6dc3d1a11d URL: https://source.winehq.org/git/wine.git/?a=commit;h=380d31b17ae96d231d6d0e80… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 24 21:20:54 2019 -0600 ntoskrnl: Implement IoCreateUnprotectedSymbolicLink. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47986 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 21 +++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 009b0dda81..9fe9c995a3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1581,6 +1581,27 @@ NTSTATUS WINAPI IoCreateSymbolicLink( UNICODE_STRING *name, UNICODE_STRING *targ } +/*********************************************************************** + * IoCreateUnprotectedSymbolicLink (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoCreateUnprotectedSymbolicLink( UNICODE_STRING *name, UNICODE_STRING *target ) +{ + HANDLE handle; + OBJECT_ATTRIBUTES attr; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = name; + attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + TRACE( "%s -> %s\n", debugstr_us(name), debugstr_us(target) ); + /* FIXME: store handle somewhere */ + return NtCreateSymbolicLinkObject( &handle, SYMBOLIC_LINK_ALL_ACCESS, &attr, target ); +} + + /*********************************************************************** * IoDeleteSymbolicLink (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d47a706054..297487fa25 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -361,7 +361,7 @@ @ stub IoCreateStreamFileObjectLite @ stdcall IoCreateSymbolicLink(ptr ptr) @ stdcall IoCreateSynchronizationEvent(ptr ptr) -@ stub IoCreateUnprotectedSymbolicLink +@ stdcall IoCreateUnprotectedSymbolicLink(ptr ptr) @ stdcall IoCsqInitialize(ptr ptr ptr ptr ptr ptr ptr) @ stub IoCsqInsertIrp @ stub IoCsqRemoveIrp

1 0

Sven Baars : mstask/tests: Wait a bit longer for tasks to start and terminate.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: d681deb3e5cff310ed3966f670ca2119e581975c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d681deb3e5cff310ed3966f6… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Oct 26 00:06:20 2019 +0200 mstask/tests: Wait a bit longer for tasks to start and terminate. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/tests/task.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 6195194d61..a9957117e9 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -626,7 +626,7 @@ static void test_Run(void) * This is how it's supposed to look like in the application * (the loop should be infinite): */ - for (i = 0; i < 3; i++) + for (i = 0; i < 5; i++) { hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task); ok(hr == S_OK, "Activate error %#x\n", hr); @@ -661,7 +661,7 @@ static void test_Run(void) * This is how it's supposed to look like in the application * (the loop should be infinite): */ - for (i = 0; i < 3; i++) + for (i = 0; i < 5; i++) { hr = ITaskScheduler_Activate(scheduler, wine_test_runW, &IID_ITask, (IUnknown **)&task); ok(hr == S_OK, "Activate error %#x\n", hr);

1 0

Zebediah Figura : gameux/tests: Get rid of registry value tests.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: e90c145020aee5aa91256c6f9b338da5374f31df URL: https://source.winehq.org/git/wine.git/?a=commit;h=e90c145020aee5aa91256c6f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 25 12:19:48 2019 -0500 gameux/tests: Get rid of registry value tests. Where gameux stores registry values is an implementation detail, and subject to change. There's no reason to test it, unless an application relies on it. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/tests/gameexplorer.c | 517 +-------------------------------------- 1 file changed, 12 insertions(+), 505 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e90c145020aee5aa9125…

1 0

Zebediah Figura : crypt32/tests: Clean up test_format_object().
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 14fd1ccdc6f167880300efe431a0a96654aadb04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14fd1ccdc6f167880300efe4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 25 17:28:31 2019 -0500 crypt32/tests: Clean up test_format_object(). Get rid of no longer needed workarounds, and handle a broken case in Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/main.c | 139 +++++++++++++++++++--------------------------- 1 file changed, 56 insertions(+), 83 deletions(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 6a031527d8..09aea37022 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -393,119 +393,92 @@ static void test_CryptInstallOssGlobal(void) } } -static const BYTE encodedInt[] = { 0x02,0x01,0x01 }; -static const WCHAR encodedIntStr[] = { '0','2',' ','0','1',' ','0','1',0 }; -static const BYTE encodedBigInt[] = { 0x02,0x1f,0x01,0x02,0x03,0x04,0x05,0x06, - 0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,0x14,0x15, - 0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f }; -static const WCHAR encodedBigIntStr[] = { '0','2',' ','1','f',' ','0','1',' ', - '0','2',' ','0','3',' ','0','4',' ','0','5',' ','0','6',' ','0','7',' ','0', - '8',' ','0','9',' ','0','a',' ','0','b',' ','0','c',' ','0','d',' ','0','e', - ' ','0','f',' ','1','0',' ','1','1',' ','1','2',' ','1','3',' ','1','4',' ', - '1','5',' ','1','6',' ','1','7',' ','1','8',' ','1','9',' ','1','a',' ','1', - 'b',' ','1','c',' ','1','d',' ','1','e',' ','1','f',0 }; - static void test_format_object(void) { - BOOL (WINAPI *pCryptFormatObject)(DWORD dwEncoding, DWORD dwFormatType, - DWORD dwFormatStrType, void *pFormatStruct, LPCSTR lpszStructType, - const BYTE *pbEncoded, DWORD dwEncoded, void *pbFormat, - DWORD *pcbFormat); + static const BYTE encodedInt[] = {0x02,0x01,0x01}; + static const BYTE encodedBigInt[] = {0x02,0x1f,0x01,0x02,0x03,0x04,0x05, + 0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12, + 0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f}; + static const WCHAR encodedBigIntStr[] = L"02 1f 01 02 03 04 05 06 07 08 09 " + "0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f"; + BOOL ret; DWORD size; - LPWSTR str; + WCHAR str[100]; - pCryptFormatObject = (void *)GetProcAddress(hCrypt, "CryptFormatObject"); - if (!pCryptFormatObject) - { - skip("No CryptFormatObject\n"); - return; - } /* Crash */ if (0) { - pCryptFormatObject(0, 0, 0, NULL, NULL, NULL, 0, NULL, NULL); + CryptFormatObject(0, 0, 0, NULL, NULL, NULL, 0, NULL, NULL); } /* When called with any but the default encoding, it fails to find a * formatting function. */ SetLastError(0xdeadbeef); - ret = pCryptFormatObject(0, 0, 0, NULL, NULL, NULL, 0, NULL, &size); - ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, - "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + ret = CryptFormatObject(0, 0, 0, NULL, NULL, NULL, 0, NULL, &size); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + /* When called with the default encoding type for any undefined struct type * (including none), it succeeds: the default encoding is a hex string * encoding. */ SetLastError(0xdeadbeef); - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL, 0, - NULL, &size); + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL, 0, NULL, &size); ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); - if (ret) - { - if (size == 0 && GetLastError() == ERROR_FILE_NOT_FOUND) - { - win_skip("CryptFormatObject has no default implementation\n"); - return; - } - ok(size == sizeof(WCHAR), "unexpected size %d\n", size); - str = HeapAlloc(GetProcessHeap(), 0, size); - SetLastError(0xdeadbeef); - size = 0; - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL, 0, - str, &size); - ok(!ret && GetLastError() == ERROR_MORE_DATA, - "expected ERROR_MORE_DATA, got %d\n", GetLastError()); - size = sizeof(WCHAR); - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL, 0, - str, &size); - ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); - ok(!str[0], "expected empty string\n"); - HeapFree(GetProcessHeap(), 0, str); - } - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, encodedInt, - sizeof(encodedInt), NULL, &size); - ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); - if (ret) - { - str = HeapAlloc(GetProcessHeap(), 0, size); - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, - encodedInt, sizeof(encodedInt), str, &size); - ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); - ok(!lstrcmpW(str, encodedIntStr), "unexpected format string\n"); - HeapFree(GetProcessHeap(), 0, str); - } - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, - encodedBigInt, sizeof(encodedBigInt), NULL, &size); + ok(size == sizeof(WCHAR) || broken(!size) /* Win10 1709+ */, "wrong size %d\n", size); + + SetLastError(0xdeadbeef); + size = 0; + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL, 0, str, &size); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_MORE_DATA, "wrong error %u\n", GetLastError()); + + size = sizeof(WCHAR); + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL, 0, str, &size); + ok(ret, "CryptFormatObject failed, error %u\n", GetLastError()); + ok(!str[0], "expected empty string\n"); + + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, encodedInt, + sizeof(encodedInt), NULL, &size); + ok(ret, "CryptFormatObject failed, error %u\n", GetLastError()); + ok(size >= sizeof(L"02 01 01"), "wrong size %u\n", size); + + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, encodedInt, + sizeof(encodedInt), str, &size); + ok(ret, "CryptFormatObject failed, error %u\n", GetLastError()); + ok(!wcscmp(str, L"02 01 01"), "wrong string %s\n", wine_dbgstr_w(str)); + + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, encodedBigInt, + sizeof(encodedBigInt), NULL, &size); + ok(ret, "CryptFormatObject failed, error %u\n", GetLastError()); + ok(size >= sizeof(encodedBigIntStr), "wrong size %u\n", size); + + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, + encodedBigInt, sizeof(encodedBigInt), str, &size); ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); - if (ret) - { - str = HeapAlloc(GetProcessHeap(), 0, size); - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, NULL, - encodedBigInt, sizeof(encodedBigInt), str, &size); - ok(ret, "CryptFormatObject failed: %d\n", GetLastError()); - ok(!lstrcmpiW(str, encodedBigIntStr), "unexpected format string\n"); - HeapFree(GetProcessHeap(), 0, str); - } + ok(!wcsicmp(str, encodedBigIntStr), "wrong string %s\n", wine_dbgstr_w(str)); + /* When called with the default encoding type for any undefined struct * type but CRYPT_FORMAT_STR_NO_HEX specified, it fails to find a * formatting function. */ SetLastError(0xdeadbeef); - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, CRYPT_FORMAT_STR_NO_HEX, - NULL, NULL, NULL, 0, NULL, &size); + ret = CryptFormatObject(X509_ASN_ENCODING, 0, CRYPT_FORMAT_STR_NO_HEX, + NULL, NULL, NULL, 0, NULL, &size); ok(!ret, "CryptFormatObject succeeded\n"); - ok(GetLastError() == ERROR_FILE_NOT_FOUND || - GetLastError() == 0xdeadbeef, /* Vista, W2K8 */ - "expected ERROR_FILE_NOT_FOUND or no change, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND + || GetLastError() == 0xdeadbeef, /* Vista, W2K8 */ + "wrong error %u\n", GetLastError()); + /* When called to format an AUTHORITY_KEY_ID2_INFO, it fails when no * data are given. */ SetLastError(0xdeadbeef); - ret = pCryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, - szOID_AUTHORITY_KEY_IDENTIFIER2, NULL, 0, NULL, &size); - ok(!ret && GetLastError() == E_INVALIDARG, - "expected E_INVALIDARG, got %d\n", GetLastError()); + ret = CryptFormatObject(X509_ASN_ENCODING, 0, 0, NULL, + szOID_AUTHORITY_KEY_IDENTIFIER2, NULL, 0, NULL, &size); + ok(!ret, "expected failure\n"); + ok(GetLastError() == E_INVALIDARG, "wrong error %u\n", GetLastError()); } START_TEST(main)

1 0