March 2014 - Wine-Commits - list.winehq.org

Aric Stewart : imm32: Set context conversion and sentence status.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: wine Branch: master Commit: f0de67de0cab3e67364d699850d86325ddcf70f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0de67de0cab3e67364d69985… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 11 09:12:10 2014 -0500 imm32: Set context conversion and sentence status. --- dlls/imm32/imm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index ccef19d..2fa31ac 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -696,6 +696,9 @@ HIMC WINAPI ImmCreateContext(void) /* Initialize the IME Private */ new_context->IMC.hPrivate = ImmCreateIMCC(new_context->immKbd->imeInfo.dwPrivateDataSize); + new_context->IMC.fdwConversion = new_context->immKbd->imeInfo.fdwConversionCaps; + new_context->IMC.fdwSentence = new_context->immKbd->imeInfo.fdwSentenceCaps; + if (!new_context->immKbd->pImeSelect(new_context, TRUE)) { TRACE("Selection of IME failed\n");

1 0

Sebastian Lackner : ntdll: Use condition variable for RtlQueueWorkItem implementation.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: wine Branch: master Commit: 7ba4d119c1674562a3f6f615986ba77d55a8ec9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ba4d119c1674562a3f6f6159… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Mar 9 04:04:53 2014 +0100 ntdll: Use condition variable for RtlQueueWorkItem implementation. --- dlls/ntdll/threadpool.c | 147 ++++++++++++++++++----------------------------- 1 file changed, 57 insertions(+), 90 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index e2fc6a5..f66f6ab 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -39,12 +39,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(threadpool); #define WORKER_TIMEOUT 30000 /* 30 seconds */ +/* threadpool_cs must be held while modifying the following elements */ +static struct list work_item_list = LIST_INIT(work_item_list); static LONG num_workers; -static LONG num_work_items; static LONG num_busy_workers; +static LONG num_items_processed; -static struct list work_item_list = LIST_INIT(work_item_list); -static HANDLE work_item_event; +static RTL_CONDITION_VARIABLE threadpool_cond = RTL_CONDITION_VARIABLE_INIT; static RTL_CRITICAL_SECTION threadpool_cs; static RTL_CRITICAL_SECTION_DEBUG critsect_debug = @@ -84,80 +85,44 @@ static inline LONG interlocked_dec( PLONG dest ) static void WINAPI worker_thread_proc(void * param) { - interlocked_inc(&num_workers); - - /* free the work item memory sooner to reduce memory usage */ - while (TRUE) - { - if (num_work_items > 0) - { - struct list *item; - RtlEnterCriticalSection(&threadpool_cs); - item = list_head(&work_item_list); - if (item) - { - struct work_item *work_item_ptr = LIST_ENTRY(item, struct work_item, entry); - struct work_item work_item; - list_remove(&work_item_ptr->entry); - interlocked_dec(&num_work_items); - - RtlLeaveCriticalSection(&threadpool_cs); - - work_item = *work_item_ptr; - RtlFreeHeap(GetProcessHeap(), 0, work_item_ptr); - - TRACE("executing %p(%p)\n", work_item.function, work_item.context); - - interlocked_inc(&num_busy_workers); + struct list *item; + struct work_item *work_item_ptr, work_item; + LARGE_INTEGER timeout; + timeout.QuadPart = -(WORKER_TIMEOUT * (ULONGLONG)10000); - /* do the work */ - work_item.function(work_item.context); + RtlEnterCriticalSection( &threadpool_cs ); + num_workers++; - interlocked_dec(&num_busy_workers); - } - else - RtlLeaveCriticalSection(&threadpool_cs); - } - else + for (;;) + { + if ((item = list_head( &work_item_list ))) { - NTSTATUS status; - LARGE_INTEGER timeout; - timeout.QuadPart = -(WORKER_TIMEOUT * (ULONGLONG)10000); - status = NtWaitForSingleObject(work_item_event, FALSE, &timeout); - if (status != STATUS_WAIT_0) - break; + work_item_ptr = LIST_ENTRY( item, struct work_item, entry ); + list_remove( &work_item_ptr->entry ); + num_busy_workers++; + num_items_processed++; + RtlLeaveCriticalSection( &threadpool_cs ); + + /* copy item to stack and do the work */ + work_item = *work_item_ptr; + RtlFreeHeap( GetProcessHeap(), 0, work_item_ptr ); + TRACE("executing %p(%p)\n", work_item.function, work_item.context); + work_item.function( work_item.context ); + + RtlEnterCriticalSection( &threadpool_cs ); + num_busy_workers--; } + else if (RtlSleepConditionVariableCS( &threadpool_cond, &threadpool_cs, &timeout ) != STATUS_SUCCESS) + break; } - interlocked_dec(&num_workers); - - RtlExitUserThread(0); + num_workers--; + RtlLeaveCriticalSection( &threadpool_cs ); + RtlExitUserThread( 0 ); /* never reached */ } -static NTSTATUS add_work_item_to_queue(struct work_item *work_item) -{ - NTSTATUS status; - - RtlEnterCriticalSection(&threadpool_cs); - list_add_tail(&work_item_list, &work_item->entry); - num_work_items++; - RtlLeaveCriticalSection(&threadpool_cs); - - if (!work_item_event) - { - HANDLE sem; - status = NtCreateSemaphore(&sem, SEMAPHORE_ALL_ACCESS, NULL, 1, INT_MAX); - if (interlocked_cmpxchg_ptr( &work_item_event, sem, 0 )) - NtClose(sem); /* somebody beat us to it */ - } - else - status = NtReleaseSemaphore(work_item_event, 1, NULL); - - return status; -} - /*********************************************************************** * RtlQueueWorkItem (NTDLL.@) * @@ -184,6 +149,7 @@ NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WORK_ITEM_ROUTINE Function, PVOID Context, { HANDLE thread; NTSTATUS status; + LONG items_processed; struct work_item *work_item = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(struct work_item)); if (!work_item) @@ -195,39 +161,40 @@ NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WORK_ITEM_ROUTINE Function, PVOID Context, if (Flags & ~WT_EXECUTELONGFUNCTION) FIXME("Flags 0x%x not supported\n", Flags); - status = add_work_item_to_queue(work_item); + RtlEnterCriticalSection( &threadpool_cs ); + list_add_tail( &work_item_list, &work_item->entry ); + status = (num_workers > num_busy_workers) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; + items_processed = num_items_processed; + RtlLeaveCriticalSection( &threadpool_cs ); /* FIXME: tune this algorithm to not be as aggressive with creating threads * if WT_EXECUTELONGFUNCTION isn't specified */ - if ((status == STATUS_SUCCESS) && - ((num_workers == 0) || (num_workers == num_busy_workers))) + if (status == STATUS_SUCCESS) + RtlWakeConditionVariable( &threadpool_cond ); + else { - status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, - NULL, 0, 0, - worker_thread_proc, NULL, &thread, NULL ); - if (status == STATUS_SUCCESS) - NtClose( thread ); + status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, NULL, 0, 0, + worker_thread_proc, NULL, &thread, NULL ); /* NOTE: we don't care if we couldn't create the thread if there is at * least one other available to process the request */ - if ((num_workers > 0) && (status != STATUS_SUCCESS)) - status = STATUS_SUCCESS; - } - - if (status != STATUS_SUCCESS) - { - RtlEnterCriticalSection(&threadpool_cs); - - interlocked_dec(&num_work_items); - list_remove(&work_item->entry); - RtlFreeHeap(GetProcessHeap(), 0, work_item); - - RtlLeaveCriticalSection(&threadpool_cs); + if (status == STATUS_SUCCESS) + NtClose( thread ); + else + { + RtlEnterCriticalSection( &threadpool_cs ); + if (num_workers > 0 || num_items_processed != items_processed) + status = STATUS_SUCCESS; + else + list_remove( &work_item->entry ); + RtlLeaveCriticalSection( &threadpool_cs ); - return status; + if (status != STATUS_SUCCESS) + RtlFreeHeap( GetProcessHeap(), 0, work_item ); + } } - return STATUS_SUCCESS; + return status; } /***********************************************************************

1 0

Nikolay Sivov : scrrun: Implement Path() property for Folder.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: wine Branch: master Commit: eebf9c6b827a9f1db9a8ae2b0daabd7de99ffe2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eebf9c6b827a9f1db9a8ae2b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 12 10:07:24 2014 +0400 scrrun: Implement Path() property for Folder. --- dlls/scrrun/filesystem.c | 10 ++++++++-- dlls/scrrun/tests/filesystem.c | 10 +++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index a48b630..d87ba30 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1826,8 +1826,14 @@ static HRESULT WINAPI folder_Invoke(IFolder *iface, DISPID dispIdMember, static HRESULT WINAPI folder_get_Path(IFolder *iface, BSTR *path) { struct folder *This = impl_from_IFolder(iface); - FIXME("(%p)->(%p): stub\n", This, path); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, path); + + if(!path) + return E_POINTER; + + *path = SysAllocString(This->path); + return *path ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI folder_get_Name(IFolder *iface, BSTR *name) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 8502934..c62b2bc 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -795,7 +795,7 @@ static void test_GetFolder(void) /* Please keep the tests for IFolderCollection and IFileCollection in sync */ static void test_FolderCollection(void) { - static const WCHAR fooW[] = {'\\','f','o','o',0}; + static const WCHAR fooW[] = {'f','o','o',0}; static const WCHAR aW[] = {'\\','a',0}; static const WCHAR bW[] = {'\\','b',0}; static const WCHAR cW[] = {'\\','c',0}; @@ -824,6 +824,14 @@ static void test_FolderCollection(void) hr = IFolder_get_SubFolders(folder, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); + hr = IFolder_get_Path(folder, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IFolder_get_Path(folder, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(buffW, str), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); + SysFreeString(str); + lstrcpyW(pathW, buffW); lstrcatW(pathW, aW); CreateDirectoryW(pathW, NULL);

1 0

Stefan Dösinger : d3d9/tests: Use a custom GUID for the private data tests.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: wine Branch: master Commit: 6ffbfc7c29543b6c6282cdd6a719b861b85af5ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ffbfc7c29543b6c6282cdd6a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 12 14:08:24 2014 +0100 d3d9/tests: Use a custom GUID for the private data tests. --- dlls/d3d9/tests/device.c | 47 ++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 93f43fa..393c14a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5082,6 +5082,13 @@ static void test_private_data(void) HRESULT hr; DWORD size; DWORD data[4] = {1, 2, 3, 4}; + static const GUID d3d9_private_data_test_guid = + { + 0xfdb37466, + 0x428f, + 0x4edf, + {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} + }; window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); @@ -5099,57 +5106,57 @@ static void test_private_data(void) D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); - hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9 /* Abuse this tag */, + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, device, 0, D3DSPD_IUNKNOWN); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9 /* Abuse this tag */, + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, device, 5, D3DSPD_IUNKNOWN); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9 /* Abuse this tag */, + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, device, sizeof(IUnknown *) * 2, D3DSPD_IUNKNOWN); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); /* A failing SetPrivateData call does not clear the old data with the same tag. */ - hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DVertexBuffer9, device, + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, device, sizeof(device), D3DSPD_IUNKNOWN); ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); - hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DVertexBuffer9, device, + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, device, sizeof(device) * 2, D3DSPD_IUNKNOWN); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); size = sizeof(ptr); - hr = IDirect3DSurface9_GetPrivateData(surface, &IID_IDirect3DVertexBuffer9, &ptr, &size); + hr = IDirect3DSurface9_GetPrivateData(surface, &d3d9_private_data_test_guid, &ptr, &size); ok(SUCCEEDED(hr), "Failed to get private data, hr %#x.\n", hr); IUnknown_Release(ptr); - hr = IDirect3DSurface9_FreePrivateData(surface, &IID_IDirect3DVertexBuffer9); + hr = IDirect3DSurface9_FreePrivateData(surface, &d3d9_private_data_test_guid); ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr); refcount = get_refcount((IUnknown *)device); - hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9 /* Abuse this tag */, + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); expected_refcount = refcount + 1; refcount = get_refcount((IUnknown *)device); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); - hr = IDirect3DSurface9_FreePrivateData(surface, &IID_IDirect3DSurface9); + hr = IDirect3DSurface9_FreePrivateData(surface, &d3d9_private_data_test_guid); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); expected_refcount = refcount - 1; refcount = get_refcount((IUnknown *)device); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); - hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9, + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9, + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, surface, sizeof(IUnknown *), D3DSPD_IUNKNOWN); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); refcount = get_refcount((IUnknown *)device); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); - hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9, + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); size = sizeof(ptr); - hr = IDirect3DSurface9_GetPrivateData(surface, &IID_IDirect3DSurface9, &ptr, &size); + hr = IDirect3DSurface9_GetPrivateData(surface, &d3d9_private_data_test_guid, &ptr, &size); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); expected_refcount = refcount + 2; refcount = get_refcount((IUnknown *)device); @@ -5171,27 +5178,27 @@ static void test_private_data(void) hr = IDirect3DTexture9_GetSurfaceLevel(texture, 1, &surface2); ok(SUCCEEDED(hr), "Failed to get texture level 1, hr %#x.\n", hr); - hr = IDirect3DTexture9_SetPrivateData(texture, &IID_IDirect3DVertexBuffer9, data, sizeof(data), 0); + hr = IDirect3DTexture9_SetPrivateData(texture, &d3d9_private_data_test_guid, data, sizeof(data), 0); ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); memset(data, 0, sizeof(data)); size = sizeof(data); - hr = IDirect3DSurface9_GetPrivateData(surface, &IID_IDirect3DVertexBuffer9, data, &size); + hr = IDirect3DSurface9_GetPrivateData(surface, &d3d9_private_data_test_guid, data, &size); ok(hr == D3DERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DTexture9_GetPrivateData(texture, &IID_IDirect3DVertexBuffer9, data, &size); + hr = IDirect3DTexture9_GetPrivateData(texture, &d3d9_private_data_test_guid, data, &size); ok(SUCCEEDED(hr), "Failed to get private data, hr %#x.\n", hr); ok(data[0] == 1 && data[1] == 2 && data[2] == 3 && data[3] == 4, "Got unexpected private data: %u, %u, %u, %u.\n", data[0], data[1], data[2], data[3]); - hr = IDirect3DTexture9_FreePrivateData(texture, &IID_IDirect3DVertexBuffer9); + hr = IDirect3DTexture9_FreePrivateData(texture, &d3d9_private_data_test_guid); ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr); - hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DVertexBuffer9, data, sizeof(data), 0); + hr = IDirect3DSurface9_SetPrivateData(surface, &d3d9_private_data_test_guid, data, sizeof(data), 0); ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); - hr = IDirect3DSurface9_GetPrivateData(surface2, &IID_IDirect3DVertexBuffer9, data, &size); + hr = IDirect3DSurface9_GetPrivateData(surface2, &d3d9_private_data_test_guid, data, &size); ok(hr == D3DERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DSurface9_FreePrivateData(surface, &IID_IDirect3DVertexBuffer9); + hr = IDirect3DSurface9_FreePrivateData(surface, &d3d9_private_data_test_guid); ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr); IDirect3DSurface9_Release(surface2);

1 0

Aric Stewart : imm32: Add IME_CMODE_FULLSHAPE to conversion mode.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: wine Branch: master Commit: 7a907f1fd7c950287fa7184e94ebcff22b9fb768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a907f1fd7c950287fa7184e9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 11 09:10:38 2014 -0500 imm32: Add IME_CMODE_FULLSHAPE to conversion mode. --- dlls/winemac.drv/ime.c | 2 +- dlls/winex11.drv/ime.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 3a2a78b..b62736f 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -1410,7 +1410,7 @@ BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, LPCWSTR lpszOpti InitOnceExecuteOnce( &init_once, register_classes, NULL, NULL ); lpIMEInfo->dwPrivateDataSize = sizeof(IMEPRIVATE); lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET; - lpIMEInfo->fdwConversionCaps = IME_CMODE_NATIVE; + lpIMEInfo->fdwConversionCaps = IME_CMODE_NATIVE | IME_CMODE_FULLSHAPE; lpIMEInfo->fdwSentenceCaps = IME_SMODE_AUTOMATIC; lpIMEInfo->fdwUICaps = UI_CAP_2700; /* Tell App we cannot accept ImeSetCompositionString calls */ diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index cd40f77..22698cf 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -564,7 +564,7 @@ BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, InitOnceExecuteOnce( &init_once, register_classes, NULL, NULL ); lpIMEInfo->dwPrivateDataSize = sizeof (IMEPRIVATE); lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET; - lpIMEInfo->fdwConversionCaps = IME_CMODE_NATIVE; + lpIMEInfo->fdwConversionCaps = IME_CMODE_NATIVE | IME_CMODE_FULLSHAPE; lpIMEInfo->fdwSentenceCaps = IME_SMODE_AUTOMATIC; lpIMEInfo->fdwUICaps = UI_CAP_2700; /* Tell App we cannot accept ImeSetCompositionString calls */

1 0

Jacek Caban : crypt32/tests: Improved test failure message.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: wine Branch: master Commit: 3d09d1a9cb1db5bca846808b2e0ec94214017daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d09d1a9cb1db5bca846808b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 12 11:24:52 2014 +0100 crypt32/tests: Improved test failure message. --- dlls/crypt32/tests/chain.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index f69fbdc..bf02ca0 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3880,9 +3880,8 @@ static void testGetCertChain(void) ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError()); if (ret) { - ok(!(chain->TrustStatus.dwErrorStatus & - CERT_TRUST_IS_NOT_VALID_FOR_USAGE), - "didn't expect CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); + ok(!(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE), + "didn't expect CERT_TRUST_IS_NOT_VALID_FOR_USAGE, got %x\n", chain->TrustStatus.dwErrorStatus); pCertFreeCertificateChain(chain); } oids[1] = one_two_three;

1 0

Francois Gouget : testbot/TestAgent: We don' t need the server version for SetTime().
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: tools Branch: master Commit: 8fd1a3be1d792132a397144b03b7b96472afc7de URL: http://source.winehq.org/git/tools.git/?a=commit;h=8fd1a3be1d792132a397144b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 12 14:25:58 2014 +0100 testbot/TestAgent: We don't need the server version for SetTime(). Just let the server return an error if it does not know about this RPC. --- testbot/lib/WineTestBot/TestAgent.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index c138663..f810f2b 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -2,7 +2,7 @@ # to run scripts. # # Copyright 2009 Ge van Geldorp -# Copyright 2012 Francois Gouget +# Copyright 2012-2014 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -1206,9 +1206,6 @@ sub SetTime($) my ($self) = @_; debug("SetTime\n"); - # Make sure we have the server version - return undef if (!$self->{agentversion} and !$self->_Connect()); - # Send the command if (!$self->_StartRPC($RPC_SETTIME) or !$self->_SendListSize(2) or

1 0

Francois Gouget : testbot: Don' t show the TestAgent server version when failing to set the time.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: tools Branch: master Commit: b7f27a6b914689b7e05073e56ac40750ce2b04b4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b7f27a6b914689b7e05073e5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 12 14:22:59 2014 +0100 testbot: Don't show the TestAgent server version when failing to set the time. The connection may have failed in which case we don't have this information. --- testbot/bin/WineRunTask.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index ce1adb5..efeac8d 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -231,7 +231,7 @@ if (defined $ErrMessage) if (!$TA->SetTime()) { # Not a fatal error - LogTaskError("Unable to set the VM system time (". $TA->GetVersion() ."): ". $TA->GetLastError() ."\n", $FullErrFileName); + LogTaskError("Unable to set the VM system time: ". $TA->GetLastError() ."\n", $FullErrFileName); } my $FileType = $Step->FileType;

1 0

Francois Gouget : testbot/TestAgent: Track the current RPC and argument name and include them in error messages.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: tools Branch: master Commit: 428d39c238140d5bca3fa7a9d65c6c09a8c4163c URL: http://source.winehq.org/git/tools.git/?a=commit;h=428d39c238140d5bca3fa7a9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 12 14:52:42 2014 +0100 testbot/TestAgent: Track the current RPC and argument name and include them in error messages. Also keep track of how many bytes were written/read before the error occurred. This helps diagnose errors. In particular, should a 'network read timeout' occur, it helps knowing where it happened. --- testbot/lib/WineTestBot/TestAgent.pm | 360 ++++++++++++++++++---------------- 1 file changed, 189 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=428d39c238140d5bca3f…

1 0

Francois Gouget : testbot/TestAgent: _SetError() may be called when connecting, that is outside any RPC.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: tools Branch: master Commit: 6157405f4a6dd1e45f3ca6aabc78c8750e6e75d2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6157405f4a6dd1e45f3ca6aa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 12 14:25:29 2014 +0100 testbot/TestAgent: _SetError() may be called when connecting, that is outside any RPC. --- testbot/lib/WineTestBot/TestAgent.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index f313984..c138663 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -212,7 +212,8 @@ sub _SetError($$$) # We did not even manage to connect but record the error anyway $self->{err} = $Msg; } - debug($RpcNames{$self->{rpcid}} || $self->{rpcid}, ": $self->{err}\n"); + my $RpcName = defined $self->{rpcid} ? $RpcNames{$self->{rpcid}} || $self->{rpcid} : "Connect"; + debug("$RpcName: $self->{err}\n"); } sub GetLastError($)

1 0