February 2018 - Wine-Commits

Jacek Caban : mshtml: Added IDOMMouseEvent position getters implementation.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: feb957b2768e8864afc9946f1044cf251e311a61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=feb957b2768e8864afc9946f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 5 17:29:59 2018 +0100 mshtml: Added IDOMMouseEvent position getters implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 52 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0cf69fb..e4ba0ed 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1263,29 +1263,65 @@ static HRESULT WINAPI DOMMouseEvent_Invoke(IDOMMouseEvent *iface, DISPID dispIdM static HRESULT WINAPI DOMMouseEvent_get_screenX(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT32 screen_x; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetScreenX(This->mouse_event, &screen_x); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = screen_x; + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_screenY(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT32 screen_y; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetScreenY(This->mouse_event, &screen_y); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = screen_y; + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_clientX(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT32 client_x; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetClientX(This->mouse_event, &client_x); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = client_x; + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_clientY(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT32 client_y; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetClientY(This->mouse_event, &client_y); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = client_y; + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_ctrlKey(IDOMMouseEvent *iface, VARIANT_BOOL *p)

1 0

Jacek Caban : mshtml: Use IDOMMouseEvent instead of nsIDOMMouseEvent in IHTMLEventObj implementation.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 65ce11478c2885ed2b248e6967479ba84fabb449 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65ce11478c2885ed2b248e69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 5 17:31:04 2018 +0100 mshtml: Use IDOMMouseEvent instead of nsIDOMMouseEvent in IHTMLEventObj implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 109 ++++++++++++------------------------------------ 1 file changed, 27 insertions(+), 82 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 8462bed..633c1f9 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -411,6 +411,9 @@ static HRESULT WINAPI HTMLEventObj_get_altKey(IHTMLEventObj *iface, VARIANT_BOOL TRACE("(%p)->(%p)\n", This, p); + if(This->event && This->event->mouse_event) + return IDOMMouseEvent_get_altKey(&This->event->IDOMMouseEvent_iface, p); + if(This->event) { nsIDOMKeyEvent *key_event; nsresult nsres; @@ -419,14 +422,6 @@ static HRESULT WINAPI HTMLEventObj_get_altKey(IHTMLEventObj *iface, VARIANT_BOOL if(NS_SUCCEEDED(nsres)) { nsIDOMKeyEvent_GetAltKey(key_event, &ret); nsIDOMKeyEvent_Release(key_event); - }else { - nsIDOMMouseEvent *mouse_event; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMMouseEvent_GetAltKey(mouse_event, &ret); - nsIDOMMouseEvent_Release(mouse_event); - } } } @@ -441,6 +436,9 @@ static HRESULT WINAPI HTMLEventObj_get_ctrlKey(IHTMLEventObj *iface, VARIANT_BOO TRACE("(%p)->(%p)\n", This, p); + if(This->event && This->event->mouse_event) + return IDOMMouseEvent_get_ctrlKey(&This->event->IDOMMouseEvent_iface, p); + if(This->event) { nsIDOMKeyEvent *key_event; nsresult nsres; @@ -449,14 +447,6 @@ static HRESULT WINAPI HTMLEventObj_get_ctrlKey(IHTMLEventObj *iface, VARIANT_BOO if(NS_SUCCEEDED(nsres)) { nsIDOMKeyEvent_GetCtrlKey(key_event, &ret); nsIDOMKeyEvent_Release(key_event); - }else { - nsIDOMMouseEvent *mouse_event; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMMouseEvent_GetCtrlKey(mouse_event, &ret); - nsIDOMMouseEvent_Release(mouse_event); - } } } @@ -471,6 +461,9 @@ static HRESULT WINAPI HTMLEventObj_get_shiftKey(IHTMLEventObj *iface, VARIANT_BO TRACE("(%p)->(%p)\n", This, p); + if(This->event && This->event->mouse_event) + return IDOMMouseEvent_get_shiftKey(&This->event->IDOMMouseEvent_iface, p); + if(This->event) { nsIDOMKeyEvent *key_event; nsresult nsres; @@ -479,14 +472,6 @@ static HRESULT WINAPI HTMLEventObj_get_shiftKey(IHTMLEventObj *iface, VARIANT_BO if(NS_SUCCEEDED(nsres)) { nsIDOMKeyEvent_GetShiftKey(key_event, &ret); nsIDOMKeyEvent_Release(key_event); - }else { - nsIDOMMouseEvent *mouse_event; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMMouseEvent_GetShiftKey(mouse_event, &ret); - nsIDOMMouseEvent_Release(mouse_event); - } } } @@ -594,19 +579,15 @@ static HRESULT WINAPI HTMLEventObj_get_keyCode(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_button(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - INT16 button = 0; + USHORT button = 0; TRACE("(%p)->(%p)\n", This, p); - if(This->event) { - nsIDOMMouseEvent *mouse_event; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMMouseEvent_GetButton(mouse_event, &button); - nsIDOMMouseEvent_Release(mouse_event); - } + if(This->event && This->event->mouse_event) { + HRESULT hres; + hres = IDOMMouseEvent_get_button(&This->event->IDOMMouseEvent_iface, &button); + if(FAILED(hres)) + return hres; } *p = button; @@ -698,44 +679,26 @@ static HRESULT WINAPI HTMLEventObj_get_y(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_clientX(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - LONG x = 0; TRACE("(%p)->(%p)\n", This, p); - if(This->event) { - nsIDOMMouseEvent *mouse_event; - nsresult nsres; + if(This->event && This->event->mouse_event) + return IDOMMouseEvent_get_clientX(&This->event->IDOMMouseEvent_iface, p); - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMMouseEvent_GetClientX(mouse_event, &x); - nsIDOMMouseEvent_Release(mouse_event); - } - } - - *p = x; + *p = 0; return S_OK; } static HRESULT WINAPI HTMLEventObj_get_clientY(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - LONG y = 0; TRACE("(%p)->(%p)\n", This, p); - if(This->event) { - nsIDOMMouseEvent *mouse_event; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMMouseEvent_GetClientY(mouse_event, &y); - nsIDOMMouseEvent_Release(mouse_event); - } - } + if(This->event && This->event->mouse_event) + return IDOMMouseEvent_get_clientY(&This->event->IDOMMouseEvent_iface, p); - *p = y; + *p = 0; return S_OK; } @@ -762,44 +725,26 @@ static HRESULT WINAPI HTMLEventObj_get_offsetY(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_screenX(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - LONG x = 0; TRACE("(%p)->(%p)\n", This, p); - if(This->event) { - nsIDOMMouseEvent *mouse_event; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMMouseEvent_GetScreenX(mouse_event, &x); - nsIDOMMouseEvent_Release(mouse_event); - } - } + if(This->event && This->event->mouse_event) + return IDOMMouseEvent_get_screenX(&This->event->IDOMMouseEvent_iface, p); - *p = x; + *p = 0; return S_OK; } static HRESULT WINAPI HTMLEventObj_get_screenY(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - LONG y = 0; TRACE("(%p)->(%p)\n", This, p); - if(This->event) { - nsIDOMMouseEvent *mouse_event; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMMouseEvent, (void**)&mouse_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMMouseEvent_GetScreenY(mouse_event, &y); - nsIDOMMouseEvent_Release(mouse_event); - } - } + if(This->event && This->event->mouse_event) + return IDOMMouseEvent_get_screenY(&This->event->IDOMMouseEvent_iface, p); - *p = y; + *p = 0; return S_OK; }

1 0

Alexandre Julliard : winebuild: Stop building the DPMI event check routine.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 96c77a8cf65a8f9300cd45e08dfc3f74985dc62b URL: https://source.winehq.org/git/wine.git/?a=commit;h=96c77a8cf65a8f9300cd45e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 5 17:16:13 2018 +0100 winebuild: Stop building the DPMI event check routine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/relay.c | 52 ------------------------------------------------- 1 file changed, 52 deletions(-) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 4b78f68..1adbda0 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -36,8 +36,6 @@ /* fix this if the x86_thread_data structure is changed */ #define GS_OFFSET 0x1d8 /* FIELD_OFFSET(TEB,SystemReserved2) + FIELD_OFFSET(struct x86_thread_data,gs) */ -#define DPMI_VIF_OFFSET (0x1fc + 0) /* FIELD_OFFSET(TEB,GdiTebBatch) + FIELD_OFFSET(WINE_VM86_TEB_INFO,dpmi_vif) */ -#define VM86_PENDING_OFFSET (0x1fc + 4) /* FIELD_OFFSET(TEB,GdiTebBatch) + FIELD_OFFSET(WINE_VM86_TEB_INFO,vm86_pending) */ static void function_header( const char *name ) { @@ -749,53 +747,6 @@ static void BuildCallTo32CBClient( int isEx ) /******************************************************************* - * BuildPendingEventCheck - * - * Build a function that checks whether there are any - * pending DPMI events. - * - * Stack layout: - * - * (sp+12) long eflags - * (sp+6) long cs - * (sp+2) long ip - * (sp) word fs - * - * On entry to function, fs register points to a valid TEB. - * On exit from function, stack will be popped. - */ -static void BuildPendingEventCheck(void) -{ - /* Function header */ - - function_header( "DPMI_PendingEventCheck" ); - - /* Check for pending events. */ - - output( "\t.byte 0x64\n\ttestl $0xffffffff,(%d)\n", VM86_PENDING_OFFSET ); - output( "\tje %s\n", asm_name("DPMI_PendingEventCheck_Cleanup") ); - output( "\t.byte 0x64\n\ttestl $0xffffffff,(%d)\n", DPMI_VIF_OFFSET ); - output( "\tje %s\n", asm_name("DPMI_PendingEventCheck_Cleanup") ); - - /* Process pending events. */ - - output( "\tsti\n" ); - - /* Start cleanup. Restore fs register. */ - - output( "%s\n", asm_globl("DPMI_PendingEventCheck_Cleanup") ); - output( "\tpopw %%fs\n" ); - - /* Return from function. */ - - output( "%s\n", asm_globl("DPMI_PendingEventCheck_Return") ); - output( "\tiret\n" ); - - output_function_size( "DPMI_PendingEventCheck" ); -} - - -/******************************************************************* * output_asm_relays16 * * Build all the 16-bit relay callbacks @@ -833,9 +784,6 @@ void output_asm_relays16(void) /* CBClientThunkSLEx routine */ BuildCallTo32CBClient( 1 ); - /* Pending DPMI events check stub */ - BuildPendingEventCheck(); - output( "%s\n", asm_globl("__wine_call16_end") ); output_function_size( "__wine_spec_thunk_text_16" );

1 0

Alexandre Julliard : krnl386: Remove support for vm86 contexts.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 526b245237b9571beebac8a4653e7dd74c62c7de URL: https://source.winehq.org/git/wine.git/?a=commit;h=526b245237b9571beebac8a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 5 17:13:07 2018 +0100 krnl386: Remove support for vm86 contexts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/dosexe.h | 6 ++-- dlls/krnl386.exe16/dosvm.c | 15 +++----- dlls/krnl386.exe16/fpu.c | 3 -- dlls/krnl386.exe16/instr.c | 7 ++-- dlls/krnl386.exe16/int15.c | 6 ---- dlls/krnl386.exe16/int21.c | 76 ++++++----------------------------------- dlls/krnl386.exe16/int2f.c | 72 ++++---------------------------------- dlls/krnl386.exe16/interrupts.c | 50 ++++++++++----------------- 8 files changed, 42 insertions(+), 193 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=526b245237b9571beeba…

1 0

Alexandre Julliard : user32/tests: Fix pointer conversion warnings.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 2d0704f73a7cd1952b684b5920b2a34a71396ee3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d0704f73a7cd1952b684b59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 5 11:50:32 2018 +0100 user32/tests: Fix pointer conversion warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 19f220d..6b2b2bc 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1247,7 +1247,7 @@ enum defdlgproc_text static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { - int mode = (int)GetPropA(hdlg, "test_mode"); + int mode = HandleToULong(GetPropA(hdlg, "test_mode")); WCHAR *text = (WCHAR *)lparam; char *textA = (char *)lparam; @@ -1290,7 +1290,7 @@ static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM static INT_PTR CALLBACK test_aw_conversion_dlgprocW(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { - int mode = (int)GetPropA(hdlg, "test_mode"); + int mode = HandleToULong(GetPropA(hdlg, "test_mode")); WCHAR *text = (WCHAR *)lparam; char *textA = (char *)lparam; @@ -1329,18 +1329,18 @@ static void dlg_test_aw_message(HWND hdlg, UINT msg) { LRESULT ret; - SetPropA(hdlg, "test_mode", DLGPROCTEXT_CONTEXT); + SetPropA(hdlg, "test_mode", ULongToHandle(DLGPROCTEXT_CONTEXT)); ret = SendMessageA(hdlg, msg, 0, (LPARAM)"WndText"); ok(ret == 0, "Unexpected retval %ld.\n", ret); ret = SendMessageW(hdlg, msg, 0, (LPARAM)testtextW); ok(ret == 0, "Unexpected retval %ld.\n", ret); - SetPropA(hdlg, "test_mode", (void *)DLGPROCTEXT_A); + SetPropA(hdlg, "test_mode", ULongToHandle(DLGPROCTEXT_A)); ret = DefDlgProcA(hdlg, msg, 0, (LPARAM)"WndText"); ok(ret == 0, "Unexpected retval %ld.\n", ret); - SetPropA(hdlg, "test_mode", (void *)DLGPROCTEXT_W); + SetPropA(hdlg, "test_mode", ULongToHandle(DLGPROCTEXT_W)); ret = DefDlgProcW(hdlg, msg, 0, (LPARAM)testtextW); ok(ret == 0, "Unexpected retval %ld.\n", ret); }

1 0

Józef Kucia : wined3d: Do not validate texture type in resolve_depth_buffer().
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 89eaa4aa37c111bccbc17557ec0e13fdcd70100e URL: https://source.winehq.org/git/wine.git/?a=commit;h=89eaa4aa37c111bccbc17557… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 5 13:13:40 2018 +0100 wined3d: Do not validate texture type in resolve_depth_buffer(). It's validated in wined3d_texture_blt(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0c415d1..2d1603f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1931,8 +1931,7 @@ static void resolve_depth_buffer(struct wined3d_state *state) struct wined3d_rendertarget_view *src_view; RECT src_rect, dst_rect; - if (!dst_texture || dst_texture->resource.type != WINED3D_RTYPE_TEXTURE_2D - || !(dst_texture->resource.format_flags & WINED3DFMT_FLAG_DEPTH)) + if (!dst_texture || !(dst_texture->resource.format_flags & WINED3DFMT_FLAG_DEPTH)) return; if (!(src_view = state->fb->depth_stencil))

1 0

Józef Kucia : wined3d: Add ARB_texture_multisample extension.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 416f8d2e864e96152b470d9bf6b0bc40d13fd1f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=416f8d2e864e96152b470d9b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 5 13:13:36 2018 +0100 wined3d: Add ARB_texture_multisample extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 8 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1586bdc..4a69b28 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -184,6 +184,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_gather", ARB_TEXTURE_GATHER }, {"GL_ARB_texture_mirrored_repeat", ARB_TEXTURE_MIRRORED_REPEAT }, {"GL_ARB_texture_mirror_clamp_to_edge", ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE}, + {"GL_ARB_texture_multisample", ARB_TEXTURE_MULTISAMPLE }, {"GL_ARB_texture_non_power_of_two", ARB_TEXTURE_NON_POWER_OF_TWO }, {"GL_ARB_texture_query_levels", ARB_TEXTURE_QUERY_LEVELS }, {"GL_ARB_texture_rectangle", ARB_TEXTURE_RECTANGLE }, @@ -2888,6 +2889,11 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glCompressedTexSubImage2DARB) USE_GL_FUNC(glCompressedTexSubImage3DARB) USE_GL_FUNC(glGetCompressedTexImageARB) + /* GL_ARB_texture_multisample */ + USE_GL_FUNC(glGetMultisamplefv); + USE_GL_FUNC(glSampleMaski); + USE_GL_FUNC(glTexImage2DMultisample); + USE_GL_FUNC(glTexImage3DMultisample); /* GL_ARB_texture_storage */ USE_GL_FUNC(glTexStorage1D) USE_GL_FUNC(glTexStorage2D) @@ -3868,6 +3874,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_PROVOKING_VERTEX, MAKEDWORD_VERSION(3, 2)}, {ARB_SEAMLESS_CUBE_MAP, MAKEDWORD_VERSION(3, 2)}, {ARB_SYNC, MAKEDWORD_VERSION(3, 2)}, + {ARB_TEXTURE_MULTISAMPLE, MAKEDWORD_VERSION(3, 2)}, {ARB_VERTEX_ARRAY_BGRA, MAKEDWORD_VERSION(3, 2)}, {ARB_BLEND_FUNC_EXTENDED, MAKEDWORD_VERSION(3, 3)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 0894c94..1bbdaa2 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -117,6 +117,7 @@ enum wined3d_gl_extension ARB_TEXTURE_GATHER, ARB_TEXTURE_MIRRORED_REPEAT, ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE, + ARB_TEXTURE_MULTISAMPLE, ARB_TEXTURE_NON_POWER_OF_TWO, ARB_TEXTURE_QUERY_LEVELS, ARB_TEXTURE_RECTANGLE,

1 0

Dmitry Timoshkov : kerberos: Calling InitializeSecurityContext without a token buffer is not an error.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: b8f0649851f5ed59b7a333f0e915be1b786fc5c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f0649851f5ed59b7a333f0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 5 12:49:16 2018 +0800 kerberos: Calling InitializeSecurityContext without a token buffer is not an error. This patch makes Kerberos Authentication Tester work with https and dotnet40. Apparently that's a dotnet40 quirk that it passes not NULL input buffers but doesn't mark any of buffers as a token, dotnet20 passes NULL input. Note, that in order to make version 2.0 applications work (Kerberos Authentication Tester is such an application) with dotnet40+ one needs to add to the registry key [Software\\Microsoft\\.NETFramework] "OnlyUseLatestCLR"=dword:00000001 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 8b5b612..1bba926 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -913,9 +913,13 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, if (!input) input_token.length = 0; else { - if ((idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; - input_token.length = input->pBuffers[idx].cbBuffer; - input_token.value = input->pBuffers[idx].pvBuffer; + if ((idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) + input_token.length = 0; + else + { + input_token.length = input->pBuffers[idx].cbBuffer; + input_token.value = input->pBuffers[idx].pvBuffer; + } } if ((idx = get_buffer_index( output, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN;

1 0

Nikolay Sivov : comctl32/edit: Handle Ctrl-A shortcut as select all command.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: f7062d1d03c374bf8ba872f97e15261ee61ebaeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7062d1d03c374bf8ba872f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 5 00:30:11 2018 +0300 comctl32/edit: Handle Ctrl-A shortcut as select all command. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 9f065f6..86a0a58 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -1477,12 +1477,15 @@ static void EDIT_InvalidateText(EDITSTATE *es, INT start, INT end) * In other words: this handler is OK * */ -static void EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap) +static BOOL EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap) { UINT old_start = es->selection_start; UINT old_end = es->selection_end; UINT len = get_text_length(es); + if (start == old_start && end == old_end) + return FALSE; + if (start == (UINT)-1) { start = es->selection_end; end = es->selection_end; @@ -1535,6 +1538,8 @@ static void EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap) } } else EDIT_InvalidateText(es, start, old_end); + + return TRUE; } @@ -3365,6 +3370,16 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) if ((es->style & ES_MULTILINE) && EDIT_IsInsideDialog(es)) SendMessageW(es->hwndParent, WM_NEXTDLGCTL, shift, 0); break; + case 'A': + if (control) + { + if (EDIT_EM_SetSel(es, 0, get_text_length(es), FALSE)) + { + EDIT_NOTIFY_PARENT(es, EN_UPDATE); + EDIT_NOTIFY_PARENT(es, EN_CHANGE); + } + } + break; } return TRUE; }

1 0

Alexandre Julliard : krnl386: Remove support for DPMI real-mode calls.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: ed6bdb3c51cd4b8c94f9839806321703e7aa9765 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed6bdb3c51cd4b8c94f98398… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 5 17:03:48 2018 +0100 krnl386: Remove support for DPMI real-mode calls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 1 - dlls/krnl386.exe16/dosaspi.c | 234 ------------ dlls/krnl386.exe16/dosexe.h | 23 -- dlls/krnl386.exe16/dosvm.c | 105 +----- dlls/krnl386.exe16/instr.c | 2 - dlls/krnl386.exe16/int21.c | 16 +- dlls/krnl386.exe16/int2f.c | 20 +- dlls/krnl386.exe16/int31.c | 807 ++-------------------------------------- dlls/krnl386.exe16/interrupts.c | 190 ++-------- 9 files changed, 56 insertions(+), 1342 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed6bdb3c51cd4b8c94f9…

1 0