wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Hans Leidekker : msvcr100: Add a version resource.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: e6738c20859e8f07920fccb5512a0daa7374c434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6738c20859e8f07920fccb55… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 12 11:46:36 2012 +0100 msvcr100: Add a version resource. --- dlls/msvcr100/Makefile.in | 2 ++ dlls/msvcr100/rsrc.rc | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in index 22a2a5b..7714289 100644 --- a/dlls/msvcr100/Makefile.in +++ b/dlls/msvcr100/Makefile.in @@ -6,4 +6,6 @@ EXTRAINCL = -I$(top_srcdir)/include/msvcrt C_SRCS = \ msvcr100.c +RC_SRCS = rsrc.rc + @MAKE_DLL_RULES@ diff --git a/dlls/msvcr100/rsrc.rc b/dlls/msvcr100/rsrc.rc new file mode 100644 index 0000000..26eda98 --- /dev/null +++ b/dlls/msvcr100/rsrc.rc @@ -0,0 +1,24 @@ +/* + * Copyright 2012 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine CRT library" +#define WINE_FILENAME_STR "msvcr100.dll" +#define WINE_FILEVERSION 10,0,30319,0 +#define WINE_FILEVERSION_STR "10.0.30319.0" + +#include "wine/wine_common_ver.rc"

1 0

Michael Stefaniuc : msi: Don't over-allocate memory for a MSISELECTVIEW.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: dad296794365d685082e8fa4eec626e73aea0b80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dad296794365d685082e8fa4e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 12 10:28:39 2012 +0100 msi: Don't over-allocate memory for a MSISELECTVIEW. --- dlls/msi/select.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/select.c b/dlls/msi/select.c index ada4eed..e8f3885 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -431,7 +431,7 @@ UINT SELECT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, count = select_count_columns( columns ); - sv = msi_alloc_zero( sizeof *sv + count*sizeof (UINT) ); + sv = msi_alloc_zero( FIELD_OFFSET( MSISELECTVIEW, cols[count] )); if( !sv ) return ERROR_FUNCTION_FAILED;

1 0

Michael Stefaniuc : msiexec: Use FIELD_OFFSET to calculate the size of a struct with variable length array .
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: b791c25274b83bc9083359f74a53d6cbd637d575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b791c25274b83bc9083359f74… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 12 10:43:44 2012 +0100 msiexec: Use FIELD_OFFSET to calculate the size of a struct with variable length array. --- programs/msiexec/msiexec.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 2227af0..9b378c6 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -109,10 +109,8 @@ static BOOL IsProductCode(LPWSTR str) static VOID StringListAppend(struct string_list **list, LPCWSTR str) { struct string_list *entry; - DWORD size; - size = sizeof *entry + lstrlenW(str) * sizeof (WCHAR); - entry = HeapAlloc(GetProcessHeap(), 0, size); + entry = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(struct string_list, str[lstrlenW(str) + 1])); if(!entry) { WINE_ERR("Out of memory!\n");

1 0

Michael Stefaniuc : user.exe16: Use FIELD_OFFSET to calculate the size of a struct with variable length array .
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 96e428cc9e30b45ce3c7ea3075dd25816f748f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e428cc9e30b45ce3c7ea307… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 12 10:39:45 2012 +0100 user.exe16: Use FIELD_OFFSET to calculate the size of a struct with variable length array. --- dlls/user.exe16/user.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 7f184a2..b99c0ad 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -1320,7 +1320,8 @@ BOOL16 WINAPI GrayString16( HDC16 hdc, HBRUSH16 hbr, GRAYSTRINGPROC16 gsprc, struct gray_string_info *info; if (!cch) cch = strlen(str16); - if (!(info = HeapAlloc( GetProcessHeap(), 0, sizeof(*info) + cch ))) return FALSE; + info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( struct gray_string_info, str[cch] )); + if (!info) return FALSE; info->proc = gsprc; info->param = lParam; memcpy( info->str, str16, cch );

1 0

Nikolay Sivov : msxml3: Disable text data escaping for format nodes set with put_data().
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 47d2f3caf56eb6c06b1d8f6d0f07b9815da685e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47d2f3caf56eb6c06b1d8f6d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 12 09:29:30 2012 -0500 msxml3: Disable text data escaping for format nodes set with put_data(). --- dlls/msxml3/tests/domdoc.c | 34 +++++++++++++++++++++++++++++----- dlls/msxml3/text.c | 15 +++++++++++++++ 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 85d2bc4..4b894b0 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12185,6 +12185,9 @@ static void test_put_data(void) WCHAR buff[100], *data; IXMLDOMDocument *doc; DOMNodeType *type; + IXMLDOMText *text; + IXMLDOMNode *node; + VARIANT v; BSTR get_data; HRESULT hr; @@ -12199,9 +12202,6 @@ static void test_put_data(void) type = put_data_types; while (*type != NODE_INVALID) { - IXMLDOMNode *node; - VARIANT v; - V_VT(&v) = VT_I2; V_I2(&v) = *type; @@ -12213,8 +12213,6 @@ static void test_put_data(void) { case NODE_TEXT: { - IXMLDOMText *text; - hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); EXPECT_HR(hr, S_OK); hr = IXMLDOMText_put_data(text, data); @@ -12284,6 +12282,32 @@ static void test_put_data(void) type++; } + /* \r\n sequence is never escaped */ + V_VT(&v) = VT_I2; + V_I2(&v) = NODE_TEXT; + + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); + + hr = IXMLDOMText_put_data(text, _bstr_("\r\n")); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMText_get_data(text, &get_data); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(!lstrcmpW(get_data, _bstr_("\n")), "got %s\n", wine_dbgstr_w(get_data)); + SysFreeString(get_data); + + hr = IXMLDOMText_get_xml(text, &get_data); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(get_data, _bstr_("\r\n")), "got %s\n", wine_dbgstr_w(get_data)); + SysFreeString(get_data); + + IXMLDOMText_Release(text); + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release(doc); free_bstrs(); } diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 6fb29f9..e9c64c1 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -26,6 +26,7 @@ #include <stdarg.h> #ifdef HAVE_LIBXML2 # include <libxml/parser.h> +# include <libxml/parserInternals.h> # include <libxml/xmlerror.h> #endif @@ -55,6 +56,11 @@ static inline domtext *impl_from_IXMLDOMText( IXMLDOMText *iface ) return CONTAINING_RECORD(iface, domtext, IXMLDOMText_iface); } +static void domtext_reset_noenc(domtext *This) +{ + This->node.node->name = NULL; +} + static HRESULT WINAPI domtext_QueryInterface( IXMLDOMText *iface, REFIID riid, @@ -182,6 +188,7 @@ static HRESULT WINAPI domtext_put_nodeValue( TRACE("(%p)->(%s)\n", This, debugstr_variant(&value)); + domtext_reset_noenc(This); return node_put_value(&This->node, &value); } @@ -371,6 +378,7 @@ static HRESULT WINAPI domtext_put_text( { domtext *This = impl_from_IXMLDOMText( iface ); TRACE("(%p)->(%s)\n", This, debugstr_w(p)); + domtext_reset_noenc(This); return node_put_text( &This->node, p ); } @@ -608,7 +616,14 @@ static HRESULT WINAPI domtext_put_data( BSTR data) { domtext *This = impl_from_IXMLDOMText( iface ); + static WCHAR rnW[] = {'\r','\n',0}; + TRACE("(%p)->(%s)\n", This, debugstr_w(data)); + + if (data && !strcmpW(rnW, data)) + This->node.node->name = xmlStringTextNoenc; + else + domtext_reset_noenc(This); return node_set_content(&This->node, data); }

1 0

Nikolay Sivov : msxml3: Fix a redundant newline in transformation result in html mode.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: f9ab8dab519b25f6d5aa86f403dd6fc910b12264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ab8dab519b25f6d5aa86f40… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 9 22:22:25 2012 -0500 msxml3: Fix a redundant newline in transformation result in html mode. --- dlls/msxml3/node.c | 49 +++++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 45 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 36602eb..4835859 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -833,6 +833,53 @@ HRESULT node_get_xml(xmlnode *This, BOOL ensure_eol, BSTR *ret) return *ret ? S_OK : E_OUTOFMEMORY; } +static void htmldtd_dumpcontent(xmlOutputBufferPtr buf, xmlDocPtr doc) +{ + xmlDtdPtr cur = doc->intSubset; + + xmlOutputBufferWriteString(buf, "<!DOCTYPE "); + xmlOutputBufferWriteString(buf, (const char *)cur->name); + if (cur->ExternalID) + { + xmlOutputBufferWriteString(buf, " PUBLIC "); + xmlBufferWriteQuotedString(buf->buffer, cur->ExternalID); + if (cur->SystemID) + { + xmlOutputBufferWriteString(buf, " "); + xmlBufferWriteQuotedString(buf->buffer, cur->SystemID); + } + } + else if (cur->SystemID) + { + xmlOutputBufferWriteString(buf, " SYSTEM "); + xmlBufferWriteQuotedString(buf->buffer, cur->SystemID); + } + xmlOutputBufferWriteString(buf, ">\n"); +} + +static void htmldoc_dumpcontent(xmlOutputBufferPtr buf, xmlDocPtr doc) +{ + xmlElementType type; + + /* force HTML output */ + type = doc->type; + doc->type = XML_HTML_DOCUMENT_NODE; + if (doc->intSubset) + htmldtd_dumpcontent(buf, doc); + if (doc->children) + { + xmlNodePtr cur = doc->children; + + while (cur) + { + htmlNodeDumpFormatOutput(buf, doc, cur, NULL, 1); + cur = cur->next; + } + + } + doc->type = type; +} + HRESULT node_transform_node(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR *p) { #ifdef SONAME_LIBXSLT @@ -860,7 +907,7 @@ HRESULT node_transform_node(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR * xmlOutputBufferPtr output = xmlAllocOutputBuffer(NULL); if (output) { - htmlDocContentDumpOutput(output, result->doc, NULL); + htmldoc_dumpcontent(output, result->doc); content = xmlBufferContent(output->buffer); *p = bstr_from_xmlChar(content); xmlOutputBufferClose(output); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f59a001..85d2bc4 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9732,8 +9732,7 @@ todo_wine { hr = IXSLProcessor_get_output(processor, &v); ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&v) == VT_BSTR, "got type %d\n", V_VT(&v)); - /* we currently output one '\n' instead of empty string */ - todo_wine ok(lstrcmpW(V_BSTR(&v), _bstr_("")) == 0, "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(lstrcmpW(V_BSTR(&v), _bstr_("")) == 0, "got %s\n", wine_dbgstr_w(V_BSTR(&v))); IXMLDOMDocument_Release(doc2); VariantClear(&v); @@ -12469,6 +12468,47 @@ static void test_namedmap_newenum(void) IXMLDOMDocument_Release(doc); } +static const char xsltext_xsl[] = +"<?xml version=\"1.0\"?>" +"<xsl:stylesheet version=\"1.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" >" +"<xsl:output method=\"html\" encoding=\"us-ascii\"/>" +"<xsl:template match=\"/\">" +" <xsl:choose>" +" <xsl:when test=\"testkey\">" +" <xsl:text>testdata</xsl:text>" +" </xsl:when>" +" </xsl:choose>" +"</xsl:template>" +"</xsl:stylesheet>"; + +static void test_xsltext(void) +{ + IXMLDOMDocument *doc, *doc2; + VARIANT_BOOL b; + HRESULT hr; + BSTR ret; + + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + doc2 = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(xsltext_xsl), &b); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_loadXML(doc2, _bstr_("<testkey/>"), &b); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_transformNode(doc2, (IXMLDOMNode*)doc, &ret); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(ret, _bstr_("testdata")), "transform result %s\n", wine_dbgstr_w(ret)); + SysFreeString(ret); + + IXMLDOMDocument_Release(doc2); + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -12552,6 +12592,7 @@ START_TEST(domdoc) test_namedmap_newenum(); test_xsltemplate(); + test_xsltext(); hr = CoCreateInstance(&CLSID_MXNamespaceManager40, NULL, CLSCTX_INPROC_SERVER, &IID_IMXNamespaceManager, (void**)&unk);

1 0

Nikolay Sivov : msxml3: Add VT_INT to VARIANT tracing helper.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 9860e85ac855b32a0178f6c4ef15322eceb6cace URL: http://source.winehq.org/git/wine.git/?a=commit;h=9860e85ac855b32a0178f6c4e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 7 21:43:44 2012 -0500 msxml3: Add VT_INT to VARIANT tracing helper. --- dlls/msxml3/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 3debd06..da3969e 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -273,6 +273,8 @@ const char *debugstr_variant(const VARIANT *v) return wine_dbg_sprintf("{VT_I2: %d}", V_I2(v)); case VT_I4: return wine_dbg_sprintf("{VT_I4: %d}", V_I4(v)); + case VT_INT: + return wine_dbg_sprintf("{VT_INT: %d}", V_INT(v)); case VT_R8: return wine_dbg_sprintf("{VT_R8: %lf}", V_R8(v)); case VT_BSTR:

1 0

Nikolay Sivov : comcat: Cleanup from unused includes and imports.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: bb44713e6d4431492dea28b52fdaed6f27fdfc94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb44713e6d4431492dea28b52… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 11 23:10:10 2012 -0500 comcat: Cleanup from unused includes and imports. --- dlls/comcat/Makefile.in | 2 +- dlls/comcat/comcat_main.c | 6 ------ 2 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/comcat/Makefile.in b/dlls/comcat/Makefile.in index 695c66b..d38f779 100644 --- a/dlls/comcat/Makefile.in +++ b/dlls/comcat/Makefile.in @@ -1,5 +1,5 @@ MODULE = comcat.dll -IMPORTS = uuid ole32 user32 advapi32 +IMPORTS = ole32 C_SRCS = \ comcat_main.c diff --git a/dlls/comcat/comcat_main.c b/dlls/comcat/comcat_main.c index 83fc0ee..345cf67 100644 --- a/dlls/comcat/comcat_main.c +++ b/dlls/comcat/comcat_main.c @@ -20,14 +20,8 @@ #include <stdarg.h> -#define COBJMACROS - #include "windef.h" #include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "winerror.h" -#include "ole2.h" /*********************************************************************** * DllCanUnloadNow (COMCAT.@)

1 0

Henri Verbeet : wined3d: Handle relative addresses in the common code in shader_glsl_get_register_name ().
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 0a7b32e3f08d68feddd563afca3c03416cc4cb00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a7b32e3f08d68feddd563afc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 11 18:52:39 2012 +0100 wined3d: Handle relative addresses in the common code in shader_glsl_get_register_name(). --- dlls/wined3d/glsl_shader.c | 39 ++++++++++++++++----------------------- 1 files changed, 16 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1e09c9e..66cee1b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1378,7 +1378,12 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * const struct wined3d_shader_version *version = &reg_maps->shader_version; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; const char *prefix = shader_glsl_get_prefix(version->type); + struct glsl_src_param rel_param0, rel_param1; + if (reg->idx[0].offset != ~0U && reg->idx[0].rel_addr) + shader_glsl_add_src_param(ins, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param0); + if (reg->idx[1].offset != ~0U && reg->idx[1].rel_addr) + shader_glsl_add_src_param(ins, reg->idx[1].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param1); *is_color = FALSE; switch (reg->type) @@ -1406,24 +1411,20 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (reg->idx[0].rel_addr) { - struct glsl_src_param rel_param; - - shader_glsl_add_src_param(ins, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param); - - /* Removing a + 0 would be an obvious optimization, but macos doesn't see the NOP - * operation there */ + /* Removing a + 0 would be an obvious optimization, but + * OS X doesn't see the NOP operation there. */ if (idx) { if (shader->u.ps.declared_in_count > in_count) { sprintf(register_name, "((%s + %u) > %u ? (%s + %u) > %u ? gl_SecondaryColor : gl_Color : %s_in[%s + %u])", - rel_param.param_str, idx, in_count - 1, rel_param.param_str, idx, in_count, - prefix, rel_param.param_str, idx); + rel_param0.param_str, idx, in_count - 1, rel_param0.param_str, idx, in_count, + prefix, rel_param0.param_str, idx); } else { - sprintf(register_name, "%s_in[%s + %u]", prefix, rel_param.param_str, idx); + sprintf(register_name, "%s_in[%s + %u]", prefix, rel_param0.param_str, idx); } } else @@ -1431,12 +1432,12 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (shader->u.ps.declared_in_count > in_count) { sprintf(register_name, "((%s) > %u ? (%s) > %u ? gl_SecondaryColor : gl_Color : %s_in[%s])", - rel_param.param_str, in_count - 1, rel_param.param_str, in_count, - prefix, rel_param.param_str); + rel_param0.param_str, in_count - 1, rel_param0.param_str, in_count, + prefix, rel_param0.param_str); } else { - sprintf(register_name, "%s_in[%s]", prefix, rel_param.param_str); + sprintf(register_name, "%s_in[%s]", prefix, rel_param0.param_str); } } } @@ -1462,12 +1463,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * /* Relative addressing */ if (reg->idx[0].rel_addr) { - struct glsl_src_param rel_param; - shader_glsl_add_src_param(ins, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param); if (reg->idx[0].offset) - sprintf(register_name, "%s_c[%s + %u]", prefix, rel_param.param_str, reg->idx[0].offset); + sprintf(register_name, "%s_c[%s + %u]", prefix, rel_param0.param_str, reg->idx[0].offset); else - sprintf(register_name, "%s_c[%s]", prefix, rel_param.param_str); + sprintf(register_name, "%s_c[%s]", prefix, rel_param0.param_str); } else { @@ -1606,16 +1605,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3DSPR_CONSTBUFFER: if (reg->idx[1].rel_addr) - { - struct glsl_src_param rel_param; - shader_glsl_add_src_param(ins, reg->idx[1].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param); sprintf(register_name, "%s_cb%u[%s + %u]", - prefix, reg->idx[0].offset, rel_param.param_str, reg->idx[1].offset); - } + prefix, reg->idx[0].offset, rel_param1.param_str, reg->idx[1].offset); else - { sprintf(register_name, "%s_cb%u[%u]", prefix, reg->idx[0].offset, reg->idx[1].offset); - } break; case WINED3DSPR_PRIMID:

1 0

Henri Verbeet : wined3d: Add support for GLSL based fixed function fragment shaders.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 10d46bc042696bb9e5c45ac88af332c957bbff03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10d46bc042696bb9e5c45ac88… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 11 18:52:38 2012 +0100 wined3d: Add support for GLSL based fixed function fragment shaders. --- dlls/wined3d/arb_program_shader.c | 14 - dlls/wined3d/directx.c | 18 +- dlls/wined3d/glsl_shader.c | 1068 +++++++++++++++++++++++++++++++++++-- dlls/wined3d/state.c | 14 + dlls/wined3d/wined3d_private.h | 3 + 5 files changed, 1049 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10d46bc042696bb9e5c45…

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DMATERIAL2.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 67886fed9291e379765e8d6f9ef2e036ed10d9f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67886fed9291e379765e8d6f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 11 18:52:37 2012 +0100 ddraw: Avoid LPDIRECT3DMATERIAL2. --- include/d3d.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index f05f690b..3746b4b 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -260,7 +260,7 @@ DECLARE_INTERFACE_(IDirect3D2,IUnknown) /*** IDirect3D2 methods ***/ STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE; STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE; - STDMETHOD(CreateMaterial)(THIS_ LPDIRECT3DMATERIAL2 *lplpDirect3DMaterial2, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial2 **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DVIEWPORT2 *lplpD3DViewport2, IUnknown *pUnkOuter) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, IDirectDrawSurface *surface,

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DMATERIAL3.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 3a32ecd90fd8fb4e36fd8c4a5fa3c3d750ecde5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a32ecd90fd8fb4e36fd8c4a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 11 18:52:36 2012 +0100 ddraw: Avoid LPDIRECT3DMATERIAL3. --- include/d3d.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 4cdfe2d..f05f690b 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -308,7 +308,7 @@ DECLARE_INTERFACE_(IDirect3D3,IUnknown) /*** IDirect3D3 methods ***/ STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE; STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE; - STDMETHOD(CreateMaterial)(THIS_ LPDIRECT3DMATERIAL3 *lplpDirect3DMaterial3, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial3 **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DVIEWPORT3 *lplpD3DViewport3, IUnknown *pUnkOuter) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, IDirectDrawSurface4 *surface,

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DTEXTURE.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 2445ff616e02c2735296e107c8cb37e3d765cf6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2445ff616e02c2735296e107c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 11 18:52:35 2012 +0100 ddraw: Avoid LPDIRECT3DTEXTURE. --- include/d3d.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index fe79711..4cdfe2d 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -573,7 +573,7 @@ DECLARE_INTERFACE_(IDirect3DTexture,IUnknown) STDMETHOD(Initialize)(THIS_ struct IDirect3DDevice *device, IDirectDrawSurface *surface) PURE; STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE lpDirect3DDevice, LPD3DTEXTUREHANDLE lpHandle) PURE; STDMETHOD(PaletteChanged)(THIS_ DWORD dwStart, DWORD dwCount) PURE; - STDMETHOD(Load)(THIS_ LPDIRECT3DTEXTURE lpD3DTexture) PURE; + STDMETHOD(Load)(THIS_ IDirect3DTexture *texture) PURE; STDMETHOD(Unload)(THIS) PURE; }; #undef INTERFACE @@ -938,7 +938,7 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) /*** IDirect3DDevice methods ***/ STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D, LPGUID lpGUID, LPD3DDEVICEDESC lpD3DDVDesc) PURE; STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE; - STDMETHOD(SwapTextureHandles)(THIS_ LPDIRECT3DTEXTURE lpD3Dtex1, LPDIRECT3DTEXTURE lpD3DTex2) PURE; + STDMETHOD(SwapTextureHandles)(THIS_ IDirect3DTexture *tex1, IDirect3DTexture *tex2) PURE; STDMETHOD(CreateExecuteBuffer)(THIS_ D3DEXECUTEBUFFERDESC *desc, IDirect3DExecuteBuffer **buffer, IUnknown *outer) PURE; STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE;

1 0

Frédéric Delanoy : ole32: Avoid erroneously freeing a variable in ReadFmtUserTypeStg.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 3cdd1abd09b0292955730dac2e03a831cffa0b5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cdd1abd09b0292955730dac2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 10 10:33:49 2012 +0100 ole32: Avoid erroneously freeing a variable in ReadFmtUserTypeStg. --- dlls/ole32/storage32.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 8498eaf..3bf3216 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8771,7 +8771,10 @@ HRESULT WINAPI ReadFmtUserTypeStg (LPSTORAGE pstg, CLIPFORMAT* pcf, LPOLESTR* lp *pcf = RegisterClipboardFormatW( szOleTypeName ); if( lplpszUserType ) + { *lplpszUserType = szCLSIDName; + szCLSIDName = NULL; + } end: CoTaskMemFree( szCLSIDName );

1 0

Piotr Caban : msvcp90: Fixed a memory leak in virtual destructor tests.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 96c9b0fb842c0ecf6f4e6d36c7aced3e36c805f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c9b0fb842c0ecf6f4e6d36c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Nov 10 00:00:23 2012 +0100 msvcp90: Fixed a memory leak in virtual destructor tests. --- dlls/msvcp90/tests/misc.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 19dcdde..5188fd5 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -96,6 +96,7 @@ static /*basic_ostringstream_char*/void* (__thiscall *p_basic_ostringstream_char /*basic_ostringstream_char*/void*, int, /*MSVCP_bool*/int); static void (__thiscall *p_basic_ostringstream_char_dtor)(/*basic_ostringstream_char*/void*); static void (__thiscall *p_basic_ostringstream_char_vbase_dtor)(/*basic_ostringstream_char*/void*); +static void (__thiscall *p_basic_ios_char_dtor)(/*basic_ios_char*/void*); static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, @@ -223,6 +224,8 @@ static BOOL init(void) "??1?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UEAA@XZ"); SET(p_basic_ostringstream_char_vbase_dtor, "??_D?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXXZ"); + SET(p_basic_ios_char_dtor, + "??1?$basic_ios@DU?$char_traits@D@std@@@std@@UEAA@XZ"); } else { SET(p_char_assign, "?assign@?$char_traits@D@std@@SAXAADABD@Z"); SET(p_wchar_assign, "?assign@?$char_traits@_W@std@@SAXAA_WAB_W@Z"); @@ -258,6 +261,8 @@ static BOOL init(void) "??1?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@UAE@XZ"); SET(p_basic_ostringstream_char_vbase_dtor, "??_D?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXXZ"); + SET(p_basic_ios_char_dtor, + "??1?$basic_ios@DU?$char_traits@D@std@@@std@@UAE@XZ"); } init_thiscall_thunk(); @@ -503,8 +508,10 @@ static void test_virtual_base_dtors(void) call_func3(p_basic_ostringstream_char_ctor_mode, this, 0, 1); call_func1(p_basic_ostringstream_char_vbase_dtor, this); + /* this test uses vbtable set by earlier test */ call_func3(p_basic_ostringstream_char_ctor_mode, this, 0, 0); call_func1(p_basic_ostringstream_char_dtor, this+basic_ostringstream_char_vbtable[1]); + call_func1(p_basic_ios_char_dtor, this+((int**)this)[0][1]); } START_TEST(misc)

1 0

Piotr Caban : msvcp90: Free memory allocated by _get_current_locale function.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 0609fccf449fd5ae87674feff5032e75cc69af27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0609fccf449fd5ae87674feff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Nov 10 00:00:08 2012 +0100 msvcp90: Free memory allocated by _get_current_locale function. --- dlls/msvcp90/tests/misc.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 5faa03c..19dcdde 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -50,6 +50,7 @@ typedef struct static void* (__cdecl *p_set_invalid_parameter_handler)(void*); static _locale_t (__cdecl *p__get_current_locale)(void); +static void (__cdecl *p__free_locale)(_locale_t); static void (__cdecl *p_free)(void*); static void (__cdecl *p_char_assign)(void*, const void*); @@ -174,8 +175,9 @@ static BOOL init(void) p_set_invalid_parameter_handler = (void*)GetProcAddress(msvcr, "_set_invalid_parameter_handler"); p__get_current_locale = (void*)GetProcAddress(msvcr, "_get_current_locale"); + p__free_locale = (void*)GetProcAddress(msvcr, "_free_locale"); p_free = (void*)GetProcAddress(msvcr, "free"); - if(!p_set_invalid_parameter_handler || !p__get_current_locale || !p_free) { + if(!p_set_invalid_parameter_handler || !p__get_current_locale || !p__free_locale || !p_free) { win_skip("Error setting tests environment\n"); return FALSE; } @@ -389,6 +391,7 @@ static void test_wctype(void) static void test__Getctype(void) { MSVCP__Ctypevec ret; + _locale_t locale; ok(p__Getctype(&ret) == &ret, "__Getctype returned incorrect pointer\n"); ok(ret.handle == 0, "ret.handle = %d\n", ret.handle); @@ -397,7 +400,9 @@ static void test__Getctype(void) ok(ret.table[0] == 32, "ret.table[0] = %d\n", ret.table[0]); p_free(ret.table); - p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 0x1234567; + locale = p__get_current_locale(); + locale->locinfo->lc_handle[LC_COLLATE] = 0x1234567; + p__free_locale(locale); ok(p__Getctype(&ret) == &ret, "__Getctype returned incorrect pointer\n"); ok(ret.handle == 0x1234567, "ret.handle = %d\n", ret.handle); ok(ret.page == 0, "ret.page = %d\n", ret.page); @@ -409,13 +414,16 @@ static void test__Getctype(void) static void test__Getcoll(void) { ULONGLONG (__cdecl *p__Getcoll_arg)(MSVCP__Collvec*); + _locale_t locale; union { MSVCP__Collvec collvec; ULONGLONG ull; }ret; - p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 0x7654321; + locale = p__get_current_locale(); + locale->locinfo->lc_handle[LC_COLLATE] = 0x7654321; + p__free_locale(locale); ret.ull = 0; p__Getcoll_arg = (void*)p__Getcoll; p__Getcoll_arg(&ret.collvec); @@ -462,12 +470,15 @@ static void test_virtual_call(void) { BYTE this[256]; basic_string_char bstr; + _locale_t locale; const char *p; char str1[] = "test"; char str2[] = "TEST"; int ret; - p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 1; + locale = p__get_current_locale(); + locale->locinfo->lc_handle[LC_COLLATE] = 1; + p__free_locale(locale); call_func2(p_collate_char_ctor_refs, this, 0); ret = (int)call_func5(p_collate_char_compare, this, str1, str1+4, str1, str1+4); ok(ret == 0, "collate<char>::compare returned %d\n", ret);

1 0

Francois Gouget : shell32: Fix a buffer overflow in CommandLineToArgvW().
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 3b6b2107e2648b562c7266b17c66ab263c374c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b6b2107e2648b562c7266b17… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Nov 10 01:00:54 2012 +0100 shell32: Fix a buffer overflow in CommandLineToArgvW(). --- dlls/shell32/shell32_main.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 7648dbb..1507d4a 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -227,15 +227,20 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) if (*s) s++; } - /* close the argument */ + /* close the executable path */ *d++=0; /* skip to the first argument and initialize it if any */ while (*s==' ' || *s=='\t') s++; - if (*s) - argv[argc++]=d; + if (!*s) + { + /* There are no parameters so we are all done */ + *numargs=argc; + return argv; + } /* Split and copy the remaining arguments */ + argv[argc++]=d; qcount=bcount=0; while (*s) {

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.17
by Jeremy Newman 12 Nov '12

12 Nov '12

Module: website Branch: master Commit: d97aede18aa7c1228997c36ca1340318b7624203 URL: http://source.winehq.org/git/website.git/?a=commit;h=d97aede18aa7c1228997c3… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Nov 10 07:28:36 2012 +0100 Polish translation for release 1.5.17 --- news/pl/2012110901.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2012110901.xml b/news/pl/2012110901.xml new file mode 100644 index 0000000..e10ec77 --- /dev/null +++ b/news/pl/2012110901.xml @@ -0,0 +1,17 @@ +<news> +<date>Listopad 9, 2012</date> +<title>Wydano Wine 1.5.17</title> +<body> + Wydanie rozwojowe Wine 1.5.17 jest już dostępne. + <a href="{$root}/announce/1.5.17">Co nowego</a> w tym wydaniu: +<ul> + <li>Międzypikselowe wygładzanie czcionek w silniku DIB.</li> + <li>Wsparcie dla samoczynnej instalacji elementów sterowania ActiveX.</li> + <li>Samoczynny powrót do TLS 1.0 dla zabezpieczonych połączeń.</li> + <li>Początki analizatora tekstu DirectWrite.</li> + <li>Lepsza obsługa zarysów czcionek w OpenGL.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.17.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.5.17
by Jeremy Newman 12 Nov '12

12 Nov '12

Module: website Branch: master Commit: 1eef770d1aeffd93f8bc530c782d46ee400b0056 URL: http://source.winehq.org/git/website.git/?a=commit;h=1eef770d1aeffd93f8bc53… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 9 21:09:47 2012 +0100 French translation for release 1.5.17 --- news/fr/2012110901.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/fr/2012110901.xml b/news/fr/2012110901.xml new file mode 100644 index 0000000..2ea1717 --- /dev/null +++ b/news/fr/2012110901.xml @@ -0,0 +1,16 @@ +<news> +<date>9 novembre 2012</date> +<title>Sortie de Wine 1.5.17</title> +<body> + La version de développement 1.5.17 de Wine est disponible. + <a href="{$root}/announce/1.5.17">Nouveautés</a> de cette version : +<ul> + <li>Anticrénelage sur éléments de pixel des fontes dans le moteur DIB.</li> + <li>Prise en charge de l'installation automatique des contrôles ActiveX.</li> + <li>Substitution automatique vers TLS 1.0 pour les connexions sécurisées.</li> + <li>Ébauche d'un analyseur de texte DirectWrite.</li> + <li>Meilleur traitement des polices contours dans OpenGL.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.17.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

André Hentschel : Wine 1.5.17 freigegeben
by Jeremy Newman 09 Nov '12

09 Nov '12

Module: website Branch: master Commit: 0ae35fc7d6b3891c1b2fc47d5d5f528041890e88 URL: http://source.winehq.org/git/website.git/?a=commit;h=0ae35fc7d6b3891c1b2fc4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 9 20:43:14 2012 +0100 Wine 1.5.17 freigegeben --- news/de/2012110901.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2012110901.xml b/news/de/2012110901.xml new file mode 100644 index 0000000..bc36730 --- /dev/null +++ b/news/de/2012110901.xml @@ -0,0 +1,17 @@ +<news> +<date>9. November 2012</date> +<title>Wine 1.5.17 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.17 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.17">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Subpixel Schrift Antialiasing in der DIB Engine.</li> + <li>Unterstützung für die automatische Installation von ActiveX-Steuerelementen.</li> + <li>Bei sicheren Verbindungen wird automatisch auf TLS 1.0 zurückgeschaltet.</li> + <li>Anfänge des DirectWrite Textanalysators.</li> + <li>Besseres Handling von Schriftkonturen in OpenGL.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.17.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.17
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: website Branch: master Commit: ec36f6748726ddbf8c0f8befa19a722dbfe8d185 URL: http://source.winehq.org/git/website.git/?a=commit;h=ec36f6748726ddbf8c0f8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 9 19:59:32 2012 +0100 Wine release 1.5.17 --- news/en/2012110901.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2012110901.xml b/news/en/2012110901.xml new file mode 100644 index 0000000..3cf992e --- /dev/null +++ b/news/en/2012110901.xml @@ -0,0 +1,17 @@ +<news> +<date>November 9, 2012</date> +<title>Wine 1.5.17 Released</title> +<body> + The Wine development release 1.5.17 is now available. + <a href="{$root}/announce/1.5.17">What's new</a> in this release: +<ul> + <li>Sub-pixel font anti-aliasing in the DIB engine.</li> + <li>Support for automatic installation of ActiveX controls.</li> + <li>Automatic fallback to TLS 1.0 for secure connections.</li> + <li>Beginnings of the DirectWrite text analyzer.</li> + <li>Better handling of font outlines in OpenGL.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.17.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.5.17 : Alexandre Julliard : Release 1.5.17
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: refs/tags/wine-1.5.17 Tag: 71461e3ede8285a1bce94881b6f51dfe077afed1 URL: http://source.winehq.org/git/wine.git/?a=tag;h=71461e3ede8285a1bce94881b6f5… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 9 19:46:40 2012 +0100 Release 1.5.17

1 0

Alexandre Julliard : Release 1.5.17.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 1262f07609e6722a841f511445f145d941848800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1262f07609e6722a841f51144… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 9 19:46:37 2012 +0100 Release 1.5.17. --- ANNOUNCE | 974 ++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 452 insertions(+), 542 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1262f07609e6722a841f5…

1 0

Michael Stefaniuc : msi: Use FIELD_OFFSET to calculate the size of structs with variable length array .
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 51013ad27844de2a176287b6f3edbeccd972ee68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51013ad27844de2a176287b6f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 9 16:47:44 2012 +0100 msi: Use FIELD_OFFSET to calculate the size of structs with variable length array. --- dlls/msi/dialog.c | 4 ++-- dlls/msi/table.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 85d5859..c0ff204 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -309,7 +309,7 @@ static UINT msi_dialog_add_font( MSIRECORD *rec, LPVOID param ) /* create a font and add it to the list */ name = MSI_RecordGetString( rec, 1 ); - font = msi_alloc( sizeof *font + strlenW( name )*sizeof (WCHAR) ); + font = msi_alloc( FIELD_OFFSET( msi_font, name[strlenW( name ) + 1] )); strcpyW( font->name, name ); list_add_head( &dialog->fonts, &font->entry ); @@ -414,7 +414,7 @@ static msi_control *msi_dialog_create_window( msi_dialog *dialog, style |= WS_CHILD; - control = msi_alloc( sizeof *control + strlenW(name)*sizeof(WCHAR) ); + control = msi_alloc( FIELD_OFFSET( msi_control, name[strlenW( name ) + 1] )); if (!control) return NULL; diff --git a/dlls/msi/table.c b/dlls/msi/table.c index c5aa685..e2186fc 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2141,7 +2141,7 @@ UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view ) else if ( !strcmpW( name, szStorages ) ) return STORAGES_CreateView( db, view ); - sz = sizeof *tv + lstrlenW(name)*sizeof name[0] ; + sz = FIELD_OFFSET( MSITABLEVIEW, name[lstrlenW( name ) + 1] ); tv = msi_alloc_zero( sz ); if( !tv ) return ERROR_FUNCTION_FAILED;

1 0

Hans Leidekker : msi: Avoid a string copy when comparing SQL keywords.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Module: wine Branch: master Commit: 9c431b67379839d7792aa38549cbf547bb5444c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c431b67379839d7792aa3854… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 9 16:47:09 2012 +0100 msi: Avoid a string copy when comparing SQL keywords. --- dlls/msi/tokenize.c | 169 ++++++++++++++++++++++++++------------------------- 1 files changed, 86 insertions(+), 83 deletions(-) diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index 4798917..441a54a 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -32,103 +32,108 @@ */ typedef struct Keyword Keyword; struct Keyword { - const WCHAR *zName; /* The keyword name */ + const WCHAR *name; /* The keyword name */ + unsigned int len; int tokenType; /* The token value for this keyword */ }; #define MAX_TOKEN_LEN 11 -static const WCHAR ADD_W[] = { 'A','D','D',0 }; -static const WCHAR ALTER_W[] = { 'A','L','T','E','R',0 }; -static const WCHAR AND_W[] = { 'A','N','D',0 }; -static const WCHAR BY_W[] = { 'B','Y',0 }; -static const WCHAR CHAR_W[] = { 'C','H','A','R',0 }; -static const WCHAR CHARACTER_W[] = { 'C','H','A','R','A','C','T','E','R',0 }; -static const WCHAR CREATE_W[] = { 'C','R','E','A','T','E',0 }; -static const WCHAR DELETE_W[] = { 'D','E','L','E','T','E',0 }; -static const WCHAR DISTINCT_W[] = { 'D','I','S','T','I','N','C','T',0 }; -static const WCHAR DROP_W[] = { 'D','R','O','P',0 }; -static const WCHAR FREE_W[] = { 'F','R','E','E',0 }; -static const WCHAR FROM_W[] = { 'F','R','O','M',0 }; -static const WCHAR HOLD_W[] = { 'H','O','L','D',0 }; -static const WCHAR INSERT_W[] = { 'I','N','S','E','R','T',0 }; -static const WCHAR INT_W[] = { 'I','N','T',0 }; -static const WCHAR INTEGER_W[] = { 'I','N','T','E','G','E','R',0 }; -static const WCHAR INTO_W[] = { 'I','N','T','O',0 }; -static const WCHAR IS_W[] = { 'I','S',0 }; -static const WCHAR KEY_W[] = { 'K','E','Y',0 }; -static const WCHAR LIKE_W[] = { 'L','I','K','E',0 }; -static const WCHAR LOCALIZABLE_W[] = { 'L','O','C','A','L','I','Z','A','B','L','E',0 }; -static const WCHAR LONG_W[] = { 'L','O','N','G',0 }; -static const WCHAR LONGCHAR_W[] = { 'L','O','N','G','C','H','A','R',0 }; -static const WCHAR NOT_W[] = { 'N','O','T',0 }; -static const WCHAR NULL_W[] = { 'N','U','L','L',0 }; -static const WCHAR OBJECT_W[] = { 'O','B','J','E','C','T',0 }; -static const WCHAR OR_W[] = { 'O','R',0 }; -static const WCHAR ORDER_W[] = { 'O','R','D','E','R',0 }; -static const WCHAR PRIMARY_W[] = { 'P','R','I','M','A','R','Y',0 }; -static const WCHAR SELECT_W[] = { 'S','E','L','E','C','T',0 }; -static const WCHAR SET_W[] = { 'S','E','T',0 }; -static const WCHAR SHORT_W[] = { 'S','H','O','R','T',0 }; -static const WCHAR TABLE_W[] = { 'T','A','B','L','E',0 }; -static const WCHAR TEMPORARY_W[] = { 'T','E','M','P','O','R','A','R','Y',0 }; -static const WCHAR UPDATE_W[] = { 'U','P','D','A','T','E',0 }; -static const WCHAR VALUES_W[] = { 'V','A','L','U','E','S',0 }; -static const WCHAR WHERE_W[] = { 'W','H','E','R','E',0 }; +static const WCHAR addW[] = {'A','D','D'}; +static const WCHAR alterW[] = {'A','L','T','E','R'}; +static const WCHAR andW[] = {'A','N','D'}; +static const WCHAR byW[] = {'B','Y'}; +static const WCHAR charW[] = {'C','H','A','R'}; +static const WCHAR characterW[] = {'C','H','A','R','A','C','T','E','R'}; +static const WCHAR createW[] = {'C','R','E','A','T','E'}; +static const WCHAR deleteW[] = {'D','E','L','E','T','E'}; +static const WCHAR distinctW[] = {'D','I','S','T','I','N','C','T'}; +static const WCHAR dropW[] = {'D','R','O','P'}; +static const WCHAR freeW[] = {'F','R','E','E'}; +static const WCHAR fromW[] = {'F','R','O','M'}; +static const WCHAR holdW[] = {'H','O','L','D'}; +static const WCHAR insertW[] = {'I','N','S','E','R','T'}; +static const WCHAR intW[] = {'I','N','T'}; +static const WCHAR integerW[] = {'I','N','T','E','G','E','R'}; +static const WCHAR intoW[] = {'I','N','T','O'}; +static const WCHAR isW[] = {'I','S'}; +static const WCHAR keyW[] = {'K','E','Y'}; +static const WCHAR likeW[] = {'L','I','K','E'}; +static const WCHAR localizableW[] = {'L','O','C','A','L','I','Z','A','B','L','E'}; +static const WCHAR longW[] = {'L','O','N','G'}; +static const WCHAR longcharW[] = {'L','O','N','G','C','H','A','R'}; +static const WCHAR notW[] = {'N','O','T'}; +static const WCHAR nullW[] = {'N','U','L','L'}; +static const WCHAR objectW[] = {'O','B','J','E','C','T'}; +static const WCHAR orW[] = {'O','R'}; +static const WCHAR orderW[] = {'O','R','D','E','R'}; +static const WCHAR primaryW[] = {'P','R','I','M','A','R','Y'}; +static const WCHAR selectW[] = {'S','E','L','E','C','T'}; +static const WCHAR setW[] = {'S','E','T'}; +static const WCHAR shortW[] = {'S','H','O','R','T'}; +static const WCHAR tableW[] = {'T','A','B','L','E'}; +static const WCHAR temporaryW[] = {'T','E','M','P','O','R','A','R','Y'}; +static const WCHAR updateW[] = {'U','P','D','A','T','E'}; +static const WCHAR valuesW[] = {'V','A','L','U','E','S'}; +static const WCHAR whereW[] = {'W','H','E','R','E'}; + +#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) /* ** These are the keywords ** They MUST be in alphabetical order */ static const Keyword aKeywordTable[] = { - { ADD_W, TK_ADD }, - { ALTER_W, TK_ALTER }, - { AND_W, TK_AND }, - { BY_W, TK_BY }, - { CHAR_W, TK_CHAR }, - { CHARACTER_W, TK_CHAR }, - { CREATE_W, TK_CREATE }, - { DELETE_W, TK_DELETE }, - { DISTINCT_W, TK_DISTINCT }, - { DROP_W, TK_DROP }, - { FREE_W, TK_FREE }, - { FROM_W, TK_FROM }, - { HOLD_W, TK_HOLD }, - { INSERT_W, TK_INSERT }, - { INT_W, TK_INT }, - { INTEGER_W, TK_INT }, - { INTO_W, TK_INTO }, - { IS_W, TK_IS }, - { KEY_W, TK_KEY }, - { LIKE_W, TK_LIKE }, - { LOCALIZABLE_W, TK_LOCALIZABLE }, - { LONG_W, TK_LONG }, - { LONGCHAR_W, TK_LONGCHAR }, - { NOT_W, TK_NOT }, - { NULL_W, TK_NULL }, - { OBJECT_W, TK_OBJECT }, - { OR_W, TK_OR }, - { ORDER_W, TK_ORDER }, - { PRIMARY_W, TK_PRIMARY }, - { SELECT_W, TK_SELECT }, - { SET_W, TK_SET }, - { SHORT_W, TK_SHORT }, - { TABLE_W, TK_TABLE }, - { TEMPORARY_W, TK_TEMPORARY }, - { UPDATE_W, TK_UPDATE }, - { VALUES_W, TK_VALUES }, - { WHERE_W, TK_WHERE }, + { addW, ARRAY_SIZE(addW), TK_ADD }, + { alterW, ARRAY_SIZE(alterW), TK_ALTER }, + { andW, ARRAY_SIZE(andW), TK_AND }, + { byW, ARRAY_SIZE(byW), TK_BY }, + { charW, ARRAY_SIZE(charW), TK_CHAR }, + { characterW, ARRAY_SIZE(characterW), TK_CHAR }, + { createW, ARRAY_SIZE(createW), TK_CREATE }, + { deleteW, ARRAY_SIZE(deleteW), TK_DELETE }, + { distinctW, ARRAY_SIZE(distinctW), TK_DISTINCT }, + { dropW, ARRAY_SIZE(dropW), TK_DROP }, + { freeW, ARRAY_SIZE(freeW), TK_FREE }, + { fromW, ARRAY_SIZE(fromW), TK_FROM }, + { holdW, ARRAY_SIZE(holdW), TK_HOLD }, + { insertW, ARRAY_SIZE(insertW), TK_INSERT }, + { intW, ARRAY_SIZE(intW), TK_INT }, + { integerW, ARRAY_SIZE(integerW), TK_INT }, + { intoW, ARRAY_SIZE(intoW), TK_INTO }, + { isW, ARRAY_SIZE(isW), TK_IS }, + { keyW, ARRAY_SIZE(keyW), TK_KEY }, + { likeW, ARRAY_SIZE(likeW), TK_LIKE }, + { localizableW, ARRAY_SIZE(localizableW), TK_LOCALIZABLE }, + { longW, ARRAY_SIZE(longW), TK_LONG }, + { longcharW, ARRAY_SIZE(longcharW), TK_LONGCHAR }, + { notW, ARRAY_SIZE(notW), TK_NOT }, + { nullW, ARRAY_SIZE(nullW), TK_NULL }, + { objectW, ARRAY_SIZE(objectW), TK_OBJECT }, + { orW, ARRAY_SIZE(orW), TK_OR }, + { orderW, ARRAY_SIZE(orderW), TK_ORDER }, + { primaryW, ARRAY_SIZE(primaryW), TK_PRIMARY }, + { selectW, ARRAY_SIZE(selectW), TK_SELECT }, + { setW, ARRAY_SIZE(setW), TK_SET }, + { shortW, ARRAY_SIZE(shortW), TK_SHORT }, + { tableW, ARRAY_SIZE(tableW), TK_TABLE }, + { temporaryW, ARRAY_SIZE(temporaryW), TK_TEMPORARY }, + { updateW, ARRAY_SIZE(updateW), TK_UPDATE }, + { valuesW, ARRAY_SIZE(valuesW), TK_VALUES }, + { whereW, ARRAY_SIZE(whereW), TK_WHERE }, }; -#define KEYWORD_COUNT ( sizeof aKeywordTable/sizeof (Keyword) ) - /* ** Comparison function for binary search. */ static int compKeyword(const void *m1, const void *m2){ const Keyword *k1 = m1, *k2 = m2; + int ret, len = min( k1->len, k2->len ); - return strcmpiW( k1->zName, k2->zName ); + if ((ret = memicmpW( k1->name, k2->name, len ))) return ret; + if (k1->len < k2->len) return -1; + else if (k1->len > k2->len) return 1; + return 0; } /* @@ -137,17 +142,15 @@ static int compKeyword(const void *m1, const void *m2){ ** returned. If the input is not a keyword, TK_ID is returned. */ static int sqliteKeywordCode(const WCHAR *z, int n){ - WCHAR str[MAX_TOKEN_LEN+1]; Keyword key, *r; if( n>MAX_TOKEN_LEN ) return TK_ID; - memcpy( str, z, n*sizeof (WCHAR) ); - str[n] = 0; key.tokenType = 0; - key.zName = str; - r = bsearch( &key, aKeywordTable, KEYWORD_COUNT, sizeof (Keyword), compKeyword ); + key.name = z; + key.len = n; + r = bsearch( &key, aKeywordTable, ARRAY_SIZE(aKeywordTable), sizeof(Keyword), compKeyword ); if( r ) return r->tokenType; return TK_ID;

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
29
Older →

Jump to page:

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-commits November 2012