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

Alexandre Julliard : Release 4.6.
by Alexandre Julliard 12 Apr '19

12 Apr '19

Module: wine Branch: master Commit: fabde842ede40fc53cf6f5743d5b477841f7b11c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fabde842ede40fc53cf6f574… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 20:10:12 2019 +0200 Release 4.6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 995 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 516 insertions(+), 501 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fabde842ede40fc53cf6…

1 0

Tag wine-4.6 : Alexandre Julliard : Release 4.6
by Alexandre Julliard 12 Apr '19

12 Apr '19

Module: wine Branch: refs/tags/wine-4.6 Tag: f646bc60caba909f6916809c24e6637f0a1ee61a URL: https://source.winehq.org/git/wine.git/?a=tag;h=f646bc60caba909f6916809c24e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 20:10:12 2019 +0200 Release 4.6

1 0

Nikolay Sivov : dbgeng: Keep a list of processes to attach to.
by Alexandre Julliard 11 Apr '19

11 Apr '19

Module: wine Branch: master Commit: 8f3e72edd97d4431c430474bb16385ea515333ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f3e72edd97d4431c430474b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 11 16:03:10 2019 +0300 dbgeng: Keep a list of processes to attach to. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 39 +++++++- dlls/dbgeng/tests/dbgeng.c | 231 +++++++++++++++++++++++++++++++++++++++++++++ include/dbgeng.h | 89 +++++++++++++++++ 3 files changed, 357 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8f3e72edd97d4431c430…

1 0

Nikolay Sivov : dbgeng: Keep event callbacks pointer.
by Alexandre Julliard 11 Apr '19

11 Apr '19

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

Jacek Caban : jscript: Support type conversion to VT_UI2.
by Alexandre Julliard 11 Apr '19

11 Apr '19

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

Akihiro Sagawa : user32/tests: Use calculated EC_USEFONTINFO margins in the CJK case.
by Alexandre Julliard 11 Apr '19

11 Apr '19

Module: wine Branch: master Commit: 8ba6c1f2fcee2f6432928395dfb660ace169327f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ba6c1f2fcee2f6432928395… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 11 00:04:39 2019 +0900 user32/tests: Use calculated 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/tests/edit.c | 46 +++++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index b1223a9..2930c33 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1549,6 +1549,16 @@ static void test_margins_usefontinfo(UINT charset) DeleteObject(hfont); } +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; +} + static void test_margins_default(const char* facename, UINT charset) { HWND hwnd; @@ -1562,6 +1572,14 @@ static void test_margins_default(const char* facename, UINT charset) INT margins, expect; const UINT small_margins = MAKELONG(1, 5); const WCHAR EditW[] = {'E','d','i','t',0}, strW[] = {'W',0}; + struct char_width_info { + INT lsb, rsb, unknown; + } info; + HMODULE hgdi32; + BOOL (WINAPI *pGetCharWidthInfo)(HDC, struct char_width_info *); + + hgdi32 = GetModuleHandleA("gdi32.dll"); + pGetCharWidthInfo = (void *)GetProcAddress(hgdi32, "GetCharWidthInfo"); memset(&lf, 0, sizeof(lf)); lf.lfHeight = -11; @@ -1590,8 +1608,16 @@ static void test_margins_default(const char* facename, UINT charset) DeleteObject(hfont); return; } - expect = MAKELONG(size.cx / 2, size.cx / 2); cjk_charset = is_cjk_charset(hdc); + if (cjk_charset && pGetCharWidthInfo && pGetCharWidthInfo(hdc, &info)) { + short left, right; + + left = get_cjk_fontinfo_margin(size.cx, info.lsb); + right = get_cjk_fontinfo_margin(size.cx, info.rsb); + expect = MAKELONG(left, right); + } + else + expect = MAKELONG(size.cx / 2, size.cx / 2); hfont = SelectObject(hdc, hfont); ReleaseDC(hwnd, hdc); @@ -1606,13 +1632,8 @@ 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); - if (!cjk_charset) - ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); - else - { - ok(HIWORD(margins) <= HIWORD(expect), "%s:%d: got %d\n", facename, charset, HIWORD(margins)); - ok(LOWORD(margins) <= LOWORD(expect), "%s:%d: got %d\n", facename, charset, LOWORD(margins)); - } + 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); /* ANSI version */ @@ -1631,13 +1652,8 @@ 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); - if (!cjk_charset) - ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); - else - { - ok(HIWORD(margins) <= HIWORD(expect), "%s:%d: got %d\n", facename, charset, HIWORD(margins)); - ok(LOWORD(margins) <= LOWORD(expect), "%s:%d: got %d\n", facename, charset, LOWORD(margins)); - } + 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); DeleteObject(hfont);

1 0

Akihiro Sagawa : user32: Implement EC_USEFONTINFO margins in the CJK case.
by Alexandre Julliard 11 Apr '19

11 Apr '19

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

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 11 Apr '19

11 Apr '19

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

Paul Gofman : ddraw: Improve d3d_device7_GetClipStatus() stub.
by Alexandre Julliard 11 Apr '19

11 Apr '19

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

Jacek Caban : ntoskrnl.exe: Use proper device handle in DevicePropertyPhysicalDeviceObjectName implementation.
by Alexandre Julliard 11 Apr '19

11 Apr '19

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