November 2012 - Wine-commits

Nikolay Sivov : msxml3: Support ISequentialStream as a document load source .
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: db9d8ebb086c5ef3ef12fb33e7cb47478205e89e URL: http://source.winehq.org/git/wine.git/?a=commit;h=db9d8ebb086c5ef3ef12fb33e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 26 23:29:06 2012 -0500 msxml3: Support ISequentialStream as a document load source. --- dlls/msxml3/domdoc.c | 58 +++++++++++++++++++------------------------------ 1 files changed, 23 insertions(+), 35 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 16fc64c..c3144ce 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2037,8 +2037,6 @@ static HRESULT WINAPI domdoc_load( domdoc *This = impl_from_IXMLDOMDocument3( iface ); LPWSTR filename = NULL; HRESULT hr = S_FALSE; - IXMLDOMDocument3 *pNewDoc = NULL; - IStream *pStream = NULL; xmlDocPtr xmldoc; TRACE("(%p)->(%s)\n", This, debugstr_variant(&source)); @@ -2104,13 +2102,18 @@ static HRESULT WINAPI domdoc_load( } break; case VT_UNKNOWN: + { + ISequentialStream *stream = NULL; + IXMLDOMDocument3 *newdoc = NULL; + if (!V_UNKNOWN(&source)) return E_INVALIDARG; - hr = IUnknown_QueryInterface(V_UNKNOWN(&source), &IID_IXMLDOMDocument3, (void**)&pNewDoc); + + hr = IUnknown_QueryInterface(V_UNKNOWN(&source), &IID_IXMLDOMDocument3, (void**)&newdoc); if(hr == S_OK) { - if(pNewDoc) + if(newdoc) { - domdoc *newDoc = impl_from_IXMLDOMDocument3( pNewDoc ); + domdoc *newDoc = impl_from_IXMLDOMDocument3( newdoc ); xmldoc = xmlCopyDoc(get_doc(newDoc), 1); xmldoc->_private = create_priv(); @@ -2122,40 +2125,25 @@ static HRESULT WINAPI domdoc_load( return hr; } } - hr = IUnknown_QueryInterface(V_UNKNOWN(&source), &IID_IStream, (void**)&pStream); - if(hr == S_OK) - { - IPersistStream *pDocStream; - hr = IXMLDOMDocument3_QueryInterface(iface, &IID_IPersistStream, (void**)&pDocStream); - if(hr == S_OK) - { - hr = IPersistStream_Load(pDocStream, pStream); - IStream_Release(pStream); - if(hr == S_OK) - { - *isSuccessful = VARIANT_TRUE; - TRACE("Using IStream to load Document\n"); - return S_OK; - } - else - { - ERR("xmldoc_IPersistStream_Load failed (%d)\n", hr); - } - } - else - { - ERR("QueryInterface IID_IPersistStream failed (%d)\n", hr); - } - } - else + hr = IUnknown_QueryInterface(V_UNKNOWN(&source), &IID_IStream, (void**)&stream); + if (FAILED(hr)) + hr = IUnknown_QueryInterface(V_UNKNOWN(&source), &IID_ISequentialStream, (void**)&stream); + + if (hr == S_OK) { - /* ISequentialStream */ - FIXME("Unknown type not supported (0x%08x) (%p)(%p)\n", hr, pNewDoc, V_UNKNOWN(&source)->lpVtbl); + hr = domdoc_load_from_stream(This, stream); + if (hr == S_OK) + *isSuccessful = VARIANT_TRUE; + ISequentialStream_Release(stream); + return hr; } + + FIXME("unsupported IUnknown type (0x%08x) (%p)\n", hr, V_UNKNOWN(&source)->lpVtbl); break; - default: - FIXME("VT type not supported (%d)\n", V_VT(&source)); + } + default: + FIXME("VT type not supported (%d)\n", V_VT(&source)); } if ( filename )

1 0

Nikolay Sivov : msxml3: No need to keep a reference to a temporarily used stream.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: 5aa1754b7eae26f238a060862021fa7b8df6a8ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aa1754b7eae26f238a060862… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 26 23:32:57 2012 -0500 msxml3: No need to keep a reference to a temporarily used stream. --- dlls/msxml3/domdoc.c | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index c3144ce..52b41a7 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -132,9 +132,6 @@ struct domdoc bsc_t *bsc; HRESULT error; - /* IPersistStream */ - IStream *stream; - /* IObjectWithSite*/ IUnknown *site; @@ -722,34 +719,31 @@ static HRESULT domdoc_load_from_stream(domdoc *doc, ISequentialStream *stream) { DWORD read, written, len; xmlDocPtr xmldoc = NULL; + IStream *hstream; HGLOBAL hglobal; BYTE buf[4096]; HRESULT hr; char *ptr; - if (doc->stream) - { - IStream_Release(doc->stream); - doc->stream = NULL; - } - - hr = CreateStreamOnHGlobal(NULL, TRUE, &doc->stream); + hstream = NULL; + hr = CreateStreamOnHGlobal(NULL, TRUE, &hstream); if (FAILED(hr)) return hr; do { ISequentialStream_Read(stream, buf, sizeof(buf), &read); - hr = IStream_Write(doc->stream, buf, read, &written); + hr = IStream_Write(hstream, buf, read, &written); } while(SUCCEEDED(hr) && written != 0 && read != 0); if (FAILED(hr)) { ERR("failed to copy stream 0x%08x\n", hr); + IStream_Release(hstream); return hr; } - hr = GetHGlobalFromStream(doc->stream, &hglobal); + hr = GetHGlobalFromStream(hstream, &hglobal); if (FAILED(hr)) return hr; @@ -922,8 +916,6 @@ static ULONG WINAPI domdoc_Release( IXMLDOMDocument3 *iface ) if (This->site) IUnknown_Release( This->site ); destroy_xmlnode(&This->node); - if (This->stream) - IStream_Release(This->stream); for (eid = 0; eid < EVENTID_LAST; eid++) if (This->events[eid]) IDispatch_Release(This->events[eid]); @@ -3493,7 +3485,6 @@ HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) doc->resolving = 0; doc->properties = properties_from_xmlDocPtr(xmldoc); doc->error = S_OK; - doc->stream = NULL; doc->site = NULL; doc->safeopt = 0; doc->bsc = NULL;

1 0

Nikolay Sivov : xmllite: Implement encoding declaration parsing.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: 8e2bc1eb1b875f0dfdc4c09735b1f53538baeceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2bc1eb1b875f0dfdc4c0973… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 27 08:46:42 2012 -0500 xmllite: Implement encoding declaration parsing. --- dlls/xmllite/reader.c | 99 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 88 insertions(+), 11 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 0d21e79..87d7936 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -46,6 +46,10 @@ typedef enum static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; static const WCHAR utf8W[] = {'U','T','F','-','8',0}; +static const WCHAR dblquoteW[] = {'\"',0}; +static const WCHAR quoteW[] = {'\'',0}; +static const WCHAR eqW[] = {'=',0}; + struct xml_encoding_data { const WCHAR *name; @@ -213,7 +217,7 @@ static HRESULT get_code_page(xml_encoding encoding, UINT *cp) return S_OK; } -static xml_encoding parse_encoding_name(const WCHAR *name) +static xml_encoding parse_encoding_name(const WCHAR *name, int len) { int min, max, n, c; @@ -226,7 +230,10 @@ static xml_encoding parse_encoding_name(const WCHAR *name) { n = (min+max)/2; - c = strcmpiW(xml_encoding_map[n].name, name); + if (len != -1) + c = strncmpiW(xml_encoding_map[n].name, name, len); + else + c = strcmpiW(xml_encoding_map[n].name, name); if (!c) return xml_encoding_map[n].enc; @@ -491,20 +498,20 @@ static int reader_skipspaces(xmlreader *reader) /* [26] VersionNum ::= '1.' [0-9]+ */ static HRESULT reader_parse_versionnum(xmlreader *reader) { - const WCHAR *ptr, *start = reader_get_cur(reader); + const WCHAR *ptr, *ptr2, *start = reader_get_cur(reader); static const WCHAR onedotW[] = {'1','.',0}; if (reader_cmp(reader, onedotW)) return WC_E_XMLDECL; /* skip "1." */ reader_skipn(reader, 2); - ptr = reader_get_cur(reader); + ptr2 = ptr = reader_get_cur(reader); while (*ptr >= '0' && *ptr <= '9') ptr++; - if (ptr == start) return WC_E_DIGIT; - TRACE("version=%s\n", debugstr_wn(start, ptr-start)); - reader_skipn(reader, ptr-start); + if (ptr2 == ptr) return WC_E_DIGIT; + TRACE("version=%s", debugstr_wn(start, ptr-start)); + reader_skipn(reader, ptr-ptr2); return S_OK; } @@ -512,9 +519,6 @@ static HRESULT reader_parse_versionnum(xmlreader *reader) static HRESULT reader_parse_versioninfo(xmlreader *reader) { static const WCHAR versionW[] = {'v','e','r','s','i','o','n',0}; - static const WCHAR dblquoteW[] = {'\"',0}; - static const WCHAR quoteW[] = {'\'',0}; - static const WCHAR eqW[] = {'=',0}; HRESULT hr; if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; @@ -544,6 +548,75 @@ static HRESULT reader_parse_versioninfo(xmlreader *reader) return S_OK; } +/* ([A-Za-z0-9._] | '-') */ +static inline int is_wchar_encname(WCHAR ch) +{ + return ((ch >= 'A' && ch <= 'Z') || + (ch >= 'a' && ch <= 'z') || + (ch >= '0' && ch <= '9') || + (ch == '.') || (ch == '_') || + (ch == '-')); +} + +/* [81] EncName ::= [A-Za-z] ([A-Za-z0-9._] | '-')* */ +static HRESULT reader_parse_encname(xmlreader *reader) +{ + const WCHAR *start = reader_get_cur(reader), *ptr; + xml_encoding enc; + int len; + + if ((*start < 'A' || *start > 'Z') && (*start < 'a' || *start > 'z')) + return WC_E_ENCNAME; + + ptr = start; + while (is_wchar_encname(*++ptr)) + ; + + len = ptr - start; + enc = parse_encoding_name(start, len); + TRACE("encoding name %s\n", debugstr_wn(start, len)); + + if (enc == XmlEncoding_Unknown) + return WC_E_ENCNAME; + + /* skip encoding name */ + reader_skipn(reader, len); + return S_OK; +} + +/* [80] EncodingDecl ::= S 'encoding' Eq ('"' EncName '"' | "'" EncName "'" ) */ +static HRESULT reader_parse_encdecl(xmlreader *reader) +{ + static const WCHAR encodingW[] = {'e','n','c','o','d','i','n','g',0}; + HRESULT hr; + + if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; + + if (reader_cmp(reader, encodingW)) return S_OK; + /* skip 'encoding' */ + reader_skipn(reader, 8); + + if (reader_cmp(reader, eqW)) return WC_E_EQUAL; + /* skip '=' */ + reader_skipn(reader, 1); + + if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) + return WC_E_QUOTE; + /* skip "'"|'"' */ + reader_skipn(reader, 1); + + hr = reader_parse_encname(reader); + if (FAILED(hr)) return hr; + + if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) + return WC_E_QUOTE; + + /* skip "'"|'"' */ + reader_skipn(reader, 1); + + return S_OK; +} + /* [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>' */ static HRESULT reader_parse_xmldecl(xmlreader *reader) { @@ -558,6 +631,10 @@ static HRESULT reader_parse_xmldecl(xmlreader *reader) if (FAILED(hr)) return hr; + hr = reader_parse_encdecl(reader); + if (FAILED(hr)) + return hr; + return E_NOTIMPL; } @@ -1028,7 +1105,7 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, readerinput->imalloc = imalloc; readerinput->stream = NULL; if (imalloc) IMalloc_AddRef(imalloc); - readerinput->encoding = parse_encoding_name(encoding); + readerinput->encoding = parse_encoding_name(encoding, -1); readerinput->hint = hint; readerinput->baseuri = readerinput_strdupW(readerinput, base_uri);

1 0

Huw Davies : gdi32: Simplify the point type checking logic.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: e6f1930116c9f0fa49d931120ea02e4828e1991a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f1930116c9f0fa49d931120… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 27 09:15:53 2012 +0000 gdi32: Simplify the point type checking logic. --- dlls/gdi32/painting.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 74ca835..354bea9 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -152,12 +152,11 @@ BOOL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWOR case PT_LINETO: break; case PT_BEZIERTO: - if((i + 2 < count) && (types[i + 1] == PT_BEZIERTO) && - ((types[i + 2] & ~PT_CLOSEFIGURE) == PT_BEZIERTO)) - { - i += 2; - break; - } + if (i + 2 >= count) return FALSE; + if (types[i + 1] != PT_BEZIERTO) return FALSE; + if ((types[i + 2] & ~PT_CLOSEFIGURE) != PT_BEZIERTO) return FALSE; + i += 2; + break; default: return FALSE; }

1 0

Huw Davies : winex11: Add a few 'fall through' comments.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: 2232fef56c0258f859bf6622f6104c8b2e2d7610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2232fef56c0258f859bf6622f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 27 10:11:03 2012 +0000 winex11: Add a few 'fall through' comments. --- dlls/winex11.drv/palette.c | 2 ++ dlls/winex11.drv/xrender.c | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 91476d4..b9ad599 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -146,6 +146,7 @@ int X11DRV_PALETTE_Init(void) { case DirectColor: X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_VIRTUAL; + /* fall through */ case GrayScale: case PseudoColor: if (private_color_map) @@ -175,6 +176,7 @@ int X11DRV_PALETTE_Init(void) case TrueColor: X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_VIRTUAL; + /* fall through */ case StaticColor: X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_FIXED; X11DRV_PALETTE_ComputeColorShifts(&X11DRV_PALETTE_default_shifts, default_visual.red_mask, default_visual.green_mask, default_visual.blue_mask); diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index bafc622..d1d1ccc 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1112,6 +1112,7 @@ static void UploadGlyph(struct xrender_physdev *physDev, int glyph) default: ERR("aa = %d - not implemented\n", format); + /* fall through */ case AA_None: wxr_format = WXR_FORMAT_MONO; break;

1 0

Andrew Talbot : msvcp100: Remove superfluous semicolons.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: 2808433a7a7eb1fb5f7cc05948fe3d3bf0da96f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2808433a7a7eb1fb5f7cc0594… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Nov 26 19:42:31 2012 +0000 msvcp100: Remove superfluous semicolons. --- dlls/msvcp100/exception.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp100/exception.c b/dlls/msvcp100/exception.c index 6482463..3701fb4 100644 --- a/dlls/msvcp100/exception.c +++ b/dlls/msvcp100/exception.c @@ -132,7 +132,7 @@ void * __thiscall MSVCP_exception_vector_dtor(exception *this, unsigned int flag } DEFINE_RTTI_DATA0(exception, 0, ".?AVexception(a)std@@"); -DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor); +DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor) /* bad_alloc class data */ typedef exception bad_alloc; @@ -189,7 +189,7 @@ const char* __thiscall MSVCP_what_exception(exception * this) } DEFINE_RTTI_DATA1(bad_alloc, 0, &exception_rtti_base_descriptor, ".?AVbad_alloc(a)std@@"); -DEFINE_CXX_DATA1(bad_alloc, &exception_cxx_type_info, MSVCP_bad_alloc_dtor); +DEFINE_CXX_DATA1(bad_alloc, &exception_cxx_type_info, MSVCP_bad_alloc_dtor) /* logic_error class data */ typedef struct _logic_error { @@ -256,7 +256,7 @@ const char* __thiscall MSVCP_logic_error_what(logic_error *this) } DEFINE_RTTI_DATA1(logic_error, 0, &exception_rtti_base_descriptor, ".?AVlogic_error(a)std@@"); -DEFINE_CXX_DATA1(logic_error, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA1(logic_error, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* length_error class data */ typedef logic_error length_error; @@ -281,7 +281,7 @@ length_error* __thiscall MSVCP_length_error_copy_ctor( } DEFINE_RTTI_DATA2(length_error, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVlength_error(a)std@@"); -DEFINE_CXX_DATA2(length_error, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(length_error, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* out_of_range class data */ typedef logic_error out_of_range; @@ -306,7 +306,7 @@ out_of_range* __thiscall MSVCP_out_of_range_copy_ctor( } DEFINE_RTTI_DATA2(out_of_range, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVout_of_range(a)std@@"); -DEFINE_CXX_DATA2(out_of_range, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(out_of_range, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* invalid_argument class data */ typedef logic_error invalid_argument; @@ -331,7 +331,7 @@ invalid_argument* __thiscall MSVCP_invalid_argument_copy_ctor( } DEFINE_RTTI_DATA2(invalid_argument, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVinvalid_argument(a)std@@"); -DEFINE_CXX_DATA2(invalid_argument, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(invalid_argument, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* runtime_error class data */ typedef struct { @@ -398,7 +398,7 @@ const char* __thiscall MSVCP_runtime_error_what(runtime_error *this) } DEFINE_RTTI_DATA1(runtime_error, 0, &exception_rtti_base_descriptor, ".?AVruntime_error(a)std@@"); -DEFINE_CXX_DATA1(runtime_error, &exception_cxx_type_info, MSVCP_runtime_error_dtor); +DEFINE_CXX_DATA1(runtime_error, &exception_cxx_type_info, MSVCP_runtime_error_dtor) /* failure class data */ typedef runtime_error failure; @@ -445,7 +445,7 @@ const char* __thiscall MSVCP_failure_what(failure *this) } DEFINE_RTTI_DATA2(failure, 0, &runtime_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVfailure(a)std@@"); -DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor); +DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor) /* ?_Nomemory(a)std@@YAXXZ */ void __cdecl _Nomemory(void)

1 0

Andrew Talbot : msvcp90: Remove superfluous semicolons.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: c25d7f1b3c21aa79c2c231ae5ea9f76c1b861a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c25d7f1b3c21aa79c2c231ae5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Nov 26 19:42:28 2012 +0000 msvcp90: Remove superfluous semicolons. --- dlls/msvcp90/exception.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 6247616..1e33301 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -132,7 +132,7 @@ void * __thiscall MSVCP_exception_vector_dtor(exception *this, unsigned int flag } DEFINE_RTTI_DATA0(exception, 0, ".?AVexception(a)std@@"); -DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor); +DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor) /* bad_alloc class data */ typedef exception bad_alloc; @@ -189,7 +189,7 @@ const char* __thiscall MSVCP_what_exception(exception * this) } DEFINE_RTTI_DATA1(bad_alloc, 0, &exception_rtti_base_descriptor, ".?AVbad_alloc(a)std@@"); -DEFINE_CXX_DATA1(bad_alloc, &exception_cxx_type_info, MSVCP_bad_alloc_dtor); +DEFINE_CXX_DATA1(bad_alloc, &exception_cxx_type_info, MSVCP_bad_alloc_dtor) /* logic_error class data */ typedef struct _logic_error { @@ -256,7 +256,7 @@ const char* __thiscall MSVCP_logic_error_what(logic_error *this) } DEFINE_RTTI_DATA1(logic_error, 0, &exception_rtti_base_descriptor, ".?AVlogic_error(a)std@@"); -DEFINE_CXX_DATA1(logic_error, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA1(logic_error, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* length_error class data */ typedef logic_error length_error; @@ -281,7 +281,7 @@ length_error* __thiscall MSVCP_length_error_copy_ctor( } DEFINE_RTTI_DATA2(length_error, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVlength_error(a)std@@"); -DEFINE_CXX_DATA2(length_error, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(length_error, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* out_of_range class data */ typedef logic_error out_of_range; @@ -306,7 +306,7 @@ out_of_range* __thiscall MSVCP_out_of_range_copy_ctor( } DEFINE_RTTI_DATA2(out_of_range, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVout_of_range(a)std@@"); -DEFINE_CXX_DATA2(out_of_range, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(out_of_range, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* invalid_argument class data */ typedef logic_error invalid_argument; @@ -331,7 +331,7 @@ invalid_argument* __thiscall MSVCP_invalid_argument_copy_ctor( } DEFINE_RTTI_DATA2(invalid_argument, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVinvalid_argument(a)std@@"); -DEFINE_CXX_DATA2(invalid_argument, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(invalid_argument, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* runtime_error class data */ typedef struct { @@ -398,7 +398,7 @@ const char* __thiscall MSVCP_runtime_error_what(runtime_error *this) } DEFINE_RTTI_DATA1(runtime_error, 0, &exception_rtti_base_descriptor, ".?AVruntime_error(a)std@@"); -DEFINE_CXX_DATA1(runtime_error, &exception_cxx_type_info, MSVCP_runtime_error_dtor); +DEFINE_CXX_DATA1(runtime_error, &exception_cxx_type_info, MSVCP_runtime_error_dtor) /* failure class data */ typedef runtime_error failure; @@ -445,7 +445,7 @@ const char* __thiscall MSVCP_failure_what(failure *this) } DEFINE_RTTI_DATA2(failure, 0, &runtime_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVfailure(a)std@@"); -DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor); +DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor) /* ?_Nomemory(a)std@@YAXXZ */ void __cdecl _Nomemory(void)

1 0

Andrew Talbot : msvcp71: Remove superfluous semicolons.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: b4c4bae7a3ac72dbe191c6528c342963aa45aa91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c4bae7a3ac72dbe191c6528… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Nov 26 19:42:25 2012 +0000 msvcp71: Remove superfluous semicolons. --- dlls/msvcp71/exception.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp71/exception.c b/dlls/msvcp71/exception.c index 6482463..3701fb4 100644 --- a/dlls/msvcp71/exception.c +++ b/dlls/msvcp71/exception.c @@ -132,7 +132,7 @@ void * __thiscall MSVCP_exception_vector_dtor(exception *this, unsigned int flag } DEFINE_RTTI_DATA0(exception, 0, ".?AVexception(a)std@@"); -DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor); +DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor) /* bad_alloc class data */ typedef exception bad_alloc; @@ -189,7 +189,7 @@ const char* __thiscall MSVCP_what_exception(exception * this) } DEFINE_RTTI_DATA1(bad_alloc, 0, &exception_rtti_base_descriptor, ".?AVbad_alloc(a)std@@"); -DEFINE_CXX_DATA1(bad_alloc, &exception_cxx_type_info, MSVCP_bad_alloc_dtor); +DEFINE_CXX_DATA1(bad_alloc, &exception_cxx_type_info, MSVCP_bad_alloc_dtor) /* logic_error class data */ typedef struct _logic_error { @@ -256,7 +256,7 @@ const char* __thiscall MSVCP_logic_error_what(logic_error *this) } DEFINE_RTTI_DATA1(logic_error, 0, &exception_rtti_base_descriptor, ".?AVlogic_error(a)std@@"); -DEFINE_CXX_DATA1(logic_error, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA1(logic_error, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* length_error class data */ typedef logic_error length_error; @@ -281,7 +281,7 @@ length_error* __thiscall MSVCP_length_error_copy_ctor( } DEFINE_RTTI_DATA2(length_error, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVlength_error(a)std@@"); -DEFINE_CXX_DATA2(length_error, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(length_error, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* out_of_range class data */ typedef logic_error out_of_range; @@ -306,7 +306,7 @@ out_of_range* __thiscall MSVCP_out_of_range_copy_ctor( } DEFINE_RTTI_DATA2(out_of_range, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVout_of_range(a)std@@"); -DEFINE_CXX_DATA2(out_of_range, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(out_of_range, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* invalid_argument class data */ typedef logic_error invalid_argument; @@ -331,7 +331,7 @@ invalid_argument* __thiscall MSVCP_invalid_argument_copy_ctor( } DEFINE_RTTI_DATA2(invalid_argument, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVinvalid_argument(a)std@@"); -DEFINE_CXX_DATA2(invalid_argument, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(invalid_argument, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* runtime_error class data */ typedef struct { @@ -398,7 +398,7 @@ const char* __thiscall MSVCP_runtime_error_what(runtime_error *this) } DEFINE_RTTI_DATA1(runtime_error, 0, &exception_rtti_base_descriptor, ".?AVruntime_error(a)std@@"); -DEFINE_CXX_DATA1(runtime_error, &exception_cxx_type_info, MSVCP_runtime_error_dtor); +DEFINE_CXX_DATA1(runtime_error, &exception_cxx_type_info, MSVCP_runtime_error_dtor) /* failure class data */ typedef runtime_error failure; @@ -445,7 +445,7 @@ const char* __thiscall MSVCP_failure_what(failure *this) } DEFINE_RTTI_DATA2(failure, 0, &runtime_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVfailure(a)std@@"); -DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor); +DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor) /* ?_Nomemory(a)std@@YAXXZ */ void __cdecl _Nomemory(void)

1 0

Andrew Talbot : msvcp60: Remove superfluous semicolons.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: 1f221e87eb77247aae754aca27e855fa9fd7172c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f221e87eb77247aae754aca2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Nov 26 19:42:22 2012 +0000 msvcp60: Remove superfluous semicolons. --- dlls/msvcp60/exception.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/exception.c b/dlls/msvcp60/exception.c index 761075e..b8c6921 100644 --- a/dlls/msvcp60/exception.c +++ b/dlls/msvcp60/exception.c @@ -137,7 +137,7 @@ void * __thiscall MSVCP_exception_vector_dtor(exception *this, unsigned int flag } DEFINE_RTTI_DATA0(exception, 0, ".?AVexception(a)std@@"); -DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor); +DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor) /* ?_Doraise(a)bad_alloc@std@@MBEXXZ */ /* ?_Doraise(a)bad_alloc@std@@MEBAXXZ */ @@ -234,7 +234,7 @@ bad_alloc* __thiscall MSVCP_bad_alloc_assign(bad_alloc *this, const bad_alloc *a } DEFINE_RTTI_DATA1(bad_alloc, 0, &exception_rtti_base_descriptor, ".?AVbad_alloc(a)std@@"); -DEFINE_CXX_DATA1(bad_alloc, &exception_cxx_type_info, MSVCP_bad_alloc_dtor); +DEFINE_CXX_DATA1(bad_alloc, &exception_cxx_type_info, MSVCP_bad_alloc_dtor) /* logic_error class data */ typedef struct { @@ -331,7 +331,7 @@ const char* __thiscall MSVCP_logic_error_what(logic_error *this) } DEFINE_RTTI_DATA1(logic_error, 0, &exception_rtti_base_descriptor, ".?AVlogic_error(a)std@@"); -DEFINE_CXX_DATA1(logic_error, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA1(logic_error, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* length_error class data */ typedef logic_error length_error; @@ -376,7 +376,7 @@ length_error* __thiscall MSVCP_length_error_assign(length_error *this, const len } DEFINE_RTTI_DATA2(length_error, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVlength_error(a)std@@"); -DEFINE_CXX_DATA2(length_error, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(length_error, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* out_of_range class data */ typedef logic_error out_of_range; @@ -421,7 +421,7 @@ out_of_range* __thiscall MSVCP_out_of_range_assign(out_of_range *this, const out } DEFINE_RTTI_DATA2(out_of_range, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVout_of_range(a)std@@"); -DEFINE_CXX_DATA2(out_of_range, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(out_of_range, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* invalid_argument class data */ typedef logic_error invalid_argument; @@ -446,7 +446,7 @@ invalid_argument* __thiscall MSVCP_invalid_argument_copy_ctor( } DEFINE_RTTI_DATA2(invalid_argument, 0, &logic_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVinvalid_argument(a)std@@"); -DEFINE_CXX_DATA2(invalid_argument, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(invalid_argument, &logic_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* runtime_error class data */ typedef logic_error runtime_error; @@ -499,7 +499,7 @@ runtime_error* __thiscall MSVCP_runtime_error_assign(runtime_error *this, const } DEFINE_RTTI_DATA1(runtime_error, 0, &exception_rtti_base_descriptor, ".?AVruntime_error(a)std@@"); -DEFINE_CXX_DATA1(runtime_error, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA1(runtime_error, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* ?what(a)runtime_error@std@@UBEPBDXZ */ /* ?what(a)runtime_error@std@@UEBAPEBDXZ */ @@ -555,7 +555,7 @@ const char* __thiscall MSVCP_failure_what(failure *this) } DEFINE_RTTI_DATA2(failure, 0, &runtime_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVfailure(a)std@@"); -DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor); +DEFINE_CXX_DATA2(failure, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_logic_error_dtor) /* ?_Nomemory(a)std@@YAXXZ */ void __cdecl _Nomemory(void)

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXPRTCOMPBUFFER.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: 4159758c9786264313c26c55e22123a31d5c2065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4159758c9786264313c26c55e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 26 22:52:37 2012 +0100 d3dx9: Avoid LPD3DXPRTCOMPBUFFER. --- include/d3dx9mesh.h | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index a5fc6cc..586aa63 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -708,7 +708,8 @@ HRESULT WINAPI D3DXCreatePatchMesh(const D3DXPATCHINFO *patch_info, DWORD patch_ struct IDirect3DDevice9 *device, struct ID3DXPatchMesh **mesh); HRESULT WINAPI D3DXCreatePRTBuffer(UINT, UINT, UINT, LPD3DXPRTBUFFER *); HRESULT WINAPI D3DXCreatePRTBufferTex(UINT, UINT, UINT, UINT, LPD3DXPRTBUFFER *); -HRESULT WINAPI D3DXCreatePRTCompBuffer(D3DXSHCOMPRESSQUALITYTYPE, UINT, UINT, LPD3DXSHPRTSIMCB, LPVOID, LPD3DXPRTBUFFER, LPD3DXPRTCOMPBUFFER *); +HRESULT WINAPI D3DXCreatePRTCompBuffer(D3DXSHCOMPRESSQUALITYTYPE quality, UINT cluster_count, UINT pca_count, + LPD3DXSHPRTSIMCB cb, void *ctx, ID3DXPRTBuffer *input, ID3DXPRTCompBuffer **buffer); HRESULT WINAPI D3DXCreateTextureGutterHelper(UINT width, UINT height, ID3DXMesh *mesh, float gutter_size, ID3DXTextureGutterHelper **gh); HRESULT WINAPI D3DXCreatePRTEngine(ID3DXMesh *mesh, DWORD *adjacency, BOOL extract_uv, @@ -739,8 +740,8 @@ HRESULT WINAPI D3DXLoadSkinMeshFromXof(struct ID3DXFileData *file_data, DWORD fl HRESULT WINAPI D3DXLoadPRTBufferFromFileA(LPCSTR, LPD3DXPRTBUFFER *); HRESULT WINAPI D3DXLoadPRTBufferFromFileW(LPCWSTR, LPD3DXPRTBUFFER *); #define D3DXLoadPRTBufferFromFile WINELIB_NAME_AW(D3DXLoadPRTBufferFromFile) -HRESULT WINAPI D3DXLoadPRTCompBufferFromFileA(LPCSTR, LPD3DXPRTCOMPBUFFER *); -HRESULT WINAPI D3DXLoadPRTCompBufferFromFileW(LPCWSTR, LPD3DXPRTCOMPBUFFER *); +HRESULT WINAPI D3DXLoadPRTCompBufferFromFileA(const char *filename, ID3DXPRTCompBuffer **buffer); +HRESULT WINAPI D3DXLoadPRTCompBufferFromFileW(const WCHAR *filename, ID3DXPRTCompBuffer **buffer); #define D3DXLoadPRTCompBufferFromFile WINELIB_NAME_AW(D3DXLoadPRTCompBufferFromFile) HRESULT WINAPI D3DXSaveMeshToXA(LPCSTR, LPD3DXMESH, CONST DWORD *, CONST D3DXMATERIAL *, CONST D3DXEFFECTINSTANCE *, DWORD, DWORD); HRESULT WINAPI D3DXSaveMeshToXW(LPCWSTR, LPD3DXMESH, CONST DWORD *, CONST D3DXMATERIAL *, CONST D3DXEFFECTINSTANCE *, DWORD, DWORD); @@ -748,8 +749,8 @@ HRESULT WINAPI D3DXSaveMeshToXW(LPCWSTR, LPD3DXMESH, CONST DWORD *, CONST D3DXMA HRESULT WINAPI D3DXSavePRTBufferToFileA(LPCSTR, LPD3DXPRTBUFFER); HRESULT WINAPI D3DXSavePRTBufferToFileW(LPCWSTR, LPD3DXPRTBUFFER); #define D3DXSavePRTBufferToFile WINELIB_NAME_AW(D3DXSavePRTBufferToFile) -HRESULT WINAPI D3DXSavePRTCompBufferToFileA(LPCSTR, LPD3DXPRTCOMPBUFFER); -HRESULT WINAPI D3DXSavePRTCompBufferToFileW(LPCWSTR, LPD3DXPRTCOMPBUFFER); +HRESULT WINAPI D3DXSavePRTCompBufferToFileA(const char *filename, ID3DXPRTCompBuffer *buffer); +HRESULT WINAPI D3DXSavePRTCompBufferToFileW(const WCHAR *filename, ID3DXPRTCompBuffer *buffer); #define D3DXSavePRTCompBufferToFile WINELIB_NAME_AW(D3DXSavePRTCompBufferToFile) UINT WINAPI D3DXGetDeclLength(const D3DVERTEXELEMENT9 *decl); UINT WINAPI D3DXGetDeclVertexSize(const D3DVERTEXELEMENT9 *decl, DWORD stream_idx);

1 0