wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Putin Evgeny : wineps.drv: Add orientation field to postscript header.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 3303ba7f4cb5e55c5382157c44852bcfd677d7fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3303ba7f4cb5e55c5382157c4… Author: Putin Evgeny <evcalipt(a)etersoft.ru> Date: Tue Nov 13 14:07:34 2012 +0400 wineps.drv: Add orientation field to postscript header. --- dlls/wineps.drv/ps.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 35a55f0..2f482d4 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -49,11 +49,12 @@ static const char *cups_duplexes[3] = cups_two_sided_short /* DMDUP_HORIZONTAL */ }; -static const char psheader[] = /* title llx lly urx ury */ +static const char psheader[] = /* title llx lly urx ury orientation */ "%%%%Creator: Wine PostScript Driver\n" "%%%%Title: %s\n" "%%%%BoundingBox: %d %d %d %d\n" "%%%%Pages: (atend)\n" +"%%%%Orientation: %s\n" "%%%%EndComments\n"; static const char psbeginprolog[] = @@ -366,6 +367,8 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) DUPLEX *duplex = find_duplex( physDev->pi->ppd, physDev->Devmode ); int llx, lly, urx, ury; int ret, len; + const char * dmOrientation; + struct ticket_info ticket_info = { page, duplex }; TRACE("%s\n", debugstr_w(title)); @@ -397,7 +400,8 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) ury = physDev->ImageableArea.top * 72.0 / physDev->logPixelsY; /* FIXME should do something better with BBox */ - sprintf(buf, psheader, escaped_title, llx, lly, urx, ury); + dmOrientation = (physDev->Devmode->dmPublic.u1.s1.dmOrientation == DMORIENT_LANDSCAPE ? "Landscape" : "Portrait"); + sprintf(buf, psheader, escaped_title, llx, lly, urx, ury, dmOrientation); HeapFree(GetProcessHeap(), 0, escaped_title);

1 0

Piotr Caban : msvcp: Remove superfluous semicolons.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: a1797d885f545c7d8a20e54f4e6f33dbf36f0c9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1797d885f545c7d8a20e54f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 28 12:01:33 2012 +0000 msvcp: Remove superfluous semicolons. --- dlls/msvcp100/cxx.h | 2 +- dlls/msvcp100/exception.c | 18 +++++++++--------- dlls/msvcp100/ios.c | 4 ++-- dlls/msvcp100/locale.c | 42 +++++++++++++++++++++--------------------- dlls/msvcp60/cxx.h | 2 +- dlls/msvcp60/exception.c | 18 +++++++++--------- dlls/msvcp60/ios.c | 4 ++-- dlls/msvcp60/locale.c | 42 +++++++++++++++++++++--------------------- dlls/msvcp71/cxx.h | 2 +- dlls/msvcp71/exception.c | 18 +++++++++--------- dlls/msvcp71/ios.c | 4 ++-- dlls/msvcp71/locale.c | 42 +++++++++++++++++++++--------------------- dlls/msvcp90/cxx.h | 2 +- dlls/msvcp90/exception.c | 18 +++++++++--------- dlls/msvcp90/ios.c | 4 ++-- dlls/msvcp90/locale.c | 42 +++++++++++++++++++++--------------------- 16 files changed, 132 insertions(+), 132 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1797d885f545c7d8a20e…

1 0

Piotr Caban : msvcrt: Remove superfluous semicolons.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: bdedab6c840c068d0fe4a761eb5045b72de9a91a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdedab6c840c068d0fe4a761e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 28 12:01:02 2012 +0000 msvcrt: Remove superfluous semicolons. --- dlls/msvcrt/cpp.c | 20 ++++++++++---------- dlls/msvcrt/cxx.h | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index ed5f751..ec0fa7df 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -666,16 +666,16 @@ __ASM_VTABLE(__non_rtti_object, } #endif -DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ); -DEFINE_RTTI_DATA0( exception, 0, ".?AVexception@@" ); -DEFINE_RTTI_DATA1( bad_typeid, 0, &exception_rtti_base_descriptor, ".?AVbad_typeid@@" ); -DEFINE_RTTI_DATA1( bad_cast, 0, &exception_rtti_base_descriptor, ".?AVbad_cast@@" ); -DEFINE_RTTI_DATA2( __non_rtti_object, 0, &bad_typeid_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AV__non_rtti_object@@" ); - -DEFINE_EXCEPTION_TYPE_INFO( exception, 0, NULL, NULL ); -DEFINE_EXCEPTION_TYPE_INFO( bad_typeid, 1, &exception_cxx_type_info, NULL ); -DEFINE_EXCEPTION_TYPE_INFO( bad_cast, 1, &exception_cxx_type_info, NULL ); -DEFINE_EXCEPTION_TYPE_INFO( __non_rtti_object, 2, &bad_typeid_cxx_type_info, &exception_cxx_type_info ); +DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ) +DEFINE_RTTI_DATA0( exception, 0, ".?AVexception@@" ) +DEFINE_RTTI_DATA1( bad_typeid, 0, &exception_rtti_base_descriptor, ".?AVbad_typeid@@" ) +DEFINE_RTTI_DATA1( bad_cast, 0, &exception_rtti_base_descriptor, ".?AVbad_cast@@" ) +DEFINE_RTTI_DATA2( __non_rtti_object, 0, &bad_typeid_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AV__non_rtti_object@@" ) + +DEFINE_EXCEPTION_TYPE_INFO( exception, 0, NULL, NULL ) +DEFINE_EXCEPTION_TYPE_INFO( bad_typeid, 1, &exception_cxx_type_info, NULL ) +DEFINE_EXCEPTION_TYPE_INFO( bad_cast, 1, &exception_cxx_type_info, NULL ) +DEFINE_EXCEPTION_TYPE_INFO( __non_rtti_object, 2, &bad_typeid_cxx_type_info, &exception_cxx_type_info ) void msvcrt_init_exception(void *base) { diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index 8f9f96a..e649f03 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -107,7 +107,7 @@ const rtti_object_locator name ## _rtti = { \ 0, \ &name ## _type_info, \ &name ## _hierarchy \ -} +}; #else

1 0

Nikolay Sivov : msxml3: Check return value (Coverity).
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: cf8564a992afc1a9eb9c37e4a272b3b987d59571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8564a992afc1a9eb9c37e4a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 28 13:15:29 2012 -0500 msxml3: Check return value (Coverity). --- dlls/msxml3/tests/xmlview.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/xmlview.c b/dlls/msxml3/tests/xmlview.c index eb660e4..82577bf 100644 --- a/dlls/msxml3/tests/xmlview.c +++ b/dlls/msxml3/tests/xmlview.c @@ -123,9 +123,11 @@ static HRESULT WINAPI HTMLEvents_Invoke(IDispatch *iface, DISPID dispIdMember, R { if(dispIdMember == DISPID_HTMLDOCUMENTEVENTS2_ONREADYSTATECHANGE) { static const WCHAR completeW[] = {'c','o','m','p','l','e','t','e',0}; + HRESULT hr; BSTR state; - IHTMLDocument2_get_readyState(html_doc, &state); + hr = IHTMLDocument2_get_readyState(html_doc, &state); + ok(hr == S_OK, "got 0x%08x\n", hr); if(!memcmp(state, completeW, sizeof(completeW))) loaded = TRUE; }

1 0

Nikolay Sivov : msxml3: Fix handling of NULL object site (Coverity).
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: b2643d3841118ea100df1bccc7b2f3148bfc2493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2643d3841118ea100df1bccc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 28 13:11:19 2012 -0500 msxml3: Fix handling of NULL object site (Coverity). --- dlls/msxml3/httprequest.c | 33 ++++++++++++++++++--------------- dlls/msxml3/tests/domdoc.c | 3 +++ 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 2600ffe..9d93cca 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -1444,34 +1444,37 @@ static HRESULT WINAPI httprequest_ObjectWithSite_GetSite( IObjectWithSite *iface static HRESULT WINAPI httprequest_ObjectWithSite_SetSite( IObjectWithSite *iface, IUnknown *punk ) { httprequest *This = impl_from_IObjectWithSite(iface); - IServiceProvider *provider; - HRESULT hr; - - TRACE("(%p)->(%p)\n", iface, punk); - if (punk) - IUnknown_AddRef( punk ); + TRACE("(%p)->(%p)\n", This, punk); if(This->site) IUnknown_Release( This->site ); + SysFreeString(This->siteurl); + This->siteurl = NULL; This->site = punk; - hr = IUnknown_QueryInterface(This->site, &IID_IServiceProvider, (void**)&provider); - if (hr == S_OK) + if (punk) { - IHTMLDocument2 *doc; + IServiceProvider *provider; + HRESULT hr; + + IUnknown_AddRef( punk ); - hr = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IHTMLDocument2, (void**)&doc); + hr = IUnknown_QueryInterface(This->site, &IID_IServiceProvider, (void**)&provider); if (hr == S_OK) { - SysFreeString(This->siteurl); + IHTMLDocument2 *doc; - hr = IHTMLDocument2_get_URL(doc, &This->siteurl); - IHTMLDocument2_Release(doc); - TRACE("host url %s, 0x%08x\n", debugstr_w(This->siteurl), hr); + hr = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IHTMLDocument2, (void**)&doc); + if (hr == S_OK) + { + hr = IHTMLDocument2_get_URL(doc, &This->siteurl); + IHTMLDocument2_Release(doc); + TRACE("host url %s, 0x%08x\n", debugstr_w(This->siteurl), hr); + } + IServiceProvider_Release(provider); } - IServiceProvider_Release(provider); } return S_OK; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3a62c95..d75bb5f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5213,6 +5213,9 @@ todo_wine { EXPECT_REF(obj_site, 1); } + hr = IObjectWithSite_SetSite(obj_site, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + IObjectWithSite_AddRef(obj_site); todo_wine { EXPECT_REF(obj_site, 2);

1 0

Nikolay Sivov : msxml3: Actually use skipped entity event data.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 21be19a1dcfab9b74b363fb8173afb5c40ed2355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21be19a1dcfab9b74b363fb81… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 28 12:54:24 2012 -0500 msxml3: Actually use skipped entity event data. --- dlls/msxml3/tests/saxreader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 02bc00c..06fd56a 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1191,6 +1191,7 @@ static HRESULT WINAPI contentHandler_skippedEntity( init_call_entry(locator, &call); call.id = CH_SKIPPEDENTITY; call.arg1W = SysAllocStringLen(name, len); + add_call(sequences, CONTENT_HANDLER_INDEX, &call); return get_expected_ret(); }

1 0

Nikolay Sivov : msxml3: Properly store SystemID and PublicID (Coverity).
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 818917a09e71d5459ffe05d6ba067a9302d24b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=818917a09e71d5459ffe05d6b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 28 12:45:12 2012 -0500 msxml3: Properly store SystemID and PublicID (Coverity). --- dlls/msxml3/saxreader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 877493d..3b167b7 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -294,8 +294,8 @@ typedef struct saxreader *saxreader; HRESULT ret; xmlParserCtxtPtr pParserCtxt; - WCHAR *publicId; - WCHAR *systemId; + BSTR publicId; + BSTR systemId; int line; int column; BOOL vbInterface; @@ -2132,7 +2132,7 @@ static HRESULT WINAPI isaxlocator_getPublicId( publicId = bstr_from_xmlChar(xmlSAX2GetPublicId(This->pParserCtxt)); if(SysStringLen(publicId)) - This->publicId = (WCHAR*)&publicId; + This->publicId = publicId; else { SysFreeString(publicId); @@ -2154,7 +2154,7 @@ static HRESULT WINAPI isaxlocator_getSystemId( systemId = bstr_from_xmlChar(xmlSAX2GetSystemId(This->pParserCtxt)); if(SysStringLen(systemId)) - This->systemId = (WCHAR*)&systemId; + This->systemId = systemId; else { SysFreeString(systemId);

1 0

Nikolay Sivov : xmllite: Fix equal sign parsing.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: c23ce5976ee8cb96c996bda0b49b710ef15646ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c23ce5976ee8cb96c996bda0b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 28 09:44:06 2012 -0500 xmllite: Fix equal sign parsing. --- dlls/xmllite/reader.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ee6a4d7..11b5eb8 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -48,7 +48,6 @@ 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 { @@ -515,6 +514,18 @@ static HRESULT reader_parse_versionnum(xmlreader *reader) return S_OK; } +/* [25] Eq ::= S? '=' S? */ +static HRESULT reader_parse_eq(xmlreader *reader) +{ + static const WCHAR eqW[] = {'=',0}; + reader_skipspaces(reader); + if (reader_cmp(reader, eqW)) return WC_E_EQUAL; + /* skip '=' */ + reader_skipn(reader, 1); + reader_skipspaces(reader); + return S_OK; +} + /* [24] VersionInfo ::= S 'version' Eq ("'" VersionNum "'" | '"' VersionNum '"') */ static HRESULT reader_parse_versioninfo(xmlreader *reader) { @@ -527,9 +538,8 @@ static HRESULT reader_parse_versioninfo(xmlreader *reader) /* skip 'version' */ reader_skipn(reader, 7); - if (reader_cmp(reader, eqW)) return WC_E_EQUAL; - /* skip '=' */ - reader_skipn(reader, 1); + hr = reader_parse_eq(reader); + if (FAILED(hr)) return hr; if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) return WC_E_QUOTE; @@ -596,9 +606,8 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) /* skip 'encoding' */ reader_skipn(reader, 8); - if (reader_cmp(reader, eqW)) return WC_E_EQUAL; - /* skip '=' */ - reader_skipn(reader, 1); + hr = reader_parse_eq(reader); + if (FAILED(hr)) return hr; if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) return WC_E_QUOTE; @@ -624,6 +633,7 @@ static HRESULT reader_parse_sddecl(xmlreader *reader) static const WCHAR yesW[] = {'y','e','s',0}; static const WCHAR noW[] = {'n','o',0}; const WCHAR *start, *ptr; + HRESULT hr; if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; @@ -631,9 +641,8 @@ static HRESULT reader_parse_sddecl(xmlreader *reader) /* skip 'standalone' */ reader_skipn(reader, 10); - if (reader_cmp(reader, eqW)) return WC_E_EQUAL; - /* skip '=' */ - reader_skipn(reader, 1); + hr = reader_parse_eq(reader); + if (FAILED(hr)) return hr; if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) return WC_E_QUOTE;

1 0

Huw Davies : oledlg: Add a missing break.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 81057ba9b9290f2baf29bec960183832a448ba88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81057ba9b9290f2baf29bec96… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 28 10:57:07 2012 +0000 oledlg: Add a missing break. --- dlls/oledlg/insobjdlg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index 75ca77b..159f12b 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -195,6 +195,7 @@ static LRESULT UIINSOBJDLG_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam) case IDC_ADDCONTROL: UIINSERTOBJECTDLG_AddControl(pdlgInfo); + break; case IDC_OBJTYPELIST: if (wNotifyCode == LBN_SELCHANGE)

1 0

Nikolay Sivov : xmllite: Support standalone declaration.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 8b8fb88e4ba32e62d5f3c3ff62ae1c54d1e7484c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b8fb88e4ba32e62d5f3c3ff6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 28 07:59:57 2012 -0500 xmllite: Support standalone declaration. --- dlls/xmllite/reader.c | 64 +++++++++++++++++++++++++++++++++++++++--- dlls/xmllite/tests/reader.c | 3 +- 2 files changed, 60 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 87d7936..ee6a4d7 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -510,7 +510,7 @@ static HRESULT reader_parse_versionnum(xmlreader *reader) ptr++; if (ptr2 == ptr) return WC_E_DIGIT; - TRACE("version=%s", debugstr_wn(start, ptr-start)); + TRACE("version=%s\n", debugstr_wn(start, ptr-start)); reader_skipn(reader, ptr-ptr2); return S_OK; } @@ -592,7 +592,7 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; - if (reader_cmp(reader, encodingW)) return S_OK; + if (reader_cmp(reader, encodingW)) return S_FALSE; /* skip 'encoding' */ reader_skipn(reader, 8); @@ -617,14 +617,55 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) return S_OK; } +/* [32] SDDecl ::= S 'standalone' Eq (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no') '"')) */ +static HRESULT reader_parse_sddecl(xmlreader *reader) +{ + static const WCHAR standaloneW[] = {'s','t','a','n','d','a','l','o','n','e',0}; + static const WCHAR yesW[] = {'y','e','s',0}; + static const WCHAR noW[] = {'n','o',0}; + const WCHAR *start, *ptr; + + if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; + + if (reader_cmp(reader, standaloneW)) return S_FALSE; + /* skip 'standalone' */ + reader_skipn(reader, 10); + + 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); + + if (reader_cmp(reader, yesW) && reader_cmp(reader, noW)) + return WC_E_XMLDECL; + + start = reader_get_cur(reader); + /* skip 'yes'|'no' */ + reader_skipn(reader, reader_cmp(reader, yesW) ? 2 : 3); + ptr = reader_get_cur(reader); + TRACE("standalone=%s\n", debugstr_wn(start, ptr-start)); + + 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) { static const WCHAR xmldeclW[] = {'<','?','x','m','l',0}; + static const WCHAR declcloseW[] = {'?','>',0}; HRESULT hr; /* check if we have "<?xml" */ - if (reader_cmp(reader, xmldeclW)) return S_OK; + if (reader_cmp(reader, xmldeclW)) return S_FALSE; reader_skipn(reader, 5); hr = reader_parse_versioninfo(reader); @@ -635,7 +676,15 @@ static HRESULT reader_parse_xmldecl(xmlreader *reader) if (FAILED(hr)) return hr; - return E_NOTIMPL; + hr = reader_parse_sddecl(reader); + if (FAILED(hr)) + return hr; + + reader_skipspaces(reader); + if (reader_cmp(reader, declcloseW)) return WC_E_XMLDECL; + reader_skipn(reader, 2); + + return S_OK; } static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) @@ -803,7 +852,12 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *node_type) hr = reader_parse_xmldecl(This); if (FAILED(hr)) return hr; - This->state = XmlReadState_Interactive; + if (hr == S_OK) + { + This->state = XmlReadState_Interactive; + This->nodetype = *node_type = XmlNodeType_XmlDeclaration; + return S_OK; + } } return E_NOTIMPL; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 729d134..af0ea62 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -611,13 +611,12 @@ static void test_read_xmldeclaration(void) type = -1; hr = IXmlReader_Read(reader, &type); -todo_wine { ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(type == XmlNodeType_XmlDeclaration, "Expected XmlNodeType_XmlDeclaration, got %s\n", type_to_str(type)); -} /* new version 1.2.x and 1.3.x properly update position for <?xml ?> */ ok_pos(reader, 1, 3, -1, 55, TRUE); + test_read_state(reader, XmlReadState_Interactive, -1, 0); /* check attributes */ hr = IXmlReader_MoveToNextAttribute(reader);

1 0

Huw Davies : sane.ds: Add a missing break.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 0f95508936fdf6706b5d99a17a4a485bfdfd6ff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f95508936fdf6706b5d99a17… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 28 09:26:49 2012 +0000 sane.ds: Add a missing break. --- dlls/sane.ds/ui.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 815478d..07d5a59 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -1009,6 +1009,7 @@ static INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM InitializeDialog(hwndDlg); break; } + break; } case WM_COMMAND: switch (HIWORD(wParam))

1 0

Christian Costa : cabinet: Simplify concatenation of path and filename.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 94bfd24f671677468913b9a09a32ca983aff7fb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94bfd24f671677468913b9a09… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Nov 27 09:14:30 2012 +0100 cabinet: Simplify concatenation of path and filename. --- dlls/cabinet/fdi.c | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 25156c3..fb675fc 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2041,7 +2041,7 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state /* outlen=0 means this block was the last contiguous part of a split block, continued in the next cabinet */ if (outlen == 0) { - int pathlen, filenamelen, idx, i; + int pathlen, filenamelen, i; INT_PTR cabhf; char fullpath[MAX_PATH], userpath[256]; FDINOTIFICATION fdin; @@ -2060,23 +2060,21 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state if (!((cab->next = CAB(fdi)->alloc(sizeof(fdi_decomp_state))))) return DECR_NOMEMORY; - + ZeroMemory(cab->next, sizeof(fdi_decomp_state)); /* copy pszCabPath to userpath */ ZeroMemory(userpath, 256); - pathlen = (pszCabPath) ? strlen(pszCabPath) : 0; + pathlen = pszCabPath ? strlen(pszCabPath) : 0; if (pathlen) { - if (pathlen < 256) { - for (i = 0; i <= pathlen; i++) - userpath[i] = pszCabPath[i]; - } /* else we are in a weird place... let's leave it blank and see if the user fixes it */ - } + if (pathlen < 256) /* else we are in a weird place... let's leave it blank and see if the user fixes it */ + strcpy(userpath, pszCabPath); + } /* initial fdintNEXT_CABINET notification */ ZeroMemory(&fdin, sizeof(FDINOTIFICATION)); - fdin.psz1 = (cab->mii.nextname) ? cab->mii.nextname : &emptystring; - fdin.psz2 = (cab->mii.nextinfo) ? cab->mii.nextinfo : &emptystring; + fdin.psz1 = cab->mii.nextname ? cab->mii.nextname : &emptystring; + fdin.psz2 = cab->mii.nextinfo ? cab->mii.nextinfo : &emptystring; fdin.psz3 = userpath; fdin.fdie = FDIERROR_NONE; fdin.pv = pvUser; @@ -2086,7 +2084,7 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state do { pathlen = strlen(userpath); - filenamelen = (cab->mii.nextname) ? strlen(cab->mii.nextname) : 0; + filenamelen = cab->mii.nextname ? strlen(cab->mii.nextname) : 0; /* slight overestimation here to save CPU cycles in the developer's brain */ if ((pathlen + filenamelen + 3) > MAX_PATH) { @@ -2095,16 +2093,17 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state } /* paste the path and filename together */ - idx = 0; + fullpath[0] = '\0'; if (pathlen) { - for (i = 0; i < pathlen; i++) fullpath[idx++] = userpath[i]; - if (fullpath[idx - 1] != '\\') fullpath[idx++] = '\\'; + strcpy(fullpath, userpath); + if (fullpath[pathlen - 1] != '\\') + strcat(fullpath, "\\"); } - if (filenamelen) for (i = 0; i < filenamelen; i++) fullpath[idx++] = cab->mii.nextname[i]; - fullpath[idx] = '\0'; - + if (filenamelen) + strcat(fullpath, cab->mii.nextname); + TRACE("full cab path/file name: %s\n", debugstr_a(fullpath)); - + /* try to get a handle to the cabfile */ cabhf = CAB(fdi)->open(fullpath, _O_RDONLY|_O_BINARY, _S_IREAD | _S_IWRITE); if (cabhf == -1) { @@ -2113,14 +2112,14 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state if (((*pfnfdin)(fdintNEXT_CABINET, &fdin))) return DECR_USERABORT; continue; } - + if (cabhf == 0) { ERR("PFDI_OPEN returned zero for %s.\n", fullpath); fdin.fdie = FDIERROR_CABINET_NOT_FOUND; if (((*pfnfdin)(fdintNEXT_CABINET, &fdin))) return DECR_USERABORT; continue; } - + /* check if it's really a cabfile. Note that this doesn't implement the bug */ if (!FDI_read_entries(CAB(fdi), cabhf, &fdici, &(cab->next->mii))) { WARN("FDIIsCabinet failed.\n");

1 0

Christian Costa : cabinet: Remove useless ERR and turn one ERR into a WARN.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 8b6f9175182f1124d6e1df1c567a3d8f9e7319e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b6f9175182f1124d6e1df1c5… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Nov 28 09:02:57 2012 +0100 cabinet: Remove useless ERR and turn one ERR into a WARN. --- dlls/cabinet/fdi.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index d36178d..25156c3 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -710,7 +710,7 @@ static BOOL FDI_read_entries( } /*********************************************************************** - * FDIIsCabinet (CABINET.21) + * FDIIsCabinet (CABINET.21) * * Informs the caller as to whether or not the provided file handle is * really a cabinet or not, filling out the provided PFDICABINETINFO @@ -725,7 +725,7 @@ static BOOL FDI_read_entries( * be filled out with information about the cabinet * file indicated by hf if, indeed, it is determined * to be a cabinet. - * + * * RETURNS * TRUE if the file is a cabinet. The info pointed to by pfdici will * be provided. @@ -736,10 +736,7 @@ static BOOL FDI_read_entries( * INCLUDES * fdi.c */ -BOOL __cdecl FDIIsCabinet( - HFDI hfdi, - INT_PTR hf, - PFDICABINETINFO pfdici) +BOOL __cdecl FDIIsCabinet(HFDI hfdi, INT_PTR hf, PFDICABINETINFO pfdici) { BOOL rv; FDI_Int *fdi = get_fdi_ptr( hfdi ); @@ -749,13 +746,11 @@ BOOL __cdecl FDIIsCabinet( if (!fdi) return FALSE; if (!hf) { - ERR("(!hf)!\n"); SetLastError(ERROR_INVALID_HANDLE); return FALSE; } if (!pfdici) { - ERR("(!pfdici)!\n"); SetLastError(ERROR_BAD_ARGUMENTS); return FALSE; } @@ -2533,7 +2528,7 @@ BOOL __cdecl FDICopy( /* check if it's really a cabfile. Note that this doesn't implement the bug */ if (!FDI_read_entries(fdi, cabhf, &fdici, &(CAB(mii)))) { - ERR("FDIIsCabinet failed: %u.\n", fdi->perf->erfOper); + WARN("FDI_read_entries failed: %u\n", fdi->perf->erfOper); fdi->free(decomp_state); fdi->close(cabhf); return FALSE;

1 0

Alistair Leslie-Hughes : include: Add IGlobalOptions interface.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 9478e1e113567edcbc0aca1cd01b4d2246882919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9478e1e113567edcbc0aca1cd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 26 13:31:10 2012 +1100 include: Add IGlobalOptions interface. --- include/objidl.idl | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/include/objidl.idl b/include/objidl.idl index a3896e9..ecae70e 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -2407,6 +2407,39 @@ interface IThumbnailExtractor : IUnknown [in] IStorage *pStg); } +typedef enum tagGLOBALOPT_PROPERTIES +{ + COMGLB_EXCEPTION_HANDLING = 1, + COMGLB_APPID = 2, + COMGLB_RPC_THREADPOOL_SETTING = 3 +} GLOBALOPT_PROPERTIES; + +typedef enum tagGLOBALOPT_EH_VALUES +{ + COMGLB_EXCEPTION_HANDLE = 0, + COMGLB_EXCEPTION_DONOT_HANDLE_FATAL = 1, + COMGLB_EXCEPTION_DONOT_HANDLE = COMGLB_EXCEPTION_DONOT_HANDLE_FATAL, + COMGLB_EXCEPTION_DONOT_HANDLE_ANY = 2 +} GLOBALOPT_EH_VALUES; + +typedef enum tagGLOBALOPT_RPCTP_VALUES +{ + COMGLB_RPC_THREADPOOL_SETTING_DEFAULT_POOL = 0, + COMGLB_RPC_THREADPOOL_SETTING_PRIVATE_POOL = 1 +} GLOBALOPT_RPCTP_VALUES; + + +[ + object, + local, + pointer_default(unique), + uuid(0000015B-0000-0000-C000-000000000046) +] +interface IGlobalOptions : IUnknown +{ + HRESULT Set([in] GLOBALOPT_PROPERTIES property, [in] ULONG_PTR value); + HRESULT Query([in] GLOBALOPT_PROPERTIES property, [out ] ULONG_PTR *value); +} cpp_quote("#ifdef USE_COM_CONTEXT_DEF")

1 0

Andrew Talbot : gdiplus: Remove superfluous braces.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: f8da0d3a1efeaf066122b042c94593d5be4f7a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8da0d3a1efeaf066122b042c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 27 22:22:16 2012 +0000 gdiplus: Remove superfluous braces. --- dlls/gdiplus/graphicspath.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index ca96bda..1fbebba 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1724,7 +1724,6 @@ static void widen_joint(const GpPointF *p1, const GpPointF *p2, const GpPointF * { case LineJoinMiter: case LineJoinMiterClipped: - { if ((p2->X - p1->X) * (p3->Y - p1->Y) > (p2->Y - p1->Y) * (p3->X - p1->X)) { float distance = pen->width/2.0; @@ -1752,7 +1751,6 @@ static void widen_joint(const GpPointF *p1, const GpPointF *p2, const GpPointF * /* else fall-through */ } /* else fall-through */ - } default: case LineJoinBevel: add_bevel_point(p2, p1, pen, 1, last_point);

1 0

Andrew Talbot : netapi32: Remove unused variable.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 9205f02ac589681cb53b8ead56a08550811aa920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9205f02ac589681cb53b8ead5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 27 22:22:19 2012 +0000 netapi32: Remove unused variable. --- dlls/netapi32/netapi32.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index f6c6d20..a24320c 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -25,8 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(netbios); -static HMODULE NETAPI32_hModule; - BOOL NETAPI_IsLocalComputer(LMCSTR ServerName); BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -37,7 +35,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: { DisableThreadLibraryCalls(hinstDLL); - NETAPI32_hModule = hinstDLL; NetBIOSInit(); NetBTInit(); break;

1 0

Andrew Talbot : sensapi: Remove unused variable.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: c562b0e1488c3fe36c8e09122486e22a365db610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c562b0e1488c3fe36c8e09122… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 27 22:22:22 2012 +0000 sensapi: Remove unused variable. --- dlls/sensapi/sensapi.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/sensapi/sensapi.c b/dlls/sensapi/sensapi.c index 86e4a92..75d07a8 100644 --- a/dlls/sensapi/sensapi.c +++ b/dlls/sensapi/sensapi.c @@ -44,8 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(sensapi); -static HMODULE SENSAPI_hModule; - BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); @@ -54,7 +52,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: { DisableThreadLibraryCalls(hinstDLL); - SENSAPI_hModule = hinstDLL; break; } case DLL_PROCESS_DETACH:

1 0

Andrew Talbot : wineps.drv: Remove unused variable.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 393514c11941f8425936eaea506831d466e6bd7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=393514c11941f8425936eaea5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 27 22:22:24 2012 +0000 wineps.drv: Remove unused variable. --- dlls/wineps.drv/driver.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 358f088..70ee2b0 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -333,7 +333,6 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, } -static void (WINAPI *pInitCommonControls) (void); static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPage) (LPCPROPSHEETPAGEW); static int (WINAPI *pPropertySheet) (LPCPROPSHEETHEADERW); @@ -456,8 +455,6 @@ INT PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput, static const WCHAR SetupW[] = {'S','e','t','u','p','\0'}; hinstComctl32 = LoadLibraryA("comctl32.dll"); - pInitCommonControls = (void*)GetProcAddress(hinstComctl32, - "InitCommonControls"); pCreatePropertySheetPage = (void*)GetProcAddress(hinstComctl32, "CreatePropertySheetPageW"); pPropertySheet = (void*)GetProcAddress(hinstComctl32, "PropertySheetW");

1 0

Piotr Caban : msvcp60: Added seekoff exports.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: ca88f3624d38cf74747bb5990f02b7725836c7fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca88f3624d38cf74747bb5990… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 27 21:16:05 2012 +0000 msvcp60: Added seekoff exports. --- dlls/msvcp60/ios.c | 34 ++++++++++++++-------------------- dlls/msvcp60/msvcp60.spec | 28 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca88f3624d38cf74747bb…

1 0

Piotr Caban : msvcp60: Added basic_filebuf<short>::_Initcvt export.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: dea74b4da36dfe37d2eb54debdcad724ecd00e0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dea74b4da36dfe37d2eb54deb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 27 21:15:48 2012 +0000 msvcp60: Added basic_filebuf<short>::_Initcvt export. --- dlls/msvcp60/msvcp60.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index e8f2ccc..ec7380d 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2285,8 +2285,8 @@ @ extern ?_Init_cnt@_Winit@std@@0HA _Winit__Init_cnt @ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXXZ(ptr) basic_filebuf_char__Initcvt @ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IEAAXXZ(ptr) basic_filebuf_char__Initcvt -@ stub -arch=win32 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXXZ -@ stub -arch=win64 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IEAAXXZ +@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXXZ(ptr) basic_filebuf_wchar__Initcvt +@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IEAAXXZ(ptr) basic_filebuf_wchar__Initcvt @ stub -arch=win32 ?_Iput@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AAVios_base@2@DPADI@Z @ stub -arch=win64 ?_Iput@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AEAVios_base@2@DPEAD_K@Z @ stub -arch=win32 ?_Iput@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@GU?$char_traits@G@std@@@2@V32@AAVios_base@2@GPADI@Z

1 0

Piotr Caban : msvcp60: Added locale::Iscloc implementation.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 81853405b12ad0125c678a8894bf08615c36fc62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81853405b12ad0125c678a889… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 27 21:12:19 2012 +0000 msvcp60: Added locale::Iscloc implementation. --- dlls/msvcp60/locale.c | 9 +++++++++ dlls/msvcp60/msvcp60.spec | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index d6bd542..2517326 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -7396,6 +7396,15 @@ locale__Locimp* __cdecl locale__Init(void) return global_locale; } +/* ?_Iscloc@locale@std@@QBE_NXZ */ +/* ?_Iscloc@locale@std@@QEBA_NXZ */ +DEFINE_THISCALL_WRAPPER(locale__Iscloc, 4) +MSVCP_bool __thiscall locale__Iscloc(const locale *this) +{ + TRACE("(%p)\n", this); + return this->ptr == locale__Locimp__Clocptr; +} + /* ??0locale@std@@QAE@ABV01@0H@Z */ /* ??0locale@std@@QEAA@AEBV01@0H@Z */ DEFINE_THISCALL_WRAPPER(locale_ctor_locale_locale, 16) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 6e8bddd..e8f2ccc 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2291,8 +2291,8 @@ @ stub -arch=win64 ?_Iput@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AEAVios_base@2@DPEAD_K@Z @ stub -arch=win32 ?_Iput@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@GU?$char_traits@G@std@@@2@V32@AAVios_base@2@GPADI@Z @ stub -arch=win64 ?_Iput@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@GU?$char_traits@G@std@@@2@V32@AEAVios_base@2@GPEAD_K@Z -@ stub -arch=win32 ?_Iscloc@locale@std@@QBE_NXZ -@ stub -arch=win64 ?_Iscloc@locale@std@@QEBA_NXZ +@ thiscall -arch=win32 ?_Iscloc@locale@std@@QBE_NXZ(ptr) locale__Iscloc +@ cdecl -arch=win64 ?_Iscloc@locale@std@@QEBA_NXZ(ptr) locale__Iscloc @ stub ?_Isinf@?$_Ctr@M@std@@SA_NM@Z @ stub ?_Isinf@?$_Ctr@N@std@@SA_NN@Z @ stub ?_Isinf@?$_Ctr@O@std@@SA_NO@Z

1 0

Piotr Caban : msvcp60: Added locale::_Getfacet export.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 08280758dd84a7bfac239371896201b65c0b06ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=08280758dd84a7bfac2393718… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 27 21:12:04 2012 +0000 msvcp60: Added locale::_Getfacet export. --- dlls/msvcp60/locale.c | 42 ++++++++++++++++++++++-------------------- dlls/msvcp60/msvcp60.spec | 4 ++-- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index f225b4d..d6bd542 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -42,7 +42,7 @@ char* __cdecl _Getmonths(void); void* __cdecl _Gettnames(void); unsigned int __cdecl ___lc_codepage_func(void); LCID* __cdecl ___lc_handle_func(void); -static const locale_facet* locale__Getfacet(const locale*, MSVCP_size_t); +const locale_facet* __thiscall locale__Getfacet(const locale*, MSVCP_size_t, MSVCP_bool); typedef int category; @@ -1318,7 +1318,7 @@ ctype_char* ctype_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_char_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_char_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (ctype_char*)fac; @@ -1965,7 +1965,7 @@ ctype_wchar* ctype_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_wchar_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_wchar_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (ctype_wchar*)fac; @@ -1993,7 +1993,7 @@ ctype_wchar* ctype_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_short_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&ctype_short_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (ctype_wchar*)fac; @@ -2460,7 +2460,7 @@ codecvt_char* codecvt_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_char_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_char_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (codecvt_char*)fac; @@ -2698,7 +2698,7 @@ static codecvt_wchar* codecvt_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_wchar_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_wchar_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (codecvt_wchar*)fac; @@ -2750,7 +2750,7 @@ codecvt_wchar* codecvt_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_short_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&codecvt_short_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (codecvt_wchar*)fac; @@ -3120,7 +3120,7 @@ static numpunct_char* numpunct_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_char_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_char_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (numpunct_char*)fac; @@ -3456,7 +3456,7 @@ static numpunct_wchar* numpunct_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_wchar_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_wchar_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (numpunct_wchar*)fac; @@ -3504,7 +3504,7 @@ static numpunct_wchar* numpunct_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_short_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&numpunct_short_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (numpunct_wchar*)fac; @@ -3866,7 +3866,7 @@ static num_get* num_get_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_wchar_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_wchar_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_get*)fac; @@ -3906,7 +3906,7 @@ num_get* num_get_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_short_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_short_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_get*)fac; @@ -4878,7 +4878,7 @@ num_get* num_get_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_char_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_get_char_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_get*)fac; @@ -5632,7 +5632,7 @@ num_put* num_put_char_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_char_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_char_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_put*)fac; @@ -6242,7 +6242,7 @@ static num_put* num_put_wchar_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_wchar_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_wchar_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_put*)fac; @@ -6270,7 +6270,7 @@ num_put* num_put_short_use_facet(const locale *loc) const locale_facet *fac; _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); - fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_short_id)); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&num_put_short_id), TRUE); if(fac) { _Lockit_dtor(&lock); return (num_put*)fac; @@ -7559,16 +7559,18 @@ locale* __thiscall locale__Addfac(locale *this, locale_facet *facet, MSVCP_size_ return this; } -/* ?_Getfacet@locale@std@@QBEPBVfacet@12@I@Z */ -/* ?_Getfacet@locale@std@@QEBAPEBVfacet@12@_K@Z */ -static const locale_facet* locale__Getfacet(const locale *this, MSVCP_size_t id) +/* ?_Getfacet@locale@std@@QBEPBVfacet@12@I_N@Z */ +/* ?_Getfacet@locale@std@@QEBAPEBVfacet@12@_K_N@Z */ +DEFINE_THISCALL_WRAPPER(locale__Getfacet, 12) +const locale_facet* __thiscall locale__Getfacet(const locale *this, + MSVCP_size_t id, MSVCP_bool allow_transparent) { locale_facet *fac; TRACE("(%p %lu)\n", this, id); fac = id < this->ptr->facet_cnt ? this->ptr->facetvec[id] : NULL; - if(fac || !this->ptr->transparent) + if(fac || !this->ptr->transparent || !allow_transparent) return fac; return id < global_locale->facet_cnt ? global_locale->facetvec[id] : NULL; diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 121cf11..6e8bddd 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2148,8 +2148,8 @@ @ cdecl -arch=win64 ?_Getcvt@_Locinfo@std@@QEBA?AU_Cvtvec@@XZ(ptr ptr) _Locinfo__Getcvt @ thiscall -arch=win32 ?_Getdays@_Locinfo@std@@QBEPBDXZ(ptr) _Locinfo__Getdays @ cdecl -arch=win64 ?_Getdays@_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Getdays -@ stub -arch=win32 ?_Getfacet@locale@std@@QBEPBVfacet@12@I_N@Z -@ stub -arch=win64 ?_Getfacet@locale@std@@QEBAPEBVfacet@12@_K_N@Z +@ thiscall -arch=win32 ?_Getfacet@locale@std@@QBEPBVfacet@12@I_N@Z(ptr long long) locale__Getfacet +@ cdecl -arch=win64 ?_Getfacet@locale@std@@QEBAPEBVfacet@12@_K_N@Z(ptr long long) locale__Getfacet @ thiscall -arch=win32 ?_Getfalse@_Locinfo@std@@QBEPBDXZ(ptr) _Locinfo__Getfalse @ cdecl -arch=win64 ?_Getfalse@_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Getfalse @ stub -arch=win32 ?_Getffld@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@CAHPADAAV?$istreambuf_iterator@DU?$char_traits@D@std@@@2@1ABVlocale@2@@Z

1 0

Piotr Caban : msvcp60: Added locale::_Locimp::_Global export.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 200cb7d3ac19fb1b1105228e1508471691c5d3d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=200cb7d3ac19fb1b1105228e1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 27 21:11:47 2012 +0000 msvcp60: Added locale::_Locimp::_Global export. --- dlls/msvcp60/locale.c | 5 ++++- dlls/msvcp60/msvcp60.spec | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 9b71334..f225b4d 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -98,9 +98,12 @@ typedef struct { /* ?_Id_cnt@id@locale@std@@0HA */ int locale_id__Id_cnt = 0; -static locale__Locimp *global_locale; static locale classic_locale; +/* ?_Global@_Locimp@locale@std@@0PAV123@A */ +/* ?_Global@_Locimp@locale@std@@0PEAV123@EA */ +locale__Locimp *global_locale = NULL; + /* ?_Clocptr@_Locimp@locale@std@@0PAV123@A */ /* ?_Clocptr@_Locimp@locale@std@@0PEAV123@EA */ locale__Locimp *locale__Locimp__Clocptr = NULL; diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 27cae4b..121cf11 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2184,8 +2184,8 @@ @ cdecl -arch=win64 ?_Gettrue@_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Gettrue @ stub -arch=win32 ?_Getyes@_Locinfo@std@@QBEPBDXZ @ stub -arch=win64 ?_Getyes@_Locinfo@std@@QEBAPEBDXZ -# extern -arch=win32 ?_Global@_Locimp@locale@std@@0PAV123@A -# extern -arch=win64 ?_Global@_Locimp@locale@std@@0PEAV123@EA +@ extern -arch=win32 ?_Global@_Locimp@locale@std@@0PAV123@A global_locale +@ extern -arch=win64 ?_Global@_Locimp@locale@std@@0PEAV123@EA global_locale @ thiscall -arch=win32 ?_Gndec@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IAEPADXZ(ptr) basic_streambuf_char__Gndec @ cdecl -arch=win64 ?_Gndec@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IEAAPEADXZ(ptr) basic_streambuf_char__Gndec @ thiscall -arch=win32 ?_Gndec@?$basic_streambuf@GU?$char_traits@G@std@@@std@@IAEPAGXZ(ptr) basic_streambuf_wchar__Gndec

1 0

Piotr Caban : msvcp60: Forward bad_cast functions to msvcrt.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: e6e0da609da495e739f5123d5bb3bb8327c13b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6e0da609da495e739f5123d5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 27 21:11:22 2012 +0000 msvcp60: Forward bad_cast functions to msvcrt. --- dlls/msvcp60/exception.c | 2 ++ dlls/msvcp60/msvcp60.spec | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/msvcp60/exception.c b/dlls/msvcp60/exception.c index b8c6921..1dcce4e 100644 --- a/dlls/msvcp60/exception.c +++ b/dlls/msvcp60/exception.c @@ -149,6 +149,8 @@ DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor) /* ?_Doraise@out_of_range@std@@MEBAXXZ */ /* ?_Doraise@runtime_error@std@@MBEXXZ */ /* ?_Doraise@runtime_error@std@@MEBAXXZ */ +/* ?_Doraise@bad_cast@std@@MBEXXZ */ +/* ?_Doraise@bad_cast@std@@MEBAXXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_exception__Doraise, 4) void __thiscall MSVCP_exception__Doraise(exception *this) { diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 137f09c..27cae4b 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -845,10 +845,10 @@ @ cdecl -arch=win64 ??0bad_alloc@std@@QEAA@PEBD@Z(ptr str) MSVCP_bad_alloc_ctor @ thiscall -arch=win32 ??0bad_alloc@std@@QAE@XZ(ptr) MSVCP_bad_alloc_default_ctor @ cdecl -arch=win64 ??0bad_alloc@std@@QEAA@XZ(ptr) MSVCP_bad_alloc_default_ctor -@ stub -arch=win32 ??0bad_cast@std@@QAE@ABV01@@Z -@ stub -arch=win64 ??0bad_cast@std@@QEAA@AEBV01@@Z -@ stub -arch=win32 ??0bad_cast@std@@QAE@PBD@Z -@ stub -arch=win64 ??0bad_cast@std@@QEAA@PEBD@Z +@ thiscall -arch=win32 ??0bad_cast@std@@QAE@ABV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QAE@ABV0@@Z +@ cdecl -arch=win64 ??0bad_cast@std@@QEAA@AEBV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QEAA@AEBV0@@Z +@ thiscall -arch=win32 ??0bad_cast@std@@QAE@PBD@Z(ptr str) msvcrt.??0bad_cast@@QAE@PBD@Z +@ cdecl -arch=win64 ??0bad_cast@std@@QEAA@PEBD@Z(ptr str) msvcrt.??0bad_cast@@QEAA@PEBD@Z @ stub -arch=win32 ??0bad_exception@std@@QAE@ABV01@@Z @ stub -arch=win64 ??0bad_exception@std@@QEAA@AEBV01@@Z @ stub -arch=win32 ??0bad_exception@std@@QAE@PBD@Z @@ -1049,8 +1049,8 @@ @ stub -arch=win64 ??1__non_rtti_object@std@@UEAA@XZ @ thiscall -arch=win32 ??1bad_alloc@std@@UAE@XZ(ptr) MSVCP_bad_alloc_dtor @ cdecl -arch=win64 ??1bad_alloc@std@@UEAA@XZ(ptr) MSVCP_bad_alloc_dtor -@ stub -arch=win32 ??1bad_cast@std@@UAE@XZ -@ stub -arch=win64 ??1bad_cast@std@@UEAA@XZ +@ thiscall -arch=win32 ??1bad_cast@std@@UAE@XZ(ptr) msvcrt.??1bad_cast@@UAE@XZ +@ cdecl -arch=win64 ??1bad_cast@std@@UEAA@XZ(ptr) msvcrt.??1bad_cast@@UEAA@XZ @ stub -arch=win32 ??1bad_exception@std@@UAE@XZ @ stub -arch=win64 ??1bad_exception@std@@UEAA@XZ @ stub -arch=win32 ??1bad_typeid@std@@UAE@XZ @@ -1235,8 +1235,8 @@ @ stub -arch=win64 ??4__non_rtti_object@std@@QEAAAEAV01@AEBV01@@Z @ thiscall -arch=win32 ??4bad_alloc@std@@QAEAAV01@ABV01@@Z(ptr ptr) MSVCP_bad_alloc_assign @ cdecl -arch=win64 ??4bad_alloc@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) MSVCP_bad_alloc_assign -@ stub -arch=win32 ??4bad_cast@std@@QAEAAV01@ABV01@@Z -@ stub -arch=win64 ??4bad_cast@std@@QEAAAEAV01@AEBV01@@Z +@ thiscall -arch=win32 ??4bad_cast@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QAEAAV0@ABV0@@Z +@ cdecl -arch=win64 ??4bad_cast@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QEAAAEAV0@AEBV0@@Z @ stub -arch=win32 ??4bad_exception@std@@QAEAAV01@ABV01@@Z @ stub -arch=win64 ??4bad_exception@std@@QEAAAEAV01@AEBV01@@Z @ stub -arch=win32 ??4bad_typeid@std@@QAEAAV01@ABV01@@Z @@ -1815,7 +1815,7 @@ # extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ # extern ??_7__non_rtti_object@std@@6B@ @ extern ??_7bad_alloc@std@@6B@ MSVCP_bad_alloc_vtable -# extern ??_7bad_cast@std@@6B@ +@ extern ??_7bad_cast@std@@6B@ msvcrt.??_7bad_cast@@6B@ # extern ??_7bad_exception@std@@6B@ # extern ??_7bad_typeid@std@@6B@ @ extern ??_7codecvt_base@std@@6B@ MSVCP_codecvt_base_vtable @@ -1979,8 +1979,8 @@ @ cdecl -arch=win64 ??_F_Locinfo@std@@QEAAXXZ(ptr) _Locinfo_ctor @ thiscall -arch=win32 ??_F_Timevec@std@@QAEXXZ(ptr) _Timevec_ctor @ cdecl -arch=win64 ??_F_Timevec@std@@QEAAXXZ(ptr) _Timevec_ctor -@ stub -arch=win32 ??_Fbad_cast@std@@QAEXXZ -@ stub -arch=win64 ??_Fbad_cast@std@@QEAAXXZ +@ thiscall -arch=win32 ??_Fbad_cast@std@@QAEXXZ(ptr) msvcrt.??_Fbad_cast@@QAEXXZ +@ cdecl -arch=win64 ??_Fbad_cast@std@@QEAAXXZ(ptr) msvcrt.??_Fbad_cast@@QEAAXXZ @ stub -arch=win32 ??_Fbad_exception@std@@QAEXXZ @ stub -arch=win64 ??_Fbad_exception@std@@QEAAXXZ @ stub -arch=win32 ??_Fbad_typeid@std@@QAEXXZ @@ -2029,8 +2029,8 @@ @ cdecl -arch=win64 ?_Decref@facet@locale@std@@QEAAPEAV123@XZ(ptr) locale_facet__Decref @ thiscall -arch=win32 ?_Doraise@bad_alloc@std@@MBEXXZ(ptr) MSVCP_exception__Doraise @ cdecl -arch=win64 ?_Doraise@bad_alloc@std@@MEBAXXZ(ptr) MSVCP_exception__Doraise -@ stub -arch=win32 ?_Doraise@bad_cast@std@@MBEXXZ -@ stub -arch=win64 ?_Doraise@bad_cast@std@@MEBAXXZ +@ thiscall -arch=win32 ?_Doraise@bad_cast@std@@MBEXXZ(ptr) MSVCP_exception__Doraise +@ cdecl -arch=win64 ?_Doraise@bad_cast@std@@MEBAXXZ(ptr) MSVCP_exception__Doraise @ stub -arch=win32 ?_Doraise@bad_exception@std@@MBEXXZ @ stub -arch=win64 ?_Doraise@bad_exception@std@@MEBAXXZ @ stub -arch=win32 ?_Doraise@bad_typeid@std@@MBEXXZ

1 0

Henri Verbeet : d3d10core/tests: Use the correct enum in test_create_shader_resource_view().
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 7c722bea2866b274c47f97006de937934273fc5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c722bea2866b274c47f97006… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 27 22:11:00 2012 +0100 d3d10core/tests: Use the correct enum in test_create_shader_resource_view(). --- dlls/d3d10core/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 0dd96f1..a0df22a 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -383,7 +383,7 @@ static void test_create_shader_resource_view(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; - srv_desc.ViewDimension = D3D10_RTV_DIMENSION_BUFFER; + srv_desc.ViewDimension = D3D10_SRV_DIMENSION_BUFFER; U(srv_desc).Buffer.ElementOffset = 0; U(srv_desc).Buffer.ElementWidth = 64;

1 0

← Newer
1
2
3
4
5
6
7
...
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