March 2015 - Wine-Commits - list.winehq.org

Francois Gouget : mshtml: Make insert_adjacent_node() static.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 5a36a48c15db1cea8d0d807df086813a9386722c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a36a48c15db1cea8d0d807df… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 28 18:26:42 2015 +0100 mshtml: Make insert_adjacent_node() static. --- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/mshtml_private.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8120761..dfb8be5 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1508,7 +1508,7 @@ static HRESULT WINAPI HTMLElement_get_outerText(IHTMLElement *iface, BSTR *p) return E_NOTIMPL; } -HRESULT insert_adjacent_node(HTMLElement *This, const WCHAR *where, nsIDOMNode *nsnode, HTMLDOMNode **ret_node) +static HRESULT insert_adjacent_node(HTMLElement *This, const WCHAR *where, nsIDOMNode *nsnode, HTMLDOMNode **ret_node) { nsIDOMNode *ret_nsnode; nsresult nsres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5c3c1ec..fac3c64 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -878,8 +878,6 @@ void detach_ranges(HTMLDocumentNode*) DECLSPEC_HIDDEN; HRESULT get_node_text(HTMLDOMNode*,BSTR*) DECLSPEC_HIDDEN; HRESULT replace_node_by_html(nsIDOMHTMLDocument*,nsIDOMNode*,const WCHAR*) DECLSPEC_HIDDEN; -HRESULT insert_adjacent_node(HTMLElement*,const WCHAR*,nsIDOMNode*,HTMLDOMNode**) DECLSPEC_HIDDEN; - HRESULT create_nselem(HTMLDocumentNode*,const WCHAR*,nsIDOMHTMLElement**) DECLSPEC_HIDDEN; HRESULT create_element(HTMLDocumentNode*,const WCHAR*,HTMLElement**) DECLSPEC_HIDDEN;

1 0

Francois Gouget : ndis.sys: Convert ndis.sys to a native driver as it should be.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 119e20a822c69e7b3d5663b4bc16107baa99a6f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=119e20a822c69e7b3d5663b4b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 28 18:30:59 2015 +0100 ndis.sys: Convert ndis.sys to a native driver as it should be. --- dlls/ndis.sys/Makefile.in | 1 + dlls/ndis.sys/main.c | 22 ++++++++++------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/ndis.sys/Makefile.in b/dlls/ndis.sys/Makefile.in index d469e4e..33b1843 100644 --- a/dlls/ndis.sys/Makefile.in +++ b/dlls/ndis.sys/Makefile.in @@ -1,4 +1,5 @@ MODULE = ndis.sys +EXTRADLLFLAGS = -Wb,--subsystem,native C_SRCS = \ main.c diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index 99a0498..820b4af 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -18,23 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ndis); -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) { - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } + TRACE("(%p, %s)\n", driver, debugstr_w(path->Buffer)); - return TRUE; + return STATUS_SUCCESS; }

1 0

Matteo Bruni : wined3d: Remove an obsolete comment.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 7f618695c624f532300ecff8735f94fec3f3a86c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f618695c624f532300ecff87… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 27 13:18:19 2015 +0100 wined3d: Remove an obsolete comment. Wined3d doesn't actually require the GLX extension for multisampling at this point (while it does require FBOs). --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4ca13f4..89996d1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -127,7 +127,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_internalformat_query2", ARB_INTERNALFORMAT_QUERY2, }, {"GL_ARB_map_buffer_alignment", ARB_MAP_BUFFER_ALIGNMENT }, {"GL_ARB_map_buffer_range", ARB_MAP_BUFFER_RANGE }, - {"GL_ARB_multisample", ARB_MULTISAMPLE }, /* needs GLX_ARB_MULTISAMPLE as well */ + {"GL_ARB_multisample", ARB_MULTISAMPLE }, {"GL_ARB_multitexture", ARB_MULTITEXTURE }, {"GL_ARB_occlusion_query", ARB_OCCLUSION_QUERY }, {"GL_ARB_pixel_buffer_object", ARB_PIXEL_BUFFER_OBJECT },

1 0

Matteo Bruni : wined3d: Drop redundant check for instanced rendering from drawStridedFast.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: db80aba5ad526b8691dace1c4c20b5cbc85389a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db80aba5ad526b8691dace1c4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 27 13:18:22 2015 +0100 wined3d: Drop redundant check for instanced rendering from drawStridedFast. We need GL_ARB_instanced_arrays to be able to take the fastest path and that's already checked in draw_primitive. Note that GL_ARB_instanced_arrays provides glDrawElementsInstanced if GL_ARB_draw_instanced is not supported so we don't need to explicitly check for the latter. --- dlls/wined3d/drawprim.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 98e7cf4..4916c05 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -44,26 +44,19 @@ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primit GLenum idxtype = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; if (instance_count) { - if (!gl_info->supported[ARB_DRAW_INSTANCED] && !gl_info->supported[ARB_INSTANCED_ARRAYS]) + if (start_instance) + FIXME("Start instance (%u) not supported.\n", start_instance); + if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) { - FIXME("Instanced drawing not supported.\n"); + GL_EXTCALL(glDrawElementsInstancedBaseVertex(primitive_type, count, idxtype, + (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_index)); + checkGLcall("glDrawElementsInstancedBaseVertex"); } else { - if (start_instance) - FIXME("Start instance (%u) not supported.\n", start_instance); - if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) - { - GL_EXTCALL(glDrawElementsInstancedBaseVertex(primitive_type, count, idxtype, - (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_index)); - checkGLcall("glDrawElementsInstancedBaseVertex"); - } - else - { - GL_EXTCALL(glDrawElementsInstanced(primitive_type, count, idxtype, - (const char *)idx_data + (idx_size * start_idx), instance_count)); - checkGLcall("glDrawElementsInstanced"); - } + GL_EXTCALL(glDrawElementsInstanced(primitive_type, count, idxtype, + (const char *)idx_data + (idx_size * start_idx), instance_count)); + checkGLcall("glDrawElementsInstanced"); } } else if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX])

1 0

Jacek Caban : mshtml: Use return_nsstr helper in IHTMLDocument5:: get_compatMode.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 25b4d6be68f84c9810c79e932e5f5543e373894f URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b4d6be68f84c9810c79e932… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 27 17:31:48 2015 +0100 mshtml: Use return_nsstr helper in IHTMLDocument5::get_compatMode. --- dlls/mshtml/htmldoc.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a9ef3d9..977e2cb 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2882,7 +2882,7 @@ static HRESULT WINAPI HTMLDocument5_get_compatMode(IHTMLDocument5 *iface, BSTR * { HTMLDocument *This = impl_from_IHTMLDocument5(iface); nsAString mode_str; - const PRUnichar *mode; + nsresult nsres; TRACE("(%p)->(%p)\n", This, p); @@ -2892,13 +2892,8 @@ static HRESULT WINAPI HTMLDocument5_get_compatMode(IHTMLDocument5 *iface, BSTR * } nsAString_Init(&mode_str, NULL); - nsIDOMHTMLDocument_GetCompatMode(This->doc_node->nsdoc, &mode_str); - - nsAString_GetData(&mode_str, &mode); - *p = SysAllocString(mode); - nsAString_Finish(&mode_str); - - return S_OK; + nsres = nsIDOMHTMLDocument_GetCompatMode(This->doc_node->nsdoc, &mode_str); + return return_nsstr(nsres, &mode_str, p); } static const IHTMLDocument5Vtbl HTMLDocument5Vtbl = {

1 0