November 2017 - Wine-Devel - list.winehq.org

[PATCH] shell32/tests: Add test for IAutoComplete2 with custom source
by Fabian Maurer Nov. 14, 2017

Nov. 14, 2017

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/shell32/tests/autocomplete.c | 168 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 63a2eb2b11..781ced804a 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -225,6 +225,172 @@ static void createMainWnd(void) CW_USEDEFAULT, CW_USEDEFAULT, 130, 105, NULL, NULL, GetModuleHandleA(NULL), 0); } +struct string_enumerator +{ + IEnumString IEnumString_iface; + LONG ref; + WCHAR **data; + int data_len; + int cur; +}; + +static struct string_enumerator *impl_from_IEnumString(IEnumString *iface) +{ + return CONTAINING_RECORD(iface, struct string_enumerator, IEnumString_iface); +} + +static HRESULT WINAPI string_enumerator_QueryInterface(IEnumString *iface, REFIID riid, void **ppv) +{ + if (IsEqualGUID(riid, &IID_IEnumString) || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI string_enumerator_AddRef(IEnumString *iface) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + + ULONG ref = InterlockedIncrement(&this->ref); + + return ref; +} + +static ULONG WINAPI string_enumerator_Release(IEnumString *iface) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + + ULONG ref = InterlockedDecrement(&this->ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, this); + + return ref; +} + +static HRESULT WINAPI string_enumerator_Next(IEnumString *iface, ULONG num, LPOLESTR *strings, ULONG *num_returned) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + int i, len; + + *num_returned = 0; + for (i = 0; i < num; i++) + { + if (this->cur >= this->data_len) + return S_FALSE; + + len = lstrlenW(this->data[this->cur]) + 1; + + strings[i] = CoTaskMemAlloc(len * sizeof(WCHAR)); + memcpy(strings[i], this->data[this->cur], len * sizeof(WCHAR)); + + (*num_returned)++; + this->cur++; + } + + return S_OK; +} + +static HRESULT WINAPI string_enumerator_Reset(IEnumString *iface) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + + this->cur = 0; + + return S_OK; +} + +static HRESULT WINAPI string_enumerator_Skip(IEnumString *iface, ULONG num) +{ + struct string_enumerator *this = impl_from_IEnumString(iface); + + this->cur += num; + + return S_OK; +} + +static HRESULT WINAPI string_enumerator_Clone(IEnumString *iface, IEnumString **out) +{ + *out = NULL; + return E_NOTIMPL; +} + +static IEnumStringVtbl string_enumerator_vtlb = +{ + string_enumerator_QueryInterface, + string_enumerator_AddRef, + string_enumerator_Release, + string_enumerator_Next, + string_enumerator_Skip, + string_enumerator_Reset, + string_enumerator_Clone +}; + +static HRESULT string_enumerator_create(void **ppv, WCHAR **suggestions, int count) +{ + struct string_enumerator *object; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IEnumString_iface.lpVtbl = &string_enumerator_vtlb; + object->ref = 1; + object->data = suggestions; + object->data_len = count; + object->cur = 0; + + *ppv = &object->IEnumString_iface; + + return S_OK; +} + +static void test_custom_source(void) +{ + static WCHAR str_alpha[] = {'a','l','p','h','a',0}; + static WCHAR str_alpha2[] = {'a','l','p','h','a','2',0}; + static WCHAR str_beta[] = {'b','e','t','a',0}; + static WCHAR *suggestions[] = { str_alpha, str_alpha2, str_beta }; + IUnknown *enumerator; + IAutoComplete2 *autocomplete; + HWND hwnd_edit; + WCHAR buffer[20]; + HRESULT hr; + MSG msg; + + ShowWindow(hMainWnd, SW_SHOW); + + hwnd_edit = CreateWindowA("Edit", "", WS_OVERLAPPED | WS_VISIBLE | WS_CHILD | WS_BORDER, 50, 5, 200, 20, hMainWnd, 0, NULL, 0); + + hr = CoCreateInstance(&CLSID_AutoComplete, NULL, CLSCTX_INPROC_SERVER, &IID_IAutoComplete2, (void**)&autocomplete); + ok(hr == S_OK, "CoCreateInstance failed: %x\n", hr); + + string_enumerator_create((void**)&enumerator, suggestions, sizeof(suggestions) / sizeof(*suggestions)); + + hr = IAutoComplete2_SetOptions(autocomplete, ACO_AUTOSUGGEST | ACO_AUTOAPPEND); + ok(hr == S_OK, "IAutoComplete2_SetOptions failed: %x\n", hr); + hr = IAutoComplete2_Init(autocomplete, hwnd_edit, enumerator, NULL, NULL); + ok(hr == S_OK, "IAutoComplete_Init failed: %x\n", hr); + + SendMessageW(hwnd_edit, WM_CHAR, 'b', 1); + SendMessageW(hwnd_edit, WM_KEYUP, 'e', 1); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + SendMessageW(hwnd_edit, WM_GETTEXT, sizeof(buffer) / sizeof(*buffer), (LPARAM)buffer); + ok(lstrcmpW(str_beta, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str_beta), wine_dbgstr_w(buffer)); + + ShowWindow(hMainWnd, SW_HIDE); + DestroyWindow(hwnd_edit); +} + START_TEST(autocomplete) { HRESULT r; @@ -246,6 +412,8 @@ START_TEST(autocomplete) goto cleanup; test_killfocus(); + test_custom_source(); + PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { TranslateMessage(&msg); -- 2.15.0

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras Nov. 14, 2017

Nov. 14, 2017

1 0

[PATCH] sane.ds: Send events to applications through the DSM.
by Vincent Povirk Nov. 14, 2017

Nov. 14, 2017

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/sane.ds/ds_ctrl.c | 19 ++++--------------- dlls/sane.ds/sane_i.h | 5 +++-- dlls/sane.ds/sane_main.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/sane.ds/ui.c | 6 ++---- include/twain.h | 24 ++++++++++++++++++++++++ 5 files changed, 80 insertions(+), 22 deletions(-) diff --git a/dlls/sane.ds/ds_ctrl.c b/dlls/sane.ds/ds_ctrl.c index 713f311c565..b7d283725c8 100644 --- a/dlls/sane.ds/ds_ctrl.c +++ b/dlls/sane.ds/ds_ctrl.c @@ -184,13 +184,7 @@ TW_UINT16 SANE_ProcessEvent (pTW_IDENTITY pOrigin, TRACE("DG_CONTROL/DAT_EVENT/MSG_PROCESSEVENT msg 0x%x, wParam 0x%lx\n", pMsg->message, pMsg->wParam); activeDS.twCC = TWCC_SUCCESS; - if (pMsg->message == activeDS.windowMessage && activeDS.windowMessage) - { - twRC = TWRC_DSEVENT; - pEvent->TWMessage = pMsg->wParam; - } - else - pEvent->TWMessage = MSG_NULL; /* no message to the application */ + pEvent->TWMessage = MSG_NULL; /* no message to the application */ if (activeDS.currentState < 5 || activeDS.currentState > 7) { @@ -232,8 +226,7 @@ TW_UINT16 SANE_PendingXfersEndXfer (pTW_IDENTITY pOrigin, pPendingXfers->Count = 0; activeDS.currentState = 5; /* Notify the application that it can close the data source */ - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_CLOSEDSREQ, 0); + SANE_Notify(MSG_CLOSEDSREQ); } else activeDS.sane_started = TRUE; @@ -403,8 +396,6 @@ TW_UINT16 SANE_EnableDSUserInterface (pTW_IDENTITY pOrigin, else { activeDS.hwndOwner = pUserInterface->hParent; - if (! activeDS.windowMessage) - activeDS.windowMessage = RegisterWindowMessageA("SANE.DS ACTIVITY MESSAGE"); if (pUserInterface->ShowUI) { BOOL rc; @@ -413,8 +404,7 @@ TW_UINT16 SANE_EnableDSUserInterface (pTW_IDENTITY pOrigin, pUserInterface->ModalUI = TRUE; if (!rc) { - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_CLOSEDSREQ, 0); + SANE_Notify(MSG_CLOSEDSREQ); } #ifdef SONAME_LIBSANE else @@ -428,8 +418,7 @@ TW_UINT16 SANE_EnableDSUserInterface (pTW_IDENTITY pOrigin, { /* no UI will be displayed, so source is ready to transfer data */ activeDS.currentState = 6; /* Transitions to state 6 directly */ - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_XFERREADY, 0); + SANE_Notify(MSG_XFERREADY); } twRC = TWRC_SUCCESS; diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h index ae58159d596..941e8b9e1b9 100644 --- a/dlls/sane.ds/sane_i.h +++ b/dlls/sane.ds/sane_i.h @@ -62,10 +62,10 @@ extern HINSTANCE SANE_instance DECLSPEC_HIDDEN; struct tagActiveDS { struct tagActiveDS *next; /* next active DS */ - TW_IDENTITY identity; /* identity */ + TW_IDENTITY identity; /* identity of the DS */ TW_UINT16 currentState; /* current state */ - UINT windowMessage; /* message to use to send status */ TW_UINT16 twCC; /* condition code */ + TW_IDENTITY appIdentity; /* identity of the app */ HWND hwndOwner; /* window handle of the app */ HWND progressWnd; /* window handle of the scanning window */ #ifdef SONAME_LIBSANE @@ -89,6 +89,7 @@ struct tagActiveDS /* Helper functions */ extern TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN; extern TW_UINT16 SANE_SaneSetDefaults (void) DECLSPEC_HIDDEN; +extern void SANE_Notify (TW_UINT16 message) DECLSPEC_HIDDEN; /* Implementation of operation triplets * From Application to Source (Control Information) */ diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 5c0f56f6c38..80a0baf9217 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -32,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); #ifdef SONAME_LIBSANE +DSMENTRYPROC SANE_dsmentry; + HINSTANCE SANE_instance; static void *libsane_handle; @@ -109,6 +111,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } static TW_UINT16 SANE_GetIdentity( pTW_IDENTITY, pTW_IDENTITY); +static TW_UINT16 SANE_SetEntryPoint (pTW_IDENTITY pOrigin, TW_MEMREF pData); static TW_UINT16 SANE_OpenDS( pTW_IDENTITY, pTW_IDENTITY); #endif /* SONAME_LIBSANE */ @@ -181,6 +184,17 @@ static TW_UINT16 SANE_SourceControlHandler ( } break; + case DAT_ENTRYPOINT: + if (MSG == MSG_SET) + twRC = SANE_SetEntryPoint (pOrigin, pData); + else + { + twRC = TWRC_FAILURE; + activeDS.twCC = TWCC_CAPBADOPERATION; + FIXME("unrecognized operation triplet\n"); + } + break; + case DAT_EVENT: if (MSG == MSG_PROCESSEVENT) twRC = SANE_ProcessEvent (pOrigin, pData); @@ -432,7 +446,7 @@ SANE_GetIdentity( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { return TWRC_FAILURE; self->ProtocolMajor = TWON_PROTOCOLMAJOR; self->ProtocolMinor = TWON_PROTOCOLMINOR; - self->SupportedGroups = DG_CONTROL | DG_IMAGE; + self->SupportedGroups = DG_CONTROL | DG_IMAGE | DF_DS2; copy_sane_short_name(sane_devlist[cursanedev]->name, self->ProductName, sizeof(self->ProductName) - 1); lstrcpynA (self->Manufacturer, sane_devlist[cursanedev]->vendor, sizeof(self->Manufacturer) - 1); lstrcpynA (self->ProductFamily, sane_devlist[cursanedev]->model, sizeof(self->ProductFamily) - 1); @@ -447,10 +461,40 @@ SANE_GetIdentity( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { return TWRC_SUCCESS; } +void SANE_Notify (TW_UINT16 message) +{ + SANE_dsmentry (&activeDS.identity, &activeDS.appIdentity, DG_CONTROL, DAT_NULL, message, NULL); +} + +/* DG_CONTROL/DAT_ENTRYPOINT/MSG_SET */ +TW_UINT16 SANE_SetEntryPoint (pTW_IDENTITY pOrigin, TW_MEMREF pData) +{ + TW_ENTRYPOINT *entry = (TW_ENTRYPOINT*)pData; + + SANE_dsmentry = entry->DSM_Entry; + + return TWRC_SUCCESS; +} + static TW_UINT16 SANE_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { SANE_Status status; int i; + if (SANE_dsmentry == NULL) + { + static const WCHAR twain32W[] = {'t','w','a','i','n','_','3','2',0}; + HMODULE moddsm = GetModuleHandleW(twain32W); + + if (moddsm) + SANE_dsmentry = (void*)GetProcAddress(moddsm, "DSM_Entry"); + + if (!SANE_dsmentry) + { + ERR("can't find DSM entry point\n"); + return TWRC_FAILURE; + } + } + detect_sane_devices(); if (!sane_devlist[0]) { ERR("No scanners? We should not get to OpenDS?\n"); @@ -481,6 +525,8 @@ static TW_UINT16 SANE_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { activeDS.twCC = SANE_SaneSetDefaults(); if (activeDS.twCC == TWCC_SUCCESS) { activeDS.currentState = 4; + activeDS.identity.Id = self->Id; + activeDS.appIdentity = *pOrigin; return TWRC_SUCCESS; } else diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 9a9bcb0347e..fe1988a88ad 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -1034,13 +1034,11 @@ static INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM if (psn->lParam) { activeDS.currentState = 6; - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_XFERREADY, 0); + SANE_Notify(MSG_XFERREADY); } break; case PSN_QUERYCANCEL: - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_CLOSEDSREQ, 0); + SANE_Notify(MSG_CLOSEDSREQ); break; case PSN_SETACTIVE: InitializeDialog(hwndDlg); diff --git a/include/twain.h b/include/twain.h index bdbda4761e4..28eaddf0840 100644 --- a/include/twain.h +++ b/include/twain.h @@ -1843,6 +1843,30 @@ typedef TW_UINT16 (*DSENTRYPROC)(pTW_IDENTITY, } #endif /* cplusplus */ +/* Definitions from TWAIN 2.x used by our builtin data sources */ +#define DAT_ENTRYPOINT 0x0403 +#define DF_DS2 0x40000000 + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ +typedef TW_HANDLE (PASCAL *DSM_MEMALLOCATE)(TW_UINT32 _size); +typedef void (PASCAL *DSM_MEMFREE)(TW_HANDLE _handle); +typedef TW_MEMREF (PASCAL *DSM_MEMLOCK)(TW_HANDLE _handle); +typedef void (PASCAL *DSM_MEMUNLOCK)(TW_HANDLE _handle); +#ifdef __cplusplus +} +#endif /* cplusplus */ + +typedef struct { + TW_UINT32 Size; + DSMENTRYPROC DSM_Entry; + DSM_MEMALLOCATE DSM_MemAllocate; + DSM_MEMFREE DSM_MemFree; + DSM_MEMLOCK DSM_MemLock; + DSM_MEMUNLOCK DSM_MemUnlock; +} TW_ENTRYPOINT; + /* The Twain structures must be packed on 2 byte alignment */ #include "poppack.h" -- 2.11.0

2 1

[PATCH] ieproxy: Added IPersistHistory proxy/stub.
by Jacek Caban Nov. 14, 2017

Nov. 14, 2017

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ieproxy/Makefile.in | 7 ++++--- dlls/ieproxy/ieproxy_perhist.idl | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 dlls/ieproxy/ieproxy_perhist.idl

1 0

[PATCH 2/3] imm32/tests: Add more composition string tests.
by Akihiro Sagawa Nov. 14, 2017

Nov. 14, 2017

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/imm32/tests/imm32.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+)

2 1

[PATCH 1/3] imm32/tests: Add a skip message when composition string isn't available.
by Akihiro Sagawa Nov. 14, 2017

Nov. 14, 2017

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/imm32/tests/imm32.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)

2 1

[PATCH 3/3] winex11: Keep the result string in the IME UI window procedure.
by Akihiro Sagawa Nov. 14, 2017

Nov. 14, 2017

Fixes bug 43904. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/imm32/tests/imm32.c | 1 - dlls/winex11.drv/ime.c | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-)

1 0

[PATCH] comctl32: Simplify handling of the marquee highlight.
by Huw Davies Nov. 14, 2017

Nov. 14, 2017

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/comctl32/listview.c | 82 ++++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 51 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 35877976d8..4cb1f0d53a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3843,33 +3843,44 @@ static LRESULT LISTVIEW_MouseHover(LISTVIEW_INFO *infoPtr, INT x, INT y) * None. */ static void LISTVIEW_MarqueeHighlight(LISTVIEW_INFO *infoPtr, const POINT *coords_orig, - const POINT *coords_offs, const POINT *offset, INT scroll) { BOOL controlDown = FALSE; LVITEMW item; ITERATOR old_elems, new_elems; RECT rect; + POINT coords_offs, offset; - if (coords_offs->x > infoPtr->marqueeOrigin.x) + /* Ensure coordinates are within client bounds */ + coords_offs.x = max(min(coords_orig->x, infoPtr->rcList.right), 0); + coords_offs.y = max(min(coords_orig->y, infoPtr->rcList.bottom), 0); + + /* Get offset */ + LISTVIEW_GetOrigin(infoPtr, &offset); + + /* Offset coordinates by the appropriate amount */ + coords_offs.x -= offset.x; + coords_offs.y -= offset.y; + + if (coords_offs.x > infoPtr->marqueeOrigin.x) { rect.left = infoPtr->marqueeOrigin.x; - rect.right = coords_offs->x; + rect.right = coords_offs.x; } else { - rect.left = coords_offs->x; + rect.left = coords_offs.x; rect.right = infoPtr->marqueeOrigin.x; } - if (coords_offs->y > infoPtr->marqueeOrigin.y) + if (coords_offs.y > infoPtr->marqueeOrigin.y) { rect.top = infoPtr->marqueeOrigin.y; - rect.bottom = coords_offs->y; + rect.bottom = coords_offs.y; } else { - rect.top = coords_offs->y; + rect.top = coords_offs.y; rect.bottom = infoPtr->marqueeOrigin.y; } @@ -3895,7 +3906,7 @@ static void LISTVIEW_MarqueeHighlight(LISTVIEW_INFO *infoPtr, const POINT *coord infoPtr->marqueeRect = rect; infoPtr->marqueeDrawRect = rect; - OffsetRect(&infoPtr->marqueeDrawRect, offset->x, offset->y); + OffsetRect(&infoPtr->marqueeDrawRect, offset.x, offset.y); iterator_frameditems_absolute(&new_elems, infoPtr, &infoPtr->marqueeRect); iterator_remove_common_items(&old_elems, &new_elems); @@ -3960,9 +3971,7 @@ static VOID CALLBACK LISTVIEW_ScrollTimer(HWND hWnd, UINT uMsg, UINT_PTR idEvent { LISTVIEW_INFO *infoPtr; SCROLLINFO scrollInfo; - POINT coords_orig; - POINT coords_offs; - POINT offset; + POINT coords; INT scroll = 0; infoPtr = (LISTVIEW_INFO *) idEvent; @@ -3971,19 +3980,8 @@ static VOID CALLBACK LISTVIEW_ScrollTimer(HWND hWnd, UINT uMsg, UINT_PTR idEvent return; /* Get the current cursor position and convert to client coordinates */ - GetCursorPos(&coords_orig); - ScreenToClient(hWnd, &coords_orig); - - /* Ensure coordinates are within client bounds */ - coords_offs.x = max(min(coords_orig.x, infoPtr->rcList.right), 0); - coords_offs.y = max(min(coords_orig.y, infoPtr->rcList.bottom), 0); - - /* Get offset */ - LISTVIEW_GetOrigin(infoPtr, &offset); - - /* Offset coordinates by the appropriate amount */ - coords_offs.x -= offset.x; - coords_offs.y -= offset.y; + GetCursorPos(&coords); + ScreenToClient(hWnd, &coords); scrollInfo.cbSize = sizeof(SCROLLINFO); scrollInfo.fMask = SIF_ALL; @@ -4007,12 +4005,12 @@ static VOID CALLBACK LISTVIEW_ScrollTimer(HWND hWnd, UINT uMsg, UINT_PTR idEvent scroll |= SCROLL_RIGHT; } - if (((coords_orig.x <= 0) && (scroll & SCROLL_LEFT)) || - ((coords_orig.y <= 0) && (scroll & SCROLL_UP)) || - ((coords_orig.x >= infoPtr->rcList.right) && (scroll & SCROLL_RIGHT)) || - ((coords_orig.y >= infoPtr->rcList.bottom) && (scroll & SCROLL_DOWN))) + if (((coords.x <= 0) && (scroll & SCROLL_LEFT)) || + ((coords.y <= 0) && (scroll & SCROLL_UP)) || + ((coords.x >= infoPtr->rcList.right) && (scroll & SCROLL_RIGHT)) || + ((coords.y >= infoPtr->rcList.bottom) && (scroll & SCROLL_DOWN))) { - LISTVIEW_MarqueeHighlight(infoPtr, &coords_orig, &coords_offs, &offset, scroll); + LISTVIEW_MarqueeHighlight(infoPtr, &coords, scroll); } } @@ -4034,6 +4032,9 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN RECT rect; POINT pt; + pt.x = x; + pt.y = y; + if (!(fwKeys & MK_LBUTTON)) infoPtr->bLButtonDown = FALSE; @@ -4046,24 +4047,6 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN if (infoPtr->bMarqueeSelect) { - POINT coords_orig; - POINT coords_offs; - POINT offset; - - coords_orig.x = x; - coords_orig.y = y; - - /* Get offset */ - LISTVIEW_GetOrigin(infoPtr, &offset); - - /* Ensure coordinates are within client bounds */ - coords_offs.x = max(min(x, infoPtr->rcList.right), 0); - coords_offs.y = max(min(y, infoPtr->rcList.bottom), 0); - - /* Offset coordinates by the appropriate amount */ - coords_offs.x -= offset.x; - coords_offs.y -= offset.y; - /* Enable the timer if we're going outside our bounds, in case the user doesn't move the mouse again */ @@ -4082,13 +4065,10 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN KillTimer(infoPtr->hwndSelf, (UINT_PTR) infoPtr); } - LISTVIEW_MarqueeHighlight(infoPtr, &coords_orig, &coords_offs, &offset, 0); + LISTVIEW_MarqueeHighlight(infoPtr, &pt, 0); return 0; } - pt.x = x; - pt.y = y; - ht.pt = pt; LISTVIEW_HitTest(infoPtr, &ht, TRUE, TRUE); -- 2.12.0

1 0

Re: [PATCH v2] winex11.drv: Preserve last error in x11drv_thread_data().
by Marvin Nov. 14, 2017

Nov. 14, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=34138 Your paranoid android. === wvistau64 (32 bit input) === input.c:1940: Test failed: error 998 === w2008s64 (32 bit input) === input.c:1940: Test failed: error 998 === w7u (32 bit input) === input.c:1940: Test failed: error 998 === w7pro64 (32 bit input) === input.c:1940: Test failed: error 998 === w8 (32 bit input) === input.c:1940: Test failed: error 998 === w864 (32 bit input) === input.c:1940: Test failed: error 998 === w1064 (32 bit input) === input.c:1940: Test failed: error 998 === wvistau64 (64 bit input) === input.c:1940: Test failed: error 998 === w2008s64 (64 bit input) === input.c:1940: Test failed: error 998 === w7pro64 (64 bit input) === input.c:1940: Test failed: error 998 === w864 (64 bit input) === input.c:1940: Test failed: error 998 === w1064 (64 bit input) === input.c:1940: Test failed: error 998

1 0

[PATCH] msxml3/httpreq: Return S_OK from setTimeouts()
by Nikolay Sivov Nov. 13, 2017

Nov. 13, 2017

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/httprequest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 72234ee999..e3b521c2d6 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -1978,7 +1978,7 @@ static HRESULT WINAPI ServerXMLHTTPRequest_setTimeouts(IServerXMLHTTPRequest *if { serverhttp *This = impl_from_IServerXMLHTTPRequest( iface ); FIXME("(%p)->(%d %d %d %d): stub\n", This, resolveTimeout, connectTimeout, sendTimeout, receiveTimeout); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI ServerXMLHTTPRequest_waitForResponse(IServerXMLHTTPRequest *iface, VARIANT timeout, VARIANT_BOOL *isSuccessful) -- 2.15.0

1 0