- wine-devel - winehq.org

[PATCH 4/4] msvcrt: Fix write() behaviour on "no console" file descriptors
by Piotr Caban 15 Nov '17

15 Nov '17

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 11 ++++++----- dlls/msvcrt/tests/file.c | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 5 deletions(-)

1 0

[PATCH 3/4] msvcrt: Fix read() behaviour on "no console" file descriptors
by Piotr Caban 15 Nov '17

15 Nov '17

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 20 ++++++++++++++++---- dlls/msvcrt/tests/file.c | 16 ++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-)

1 0

[PATCH 2/4] msvcrt: Fix close() behaviour on "no console" file descriptors
by Piotr Caban 15 Nov '17

15 Nov '17

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 6 +++++- dlls/msvcrt/tests/file.c | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-)

1 0

[PATCH 1/4] msvcrt: Fix IO initialization when invalid handles are passed
by Piotr Caban 15 Nov '17

15 Nov '17

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 42 +++++++++++++++++++++++++----- dlls/msvcrt/msvcrt.h | 3 +++ dlls/msvcrt/tests/Makefile.in | 1 + dlls/msvcrt/tests/file.c | 59 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 7 deletions(-)

1 0

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

14 Nov '17

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- Supersedes 138548 dlls/sane.ds/ds_ctrl.c | 19 ++++--------------- dlls/sane.ds/sane_i.h | 5 +++-- dlls/sane.ds/sane_main.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/sane.ds/ui.c | 6 ++---- include/twain.h | 24 ++++++++++++++++++++++++ 5 files changed, 81 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..7af0a2321ac 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +DSMENTRYPROC SANE_dsmentry; + #ifdef SONAME_LIBSANE HINSTANCE SANE_instance; @@ -113,6 +115,8 @@ static TW_UINT16 SANE_OpenDS( pTW_IDENTITY, pTW_IDENTITY); #endif /* SONAME_LIBSANE */ +static TW_UINT16 SANE_SetEntryPoint (pTW_IDENTITY pOrigin, TW_MEMREF pData); + static TW_UINT16 SANE_SourceControlHandler ( pTW_IDENTITY pOrigin, TW_UINT16 DAT, @@ -181,6 +185,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); @@ -380,6 +395,21 @@ DS_Entry ( pTW_IDENTITY pOrigin, return twRC; } +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; +} + #ifdef SONAME_LIBSANE /* Sane returns device names that are longer than the 32 bytes allowed by TWAIN. However, it colon separates them, and the last bit is @@ -432,7 +462,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); @@ -451,6 +481,21 @@ 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 +526,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

1 0

Re: [PATCH] shell32/tests: Add test for IAutoComplete2 with custom source
by Marvin 14 Nov '17

14 Nov '17

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=34144 Your paranoid android. === w2008s64 (32 bit autocomplete) === autocomplete.c:388: Test failed: Expected L"beta", got L"b" === w7pro64 (32 bit autocomplete) === autocomplete.c:388: Test failed: Expected L"beta", got L"b" === w8 (32 bit autocomplete) === autocomplete.c:388: Test failed: Expected L"beta", got L"b" === w1064 (32 bit autocomplete) === autocomplete.c:388: Test failed: Expected L"beta", got L"b" === wvistau64 (64 bit autocomplete) === autocomplete.c:388: Test failed: Expected L"beta", got L"b" === w2008s64 (64 bit autocomplete) === autocomplete.c:388: Test failed: Expected L"beta", got L"b" === w7pro64 (64 bit autocomplete) === autocomplete.c:388: Test failed: Expected L"beta", got L"b" === w864 (64 bit autocomplete) === autocomplete.c:388: Test failed: Expected L"beta", got L"b" === w1064 (64 bit autocomplete) === autocomplete.c:388: Test failed: Expected L"beta", got L"b"

2 1

[PATCH] shell32/tests: Add test for IAutoComplete2 with custom source
by Fabian Maurer 14 Nov '17

14 Nov '17

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 14 Nov '17

14 Nov '17

1 0

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

14 Nov '17

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 14 Nov '17

14 Nov '17

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 14 Nov '17

14 Nov '17

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 14 Nov '17

14 Nov '17

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 14 Nov '17

14 Nov '17

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 14 Nov '17

14 Nov '17

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 14 Nov '17

14 Nov '17

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 14 Nov '17

14 Nov '17

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

[PATCH] widl: Generate header macros even for aggregate return methods.
by Dmitry Timoshkov 14 Nov '17

14 Nov '17

A generated macro has a clear suggestion what to do (#define WIDL_C_INLINE_WRAPPERS) instead of completely omitting the macro and leaving one wondering what is going on. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/header.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index b5fe2326d6..9f92127d06 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -960,7 +960,7 @@ static void write_method_macro(FILE *header, const type_t *iface, const type_t * if (is_override_method(iface, child, func)) continue; - if (!is_callas(func->attrs) && !is_aggregate_return(func)) { + if (!is_callas(func->attrs)) { const var_t *arg; fprintf(header, "#define %s_%s(This", name, get_name(func)); @@ -969,6 +969,12 @@ static void write_method_macro(FILE *header, const type_t *iface, const type_t * fprintf(header, ",%s", arg->name); fprintf(header, ") "); + if (is_aggregate_return(func)) + { + fprintf(header, "%s_%s_define_WIDL_C_INLINE_WRAPPERS_for_aggregate_return_support\n", name, get_name(func)); + continue; + } + fprintf(header, "(This)->lpVtbl->%s(This", get_vtbl_entry_name(iface, func)); if (type_get_function_args(func->type)) LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->type), const var_t, entry ) -- 2.15.0

1 0

[PATCH 1/3] urlmon: Added user marshaling implementation for OnDataAvailable.
by Jacek Caban 13 Nov '17

13 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/usrmarshal.c | 155 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 151 insertions(+), 4 deletions(-)

2 2

[PATCH 1/3 v2] urlmon: Added user marshaling implementation for OnDataAvailable.
by Jacek Caban 13 Nov '17

13 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/usrmarshal.c | 155 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 151 insertions(+), 4 deletions(-)

1 0

[PATCH] libport: Fix typo in rintf.
by Alex Henrie 13 Nov '17

13 Nov '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Spotted by Joris Huizer. --- libs/port/rint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/port/rint.c b/libs/port/rint.c index a99c00be43..2c0d22294c 100644 --- a/libs/port/rint.c +++ b/libs/port/rint.c @@ -33,7 +33,7 @@ double rint(double x) #ifndef HAVE_RINTF float rintf(float x) { - return rintf(x); + return rint(x); } #endif -- 2.15.0

1 0

[PATCH 3/3] urlmon/tests: Added IBindStatusCallback marshaling tests.
by Jacek Caban 13 Nov '17

13 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/tests/misc.c | 723 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 723 insertions(+)

1 0

[PATCH 2/3] urlmon: Added user marshaling implementation for GetBindInfo[Ex].
by Jacek Caban 13 Nov '17

13 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/usrmarshal.c | 113 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 99 insertions(+), 14 deletions(-)

1 0

[PATCH 3/3] mlang: Correct wrong code pages data.
by Ziqing Hui 13 Nov '17

13 Nov '17

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/mlang/mlang.c | 94 +++++++++++++++++++++++++----------------------- dlls/mlang/tests/mlang.c | 23 +----------- 2 files changed, 50 insertions(+), 67 deletions(-)

2 1

[PATCH] quartz/tests: Add a couple of tests for return values (Coverity)
by Nikolay Sivov 13 Nov '17

13 Nov '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/quartz/tests/avisplitter.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 23167b59b8..8bafb14157 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -422,8 +422,10 @@ static void test_filter_graph(void) } ok(hr == S_OK, "Could not create null renderer: %08x\n", hr); - IBaseFilter_EnumPins(pnull, &nullenum); - IEnumPins_Next(nullenum, 1, &nullpin, NULL); + hr = IBaseFilter_EnumPins(pnull, &nullenum); + ok(hr == S_OK, "Failed to enum pins, hr %#x.\n", hr); + hr = IEnumPins_Next(nullenum, 1, &nullpin, NULL); + ok(hr == S_OK, "Failed to get next pin, hr %#x.\n", hr); IEnumPins_Release(nullenum); IPin_QueryDirection(nullpin, &dir); @@ -489,7 +491,9 @@ fail2: if (dir == PINDIR_OUTPUT) { PIN_INFO info; - IPin_QueryPinInfo(to, &info); + + hr = IPin_QueryPinInfo(to, &info); + ok(hr == S_OK, "Failed to query pin info, hr %#x.\n", hr); /* Release twice: Once normal, second from the * previous while loop -- 2.15.0

1 0

[PATCH] shell32: avoid a crash in testsuite
by Marcus Meissner 13 Nov '17

13 Nov '17

This happens on wow32 builds, we try to call a 64bit program via the generic typelib marshalling and disp is NULL. We still fail, just do not pop up the crash dialog. Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/shell32/tests/shelldispatch.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 9825c3a4e9..92562650f3 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1088,6 +1088,9 @@ todo_wine { IUnknown *unk; ok(disp != NULL, "got %p\n", disp); + + if (disp == NULL) goto skip_disp_tests; + ok(ret != HandleToUlong(hwnd), "got %d\n", ret); /* IDispatch-related tests */ @@ -1165,6 +1168,7 @@ if (hr == S_OK) { IServiceProvider_Release(sp); IDispatch_Release(disp); } +skip_disp_tests: disp = (void*)0xdeadbeef; ret = 0xdead; -- 2.15.0

2 1

[PATCH v2 1/2] include: Add roparameterizediid.idl
by Alex Henrie 13 Nov '17

13 Nov '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Added winrt pragma and removed inheritance from IUnknown. --- include/Makefile.in | 1 + include/roparameterizediid.idl | 93 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 include/roparameterizediid.idl diff --git a/include/Makefile.in b/include/Makefile.in index cc42f66ebd..d453dc8568 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -146,6 +146,7 @@ IDL_SRCS = \ pstore.idl \ qedit.idl \ richole.idl \ + roparameterizediid.idl \ row.idl \ rowchg.idl \ rowpos.idl \ diff --git a/include/roparameterizediid.idl b/include/roparameterizediid.idl new file mode 100644 index 0000000000..a975f884fb --- /dev/null +++ b/include/roparameterizediid.idl @@ -0,0 +1,93 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +typedef void *ROPARAMIIDHANDLE; + +[ + object +] +interface IRoSimpleMetaDataBuilder +{ + HRESULT SetDelegate( + GUID iid + ); + + HRESULT SetEnum( + const WCHAR *typename, + const WCHAR *basetype + ); + + HRESULT SetInterfaceGroupParameterizedDefault( + const WCHAR *typename, + UINT32 name_element_count, + const WCHAR **name_elements + ); + + HRESULT SetInterfaceGroupSimpleDefault( + const WCHAR *typename, + const WCHAR *default_name, + const GUID *default_iid + ); + + HRESULT SetParameterizedDelegate( + GUID iid, + UINT32 arg_count + ); + + HRESULT SetParameterizedInterface( + GUID iid, + UINT32 arg_count + ); + + HRESULT SetRuntimeClassParameterizedDefault( + GUID iid, + UINT32 name_element_count, + const WCHAR **name_elements + ); + + HRESULT SetRuntimeClassSimpleDefault( + const WCHAR *typename, + const WCHAR *default_name, + const GUID *default_iid + ); + + HRESULT SetStruct( + const WCHAR *typename, + UINT32 field_count, + const WCHAR **field_typenames + ); + + HRESULT SetWinRtInterface( + GUID iid + ); +} + +[ + object +] +interface IRoMetaDataLocator +{ + HRESULT Locate( + const WCHAR *typename, + IRoSimpleMetaDataBuilder *out + ); +} -- 2.15.0

1 0

[PATCH 1/2] include: Add roparameterizediid.idl
by Alex Henrie 13 Nov '17

13 Nov '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Microsoft only distributes the header file, so I wrote the IDL based on MSDN documentation. --- include/Makefile.in | 1 + include/roparameterizediid.idl | 91 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 include/roparameterizediid.idl diff --git a/include/Makefile.in b/include/Makefile.in index cc42f66ebd..d453dc8568 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -146,6 +146,7 @@ IDL_SRCS = \ pstore.idl \ qedit.idl \ richole.idl \ + roparameterizediid.idl \ row.idl \ rowchg.idl \ rowpos.idl \ diff --git a/include/roparameterizediid.idl b/include/roparameterizediid.idl new file mode 100644 index 0000000000..5c3ffd7b5c --- /dev/null +++ b/include/roparameterizediid.idl @@ -0,0 +1,91 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; + +typedef void *ROPARAMIIDHANDLE; + +[ + object +] +interface IRoSimpleMetaDataBuilder : IUnknown +{ + HRESULT SetDelegate( + GUID iid + ); + + HRESULT SetEnum( + const WCHAR *typename, + const WCHAR *basetype + ); + + HRESULT SetInterfaceGroupParameterizedDefault( + const WCHAR *typename, + UINT32 name_element_count, + const WCHAR **name_elements + ); + + HRESULT SetInterfaceGroupSimpleDefault( + const WCHAR *typename, + const WCHAR *default_name, + const GUID *default_iid + ); + + HRESULT SetParameterizedDelegate( + GUID iid, + UINT32 arg_count + ); + + HRESULT SetParameterizedInterface( + GUID iid, + UINT32 arg_count + ); + + HRESULT SetRuntimeClassParameterizedDefault( + GUID iid, + UINT32 name_element_count, + const WCHAR **name_elements + ); + + HRESULT SetRuntimeClassSimpleDefault( + const WCHAR *typename, + const WCHAR *default_name, + const GUID *default_iid + ); + + HRESULT SetStruct( + const WCHAR *typename, + UINT32 field_count, + const WCHAR **field_typenames + ); + + HRESULT SetWinRtInterface( + GUID iid + ); +} + +[ + object +] +interface IRoMetaDataLocator : IUnknown +{ + HRESULT Locate( + const WCHAR *typename, + IRoSimpleMetaDataBuilder *out + ); +} -- 2.15.0

2 3

[PATCH] msvcrt/tests: Rewrite clock() tests
by Piotr Caban 13 Nov '17

13 Nov '17

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/time.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)

1 0

[PATCH] xaudio2: Add support for float formats with more than 2 channels.
by Kimmo Myllyvirta 13 Nov '17

13 Nov '17

Fixes https://bugs.winehq.org/show_bug.cgi?id=42414 See also http://openal.org/pipermail/openal/2014-December/000287.html

2 1

[PATCH] msxml3: deep-copy properties in attach_xmldoc
by Marcus Meissner 13 Nov '17

13 Nov '17

The 64bit msxml3:domdoc testcase always crash, the properties are freed twice. It seems this was due to attach_xmldoc not creating a copy of the properties, but using the same instance. Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/msxml3/domdoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index a40fac2106..12309e6e28 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -689,7 +689,7 @@ static HRESULT attach_xmldoc(domdoc *This, xmlDocPtr xml ) if(This->node.node) { xmldoc_add_ref(get_doc(This)); - priv_from_xmlDocPtr(get_doc(This))->properties = This->properties; + priv_from_xmlDocPtr(get_doc(This))->properties = copy_properties(This->properties); } return S_OK; -- 2.15.0

1 0

[PATCH] loader: Don't reserve heap range on ARM64
by André Hentschel 13 Nov '17

13 Nov '17

bug: 43946 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- loader/preloader.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/loader/preloader.c b/loader/preloader.c index 5a4bb16..6736dd8 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -113,11 +113,18 @@ static struct wine_preload_info preload_info[] = { (void *)0x00010000, 0x00100000 }, /* DOS area */ { (void *)0x00110000, 0x67ef0000 }, /* low memory area */ { (void *)0x7f000000, 0x03000000 }, /* top-down allocations + shared heap + virtual heap */ -#else +#elif defined(__x86_64__) { (void *)0x000000010000, 0x00100000 }, /* DOS area */ { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ { (void *)0x7ffffe000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ +#elif defined(__aarch64__) + { (void *)0x000000010000, 0x00100000 }, /* DOS area */ + { (void *)0x000000600000, 0x67ef0000 }, /* low memory area */ + { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ + { (void *)0x7ffffe000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ +#else +#error preloader not implemented for this CPU #endif { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ { 0, 0 } /* end of list */ -- 2.7.4

2 1

[PATCH] uxtheme: Return NULL file handle on OpenThemeFile() failure
by Nikolay Sivov 13 Nov '17

13 Nov '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/uxtheme/msstyles.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 16cfbf5f07..e471c3cc0c 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -188,6 +188,7 @@ HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWST return S_OK; invalid_theme: + *tf = NULL; if(hTheme) FreeLibrary(hTheme); return hr; } -- 2.15.0

1 0

[PATCH 5/5] user32/tests: Add a bunch of WS_EX_TOPMOST tests.
by Dmitry Timoshkov 13 Nov '17

13 Nov '17

The tests most of the time pass cleanly here under MATE environment, but sometimes there are intermittent failures (like in some other tests) without visible reason, and another 'make test' runs cleanly again. Alexandre, feel free to add/remove todo statements to make the tests pass in your WM. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 388 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 382 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d9491f5ab7..3b64515241 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9861,24 +9861,395 @@ static BOOL is_topmost(HWND hwnd) return (GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0; } +static void pump_messages(void) +{ + MSG msg; + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); +} + static void swp_after(HWND hwnd, HWND after) { BOOL ret; ret = SetWindowPos(hwnd, after, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); ok(ret, "SetWindowPos failed\n"); + + pump_messages(); } -static void test_topmost(HWND hwnd) +static void reset_window_state(HWND *state, int n) { - ok(!is_topmost(hwnd), "WS_EX_TOPMOST should not be set\n"); + int i; + + for (i = 0; i < n; i++) + { + if (state[i]) + { + swp_after(state[i], HWND_NOTOPMOST); + todo_wine_if(i == 5) /* FIXME: remove once Wine is fixed */ + ok(!is_topmost(state[i]), "%d: hwnd %p is still topmost\n", i, state[i]); + swp_after(state[i], HWND_TOP); + } + } +} + +static void test_topmost(void) +{ + HWND owner, hwnd, hwnd2, hwnd_child, hwnd_child2, hwnd_grandchild, state[6] = { 0 }; + BOOL is_wine = !strcmp(winetest_platform, "wine"); + + owner = create_tool_window(WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | + WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE, 0); + ok(owner != 0, "Failed to create owner window (%d)\n", GetLastError()); + + /* Give current thread foreground state otherwise the tests may fail. */ + if (!SetForegroundWindow(owner)) + { + DestroyWindow(owner); + skip("SetForegroundWindow not working\n"); + return; + } + + hwnd = create_tool_window(WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | + WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE, owner); + ok(hwnd != 0, "Failed to create popup window (%d)\n", GetLastError()); + hwnd2 = create_tool_window(WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | + WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE, owner); + ok(hwnd2 != 0, "Failed to create popup window (%d)\n", GetLastError()); + + pump_messages(); + + trace("owner %p, hwnd %p, hwnd2 %p\n", owner, hwnd, hwnd2); + state[0] = owner; + state[1] = hwnd; + state[2] = hwnd2; + + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + check_z_order(hwnd, 0, hwnd2, owner, FALSE); swp_after(hwnd, HWND_TOPMOST); - ok(is_topmost(hwnd), "WS_EX_TOPMOST should be set\n"); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + check_z_order(hwnd, hwnd2, 0, owner, TRUE); swp_after(hwnd, HWND_TOP); - ok(is_topmost(hwnd), "WS_EX_TOPMOST should be set\n"); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + check_z_order(hwnd, hwnd2, 0, owner, TRUE); + swp_after(hwnd, HWND_NOTOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + check_z_order(hwnd, hwnd2, 0, owner, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + swp_after(hwnd, HWND_TOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + check_z_order(hwnd, hwnd2, 0, owner, TRUE); + swp_after(hwnd2, hwnd); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + check_z_order(hwnd, hwnd2, 0, owner, TRUE); + swp_after(hwnd, hwnd2); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + check_z_order(hwnd, hwnd2, 0, owner, TRUE); + swp_after(hwnd2, HWND_TOP); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + check_z_order(hwnd, hwnd2, 0, owner, TRUE); + swp_after(owner, HWND_TOPMOST); +todo_wine + ok(is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); +todo_wine + ok(is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + swp_after(hwnd, HWND_NOTOPMOST); + ok(!is_topmost(owner) || broken(is_topmost(owner)) /*win7 64-bit*/, "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2) || broken(is_topmost(hwnd2)) /*win7 64-bit*/, "hwnd %p topmost state is wrong\n", hwnd2); + if (0) /*win7 64-bit is broken*/ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); + swp_after(hwnd2, HWND_NOTOPMOST); + ok(!is_topmost(owner) || broken(is_topmost(owner)) /*win7 64-bit*/, "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, 0, hwnd2, owner, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + swp_after(hwnd, HWND_TOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + check_z_order(hwnd, hwnd2, 0, owner, TRUE); + swp_after(hwnd, HWND_BOTTOM); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); +todo_wine + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, 0, hwnd2, owner, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + swp_after(hwnd, HWND_TOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + check_z_order(hwnd, hwnd2, 0, owner, TRUE); + swp_after(hwnd, hwnd2); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); +todo_wine + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, 0, hwnd2, owner, FALSE); + /* FIXME: compensate todo_wine above */ + swp_after(hwnd, HWND_NOTOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, 0, hwnd2, owner, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + hwnd_child2 = create_tool_window(WS_VISIBLE|WS_POPUP, hwnd); + ok(hwnd_child2 != 0, "Failed to create popup window (%d)\n", GetLastError()); + hwnd_child = create_tool_window(WS_VISIBLE|WS_POPUP, hwnd); + ok(hwnd_child != 0, "Failed to create popup window (%d)\n", GetLastError()); + hwnd_grandchild = create_tool_window(WS_VISIBLE|WS_POPUP, hwnd_child); + ok(hwnd_grandchild != 0, "Failed to create popup window (%d)\n", GetLastError()); + + pump_messages(); + + trace("hwnd_child %p, hwnd_child2 %p, hwnd_grandchild %p\n", hwnd_child, hwnd_child2, hwnd_grandchild); + state[3] = hwnd_child2; + state[4] = hwnd_child; + state[5] = hwnd_grandchild; + + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd2), "hwnd %p topmost state is wrong\n", hwnd2); + ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); + + swp_after(hwnd, HWND_TOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); +todo_wine + ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); +todo_wine + ok(is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); +todo_wine + ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, TRUE); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); + swp_after(hwnd, HWND_NOTOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + swp_after(hwnd, HWND_TOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); +todo_wine + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); +todo_wine + ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); +todo_wine + ok(is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, TRUE); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); + swp_after(hwnd_child, HWND_NOTOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); +todo_wine + ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + check_z_order(hwnd, hwnd2, 0, owner, FALSE); + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + swp_after(hwnd, HWND_TOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); +todo_wine + ok(is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); +todo_wine + ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); +todo_wine + ok(is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, TRUE); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); + swp_after(hwnd_grandchild, HWND_NOTOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); +todo_wine + ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); + check_z_order(hwnd, hwnd2, 0, owner, FALSE); + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + swp_after(hwnd_child, HWND_TOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); +todo_wine + ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); + swp_after(hwnd_child, HWND_TOP); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); +todo_wine + ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); + swp_after(hwnd, HWND_NOTOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); +todo_wine + ok(!is_topmost(hwnd_grandchild) || broken(is_topmost(hwnd_grandchild))/*win2008 64-bit*/, "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + swp_after(hwnd_child, HWND_TOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); +todo_wine + ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); swp_after(hwnd, HWND_NOTOPMOST); - ok(!is_topmost(hwnd), "WS_EX_TOPMOST should not be set\n"); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); +todo_wine + ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + swp_after(hwnd_grandchild, HWND_TOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, FALSE); + swp_after(hwnd_child2, HWND_NOTOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(is_topmost(hwnd_grandchild) || broken(!is_topmost(hwnd_grandchild)) /* win8+ */, "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd_child, 0, hwnd_child2, hwnd, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + swp_after(hwnd_child, HWND_TOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); +todo_wine + ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); + swp_after(hwnd_child, HWND_BOTTOM); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); +todo_wine + ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, 0, hwnd2, owner, FALSE); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd_child, 0, hwnd_child2, hwnd, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + swp_after(hwnd_child, HWND_TOPMOST); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); +todo_wine + ok(is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); + ok(is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd_child, hwnd_child2, 0, hwnd, TRUE); + swp_after(hwnd_child, hwnd_child2); + ok(!is_topmost(owner), "hwnd %p topmost state is wrong\n", owner); + ok(!is_topmost(hwnd), "hwnd %p topmost state is wrong\n", hwnd); + ok(!is_topmost(hwnd_child), "hwnd %p topmost state is wrong\n", hwnd_child); + ok(!is_topmost(hwnd_child2), "hwnd %p topmost state is wrong\n", hwnd_child2); +todo_wine + ok(!is_topmost(hwnd_grandchild), "hwnd %p topmost state is wrong\n", hwnd_grandchild); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd, hwnd2, 0, owner, FALSE); +if (!is_wine) /* FIXME: remove once Wine is fixed */ + check_z_order(hwnd_child, 0, hwnd_child2, hwnd, FALSE); + reset_window_state(state, sizeof(state)/sizeof(state[0])); + + DestroyWindow(hwnd_grandchild); + DestroyWindow(hwnd_child); + DestroyWindow(hwnd_child2); + DestroyWindow(hwnd); + DestroyWindow(hwnd2); + DestroyWindow(owner); } START_TEST(win) @@ -9958,7 +10329,6 @@ START_TEST(win) our_pid = GetWindowThreadProcessId(hwndMain, NULL); /* Add the tests below this line */ - test_topmost(hwndMain); test_child_window_from_point(); test_window_from_point(argv[0]); test_thick_child_size(hwndMain); @@ -10037,4 +10407,10 @@ START_TEST(win) DestroyWindow(hwndMain2); DestroyWindow(hwndMain); + + /* Make sure that following tests are executed last, under Windows they + * tend to break the tests which are sensitive to z-order and activation + * state of hwndMain and hwndMain2 windows. + */ + test_topmost(); } -- 2.15.0

1 0

[PATCH 4/5] user32/tests: Make WS_EX_TOPMOST tests more generic.
by Dmitry Timoshkov 13 Nov '17

13 Nov '17

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index fdfdf9215a..d9491f5ab7 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9856,20 +9856,29 @@ static void test_desktop( void ) } } -static void test_topmost(HWND hwnd) +static BOOL is_topmost(HWND hwnd) +{ + return (GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0; +} + +static void swp_after(HWND hwnd, HWND after) { BOOL ret; - ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); - ret = SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); - ret = SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); - ret = SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); + ret = SetWindowPos(hwnd, after, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + ok(ret, "SetWindowPos failed\n"); +} + +static void test_topmost(HWND hwnd) +{ + ok(!is_topmost(hwnd), "WS_EX_TOPMOST should not be set\n"); + + swp_after(hwnd, HWND_TOPMOST); + ok(is_topmost(hwnd), "WS_EX_TOPMOST should be set\n"); + swp_after(hwnd, HWND_TOP); + ok(is_topmost(hwnd), "WS_EX_TOPMOST should be set\n"); + swp_after(hwnd, HWND_NOTOPMOST); + ok(!is_topmost(hwnd), "WS_EX_TOPMOST should not be set\n"); } START_TEST(win) -- 2.15.0

1 0

[PATCH 3/5] user32/tests: Separate WS_EX_TOPMOST tests from SetWindowPos ones.
by Dmitry Timoshkov 13 Nov '17

13 Nov '17

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 992fbf4979..fdfdf9215a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2573,17 +2573,6 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) orig_win_rc.right, orig_win_rc.bottom, 0); ok(ret, "Got %d\n", ret); - ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); - ret = SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); - ret = SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); - ret = SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); - hwnd_desktop = GetDesktopWindow(); ok(!!hwnd_desktop, "Failed to get hwnd_desktop window (%d).\n", GetLastError()); hwnd_child = create_tool_window(WS_VISIBLE|WS_CHILD, hwnd); @@ -9867,6 +9856,22 @@ static void test_desktop( void ) } } +static void test_topmost(HWND hwnd) +{ + BOOL ret; + + ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); + ret = SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + ok(ret, "Got %d\n", ret); + ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); + ret = SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + ok(ret, "Got %d\n", ret); + ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); + ret = SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + ok(ret, "Got %d\n", ret); + ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); +} + START_TEST(win) { char **argv; @@ -9944,6 +9949,7 @@ START_TEST(win) our_pid = GetWindowThreadProcessId(hwndMain, NULL); /* Add the tests below this line */ + test_topmost(hwndMain); test_child_window_from_point(); test_window_from_point(argv[0]); test_thick_child_size(hwndMain); -- 2.15.0

1 0

[PATCH 2/5] user32/tests: Fix test failures under Windows.
by Dmitry Timoshkov 13 Nov '17

13 Nov '17

Without SetForegroundWindow() these tests fail in some testbot runs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index eace140388..992fbf4979 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2909,6 +2909,13 @@ static void test_popup_zorder(HWND hwnd_D, HWND hwnd_E, DWORD style) { HWND hwnd_A, hwnd_B, hwnd_C, hwnd_F; + /* Give current thread foreground state otherwise the tests may fail. */ + if (!SetForegroundWindow(hwnd_D)) + { + skip("SetForegroundWindow not working\n"); + return; + } + trace("hwnd_D %p, hwnd_E %p\n", hwnd_D, hwnd_E); SetWindowPos(hwnd_E, hwnd_D, 0,0,0,0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE); -- 2.15.0

1 0

[PATCH 1/5] user32/tests: Don't leave a stray test window behind.
by Dmitry Timoshkov 13 Nov '17

13 Nov '17

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index feca2bee51..eace140388 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4932,6 +4932,7 @@ static void test_dialog_parent(void) ok(!IsWindowEnabled(other), "other is enabled\n"); EnableWindow(other, TRUE); + DestroyWindow(other); DestroyWindow(parent); } -- 2.15.0

1 0

[PATCH] riched20: Protect against pasting multi-line text in single-line control.
by Rafał Harabień 13 Nov '17

13 Nov '17

Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- dlls/riched20/caret.c | 4 ++++ dlls/riched20/tests/editor.c | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 26af743..8a99394 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -551,6 +551,10 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, ME_DisplayItem *tp, *end_run, *run, *prev; int eol_len = 0; + /* Check if new line is allowed for this control */ + if (!(editor->styleFlags & ES_MULTILINE)) + break; + /* Find number of CR and LF in end of paragraph run */ if (*pos =='\r') { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index a19ec85..d5fd8c0 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -70,6 +70,10 @@ static HWND new_richedit(HWND parent) { return new_window(RICHEDIT_CLASS20A, ES_MULTILINE, parent); } +static HWND new_richedit_with_style(HWND parent, DWORD style) { + return new_window(RICHEDIT_CLASS20A, style, parent); +} + static HWND new_richeditW(HWND parent) { return new_windowW(RICHEDIT_CLASS20W, ES_MULTILINE, parent); } @@ -5509,10 +5513,20 @@ static void test_WM_PASTE(void) /* Cut from read-only control */ SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); SendMessageA(hwndRichEdit, WM_CUT, 0, 0); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); result = strcmp(buffer,"cut\r\n"); ok(result == 0, "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + OleFlushClipboard(); /* flush is needed because of broken OleClipboard implementation */ + DestroyWindow(hwndRichEdit); + /* Paste multi-line text into single-line control */ + hwndRichEdit = new_richedit_with_style(NULL, 0); + SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); + SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + result = strcmp(buffer,"cut"); + ok(result == 0, + "test paste: strcmp = %i, actual = '%s'\n", result, buffer); DestroyWindow(hwndRichEdit); } -- 2.7.4

2 1

[PATCH v2] winex11.drv: Preserve last error in x11drv_thread_data().
by Rafał Harabień 13 Nov '17

13 Nov '17

Issue was caused by TlsGetValue always resetting error to ERROR_SUCCESS. This change fixes GetCursorPos resetting last-error randomly. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- dlls/user32/tests/input.c | 10 +++++++++- dlls/winex11.drv/x11drv.h | 7 ++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8f2576d..0b72835 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1928,8 +1928,16 @@ static void test_Input_mouse(void) DWORD thread_id; POINT pt, pt_org; MSG msg; + BOOL ret; - GetCursorPos(&pt_org); + SetLastError(0xdeadbeef); + ret = GetCursorPos(NULL); + ok(!ret, "GetCursorPos succeed\n"); + ok(GetLastError() == 0xdeadbeef || GetLastError() == ERROR_NOACCESS, "error %lu\n", GetLastError()); + + ret = GetCursorPos(&pt_org); + ok(ret, "GetCursorPos failed\n"); + ok(GetLastError() == 0xdeadbeef, "error %lu\n", GetLastError()); button_win = CreateWindowA("button", "button", WS_VISIBLE | WS_POPUP, 100, 100, 100, 100, 0, NULL, NULL, NULL); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 721c082..6786a08 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -345,7 +345,12 @@ extern DWORD thread_data_tls_index DECLSPEC_HIDDEN; static inline struct x11drv_thread_data *x11drv_thread_data(void) { - return TlsGetValue( thread_data_tls_index ); + /* TlsGetValue always resets last error */ + unsigned long err = GetLastError(); + struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); + if (err != ERROR_SUCCESS && GetLastError() == ERROR_SUCCESS) + SetLastError(err); + return data; } /* retrieve the thread display, or NULL if not created yet */ -- 2.7.4

1 0

Re: [PATCH 1/4] winex11.drv: Preserve last error in x11drv_thread_data().
by Marvin 13 Nov '17

13 Nov '17

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=34115 Your paranoid android. === wvistau64 (32 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w2008s64 (32 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w7u (32 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w7pro64 (32 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w8 (32 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w864 (32 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w1064 (32 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === wvistau64 (64 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w2008s64 (64 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w7pro64 (64 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w864 (64 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998 === w1064 (64 bit input) === input.c:1936: Test failed: error 998 input.c:1940: Test failed: error 998

1 0

[PATCH 1/4] winex11.drv: Preserve last error in x11drv_thread_data().
by Rafał Harabień 12 Nov '17

12 Nov '17

Issue was caused by TlsGetValue always resetting error to ERROR_SUCCESS. This change fixes GetCursorPos resetting last-error randomly. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> --- dlls/user32/tests/input.c | 10 +++++++++- dlls/winex11.drv/x11drv.h | 7 ++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8f2576d..0f0f137 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1928,8 +1928,16 @@ static void test_Input_mouse(void) DWORD thread_id; POINT pt, pt_org; MSG msg; + BOOL ret; - GetCursorPos(&pt_org); + SetLastError(0xdeadbeef); + ret = GetCursorPos(NULL); + ok(!ret, "GetCursorPos succeed\n"); + ok(GetLastError() == 0xdeadbeef, "error %lu\n", GetLastError()); + + ret = GetCursorPos(&pt_org); + ok(ret, "GetCursorPos failed\n"); + ok(GetLastError() == 0xdeadbeef, "error %lu\n", GetLastError()); button_win = CreateWindowA("button", "button", WS_VISIBLE | WS_POPUP, 100, 100, 100, 100, 0, NULL, NULL, NULL); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 721c082..6786a08 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -345,7 +345,12 @@ extern DWORD thread_data_tls_index DECLSPEC_HIDDEN; static inline struct x11drv_thread_data *x11drv_thread_data(void) { - return TlsGetValue( thread_data_tls_index ); + /* TlsGetValue always resets last error */ + unsigned long err = GetLastError(); + struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); + if (err != ERROR_SUCCESS && GetLastError() == ERROR_SUCCESS) + SetLastError(err); + return data; } /* retrieve the thread display, or NULL if not created yet */ -- 2.7.4

1 3

[PATCH] ws2_32: avoid crashes on flaky/non-present network
by Marcus Meissner 12 Nov '17

12 Nov '17

Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/ws2_32/tests/sock.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 179ace4c6a..cefc62326e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7657,10 +7657,12 @@ static void test_GetAddrInfoExW(void) ok(overlapped.Internal == ERROR_SUCCESS, "overlapped.Internal = %lx\n", overlapped.Internal); ok(overlapped.Pointer == &result, "overlapped.Pointer != &result\n"); ok(result != NULL, "result == NULL\n"); - ok(!result->ai_blob, "ai_blob != NULL\n"); - ok(!result->ai_bloblen, "ai_bloblen != 0\n"); - ok(!result->ai_provider, "ai_provider = %s\n", wine_dbgstr_guid(result->ai_provider)); - pFreeAddrInfoExW(result); + if (result != NULL) { + ok(!result->ai_blob, "ai_blob != NULL\n"); + ok(!result->ai_bloblen, "ai_bloblen != 0\n"); + ok(!result->ai_provider, "ai_provider = %s\n", wine_dbgstr_guid(result->ai_provider)); + pFreeAddrInfoExW(result); + } result = (void*)0xdeadbeef; memset(&overlapped, 0xcc, sizeof(overlapped)); -- 2.15.0

1 0

[PATCH] gdi32: change negative values in OS2 struct to 0
by Marcus Meissner 12 Nov '17

12 Nov '17

fixes gdiplus:font testcase with Goha-Tibeb Zemen font. Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/gdi32/freetype.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 346e21dc21..0e85f98169 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7928,8 +7928,26 @@ static BOOL get_outline_text_metrics(GdiFont *font) font->potm->otmAscent = SCALE_Y(pOS2->sTypoAscender); font->potm->otmDescent = SCALE_Y(pOS2->sTypoDescender); font->potm->otmLineGap = SCALE_Y(pOS2->sTypoLineGap); - font->potm->otmsCapEmHeight = SCALE_Y(pOS2->sCapHeight); - font->potm->otmsXHeight = SCALE_Y(pOS2->sxHeight); + /* There is one font which has 0x8000 in it, which would be -32768 and not map + * to an unsigned integer */ + if (pOS2->sCapHeight < 0) + { + font->potm->otmsCapEmHeight = 0; + WARN("%s sCapHeight=%d\n",debugstr_w(font->name), pOS2->sCapHeight); + } + else + { + font->potm->otmsCapEmHeight = SCALE_Y(pOS2->sCapHeight); + } + if (pOS2->sxHeight < 0) + { + font->potm->otmsXHeight = 0; + WARN("%s sxHeight=%d\n",debugstr_w(font->name), pOS2->sxHeight); + } + else + { + font->potm->otmsXHeight = SCALE_Y(pOS2->sxHeight); + } font->potm->otmrcFontBox.left = SCALE_X(ft_face->bbox.xMin); font->potm->otmrcFontBox.right = SCALE_X(ft_face->bbox.xMax); font->potm->otmrcFontBox.top = SCALE_Y(ft_face->bbox.yMax); -- 2.15.0

2 1

[PATCH] V3 msvcrt : add arm implementation for _control87
by Vijay Kiran Kamuju 12 Nov '17

12 Nov '17

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/math.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b7288cf6cf..9b4298c89f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1233,6 +1233,48 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) if ((x86_cw ^ sse2_cw) & (MSVCRT__MCW_EM | MSVCRT__MCW_RC)) x86_cw |= MSVCRT__EM_AMBIGUOUS; return x86_cw; +#elif defined(__arm__) + unsigned long fpword; + unsigned int flags = 0; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); + if (fpword & 0x1) flags |= MSVCRT__EM_INVALID; + if (fpword & 0x2) flags |= MSVCRT__EM_ZERODIVIDE; + if (fpword & 0x4) flags |= MSVCRT__EM_OVERFLOW; + if (fpword & 0x8) flags |= MSVCRT__EM_UNDERFLOW; + if (fpword & 0x10) flags |= MSVCRT__EM_INEXACT; + if (fpword & 0x80) flags |= MSVCRT__EM_DENORMAL; + switch (fpword & 0xc00000) + { + case 0xc00000: flags |= MSVCRT__RC_UP|MSVCRT__RC_DOWN; break; + case 0x800000: flags |= MSVCRT__RC_DOWN; break; + case 0x400000: flags |= MSVCRT__RC_UP; break; + } + if (fpword & 0x1000000) flags |= MSVCRT__DN_FLUSH; + + TRACE( "arm flags=%08x newval=%08x mask=%08x\n", flags, newval, mask ); + if (mask) + { + flags = (flags & ~mask) | (newval & mask); + + /* Convert (masked) value back to fp word */ + fpword = 0; + if (flags & MSVCRT__EM_INVALID) fpword |= 0x1; + if (flags & MSVCRT__EM_ZERODIVIDE) fpword |= 0x2; + if (flags & MSVCRT__EM_OVERFLOW) fpword |= 0x4; + if (flags & MSVCRT__EM_UNDERFLOW) fpword |= 0x8; + if (flags & MSVCRT__EM_INEXACT) fpword |= 0x10; + if (flags & MSVCRT__EM_DENORMAL) fpword |= 0x80; + switch (flags & MSVCRT__MCW_RC) + { + case MSVCRT__RC_UP|MSVCRT__RC_DOWN: fpword |= 0xc00000; break; + case MSVCRT__RC_DOWN: fpword |= 0x800000; break; + case MSVCRT__RC_UP: fpword |= 0x200000; break; + } + if (flags & MSVCRT__DN_FLUSH) fpword |= 0x1000000; + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); + } + return flags; #else FIXME( "not implemented\n" ); return 0; -- 2.15.0

1 0

[PATCH] V2 msvcrt : add arm implementation for _control87
by Vijay Kiran Kamuju 12 Nov '17

12 Nov '17

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/math.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b7288cf6cf..9b4298c89f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1233,6 +1233,48 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) if ((x86_cw ^ sse2_cw) & (MSVCRT__MCW_EM | MSVCRT__MCW_RC)) x86_cw |= MSVCRT__EM_AMBIGUOUS; return x86_cw; +#elif defined(__arm__) + unsigned long fpword; + unsigned int flags = 0; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); + if (fpword & 0x1) flags |= MSVCRT__EM_INVALID; + if (fpword & 0x2) flags |= MSVCRT__EM_ZERODIVIDE; + if (fpword & 0x4) flags |= MSVCRT__EM_OVERFLOW; + if (fpword & 0x8) flags |= MSVCRT__EM_UNDERFLOW; + if (fpword & 0x10) flags |= MSVCRT__EM_INEXACT; + if (fpword & 0x40) flags |= MSVCRT__EM_DENORMAL; + switch (fpword & 0xc00000) + { + case 0xc00000: flags |= MSVCRT__RC_UP|MSVCRT__RC_DOWN; break; + case 0x800000: flags |= MSVCRT__RC_DOWN; break; + case 0x400000: flags |= MSVCRT__RC_UP; break; + } + if (fpword & 0x1000000) flags |= MSVCRT__DN_FLUSH; + + TRACE( "arm flags=%08x newval=%08x mask=%08x\n", flags, newval, mask ); + if (mask) + { + flags = (flags & ~mask) | (newval & mask); + + /* Convert (masked) value back to fp word */ + fpword = 0; + if (flags & MSVCRT__EM_INVALID) fpword |= 0x1; + if (flags & MSVCRT__EM_ZERODIVIDE) fpword |= 0x2; + if (flags & MSVCRT__EM_OVERFLOW) fpword |= 0x4; + if (flags & MSVCRT__EM_UNDERFLOW) fpword |= 0x8; + if (flags & MSVCRT__EM_INEXACT) fpword |= 0x10; + if (flags & MSVCRT__EM_DENORMAL) fpword |= 0x40; + switch (flags & MSVCRT__MCW_RC) + { + case MSVCRT__RC_UP|MSVCRT__RC_DOWN: fpword |= 0xc00000; break; + case MSVCRT__RC_DOWN: fpword |= 0x800000; break; + case MSVCRT__RC_UP: fpword |= 0x200000; break; + } + if (flags & MSVCRT__DN_FLUSH) fpword |= 0x1000000; + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); + } + return flags; #else FIXME( "not implemented\n" ); return 0; -- 2.15.0

1 0

[PATCH 1/2] user32/tests: Test manually setting WS_VSCROLL on combobox listbox
by Fabian Maurer 11 Nov '17

11 Nov '17

A test to narrow down the problem from Bug 43465 wrong. Proves my hack I attached there wrong. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/tests/combo.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 03fc412e41..0519ace51c 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -806,11 +806,54 @@ static void test_listbox_size(DWORD style) } } +void test_WS_VSCROLL(void) +{ + BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); + HWND hCombo, hList; + COMBOBOXINFO info; + DWORD style; + BOOL ret; + int i; + + pGetComboBoxInfo = (void *)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); + if (!pGetComboBoxInfo) + { + win_skip("GetComboBoxInfo is not available\n"); + return; + } + info.cbSize = sizeof(info); + hCombo = build_combo(CBS_DROPDOWNLIST); + + SetLastError(0xdeadbeef); + ret = pGetComboBoxInfo(hCombo, &info); + ok(ret, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); + hList = info.hwndList; + + for(i = 0; i < 3; i++) + { + char buffer[2]; + sprintf(buffer, "%d", i); + SendMessageA(hCombo, CB_ADDSTRING, 0, (LPARAM)buffer); + } + + style = GetWindowLongA(info.hwndList, GWL_STYLE); + SetWindowLongA(hList, GWL_STYLE, style | WS_VSCROLL); + + SendMessageA(hCombo, CB_SHOWDROPDOWN, TRUE, 0); + SendMessageA(hCombo, CB_SHOWDROPDOWN, FALSE, 0); + + style = GetWindowLongA(hList, GWL_STYLE); + ok((style & WS_VSCROLL) != 0, "Style does not include WS_VSCROLL\n"); + + DestroyWindow(hCombo); +} + START_TEST(combo) { hMainWnd = CreateWindowA("static", "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); ShowWindow(hMainWnd, SW_SHOW); + test_WS_VSCROLL(); test_setfont(CBS_DROPDOWN); test_setfont(CBS_DROPDOWNLIST); test_setitemheight(CBS_DROPDOWN); -- 2.15.0

1 1

[PATCH] V2 msvcrt : add arm implementation for _control87
by Vijay Kiran Kamuju 11 Nov '17

11 Nov '17

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/math.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b7288cf6cf..9b4298c89f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1233,6 +1233,48 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) if ((x86_cw ^ sse2_cw) & (MSVCRT__MCW_EM | MSVCRT__MCW_RC)) x86_cw |= MSVCRT__EM_AMBIGUOUS; return x86_cw; +#elif defined(__arm__) + unsigned long fpword; + unsigned int flags = 0; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); + if (fpword & 0x1) flags |= MSVCRT__EM_INVALID; + if (fpword & 0x2) flags |= MSVCRT__EM_ZERODIVIDE; + if (fpword & 0x4) flags |= MSVCRT__EM_OVERFLOW; + if (fpword & 0x8) flags |= MSVCRT__EM_UNDERFLOW; + if (fpword & 0x10) flags |= MSVCRT__EM_INEXACT; + if (fpword & 0x40) flags |= MSVCRT__EM_DENORMAL; + switch (fpword & 0xc00000) + { + case 0xc00000: flags |= MSVCRT__RC_UP|MSVCRT__RC_DOWN; break; + case 0x800000: flags |= MSVCRT__RC_DOWN; break; + case 0x400000: flags |= MSVCRT__RC_UP; break; + } + if (fpword & 0x1000000) flags |= MSVCRT__DN_FLUSH; + + TRACE( "arm flags=%08x newval=%08x mask=%08x\n", flags, newval, mask ); + if (mask) + { + flags = (flags & ~mask) | (newval & mask); + + /* Convert (masked) value back to fp word */ + fpword = 0; + if (flags & MSVCRT__EM_INVALID) fpword |= 0x1; + if (flags & MSVCRT__EM_ZERODIVIDE) fpword |= 0x2; + if (flags & MSVCRT__EM_OVERFLOW) fpword |= 0x4; + if (flags & MSVCRT__EM_UNDERFLOW) fpword |= 0x8; + if (flags & MSVCRT__EM_INEXACT) fpword |= 0x10; + if (flags & MSVCRT__EM_DENORMAL) fpword |= 0x40; + switch (flags & MSVCRT__MCW_RC) + { + case MSVCRT__RC_UP|MSVCRT__RC_DOWN: fpword |= 0xc00000; break; + case MSVCRT__RC_DOWN: fpword |= 0x800000; break; + case MSVCRT__RC_UP: fpword |= 0x200000; break; + } + if (flags & MSVCRT__DN_FLUSH) fpword |= 0x1000000; + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); + } + return flags; #else FIXME( "not implemented\n" ); return 0; -- 2.15.0

1 0

[PATCH] msvcrt : add arm implementation for _control87
by Vijay Kiran Kamuju 11 Nov '17

11 Nov '17

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/math.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b7288cf6cf..a5967b7b6c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1233,6 +1233,48 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) if ((x86_cw ^ sse2_cw) & (MSVCRT__MCW_EM | MSVCRT__MCW_RC)) x86_cw |= MSVCRT__EM_AMBIGUOUS; return x86_cw; +#elif defined(__arm__) + unsigned long fpword; + unsigned int flags = 0; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); + if (fpword & 0x1) flags |= MSVCRT__EM_INVALID; + if (fpword & 0x2) flags |= MSVCRT__EM_ZERODIVIDE; + if (fpword & 0x4) flags |= MSVCRT__EM_OVERFLOW; + if (fpword & 0x8) flags |= MSVCRT__EM_UNDERFLOW; + if (fpword & 0x10) flags |= MSVCRT__EM_INEXACT; + if (fpword & 0x40) flags |= MSVCRT__EM_DENORMAL; + switch (fpword & 0x60000) + { + case 0x60000: flags |= MSVCRT__RC_UP|MSVCRT__RC_DOWN; break; + case 0x40000: flags |= MSVCRT__RC_DOWN; break; + case 0x20000: flags |= MSVCRT__RC_UP; break; + } + if (fpword & 0x80000) flags |= MSVCRT__DN_FLUSH; + + TRACE( "arm flags=%08x newval=%08x mask=%08x\n", flags, newval, mask ); + if (mask) + { + flags = (flags & ~mask) | (newval & mask); + + /* Convert (masked) value back to fp word */ + fpword = 0; + if (flags & MSVCRT__EM_INVALID) fpword |= 0x1; + if (flags & MSVCRT__EM_ZERODIVIDE) fpword |= 0x2; + if (flags & MSVCRT__EM_OVERFLOW) fpword |= 0x4; + if (flags & MSVCRT__EM_UNDERFLOW) fpword |= 0x8; + if (flags & MSVCRT__EM_INEXACT) fpword |= 0x10; + if (flags & MSVCRT__EM_DENORMAL) fpword |= 0x40; + switch (flags & MSVCRT__MCW_RC) + { + case MSVCRT__RC_UP|MSVCRT__RC_DOWN: fpword |= 0x60000; break; + case MSVCRT__RC_DOWN: fpword |= 0x40000; break; + case MSVCRT__RC_UP: fpword |= 0x20000; break; + } + if (flags & MSVCRT__DN_FLUSH) fpword |= 0x80000; + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); + } + return flags; #else FIXME( "not implemented\n" ); return 0; -- 2.15.0

1 0

[PATCH] msvcrt : add arm implementation for _control87
by Vijay Kiran Kamuju 11 Nov '17

11 Nov '17

--- dlls/msvcrt/math.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b7288cf6cf..a5967b7b6c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1233,6 +1233,48 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) if ((x86_cw ^ sse2_cw) & (MSVCRT__MCW_EM | MSVCRT__MCW_RC)) x86_cw |= MSVCRT__EM_AMBIGUOUS; return x86_cw; +#elif defined(__arm__) + unsigned long fpword; + unsigned int flags = 0; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpword) ); + if (fpword & 0x1) flags |= MSVCRT__EM_INVALID; + if (fpword & 0x2) flags |= MSVCRT__EM_ZERODIVIDE; + if (fpword & 0x4) flags |= MSVCRT__EM_OVERFLOW; + if (fpword & 0x8) flags |= MSVCRT__EM_UNDERFLOW; + if (fpword & 0x10) flags |= MSVCRT__EM_INEXACT; + if (fpword & 0x40) flags |= MSVCRT__EM_DENORMAL; + switch (fpword & 0x60000) + { + case 0x60000: flags |= MSVCRT__RC_UP|MSVCRT__RC_DOWN; break; + case 0x40000: flags |= MSVCRT__RC_DOWN; break; + case 0x20000: flags |= MSVCRT__RC_UP; break; + } + if (fpword & 0x80000) flags |= MSVCRT__DN_FLUSH; + + TRACE( "arm flags=%08x newval=%08x mask=%08x\n", flags, newval, mask ); + if (mask) + { + flags = (flags & ~mask) | (newval & mask); + + /* Convert (masked) value back to fp word */ + fpword = 0; + if (flags & MSVCRT__EM_INVALID) fpword |= 0x1; + if (flags & MSVCRT__EM_ZERODIVIDE) fpword |= 0x2; + if (flags & MSVCRT__EM_OVERFLOW) fpword |= 0x4; + if (flags & MSVCRT__EM_UNDERFLOW) fpword |= 0x8; + if (flags & MSVCRT__EM_INEXACT) fpword |= 0x10; + if (flags & MSVCRT__EM_DENORMAL) fpword |= 0x40; + switch (flags & MSVCRT__MCW_RC) + { + case MSVCRT__RC_UP|MSVCRT__RC_DOWN: fpword |= 0x60000; break; + case MSVCRT__RC_DOWN: fpword |= 0x40000; break; + case MSVCRT__RC_UP: fpword |= 0x20000; break; + } + if (flags & MSVCRT__DN_FLUSH) fpword |= 0x80000; + __asm__ __volatile__( "vmsr fpscr, %0" : : "r" (fpword) ); + } + return flags; #else FIXME( "not implemented\n" ); return 0; -- 2.15.0

1 0

[PATCH] kernel32: Handle zh-Hant and zh-Hans in LocaleNameToLCID.
by Zhiyi Zhang 11 Nov '17

11 Nov '17

I extended get_default_sublang() to work with LCIDs that have a script but no country. I also made a change in parse_locale_name(), because <LANG>-<SCRIPTS> is also a valid locale name form. Thanks to Alexandre for the suggestion. Signed-off-by: Zhiyi Zhang <yi.gd.cn(a)gmail.com> --- dlls/kernel32/locale.c | 34 ++++++++++++++++++++++++---------- dlls/kernel32/tests/locale.c | 24 +++++++++++------------- 2 files changed, 35 insertions(+), 23 deletions(-)

1 0

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-devel