April 2019 - Wine-Commits - list.winehq.org

Jacek Caban : jscript: Support type conversion to VT_UI2.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: f192f2f1a13190378cbecc33dcf06ff3fd637eb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f192f2f1a13190378cbecc33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 11 16:44:06 2019 +0200 jscript: Support type conversion to VT_UI2. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsutils.c | 8 ++++++++ dlls/jscript/tests/caller.c | 3 +++ 2 files changed, 11 insertions(+) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index b653e52..f252824 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -894,6 +894,14 @@ HRESULT variant_change_type(script_ctx_t *ctx, VARIANT *dst, VARIANT *src, VARTY } break; } + case VT_UI2: { + UINT32 i; + + hres = to_uint32(ctx, val, &i); + if(SUCCEEDED(hres)) + V_UI2(dst) = i; + break; + } case VT_R8: { double n; hres = to_number(ctx, val, &n); diff --git a/dlls/jscript/tests/caller.c b/dlls/jscript/tests/caller.c index f09ad90..dc97fb7 100644 --- a/dlls/jscript/tests/caller.c +++ b/dlls/jscript/tests/caller.c @@ -136,6 +136,9 @@ static void test_change_type(IVariantChangeType *change_type, VARIANT *src, cons call_change_type(change_type, &v, src, VT_I4); ok(V_I4(&v) == ex->int_result, "V_I4(v) = %d, expected %d\n", V_I4(&v), ex->int_result); + call_change_type(change_type, &v, src, VT_UI2); + ok(V_UI2(&v) == (UINT16)ex->int_result, "V_UI2(v) = %u, expected %u\n", V_UI2(&v), (UINT16)ex->int_result); + call_change_type(change_type, &v, src, VT_BSTR); ok(!strcmp_wa(V_BSTR(&v), ex->str_result), "V_BSTR(v) = %s, expected %s\n", wine_dbgstr_w(V_BSTR(&v)), ex->str_result); VariantClear(&v);

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 77aa55d9eebc9437d4772b4bd55b12820bc69bea URL: https://source.winehq.org/git/wine.git/?a=commit;h=77aa55d9eebc9437d4772b4b… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Apr 11 12:24:45 2019 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 48 +++++++++++++----------------------------------- 1 file changed, 13 insertions(+), 35 deletions(-) diff --git a/po/fi.po b/po/fi.po index e27f3f0..6a2a857 100644 --- a/po/fi.po +++ b/po/fi.po @@ -4917,7 +4917,7 @@ msgstr "Kovalevyn nollaus epäonnistui.\n" #: winerror.mc:1443 msgid "End of tape media.\n" -msgstr "Nauha on loppussa.\n" +msgstr "Nauhan loppu.\n" #: winerror.mc:1448 msgid "Not enough server memory.\n" @@ -7029,78 +7029,56 @@ msgid "No events available.\n" msgstr "Tapahtumia ei ole saatavilla.\n" #: mferror.mc:445 -#, fuzzy -#| msgid "Unsupported state transition.\n" msgid "Invalid media source state transition.\n" -msgstr "Tilan muutosta ei tueta.\n" +msgstr "Medialähteen tilan muutos ei kelpaa.\n" #: mferror.mc:452 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "End of media stream has been reached.\n" -msgstr "Rekisteri on palautettu.\n" +msgstr "Mediavirta on lopussa.\n" #: mferror.mc:459 msgid "Shutdown() was called.\n" msgstr "Shutdown() kutsuttu.\n" #: mferror.mc:466 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media stream has no duration set.\n" -msgstr "Rekisteri on palautettu.\n" +msgstr "Mediavirralla ei ole kestoa.\n" #: mferror.mc:473 msgid "Media format was recognized but is invalid.\n" -msgstr "" +msgstr "Median muoto tunnistettiin, mutta se ei kelpaa.\n" #: mferror.mc:480 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Property wasn't found.\n" -msgstr "Ominaisuusjoukkoa ei löytynyt.\n" +msgstr "Ominaisuutta ei löytynyt.\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Property is empty.\n" msgid "Property is read-only.\n" -msgstr "Ominaisuus on tyhjä.\n" +msgstr "Ominaisuus on vain luettava.\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Property type is not allowed.\n" msgid "Property is not allowed.\n" -msgstr "Ominaisuuden tyyppi ei ole sallittu.\n" +msgstr "Ominaisuutta ei sallita.\n" #: mferror.mc:501 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is not started.\n" -msgstr "Resurssi on käytössä.\n" +msgstr "Medialähdettä ei ole käynnistetty.\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported time format.\n" msgid "Unsupported media format.\n" -msgstr "Ajan muotoa ei tueta.\n" +msgstr "Median muotoa ei tueta.\n" #: mferror.mc:515 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is in wrong state.\n" -msgstr "Resurssi on käytössä.\n" +msgstr "Medialähde on väärässä tilassa.\n" #: mferror.mc:522 -#, fuzzy -#| msgid "No data detected.\n" msgid "No media streams were selected.\n" -msgstr "Dataa ei löytynyt.\n" +msgstr "Mediavirtoja ei ole valittu.\n" #: mferror.mc:529 -#, fuzzy -#| msgid "Unsupported time format.\n" msgid "Unsupported media source characteristics.\n" -msgstr "Ajan muotoa ei tueta.\n" +msgstr "Medialähteen ominaisuuksia ei tueta.\n" #: mferror.mc:536 msgid "Optional node is invalid.\n"

1 0

Nikolay Sivov : dbgeng: Keep event callbacks pointer.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 02da0edd9d2746ddd0d6266a5945608726603e01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02da0edd9d2746ddd0d6266a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 11 16:03:11 2019 +0300 dbgeng: Keep event callbacks pointer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 26 ++++++++++++++++++++++---- dlls/dbgeng/tests/dbgeng.c | 1 - 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index 9aed1b0..f9faef0 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -51,6 +51,7 @@ struct debug_client LONG refcount; ULONG engine_options; struct list targets; + IDebugEventCallbacks *event_callbacks; }; static struct debug_client *impl_from_IDebugClient(IDebugClient *iface) @@ -133,6 +134,8 @@ static ULONG STDMETHODCALLTYPE debugclient_Release(IDebugClient *iface) list_remove(&cur->entry); heap_free(cur); } + if (debug_client->event_callbacks) + debug_client->event_callbacks->lpVtbl->Release(debug_client->event_callbacks); heap_free(debug_client); } @@ -467,16 +470,31 @@ static HRESULT STDMETHODCALLTYPE debugclient_OutputIdentity(IDebugClient *iface, static HRESULT STDMETHODCALLTYPE debugclient_GetEventCallbacks(IDebugClient *iface, IDebugEventCallbacks **callbacks) { - FIXME("%p, %p stub.\n", iface, callbacks); + struct debug_client *debug_client = impl_from_IDebugClient(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, callbacks); + + if (debug_client->event_callbacks) + { + *callbacks = debug_client->event_callbacks; + (*callbacks)->lpVtbl->AddRef(*callbacks); + } + + return S_OK; } static HRESULT STDMETHODCALLTYPE debugclient_SetEventCallbacks(IDebugClient *iface, IDebugEventCallbacks *callbacks) { - FIXME("%p, %p stub.\n", iface, callbacks); + struct debug_client *debug_client = impl_from_IDebugClient(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, callbacks); + + if (debug_client->event_callbacks) + debug_client->event_callbacks->lpVtbl->Release(debug_client->event_callbacks); + if ((debug_client->event_callbacks = callbacks)) + debug_client->event_callbacks->lpVtbl->AddRef(debug_client->event_callbacks); + + return S_OK; } static HRESULT STDMETHODCALLTYPE debugclient_FlushCallbacks(IDebugClient *iface) diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c index f5d50c8..baec60a 100644 --- a/dlls/dbgeng/tests/dbgeng.c +++ b/dlls/dbgeng/tests/dbgeng.c @@ -247,7 +247,6 @@ static void test_attach(void) ok(hr == S_OK, "Failed to get interface pointer, hr %#x.\n", hr); hr = client->lpVtbl->SetEventCallbacks(client, &event_callbacks); -todo_wine ok(hr == S_OK, "Failed to set event callbacks, hr %#x.\n", hr); event = CreateEventA(NULL, FALSE, FALSE, event_name);

1 0

Akihiro Sagawa : user32: Implement EC_USEFONTINFO margins in the CJK case.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: c5823e9cac8311cd1dfd622331f2502df0b9f12a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5823e9cac8311cd1dfd6223… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 11 00:04:41 2019 +0900 user32: Implement EC_USEFONTINFO margins in the CJK case. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 41 ++++++++++++++++++++++++++++++++++++++--- dlls/user32/tests/edit.c | 4 ++-- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index d1659b4..7eb2214 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2841,6 +2841,32 @@ static void EDIT_EM_SetLimitText(EDITSTATE *es, UINT limit) es->buffer_limit = limit; } +static BOOL is_cjk_charset(HDC dc) +{ + switch (GdiGetCodePage(dc)) { + case 932: case 936: case 949: case 950: case 1361: + return TRUE; + default: + return FALSE; + } +} + +static int get_cjk_fontinfo_margin(int width, int side_bearing) +{ + int margin; + if (side_bearing < 0) + margin = min(-side_bearing, width/2); + else + margin = 0; + return margin; +} + +struct char_width_info { + INT min_lsb, min_rsb, unknown; +}; + +/* Undocumented gdi32 export */ +extern BOOL WINAPI GetCharWidthInfo(HDC, struct char_width_info *); /********************************************************************* * @@ -2870,9 +2896,18 @@ static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, /* The default margins are only non zero for TrueType or Vector fonts */ if (tm.tmPitchAndFamily & ( TMPF_VECTOR | TMPF_TRUETYPE )) { - /* FIXME: figure out the CJK values. */ - default_left_margin = width / 2; - default_right_margin = width / 2; + struct char_width_info width_info; + + if (is_cjk_charset(dc) && GetCharWidthInfo(dc, &width_info)) + { + default_left_margin = get_cjk_fontinfo_margin(width, width_info.min_lsb); + default_right_margin = get_cjk_fontinfo_margin(width, width_info.min_rsb); + } + else + { + default_left_margin = width / 2; + default_right_margin = width / 2; + } GetClientRect(es->hwndSelf, &rc); rc_width = !IsRectEmpty(&rc) ? rc.right - rc.left : 80; diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 2930c33..e8ea774 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1632,7 +1632,7 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - todo_wine_if(cjk_charset && expect != MAKELONG(size.cx / 2, size.cx / 2)) + ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd); @@ -1652,7 +1652,7 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - todo_wine_if(cjk_charset && expect != MAKELONG(size.cx / 2, size.cx / 2)) + ok(margins == expect, "%s:%d: expected %d, %d, got %d, %d\n", facename, charset, HIWORD(expect), LOWORD(expect), HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd);

1 0

Paul Gofman : ddraw: Improve d3d_device7_GetClipStatus() stub.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 38bdd6fc5c36c61a2b8edbb8fe52ba858d4c32c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38bdd6fc5c36c61a2b8edbb8… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 11 17:05:36 2019 +0300 ddraw: Improve d3d_device7_GetClipStatus() stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43411 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 003ce1d..054e2dc 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3916,7 +3916,20 @@ static HRESULT WINAPI d3d_device2_SetClipStatus(IDirect3DDevice2 *iface, D3DCLIP *****************************************************************************/ static HRESULT WINAPI d3d_device7_GetClipStatus(IDirect3DDevice7 *iface, D3DCLIPSTATUS *clip_status) { - FIXME("iface %p, clip_status %p stub!\n", iface, clip_status); + struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + struct wined3d_viewport vp; + + FIXME("iface %p, clip_status %p stub.\n", iface, clip_status); + + wined3d_device_get_viewports(device->wined3d_device, NULL, &vp); + clip_status->minx = vp.x; + clip_status->maxx = vp.x + vp.width; + clip_status->miny = vp.y; + clip_status->maxy = vp.y + vp.height; + clip_status->minz = 0.0f; + clip_status->maxz = 0.0f; + clip_status->dwFlags = D3DCLIPSTATUS_EXTENTS2; + clip_status->dwStatus = 0; return D3D_OK; }

1 0

Zhiyi Zhang : dinput: Fix a possible deadlock at exit.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 886d28de974b0b012be87cf8552806dc65ef3ea9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=886d28de974b0b012be87cf8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Apr 11 18:28:40 2019 +0800 dinput: Fix a possible deadlock at exit. This fix another deadlock issue with dinput. The old implementation of dinput waits for a hook thread to exit during its uninitialization, which will never return during DLL_THREAD_DETACH. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 65aaf92..1b2020c 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1781,7 +1781,7 @@ static DWORD WINAPI hook_thread_proc(void *param) DispatchMessageW(&msg); } - return 0; + FreeLibraryAndExitThread(DINPUT_instance, 0); } static DWORD hook_thread_id; @@ -1798,15 +1798,16 @@ static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0 static BOOL check_hook_thread(void) { static HANDLE hook_thread; + HMODULE module; EnterCriticalSection(&dinput_hook_crit); TRACE("IDirectInputs left: %d\n", list_count(&direct_input_list)); if (!list_empty(&direct_input_list) && !hook_thread) { + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR*)DINPUT_instance, &module); hook_thread_event = CreateEventW(NULL, FALSE, FALSE, NULL); hook_thread = CreateThread(NULL, 0, hook_thread_proc, hook_thread_event, 0, &hook_thread_id); - LeaveCriticalSection(&dinput_hook_crit); } else if (list_empty(&direct_input_list) && hook_thread) { @@ -1821,16 +1822,11 @@ static BOOL check_hook_thread(void) hook_thread_id = 0; PostThreadMessageW(tid, WM_USER+0x10, 0, 0); - LeaveCriticalSection(&dinput_hook_crit); - - /* wait for hook thread to exit */ - WaitForSingleObject(hook_thread, INFINITE); CloseHandle(hook_thread); hook_thread = NULL; } - else - LeaveCriticalSection(&dinput_hook_crit); + LeaveCriticalSection(&dinput_hook_crit); return hook_thread_id != 0; }

1 0

Jacek Caban : ntoskrnl.exe: Use proper device handle in DevicePropertyPhysicalDeviceObjectName implementation.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: c1fb240f0ccc92d6ec180bfc2542c0dbcb52296c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1fb240f0ccc92d6ec180bfc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 11 17:19:03 2019 +0200 ntoskrnl.exe: Use proper device handle in DevicePropertyPhysicalDeviceObjectName implementation. Spotted by Huw Davies. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index acb204d..861eb40 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1831,8 +1831,11 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP { ULONG used_len, len = buffer_length + sizeof(OBJECT_NAME_INFORMATION); OBJECT_NAME_INFORMATION *name = HeapAlloc(GetProcessHeap(), 0, len); + HANDLE handle; - status = NtQueryObject(device->Reserved, ObjectNameInformation, name, len, &used_len); + handle = kernel_object_handle( device, 0 ); + status = NtQueryObject( handle, ObjectNameInformation, name, len, &used_len ); + NtClose( handle ); if (status == STATUS_SUCCESS) { /* Ensure room for NULL termination */

1 0

Alistair Leslie-Hughes : wintab32/tests: Add WTInfoA tests.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 9b7b9fa0f53ebaf7bcb96e4af276b2b6a632f013 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b7b9fa0f53ebaf7bcb96e4a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 11 08:23:32 2019 +0000 wintab32/tests: Add WTInfoA tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab32/tests/context.c | 64 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/wintab32/tests/context.c b/dlls/wintab32/tests/context.c index 5f05912..3eb1315 100644 --- a/dlls/wintab32/tests/context.c +++ b/dlls/wintab32/tests/context.c @@ -32,8 +32,11 @@ static const UINT Y = 0; static const UINT WIDTH = 200; static const UINT HEIGHT = 200; +static LOGCONTEXTA glogContext; + static HCTX (WINAPI *pWTOpenA)(HWND, LPLOGCONTEXTA, BOOL); static BOOL (WINAPI *pWTClose)(HCTX); +static UINT (WINAPI *pWTInfoA)(UINT, UINT, void*); static HMODULE load_functions(void) { @@ -50,6 +53,7 @@ static HMODULE load_functions(void) } if (GET_PROC(WTOpenA) && + GET_PROC(WTInfoA) && GET_PROC(WTClose) ) { return hWintab; @@ -135,6 +139,65 @@ static void test_WTOpenContextValidation(void) wintab_destroy_window(defaultWindow); } +static void test_WTInfoA(void) +{ + char name[LCNAMELEN]; + UINT ret; + AXIS value; + AXIS orientation[3]; + + glogContext.lcOptions |= CXO_SYSTEM; + + ret = pWTInfoA(WTI_DEFSYSCTX, 0, &glogContext); + if(!ret) + { + skip("No tablet connected\n"); + return; + } + ok(ret == sizeof( LOGCONTEXTA ), "incorrect size\n" ); + ok(glogContext.lcOptions & CXO_SYSTEM, "Wrong options 0x%08x\n", glogContext.lcOptions); + + ret = pWTInfoA( WTI_DEVICES, DVC_NAME, name ); + trace("DVC_NAME %s\n", name); + + ret = pWTInfoA( WTI_DEVICES, DVC_X, &value ); + ok(ret == sizeof( AXIS ), "Wrong DVC_X size %d\n", ret); + trace("DVC_X %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + + ret = pWTInfoA( WTI_DEVICES, DVC_Y, &value ); + ok(ret == sizeof( AXIS ), "Wrong DVC_Y size %d\n", ret); + trace("DVC_Y %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + + ret = pWTInfoA( WTI_DEVICES, DVC_Z, &value ); + todo_wine ok(ret == sizeof( AXIS ), "Wrong DVC_Z size %d\n", ret); + trace("DVC_Z %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + + ret = pWTInfoA( WTI_DEVICES, DVC_NPRESSURE, &value ); + ok(ret == sizeof( AXIS ), "Wrong DVC_NPRESSURE, size %d\n", ret); + trace("DVC_NPRESSURE %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + + ret = pWTInfoA( WTI_DEVICES, DVC_TPRESSURE, &value ); + todo_wine ok(ret == sizeof( AXIS ), "Wrong DVC_TPRESSURE, size %d\n", ret); + trace("DVC_TPRESSURE %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + + ret = pWTInfoA( WTI_DEVICES, DVC_ORIENTATION, &orientation ); + ok(ret == sizeof( AXIS )*3, "Wrong DVC_ORIENTATION, size %d\n", ret); + trace("DVC_ORIENTATION0 %d, %d, %d\n", orientation[0].axMin, orientation[0].axMax, orientation[0].axUnits); + trace("DVC_ORIENTATION1 %d, %d, %d\n", orientation[1].axMin, orientation[1].axMax, orientation[1].axUnits); + trace("DVC_ORIENTATION2 %d, %d, %d\n", orientation[2].axMin, orientation[2].axMax, orientation[2].axUnits); + + ret = pWTInfoA( WTI_DEVICES, DVC_ROTATION, &orientation ); + if(ret) + { + trace("DVC_ROTATION0 %d, %d, %d\n", orientation[0].axMin, orientation[0].axMax, orientation[0].axUnits); + trace("DVC_ROTATION1 %d, %d, %d\n", orientation[1].axMin, orientation[1].axMax, orientation[1].axUnits); + trace("DVC_ROTATION2 %d, %d, %d\n", orientation[2].axMin, orientation[2].axMax, orientation[2].axUnits); + } + else + trace("DVC_ROTATION not supported\n"); + +} + START_TEST(context) { HMODULE hWintab = load_functions(); @@ -146,6 +209,7 @@ START_TEST(context) } test_WTOpenContextValidation(); + test_WTInfoA(); FreeLibrary(hWintab); }

1 0

Martin Storsjo : msvcrt: Implement the remquo family of functions.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: de8be4a09c18fabd72f33f7e45b19ff0d735864b URL: https://source.winehq.org/git/wine.git/?a=commit;h=de8be4a09c18fabd72f33f7e… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Apr 10 21:14:28 2019 +0300 msvcrt: Implement the remquo family of functions. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ .../api-ms-win-crt-math-l1-1-0.spec | 6 ++-- dlls/msvcr120/msvcr120.spec | 6 ++-- dlls/msvcr120_app/msvcr120_app.spec | 6 ++-- dlls/msvcrt/math.c | 38 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 ++-- include/config.h.in | 6 ++++ 8 files changed, 60 insertions(+), 12 deletions(-) diff --git a/configure b/configure index a7c072b..5733ea7 100755 --- a/configure +++ b/configure @@ -19163,6 +19163,8 @@ for ac_func in \ powl \ remainder \ remainderf \ + remquo \ + remquof \ rint \ rintf \ round \ diff --git a/configure.ac b/configure.ac index bb02ec4..4dbb7f4 100644 --- a/configure.ac +++ b/configure.ac @@ -2724,6 +2724,8 @@ AC_CHECK_FUNCS(\ powl \ remainder \ remainderf \ + remquo \ + remquof \ rint \ rintf \ round \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index dea5094..a9deec8 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -308,9 +308,9 @@ @ cdecl remainder(double double) ucrtbase.remainder @ cdecl remainderf(float float) ucrtbase.remainderf @ cdecl remainderl(double double) ucrtbase.remainderl -@ stub remquo -@ stub remquof -@ stub remquol +@ cdecl remquo(double double ptr) ucrtbase.remquo +@ cdecl remquof(float float ptr) ucrtbase.remquof +@ cdecl remquol(double double ptr) ucrtbase.remquol @ cdecl rint(double) ucrtbase.rint @ cdecl rintf(float) ucrtbase.rintf @ cdecl rintl(double) ucrtbase.rintl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 8cd39ea..618b9bc 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2328,9 +2328,9 @@ @ cdecl remainderf(float float) MSVCR120_remainderf @ cdecl remainderl(double double) MSVCR120_remainderl @ cdecl remove(str) MSVCRT_remove -@ stub remquo -@ stub remquof -@ stub remquol +@ cdecl remquo(double double ptr) MSVCR120_remquo +@ cdecl remquof(float float ptr) MSVCR120_remquof +@ cdecl remquol(double double ptr) MSVCR120_remquol @ cdecl rename(str str) MSVCRT_rename @ cdecl rewind(ptr) MSVCRT_rewind @ cdecl rint(double) MSVCR120_rint diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index dc3f3bd..26ffaf7 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1991,9 +1991,9 @@ @ cdecl remainderf(float float) msvcr120.remainderf @ cdecl remainderl(double double) msvcr120.remainderl @ cdecl remove(str) msvcr120.remove -@ stub remquo -@ stub remquof -@ stub remquol +@ cdecl remquo(double double ptr) msvcr120.remquo +@ cdecl remquof(float float ptr) msvcr120.remquof +@ cdecl remquol(double double ptr) msvcr120.remquol @ cdecl rename(str str) msvcr120.rename @ cdecl rewind(ptr) msvcr120.rewind @ cdecl rint(double) msvcr120.rint diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 754e46c..c893c83 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3273,6 +3273,44 @@ LDOUBLE CDECL MSVCR120_remainderl(LDOUBLE x, LDOUBLE y) } /********************************************************************* + * remquo (MSVCR120.@) + */ +double CDECL MSVCR120_remquo(double x, double y, int *quo) +{ +#ifdef HAVE_REMQUO + if(!finite(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if(isnan(y) || y==0.0) *MSVCRT__errno() = MSVCRT_EDOM; + return remquo(x, y, quo); +#else + FIXME( "not implemented\n" ); + return 0.0; +#endif +} + +/********************************************************************* + * remquof (MSVCR120.@) + */ +float CDECL MSVCR120_remquof(float x, float y, int *quo) +{ +#ifdef HAVE_REMQUOF + if(!finitef(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if(isnan(y) || y==0.0f) *MSVCRT__errno() = MSVCRT_EDOM; + return remquof(x, y, quo); +#else + FIXME( "not implemented\n" ); + return 0.0f; +#endif +} + +/********************************************************************* + * remquol (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_remquol(LDOUBLE x, LDOUBLE y, int *quo) +{ + return MSVCR120_remquo(x, y, quo); +} + +/********************************************************************* * lgamma (MSVCR120.@) */ double CDECL MSVCR120_lgamma(double x) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d218aa3..1866f1b 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2463,9 +2463,9 @@ @ cdecl remainderf(float float) MSVCR120_remainderf @ cdecl remainderl(double double) MSVCR120_remainderl @ cdecl remove(str) MSVCRT_remove -@ stub remquo -@ stub remquof -@ stub remquol +@ cdecl remquo(double double ptr) MSVCR120_remquo +@ cdecl remquof(float float ptr) MSVCR120_remquof +@ cdecl remquol(double double ptr) MSVCR120_remquol @ cdecl rename(str str) MSVCRT_rename @ cdecl rewind(ptr) MSVCRT_rewind @ cdecl rint(double) MSVCR120_rint diff --git a/include/config.h.in b/include/config.h.in index 535f43f..aeb571a 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -744,6 +744,12 @@ /* Define to 1 if you have the `remainderf' function. */ #undef HAVE_REMAINDERF +/* Define to 1 if you have the `remquo' function. */ +#undef HAVE_REMQUO + +/* Define to 1 if you have the `remquof' function. */ +#undef HAVE_REMQUOF + /* Define to 1 if the system has the type `request_sense'. */ #undef HAVE_REQUEST_SENSE

1 0

Zhiyi Zhang : kernel32/tests: Test readonly file access.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 304fb43aaa60268dbc01992cb049b5b27b9931b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=304fb43aaa60268dbc01992c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 9 23:54:04 2019 +0800 kernel32/tests: Test readonly file access. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 33b17aa..e92764b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5228,6 +5228,75 @@ static void test_overlapped_read(void) ok(ret, "Unexpected error %u.\n", GetLastError()); } +static void test_file_readonly_access(void) +{ + static const DWORD default_sharing = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; + static const CHAR prefix[] = "pfx"; + CHAR file_name[MAX_PATH], file_name2[MAX_PATH]; + CHAR temp_path[MAX_PATH]; + HANDLE handle; + DWORD error; + DWORD ret; + + /* Set up */ + ret = GetTempPathA(MAX_PATH, temp_path); + ok(ret != 0, "GetTempPathA error %d\n", GetLastError()); + ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n"); + + ret = GetTempFileNameA(temp_path, prefix, 0, file_name); + ok(ret != 0, "GetTempFileNameA error %d\n", GetLastError()); + ret = DeleteFileA(file_name); + ok(ret, "expect success\n"); + + ret = GetTempFileNameA(temp_path, prefix, 0, file_name2); + ok(ret != 0, "GetTempFileNameA error %d\n", GetLastError()); + ret = DeleteFileA(file_name2); + ok(ret, "expect success\n"); + + handle = CreateFileA(file_name, 0, default_sharing, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_READONLY, 0); + ok(handle != INVALID_HANDLE_VALUE, "CreateFileA: error %d\n", GetLastError()); + CloseHandle(handle); + + /* CreateFile GENERIC_WRITE */ + SetLastError(0xdeadbeef); + handle = CreateFileA(file_name, GENERIC_WRITE, default_sharing, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); + error = GetLastError(); + ok(handle == INVALID_HANDLE_VALUE, "expect failure\n"); + ok(error == ERROR_ACCESS_DENIED, "wrong error code: %#x\n", error); + + /* CreateFile DELETE without FILE_FLAG_DELETE_ON_CLOSE */ + handle = CreateFileA(file_name, DELETE, default_sharing, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); + ok(handle != INVALID_HANDLE_VALUE, "expect success\n"); + CloseHandle(handle); + + /* CreateFile DELETE with FILE_FLAG_DELETE_ON_CLOSE */ + SetLastError(0xdeadbeef); + handle = CreateFileA(file_name, DELETE, default_sharing, NULL, OPEN_EXISTING, + FILE_FLAG_DELETE_ON_CLOSE | FILE_ATTRIBUTE_NORMAL, 0); + error = GetLastError(); + ok(handle == INVALID_HANDLE_VALUE, "expect failure\n"); + ok(error == ERROR_ACCESS_DENIED, "wrong error code: %#x\n", error); + + ret = MoveFileA(file_name, file_name2); + ok(ret, "expect success\n"); + ret = MoveFileA(file_name2, file_name); + ok(ret, "expect success\n"); + + SetLastError(0xdeadbeef); + ret = DeleteFileA(file_name); + error = GetLastError(); + ok(!ret, "expect failure\n"); + ok(error == ERROR_ACCESS_DENIED, "wrong error code: %#x\n", error); + + ret = GetFileAttributesA(file_name); + ok(ret & FILE_ATTRIBUTE_READONLY, "got wrong attribute: %#x.\n", ret); + + /* Clean up */ + SetFileAttributesA(file_name, FILE_ATTRIBUTE_NORMAL); + ret = DeleteFileA(file_name); + ok(ret, "DeleteFileA: error %d\n", GetLastError()); +} + START_TEST(file) { char temp_path[MAX_PATH]; @@ -5298,4 +5367,5 @@ START_TEST(file) test_GetFileAttributesExW(); test_post_completion(); test_overlapped_read(); + test_file_readonly_access(); }

1 0