wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Dmitry Timoshkov : windowscodecs: Add a NULL check to GetFrameCount of the BMP decoder.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: afd1ddbe0d34ea2ab2bd9867aedf3e1cf9f41f8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=afd1ddbe0d34ea2ab2bd9867a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 23 11:47:35 2012 +0800 windowscodecs: Add a NULL check to GetFrameCount of the BMP decoder. --- dlls/windowscodecs/bmpdecode.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 7b3f82d..54de0f1 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -1113,6 +1113,8 @@ static HRESULT WINAPI BmpDecoder_GetThumbnail(IWICBitmapDecoder *iface, static HRESULT WINAPI BmpDecoder_GetFrameCount(IWICBitmapDecoder *iface, UINT *pCount) { + if (!pCount) return E_INVALIDARG; + *pCount = 1; return S_OK; }

1 0

Alexandre Julliard : gdi32: Fully reset the DC state before deleting it.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: 4ad528749641dd42859f4adfcc4cd0f85ab35f27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad528749641dd42859f4adfc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 27 13:24:18 2012 +0100 gdi32: Fully reset the DC state before deleting it. --- dlls/gdi32/dc.c | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index b59c154..5df55bc 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -815,21 +815,7 @@ BOOL WINAPI DeleteDC( HDC hdc ) release_dc_ptr( dc ); return TRUE; } - - while (dc->saveLevel) - { - DC *dcs = dc->saved_dc; - dc->saved_dc = dcs->saved_dc; - dc->saveLevel--; - free_dc_state( dcs ); - } - - AbortPath( hdc ); - SelectObject( hdc, GetStockObject(BLACK_PEN) ); - SelectObject( hdc, GetStockObject(WHITE_BRUSH) ); - SelectObject( hdc, GetStockObject(SYSTEM_FONT) ); - SelectObject( hdc, GetStockObject(DEFAULT_BITMAP) ); - + reset_dc_state( hdc ); free_dc_ptr( dc ); return TRUE; }

1 0

Alexandre Julliard : server: Don't expose the desktop on window resizes.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: 6c94d4466ac575c0b703c9c2000208d40251de4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c94d4466ac575c0b703c9c20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 27 16:51:46 2012 +0100 server: Don't expose the desktop on window resizes. --- server/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/window.c b/server/window.c index fc40d55..a460a7c 100644 --- a/server/window.c +++ b/server/window.c @@ -1581,7 +1581,7 @@ static struct region *expose_window( struct window *win, const rectangle_t *old_ } } - if (win->parent) + if (win->parent && !is_desktop_window( win->parent )) { /* make it relative to the old window pos for subtracting */ offset_region( new_vis_rgn, win->window_rect.left - old_window_rect->left,

1 0

Jacek Caban : mshtml: Use UTF-8 encoding in is_gecko_path.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: fbeb1b4acf1fe33cbaa1b2fe5d5d3849d697cb31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbeb1b4acf1fe33cbaa1b2fe5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 27 14:53:29 2012 +0100 mshtml: Use UTF-8 encoding in is_gecko_path. --- dlls/mshtml/nsembed.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 5593c6b..109b6ad 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1100,8 +1100,8 @@ BOOL is_gecko_path(const char *path) WCHAR *buf, *ptr; BOOL ret; - buf = heap_strdupAtoW(path); - if(strlenW(buf) < gecko_path_len) + buf = heap_strdupUtoW(path); + if(!buf || strlenW(buf) < gecko_path_len) return FALSE; buf[gecko_path_len] = 0;

1 0

Jacek Caban : jscript: Fixed some Coverity issues.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: ac41380b944e8409961a65c146f925bd2e056cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac41380b944e8409961a65c14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 27 12:29:06 2012 +0100 jscript: Fixed some Coverity issues. --- dlls/jscript/array.c | 2 +- dlls/jscript/compile.c | 2 ++ dlls/jscript/dispex.c | 1 + 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index e255880..fef37e6 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -325,7 +325,7 @@ static HRESULT array_join(script_ctx_t *ctx, jsdisp_t *array, DWORD length, cons TRACE("= %s\n", debugstr_jsstr(ret)); if(r) - *r = ret ? jsval_string(ret) : jsval_string(jsstr_empty()); + *r = jsval_string(ret); else jsstr_release(ret); return S_OK; diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 2e18c50..501c340 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1395,6 +1395,8 @@ static HRESULT compile_continue_statement(compiler_ctx_t *ctx, branch_statement_ WARN("Label is not a loop\n"); return JS_E_INVALID_CONTINUE; } + + assert(pop_ctx != NULL); }else { for(pop_ctx = ctx->stat_ctx; pop_ctx; pop_ctx = pop_ctx->next) { if(pop_ctx->continue_label) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 8bc4d1d..4eda704 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -454,6 +454,7 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val, IServi vdisp_release(&vthis); return hres; } + /* fall through */ case PROP_PROTREF: prop->type = PROP_JSVAL; prop->flags = PROPF_ENUM;

1 0

Jacek Caban : mshtml: Fixed a few coverity issues.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: df53b501714089f30626664a0daa226c0e80a3aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=df53b501714089f30626664a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 27 12:16:34 2012 +0100 mshtml: Fixed a few coverity issues. --- dlls/mshtml/navigate.c | 16 ++++++++-------- dlls/mshtml/nsembed.c | 1 + dlls/mshtml/nsio.c | 12 +++++++++--- dlls/mshtml/pluginhost.c | 4 +++- dlls/mshtml/protocol.c | 9 +++++++-- 5 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 346524d..fb4f1e8 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -800,15 +800,16 @@ HRESULT start_binding(HTMLInnerWindow *inner_window, BSCallback *bscallback, IBi /* NOTE: IE7 calls IsSystemMoniker here*/ if(bctx) { - RegisterBindStatusCallback(bctx, &bscallback->IBindStatusCallback_iface, NULL, 0); - IBindCtx_AddRef(bctx); + hres = RegisterBindStatusCallback(bctx, &bscallback->IBindStatusCallback_iface, NULL, 0); + if(SUCCEEDED(hres)) + IBindCtx_AddRef(bctx); }else { hres = CreateAsyncBindCtx(0, &bscallback->IBindStatusCallback_iface, NULL, &bctx); - if(FAILED(hres)) { - WARN("CreateAsyncBindCtx failed: %08x\n", hres); - bscallback->vtbl->stop_binding(bscallback, hres); - return hres; - } + } + + if(FAILED(hres)) { + bscallback->vtbl->stop_binding(bscallback, hres); + return hres; } hres = IMoniker_BindToStorage(bscallback->mon, bctx, NULL, &IID_IStream, (void**)&str); @@ -1473,7 +1474,6 @@ static void handle_navigation_error(nsChannelBSC *This, DWORD result) return; if(!doc->client_cmdtrg) - if(FAILED(hres)) return; bound.lLbound = 0; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index c93673a..5593c6b 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -280,6 +280,7 @@ static nsresult NSAPI nsDirectoryServiceProvider2_GetFile(nsIDirectoryServicePro return nsres; } + assert(profile_directory != NULL); return nsIFile_Clone(profile_directory, _retval); } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 89a7fe8..c8bbdd8 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1042,10 +1042,16 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen return NS_ERROR_FAILURE; if(TRACE_ON(mshtml)) { + HRESULT hres; BSTR uri_str; - IUri_GetDisplayUri(This->uri->uri, &uri_str); - TRACE("opening %s\n", debugstr_w(uri_str)); - SysFreeString(uri_str); + + hres = IUri_GetDisplayUri(This->uri->uri, &uri_str); + if(SUCCEEDED(hres)) { + TRACE("opening %s\n", debugstr_w(uri_str)); + SysFreeString(uri_str); + }else { + WARN("GetDisplayUri failed: %08x\n", hres); + } } if(This->uri->is_doc_uri) { diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 4f088ad..38a8fd5 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -1301,8 +1301,10 @@ static HRESULT WINAPI PHInPlaceSite_GetWindowContext(IOleInPlaceSiteEx *iface, return hres; hres = create_ip_window(ppDoc); - if(FAILED(hres)) + if(FAILED(hres)) { + IOleInPlaceFrame_Release(ip_frame); return hres; + } *ppFrame = ip_frame; *lprcPosRect = This->rect; diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index d9a008c..021ce55 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -218,6 +218,7 @@ static HRESULT WINAPI AboutProtocol_Start(IInternetProtocol *iface, LPCWSTR szUr LPCWSTR text = NULL; DWORD data_len; BYTE *data; + HRESULT hres; static const WCHAR html_begin[] = {0xfeff,'<','H','T','M','L','>',0}; static const WCHAR html_end[] = {'<','/','H','T','M','L','>',0}; @@ -237,7 +238,9 @@ static HRESULT WINAPI AboutProtocol_Start(IInternetProtocol *iface, LPCWSTR szUr memset(&bindinfo, 0, sizeof(bindinfo)); bindinfo.cbSize = sizeof(BINDINFO); - IInternetBindInfo_GetBindInfo(pOIBindInfo, &grfBINDF, &bindinfo); + hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &grfBINDF, &bindinfo); + if(FAILED(hres)) + return hres; ReleaseBindInfo(&bindinfo); TRACE("bindf %x\n", grfBINDF); @@ -605,7 +608,9 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, memset(&bindinfo, 0, sizeof(bindinfo)); bindinfo.cbSize = sizeof(BINDINFO); - IInternetBindInfo_GetBindInfo(pOIBindInfo, &grfBINDF, &bindinfo); + hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &grfBINDF, &bindinfo); + if(FAILED(hres)) + return hres; ReleaseBindInfo(&bindinfo); len = strlenW(szUrl)+16;

1 0

Huw Davies : oledb32: Add a 'fall through' comment.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: 71d185d7fe29944a51b43497860866ba8552b683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d185d7fe29944a51b434978… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 27 10:24:47 2012 +0000 oledb32: Add a 'fall through' comment. --- dlls/oledb32/convert.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 1691792..badb899 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -870,6 +870,7 @@ static HRESULT WINAPI convert_CanConvert(IDataConvert* iface, case DBTYPE_BOOL: if(dst_base_type == DBTYPE_DATE) return S_OK; + /* fall through */ case DBTYPE_NUMERIC: case DBTYPE_CY: if(common_class(dst_class)) return S_OK;

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

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

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

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 : 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: Move document loading from stream to a separate function.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: b296b08a5c383a1f80484e49e1821f1f96d9119a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b296b08a5c383a1f80484e49e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 26 23:07:24 2012 -0500 msxml3: Move document loading from stream to a separate function. --- dlls/msxml3/domdoc.c | 49 ++++++++++++++++++++++++++++++------------------- 1 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index d1e0ebb..16fc64c 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -718,46 +718,45 @@ static HRESULT WINAPI PersistStreamInit_IsDirty( return S_FALSE; } -static HRESULT WINAPI PersistStreamInit_Load( - IPersistStreamInit *iface, LPSTREAM pStm) +static HRESULT domdoc_load_from_stream(domdoc *doc, ISequentialStream *stream) { - domdoc *This = impl_from_IPersistStreamInit(iface); - HRESULT hr; - HGLOBAL hglobal; DWORD read, written, len; + xmlDocPtr xmldoc = NULL; + HGLOBAL hglobal; BYTE buf[4096]; + HRESULT hr; char *ptr; - xmlDocPtr xmldoc = NULL; - - TRACE("(%p)->(%p)\n", This, pStm); - if (!pStm) - return E_INVALIDARG; + if (doc->stream) + { + IStream_Release(doc->stream); + doc->stream = NULL; + } - hr = CreateStreamOnHGlobal(NULL, TRUE, &This->stream); + hr = CreateStreamOnHGlobal(NULL, TRUE, &doc->stream); if (FAILED(hr)) return hr; do { - IStream_Read(pStm, buf, sizeof(buf), &read); - hr = IStream_Write(This->stream, buf, read, &written); + ISequentialStream_Read(stream, buf, sizeof(buf), &read); + hr = IStream_Write(doc->stream, buf, read, &written); } while(SUCCEEDED(hr) && written != 0 && read != 0); if (FAILED(hr)) { - ERR("Failed to copy stream\n"); + ERR("failed to copy stream 0x%08x\n", hr); return hr; } - hr = GetHGlobalFromStream(This->stream, &hglobal); + hr = GetHGlobalFromStream(doc->stream, &hglobal); if (FAILED(hr)) return hr; len = GlobalSize(hglobal); ptr = GlobalLock(hglobal); - if (len != 0) - xmldoc = doparse(This, ptr, len, XML_CHAR_ENCODING_NONE); + if (len) + xmldoc = doparse(doc, ptr, len, XML_CHAR_ENCODING_NONE); GlobalUnlock(hglobal); if (!xmldoc) @@ -768,7 +767,19 @@ static HRESULT WINAPI PersistStreamInit_Load( xmldoc->_private = create_priv(); - return attach_xmldoc(This, xmldoc); + return attach_xmldoc(doc, xmldoc); +} + +static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream *stream) +{ + domdoc *This = impl_from_IPersistStreamInit(iface); + + TRACE("(%p)->(%p)\n", This, stream); + + if (!stream) + return E_INVALIDARG; + + return domdoc_load_from_stream(This, (ISequentialStream*)stream); } static HRESULT WINAPI PersistStreamInit_Save( @@ -2140,7 +2151,7 @@ static HRESULT WINAPI domdoc_load( else { /* ISequentialStream */ - FIXME("Unknown type not supported (%d) (%p)(%p)\n", hr, pNewDoc, V_UNKNOWN(&source)->lpVtbl); + FIXME("Unknown type not supported (0x%08x) (%p)(%p)\n", hr, pNewDoc, V_UNKNOWN(&source)->lpVtbl); } break; default:

1 0

Maarten Lankhorst : dsound: Set dwChannelMask when limiting channels.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: 79084be3c176e169d4f45391a7a566867c9c8f7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=79084be3c176e169d4f45391a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 26 17:02:06 2012 +0100 dsound: Set dwChannelMask when limiting channels. --- dlls/dsound/primary.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index bf76dec..bc72d78 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -80,6 +80,7 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client mixwfe->Format.nChannels = 2; mixwfe->Format.nBlockAlign = mixwfe->Format.nChannels * mixwfe->Format.wBitsPerSample / 8; mixwfe->Format.nAvgBytesPerSec = mixwfe->Format.nSamplesPerSec * mixwfe->Format.nBlockAlign; + mixwfe->dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; } if (!IsEqualGUID(&mixwfe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)) {

1 0

Piotr Caban : msvcp100: Added _Container_base12 class tests.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: 642e9a1eda90f8011eb1f5d841874ab79c1cd718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=642e9a1eda90f8011eb1f5d84… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 26 22:33:35 2012 +0000 msvcp100: Added _Container_base12 class tests. --- dlls/msvcp100/tests/Makefile.in | 1 + dlls/msvcp100/tests/misc.c | 194 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 195 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp100/tests/Makefile.in b/dlls/msvcp100/tests/Makefile.in index fe92d54..2bf01e0 100644 --- a/dlls/msvcp100/tests/Makefile.in +++ b/dlls/msvcp100/tests/Makefile.in @@ -4,6 +4,7 @@ MODCFLAGS = @BUILTINFLAG@ EXTRAINCL = -I$(top_srcdir)/include/msvcrt C_SRCS = \ + misc.c \ string.c @MAKE_TEST_RULES@ diff --git a/dlls/msvcp100/tests/misc.c b/dlls/msvcp100/tests/misc.c new file mode 100644 index 0000000..89933d0 --- /dev/null +++ b/dlls/msvcp100/tests/misc.c @@ -0,0 +1,194 @@ +/* + * Copyright 2012 Piotr Caban 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 + */ + +#include <stdio.h> + +#include <windef.h> +#include <winbase.h> +#include "wine/test.h" + +struct __Container_proxy; + +typedef struct { + struct __Container_proxy *proxy; +} _Container_base12; + +typedef struct __Iterator_base12 { + struct __Container_proxy *proxy; + struct __Iterator_base12 *next; +} _Iterator_base12; + +typedef struct __Container_proxy { + const _Container_base12 *cont; + _Iterator_base12 *head; +} _Container_proxy; + +#undef __thiscall +#ifdef __i386__ +#define __thiscall __stdcall +#else +#define __thiscall __cdecl +#endif + +static _Container_base12* (__thiscall *p__Container_base12_copy_ctor)(_Container_base12*, _Container_base12*); +static _Container_base12* (__thiscall *p__Container_base12_ctor)(_Container_base12*); +static void (__thiscall *p__Container_base12__Orphan_all)(_Container_base12*); +static void (__thiscall *p__Container_base12_dtor)(_Container_base12*); +static _Iterator_base12** (__thiscall *p__Container_base12__Getpfirst)(_Container_base12*); +static void (__thiscall *p__Container_base12__Swap_all)(_Container_base12*, _Container_base12*); + +/* Emulate a __thiscall */ +#ifdef __i386__ + +#include "pshpack1.h" +struct thiscall_thunk +{ + BYTE pop_eax; /* popl %eax (ret addr) */ + BYTE pop_edx; /* popl %edx (func) */ + BYTE pop_ecx; /* popl %ecx (this) */ + BYTE push_eax; /* pushl %eax */ + WORD jmp_edx; /* jmp *%edx */ +}; +#include "poppack.h" + +static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); +static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); + +static void init_thiscall_thunk(void) +{ + struct thiscall_thunk *thunk = VirtualAlloc( NULL, sizeof(*thunk), + MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + thunk->pop_eax = 0x58; /* popl %eax */ + thunk->pop_edx = 0x5a; /* popl %edx */ + thunk->pop_ecx = 0x59; /* popl %ecx */ + thunk->push_eax = 0x50; /* pushl %eax */ + thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ + call_thiscall_func1 = (void *)thunk; + call_thiscall_func2 = (void *)thunk; +} + +#define call_func1(func,_this) call_thiscall_func1(func,_this) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)a) + +#else + +#define init_thiscall_thunk() +#define call_func1(func,_this) func(_this) +#define call_func2(func,_this,a) func(_this,a) + +#endif /* __i386__ */ + +#define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) +#define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) +static BOOL init(void) +{ + HMODULE msvcp = LoadLibraryA("msvcp100.dll"); + if(!msvcp) { + win_skip("msvcp100.dll not installed\n"); + return FALSE; + } + + if(sizeof(void*) == 8) { /* 64-bit initialization */ + SET(p__Container_base12_copy_ctor, "??0_Container_base12@std@@QEAA@AEBU01@@Z"); + SET(p__Container_base12_ctor, "??0_Container_base12@std@@QEAA@XZ"); + SET(p__Container_base12__Orphan_all, "?_Orphan_all@_Container_base12@std@@QEAAXXZ"); + SET(p__Container_base12_dtor, "??1_Container_base12@std@@QEAA@XZ"); + SET(p__Container_base12__Getpfirst, "?_Getpfirst@_Container_base12@std@@QEBAPEAPEAU_Iterator_base12@2@XZ"); + SET(p__Container_base12__Swap_all, "?_Swap_all@_Container_base12@std@@QEAAXAEAU12@@Z"); + }else { + SET(p__Container_base12_copy_ctor, "??0_Container_base12@std@@QAE@ABU01@@Z"); + SET(p__Container_base12_ctor, "??0_Container_base12@std@@QAE@XZ"); + SET(p__Container_base12__Orphan_all, "?_Orphan_all@_Container_base12@std@@QAEXXZ"); + SET(p__Container_base12_dtor, "??1_Container_base12@std@@QAE@XZ"); + SET(p__Container_base12__Getpfirst, "?_Getpfirst@_Container_base12@std@@QBEPAPAU_Iterator_base12@2@XZ"); + SET(p__Container_base12__Swap_all, "?_Swap_all@_Container_base12@std@@QAEXAAU12@@Z"); + } + + init_thiscall_thunk(); + return TRUE; +} + +static void test__Container_base12(void) +{ + _Container_base12 c1, c2; + _Iterator_base12 i1, i2, **pi; + _Container_proxy p1, p2; + + call_func1(p__Container_base12_ctor, &c1); + ok(c1.proxy == NULL, "c1.proxy != NULL\n"); + + p1.cont = NULL; + p1.head = NULL; + c1.proxy = &p1; + call_func2(p__Container_base12_copy_ctor, &c2, &c1); + ok(c1.proxy == &p1, "c1.proxy = %p, expected %p\n", c1.proxy, &p1); + ok(c2.proxy == NULL, "c2.proxy != NULL\n"); + + p1.head = &i1; + i1.proxy = &p1; + i1.next = &i2; + i2.proxy = &p1; + i2.next = NULL; + pi = call_func1(p__Container_base12__Getpfirst, &c1); + ok(pi == &p1.head, "pi = %p, expected %p\n", pi, &p1.head); + pi = call_func1(p__Container_base12__Getpfirst, &c2); + ok(pi == NULL, "pi != NULL\n"); + + p1.cont = &c1; + call_func1(p__Container_base12_dtor, &c1); + ok(p1.cont == &c1, "p1.cont = %p, expected %p\n", p1.cont, &c1); + ok(p1.head == &i1, "p1.head = %p, expected %p\n", p1.head, &i1); + ok(i1.proxy == &p1, "i1.proxy = %p, expected %p\n", i1.proxy, &p1); + ok(i1.next == &i2, "i1.next = %p, expected %p\n", i1.next, &i2); + ok(i2.proxy == &p1, "i2.proxy = %p, expected %p\n", i2.proxy, &p1); + ok(i2.next == NULL, "i2.next != NULL\n"); + + call_func1(p__Container_base12__Orphan_all, &c1); + ok(p1.cont == &c1, "p1.cont = %p, expected %p\n", p1.cont, &c1); + ok(p1.head == &i1, "p1.head = %p, expected %p\n", p1.head, &i1); + ok(i1.proxy == &p1, "i1.proxy = %p, expected %p\n", i1.proxy, &p1); + ok(i1.next == &i2, "i1.next = %p, expected %p\n", i1.next, &i2); + ok(i2.proxy == &p1, "i2.proxy = %p, expected %p\n", i2.proxy, &p1); + ok(i2.next == NULL, "i2.next != NULL\n"); + + c2.proxy = NULL; + call_func2(p__Container_base12__Swap_all, &c1, &c2); + ok(c1.proxy == NULL, "c1.proxy != NULL\n"); + ok(c2.proxy == &p1, "c2.proxy = %p, expected %p\n", c2.proxy, &p2); + ok(p1.cont == &c2, "p1.cont = %p, expected %p\n", p1.cont, &c2); + + c1.proxy = &p2; + p2.cont = (void*)0xdeadbeef; + p2.head = (void*)0xdeadbeef; + p1.head = &i1; + call_func2(p__Container_base12__Swap_all, &c1, &c2); + ok(c1.proxy == &p1, "c1.proxt = %p, expected %p\n", c1.proxy, &p1); + ok(p1.cont == &c1, "p1.cont = %p, expected %p\n", p1.cont, &c1); + ok(p1.head == &i1, "p1.head = %p, expected %p\n", p1.head, &i1); + ok(c2.proxy == &p2, "c2.proxy = %p, expected %p\n", c2.proxy, &p2); + ok(p2.cont == &c2, "p2.cont = %p, expected %p\n", p2.cont, &c2); + ok(p2.head == (void*)0xdeadbeef, "p2.head = %p, expected 0xdeadbeef\n", p2.head); +} + +START_TEST(misc) +{ + if(!init()) + return; + + test__Container_base12(); +}

1 0

Piotr Caban : msvcp100: Added _Container_base12 class implementation.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: de8fe962c1e9c4a985741316486a38f4c8336271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de8fe962c1e9c4a9857413164… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 26 22:33:03 2012 +0000 msvcp100: Added _Container_base12 class implementation. --- dlls/msvcp100/misc.c | 84 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp100/msvcp100.spec | 28 +++++++------- 2 files changed, 98 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp100/misc.c b/dlls/msvcp100/misc.c index 13183bb..55a19ee 100644 --- a/dlls/msvcp100/misc.c +++ b/dlls/msvcp100/misc.c @@ -28,6 +28,22 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcp); +struct __Container_proxy; + +typedef struct { + struct __Container_proxy *proxy; +} _Container_base12; + +typedef struct __Iterator_base12 { + struct __Container_proxy *proxy; + struct __Iterator_base12 *next; +} _Iterator_base12; + +typedef struct __Container_proxy { + const _Container_base12 *cont; + _Iterator_base12 *head; +} _Container_proxy; + /* ??0_Mutex@std@@QAE@XZ */ /* ??0_Mutex@std@@QEAA@XZ */ DEFINE_THISCALL_WRAPPER(mutex_ctor, 4) @@ -259,3 +275,71 @@ void* __thiscall Container_base0_op_assign(void *this, const void *that) { return this; } + +/* ??0_Container_base12@std@@QAE@ABU01@@Z */ +/* ??0_Container_base12@std@@QEAA@AEBU01@@Z */ +DEFINE_THISCALL_WRAPPER(_Container_base12_copy_ctor, 8) +_Container_base12* __thiscall _Container_base12_copy_ctor( + _Container_base12 *this, _Container_base12 *that) +{ + this->proxy = NULL; + return this; +} + +/* ??0_Container_base12@std@@QAE@XZ */ +/* ??0_Container_base12@std@@QEAA@XZ */ +DEFINE_THISCALL_WRAPPER(_Container_base12_ctor, 4) +_Container_base12* __thiscall _Container_base12_ctor(_Container_base12 *this) +{ + this->proxy = NULL; + return this; +} + +/* ??1_Container_base12@std@@QAE@XZ */ +/* ??1_Container_base12@std@@QEAA@XZ */ +DEFINE_THISCALL_WRAPPER(_Container_base12_dtor, 4) +void __thiscall _Container_base12_dtor(_Container_base12 *this) +{ +} + +/* ??4_Container_base12@std@@QAEAAU01@ABU01@@Z */ +/* ??4_Container_base12@std@@QEAAAEAU01@AEBU01@@ */ +DEFINE_THISCALL_WRAPPER(_Container_base12_op_assign, 8) +_Container_base12* __thiscall _Container_base12_op_assign( + _Container_base12 *this, const _Container_base12 *that) +{ + return this; +} + +/* ?_Getpfirst@_Container_base12@std@@QBEPAPAU_Iterator_base12@2@XZ */ +/* ?_Getpfirst@_Container_base12@std@@QEBAPEAPEAU_Iterator_base12@2@XZ */ +DEFINE_THISCALL_WRAPPER(_Container_base12__Getpfirst, 4) +_Iterator_base12** __thiscall _Container_base12__Getpfirst(_Container_base12 *this) +{ + return this->proxy ? &this->proxy->head : NULL; +} + +/* ?_Orphan_all@_Container_base12@std@@QAEXXZ */ +/* ?_Orphan_all@_Container_base12@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_Container_base12__Orphan_all, 4) +void __thiscall _Container_base12__Orphan_all(_Container_base12 *this) +{ +} + +/* ?_Swap_all@_Container_base12@std@@QAEXAAU12@@Z */ +/* ?_Swap_all@_Container_base12@std@@QEAAXAEAU12@@Z */ +DEFINE_THISCALL_WRAPPER(_Container_base12__Swap_all, 8) +void __thiscall _Container_base12__Swap_all( + _Container_base12 *this, _Container_base12 *that) +{ + _Container_proxy *tmp; + + tmp = this->proxy; + this->proxy = that->proxy; + that->proxy = tmp; + + if(this->proxy) + this->proxy->cont = this; + if(that->proxy) + that->proxy->cont = that; +} diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 4ed384e..e4ac191 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -176,10 +176,10 @@ @ stub -arch=win64 ??0_Concurrent_queue_base_v4@details@Concurrency@@IEAA@_K@Z @ stub -arch=win32 ??0_Concurrent_queue_iterator_base_v4@details@Concurrency@@IAE@ABV_Concurrent_queue_base_v4@12@@Z @ stub -arch=win64 ??0_Concurrent_queue_iterator_base_v4@details@Concurrency@@IEAA@AEBV_Concurrent_queue_base_v4@12@@Z -@ stub -arch=win32 ??0_Container_base12@std@@QAE@ABU01@@Z -@ stub -arch=win64 ??0_Container_base12@std@@QEAA@AEBU01@@Z -@ stub -arch=win32 ??0_Container_base12@std@@QAE@XZ -@ stub -arch=win64 ??0_Container_base12@std@@QEAA@XZ +@ thiscall -arch=win32 ??0_Container_base12@std@@QAE@ABU01@@Z(ptr ptr) _Container_base12_copy_ctor +@ cdecl -arch=win64 ??0_Container_base12@std@@QEAA@AEBU01@@Z(ptr ptr) _Container_base12_copy_ctor +@ thiscall -arch=win32 ??0_Container_base12@std@@QAE@XZ(ptr) _Container_base12_ctor +@ cdecl -arch=win64 ??0_Container_base12@std@@QEAA@XZ(ptr) _Container_base12_ctor @ stub -arch=win32 ??0_Init_locks@std@@QAE@XZ @ stub -arch=win64 ??0_Init_locks@std@@QEAA@XZ @ thiscall -arch=win32 ??0_Locimp@locale@std@@AAE@ABV012@@Z(ptr ptr) locale__Locimp_copy_ctor @@ -306,8 +306,8 @@ @ stub -arch=win64 ??1_Concurrent_queue_iterator_base_v4@details@Concurrency@@IEAA@XZ @ stub -arch=win32 ??1_Concurrent_vector_base_v4@details@Concurrency@@IAE@XZ @ stub -arch=win64 ??1_Concurrent_vector_base_v4@details@Concurrency@@IEAA@XZ -@ stub -arch=win32 ??1_Container_base12@std@@QAE@XZ -@ stub -arch=win64 ??1_Container_base12@std@@QEAA@XZ +@ thiscall -arch=win32 ??1_Container_base12@std@@QAE@XZ(ptr) _Container_base12_dtor +@ cdecl -arch=win64 ??1_Container_base12@std@@QEAA@XZ(ptr) _Container_base12_dtor @ stub -arch=win32 ??1_Init_locks@std@@QAE@XZ @ stub -arch=win64 ??1_Init_locks@std@@QEAA@XZ @ thiscall -arch=win32 ??1_Locimp@locale@std@@MAE@XZ(ptr) locale__Locimp_dtor @@ -402,8 +402,8 @@ @ cdecl -arch=win64 ??4Init@ios_base@std@@QEAAAEAV012@AEBV012@@Z(ptr ptr) ios_base_Init_op_assign @ thiscall -arch=win32 ??4_Container_base0@std@@QAEAAU01@ABU01@@Z(ptr ptr) Container_base0_op_assign @ cdecl -arch=win64 ??4_Container_base0@std@@QEAAAEAU01@AEBU01@@Z(ptr ptr) Container_base0_op_assign -@ stub -arch=win32 ??4_Container_base12@std@@QAEAAU01@ABU01@@Z -@ stub -arch=win64 ??4_Container_base12@std@@QEAAAEAU01@AEBU01@@Z +@ thiscall -arch=win32 ??4_Container_base12@std@@QAEAAU01@ABU01@@Z(ptr ptr) _Container_base12_op_assign +@ cdecl -arch=win64 ??4_Container_base12@std@@QEAAAEAU01@AEBU01@@Z(ptr ptr) _Container_base12_op_assign @ stub -arch=win32 ??4_Init_locks@std@@QAEAAV01@ABV01@@Z @ stub -arch=win64 ??4_Init_locks@std@@QEAAAEAV01@AEBV01@@Z @ thiscall -arch=win32 ??4_Num_base@std@@QAEAAU01@ABU01@@Z(ptr ptr) std_Num_base_op_assign @@ -897,8 +897,8 @@ @ cdecl -arch=win64 ?_Getmonths@_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Getmonths @ stub -arch=win32 ?_Getname@_Locinfo@std@@QBEPBDXZ @ stub -arch=win64 ?_Getname@_Locinfo@std@@QEBAPEBDXZ -@ stub -arch=win32 ?_Getpfirst@_Container_base12@std@@QBEPAPAU_Iterator_base12@2@XZ -@ stub -arch=win64 ?_Getpfirst@_Container_base12@std@@QEBAPEAPEAU_Iterator_base12@2@XZ +@ thiscall -arch=win32 ?_Getpfirst@_Container_base12@std@@QBEPAPAU_Iterator_base12@2@XZ(ptr) _Container_base12__Getpfirst +@ cdecl -arch=win64 ?_Getpfirst@_Container_base12@std@@QEBAPEAPEAU_Iterator_base12@2@XZ(ptr) _Container_base12__Getpfirst @ thiscall -arch=win32 ?_Getptr@_Timevec@std@@QBEPAXXZ(ptr) _Timevec__Getptr @ cdecl -arch=win64 ?_Getptr@_Timevec@std@@QEBAPEAXXZ(ptr) _Timevec__Getptr @ thiscall -arch=win32 ?_Gettnames@_Locinfo@std@@QBE?AV_Timevec@2@XZ(ptr ptr) _Locinfo__Gettnames @@ -1125,8 +1125,8 @@ @ cdecl ?_Nomemory@std@@YAXXZ() _Nomemory @ thiscall -arch=win32 ?_Orphan_all@_Container_base0@std@@QAEXXZ(ptr) Container_base0_Orphan_all @ cdecl -arch=win64 ?_Orphan_all@_Container_base0@std@@QEAAXXZ(ptr) Container_base0_Orphan_all -@ stub -arch=win32 ?_Orphan_all@_Container_base12@std@@QAEXXZ -@ stub -arch=win64 ?_Orphan_all@_Container_base12@std@@QEAAXXZ +@ thiscall -arch=win32 ?_Orphan_all@_Container_base12@std@@QAEXXZ(ptr) _Container_base12__Orphan_all +@ cdecl -arch=win64 ?_Orphan_all@_Container_base12@std@@QEAAXXZ(ptr) _Container_base12__Orphan_all @ thiscall -arch=win32 ?_Osfx@?$basic_ostream@DU?$char_traits@D@std@@@std@@QAEXXZ(ptr) basic_ostream_char__Osfx @ cdecl -arch=win64 ?_Osfx@?$basic_ostream@DU?$char_traits@D@std@@@std@@QEAAXXZ(ptr) basic_ostream_char__Osfx @ thiscall -arch=win32 ?_Osfx@?$basic_ostream@GU?$char_traits@G@std@@@std@@QAEXXZ(ptr) basic_ostream_wchar__Osfx @@ -1204,8 +1204,8 @@ @ cdecl -arch=win64 ?_Setgloballocale@locale@std@@CAXPEAX@Z(ptr) locale__Setgloballocale @ thiscall -arch=win32 ?_Swap_all@_Container_base0@std@@QAEXAAU12@@Z(ptr ptr) Container_base0_Swap_all @ cdecl -arch=win64 ?_Swap_all@_Container_base0@std@@QEAAXAEAU12@@Z(ptr ptr) Container_base0_Swap_all -@ stub -arch=win32 ?_Swap_all@_Container_base12@std@@QAEXAAU12@@Z -@ stub -arch=win64 ?_Swap_all@_Container_base12@std@@QEAAXAEAU12@@Z +@ thiscall -arch=win32 ?_Swap_all@_Container_base12@std@@QAEXAAU12@@Z(ptr ptr) _Container_base12__Swap_all +@ cdecl -arch=win64 ?_Swap_all@_Container_base12@std@@QEAAXAEAU12@@Z(ptr ptr) _Container_base12__Swap_all @ extern ?_Sync@ios_base@std@@0_NA ios_base_Sync @ thiscall -arch=win32 ?_Tidy@?$_Yarn@D@std@@AAEXXZ(ptr) _Yarn_char__Tidy @ cdecl -arch=win64 ?_Tidy@?$_Yarn@D@std@@AEAAXXZ(ptr) _Yarn_char__Tidy

1 0

Piotr Caban : msvcp100: Added _Container_base0::operator= implementation.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: acbfab38dbe10c4c9600878235fe876615bf6533 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acbfab38dbe10c4c960087823… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 26 22:32:28 2012 +0000 msvcp100: Added _Container_base0::operator= implementation. --- dlls/msvcp100/misc.c | 30 ++++++++++++++++++++++++++++++ dlls/msvcp100/msvcp100.c | 22 ---------------------- dlls/msvcp100/msvcp100.spec | 4 ++-- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/dlls/msvcp100/misc.c b/dlls/msvcp100/misc.c index 5854c5e..13183bb 100644 --- a/dlls/msvcp100/misc.c +++ b/dlls/msvcp100/misc.c @@ -229,3 +229,33 @@ MSVCP_new_handler_func __cdecl set_new_handler_reset(int unused) { return set_new_handler(NULL); } + +/* _Container_base0 is used by apps compiled without iterator checking + * (i.e. with _ITERATOR_DEBUG_LEVEL=0 ). + * It provides empty versions of methods used by visual c++'s stl's + * iterator checking. + * msvcr100 has to provide them in case apps are compiled with /Od + * or the optimizer fails to inline those (empty) calls. + */ + +/* ?_Orphan_all@_Container_base0@std@@QAEXXZ */ +/* ?_Orphan_all@_Container_base0@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(Container_base0_Orphan_all, 4) +void __thiscall Container_base0_Orphan_all(void *this) +{ +} + +/* ?_Swap_all@_Container_base0@std@@QAEXAAU12@@Z */ +/* ?_Swap_all@_Container_base0@std@@QEAAXAEAU12@@Z */ +DEFINE_THISCALL_WRAPPER(Container_base0_Swap_all, 8) +void __thiscall Container_base0_Swap_all(void *this, void *that) +{ +} + +/* ??4_Container_base0@std@@QAEAAU01@ABU01@@Z */ +/* ??4_Container_base0@std@@QEAAAEAU01@AEBU01@@Z */ +DEFINE_THISCALL_WRAPPER(Container_base0_op_assign, 8) +void* __thiscall Container_base0_op_assign(void *this, const void *that) +{ + return this; +} diff --git a/dlls/msvcp100/msvcp100.c b/dlls/msvcp100/msvcp100.c index 4238a24..c0f1ecd 100644 --- a/dlls/msvcp100/msvcp100.c +++ b/dlls/msvcp100/msvcp100.c @@ -80,28 +80,6 @@ static void init_cxx_funcs(void) } } -/* _Container_base0 is used by apps compiled without iterator checking - * (i.e. with _ITERATOR_DEBUG_LEVEL=0 ). - * It provides empty versions of methods used by visual c++'s stl's - * iterator checking. - * msvcr100 has to provide them in case apps are compiled with /Od - * or the optimizer fails to inline those (empty) calls. - */ - -/* ?_Orphan_all@_Container_base0@std@@QAEXXZ */ -/* ?_Orphan_all@_Container_base0@std@@QEAAXXZ */ -DEFINE_THISCALL_WRAPPER(Container_base0_Orphan_all, 4) -void __thiscall Container_base0_Orphan_all(void *this) -{ -} - -/* ?_Swap_all@_Container_base0@std@@QAEXAAU12@@Z */ -/* ?_Swap_all@_Container_base0@std@@QEAAXAEAU12@@Z */ -DEFINE_THISCALL_WRAPPER(Container_base0_Swap_all, 8) -void __thiscall Container_base0_Swap_all(void *this, void *that) -{ -} - BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 0603fd4..4ed384e 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -400,8 +400,8 @@ @ cdecl -arch=win64 ??4?$numeric_limits@_W@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) std_Num_base_op_assign @ thiscall -arch=win32 ??4Init@ios_base@std@@QAEAAV012@ABV012@@Z(ptr ptr) ios_base_Init_op_assign @ cdecl -arch=win64 ??4Init@ios_base@std@@QEAAAEAV012@AEBV012@@Z(ptr ptr) ios_base_Init_op_assign -@ stub -arch=win32 ??4_Container_base0@std@@QAEAAU01@ABU01@@Z -@ stub -arch=win64 ??4_Container_base0@std@@QEAAAEAU01@AEBU01@@Z +@ thiscall -arch=win32 ??4_Container_base0@std@@QAEAAU01@ABU01@@Z(ptr ptr) Container_base0_op_assign +@ cdecl -arch=win64 ??4_Container_base0@std@@QEAAAEAU01@AEBU01@@Z(ptr ptr) Container_base0_op_assign @ stub -arch=win32 ??4_Container_base12@std@@QAEAAU01@ABU01@@Z @ stub -arch=win64 ??4_Container_base12@std@@QEAAAEAU01@AEBU01@@Z @ stub -arch=win32 ??4_Init_locks@std@@QAEAAV01@ABV01@@Z

1 0

Piotr Caban : msvcp60: Export locale classes destructors.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: a704d2a40c3a55543f767f7abe70b546430379af URL: http://source.winehq.org/git/wine.git/?a=commit;h=a704d2a40c3a55543f767f7ab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 26 22:31:42 2012 +0000 msvcp60: Export locale classes destructors. --- dlls/msvcp60/locale.c | 96 ++++++++++++++++++++++---------------------- dlls/msvcp60/msvcp60.spec | 48 +++++++++++----------- 2 files changed, 72 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a704d2a40c3a55543f767…

1 0

Piotr Caban : msvcp: Sync implementations.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: a62ea07a1561be687a4de01aca472a51cb5cb3ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62ea07a1561be687a4de01ac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 26 22:31:09 2012 +0000 msvcp: Sync implementations. --- dlls/msvcp60/ios.c | 22 ++++++++++++++++++++++ dlls/msvcp60/msvcp60.spec | 8 ++++---- dlls/msvcp70/msvcp70.spec | 12 ++++++------ dlls/msvcp71/ios.c | 22 ++++++++++++++++++++++ dlls/msvcp71/msvcp71.spec | 12 ++++++------ dlls/msvcp80/msvcp80.spec | 12 ++++++------ dlls/msvcp90/ios.c | 22 ++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 12 ++++++------ 8 files changed, 94 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a62ea07a1561be687a4de…

1 0

Piotr Caban : msvcp100: Added basic_ostream::ends implementation.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: c15d625b5cdbc486471546eff78c2b4e78480764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c15d625b5cdbc486471546eff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 26 22:30:52 2012 +0000 msvcp100: Added basic_ostream::ends implementation. --- dlls/msvcp100/ios.c | 22 ++++++++++++++++++++++ dlls/msvcp100/msvcp100.spec | 12 ++++++------ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 608e9f5..1c55319 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -4498,6 +4498,16 @@ basic_ostream_char* __thiscall basic_ostream_char_print_bool(basic_ostream_char return this; } +/* ?ends@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@1@AAV21@@Z */ +/* ?ends@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@1@AEAV21@@Z */ +basic_ostream_char* __cdecl basic_ostream_char_ends(basic_ostream_char *ostr) +{ + TRACE("(%p)\n", ostr); + + basic_ostream_char_put(ostr, 0); + return ostr; +} + /* ?endl@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@1@AAV21@@Z */ /* ?endl@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@1@AEAV21@@Z */ basic_ostream_char* __cdecl basic_ostream_char_endl(basic_ostream_char *ostr) @@ -5314,6 +5324,18 @@ basic_ostream_wchar* __thiscall basic_ostream_short_print_bool(basic_ostream_wch basic_ios_wchar_rdbuf_get(basic_ostream_wchar_get_basic_ios(this))->loc)); } +/* ?ends@std@@YAAAV?$basic_ostream@_WU?$char_traits@_W@std@@@1@AAV21@@Z */ +/* ?ends@std@@YAAEAV?$basic_ostream@_WU?$char_traits@_W@std@@@1@AEAV21@@Z */ +/* ?ends@std@@YAAAV?$basic_ostream@GU?$char_traits@G@std@@@1@AAV21@@Z */ +/* ?ends@std@@YAAEAV?$basic_ostream@GU?$char_traits@G@std@@@1@AEAV21@@Z */ +basic_ostream_wchar* __cdecl basic_ostream_wchar_ends(basic_ostream_wchar *ostr) +{ + TRACE("(%p)\n", ostr); + + basic_ostream_wchar_put(ostr, 0); + return ostr; +} + /* ?endl@std@@YAAAV?$basic_ostream@_WU?$char_traits@_W@std@@@1@AAV21@@Z */ /* ?endl@std@@YAAEAV?$basic_ostream@_WU?$char_traits@_W@std@@@1@AEAV21@@Z */ /* ?endl@std@@YAAAV?$basic_ostream@GU?$char_traits@G@std@@@1@AAV21@@Z */ diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 85e6107..0603fd4 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1630,12 +1630,12 @@ @ cdecl -arch=win64 ?endl@std@@YAAEAV?$basic_ostream@GU?$char_traits@G@std@@@1@AEAV21@@Z(ptr) basic_ostream_wchar_endl @ cdecl -arch=win32 ?endl@std@@YAAAV?$basic_ostream@_WU?$char_traits@_W@std@@@1@AAV21@@Z(ptr) basic_ostream_wchar_endl @ cdecl -arch=win64 ?endl@std@@YAAEAV?$basic_ostream@_WU?$char_traits@_W@std@@@1@AEAV21@@Z(ptr) basic_ostream_wchar_endl -@ stub -arch=win32 ?ends@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@1@AAV21@@Z -@ stub -arch=win64 ?ends@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@1@AEAV21@@Z -@ stub -arch=win32 ?ends@std@@YAAAV?$basic_ostream@GU?$char_traits@G@std@@@1@AAV21@@Z -@ stub -arch=win64 ?ends@std@@YAAEAV?$basic_ostream@GU?$char_traits@G@std@@@1@AEAV21@@Z -@ stub -arch=win32 ?ends@std@@YAAAV?$basic_ostream@_WU?$char_traits@_W@std@@@1@AAV21@@Z -@ stub -arch=win64 ?ends@std@@YAAEAV?$basic_ostream@_WU?$char_traits@_W@std@@@1@AEAV21@@Z +@ cdecl -arch=win32 ?ends@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@1@AAV21@@Z(ptr) basic_ostream_char_ends +@ cdecl -arch=win64 ?ends@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@1@AEAV21@@Z(ptr) basic_ostream_char_ends +@ cdecl -arch=win32 ?ends@std@@YAAAV?$basic_ostream@GU?$char_traits@G@std@@@1@AAV21@@Z(ptr) basic_ostream_wchar_ends +@ cdecl -arch=win64 ?ends@std@@YAAEAV?$basic_ostream@GU?$char_traits@G@std@@@1@AEAV21@@Z(ptr) basic_ostream_wchar_ends +@ cdecl -arch=win32 ?ends@std@@YAAAV?$basic_ostream@_WU?$char_traits@_W@std@@@1@AAV21@@Z(ptr) basic_ostream_wchar_ends +@ cdecl -arch=win64 ?ends@std@@YAAEAV?$basic_ostream@_WU?$char_traits@_W@std@@@1@AEAV21@@Z(ptr) basic_ostream_wchar_ends @ thiscall -arch=win32 ?eof@ios_base@std@@QBE_NXZ(ptr) ios_base_eof @ cdecl -arch=win64 ?eof@ios_base@std@@QEBA_NXZ(ptr) ios_base_eof @ thiscall -arch=win32 ?epptr@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IBEPADXZ(ptr) basic_streambuf_char_epptr

1 0

Detlef Riekenberg : crypt32/tests: Fix failures on win7 and above.
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: 70a0190e9679385bd2272fc3dfc9d4a842b734ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=70a0190e9679385bd2272fc3d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Nov 26 23:20:23 2012 +0100 crypt32/tests: Fix failures on win7 and above. --- dlls/crypt32/tests/chain.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 2e4da55..9624a81 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4626,16 +4626,18 @@ static void testVerifyCertChainPolicy(void) ret = pCertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_BASE, chain, NULL, &policyStatus); ok(ret, "CertVerifyCertificateChainPolicy failed: %08x\n", GetLastError()); - ok(policyStatus.dwError == CERT_E_UNTRUSTEDROOT, - "Expected CERT_E_UNTRUSTEDROOT, got %08x\n", policyStatus.dwError); + ok(policyStatus.dwError == CERT_E_UNTRUSTEDROOT || + policyStatus.dwError == TRUST_E_CERT_SIGNATURE, /* win7 + win8 */ + "Expected CERT_E_UNTRUSTEDROOT or TRUST_E_CERT_SIGNATURE, got %08x\n", policyStatus.dwError); ok(policyStatus.lChainIndex == 0 && policyStatus.lElementIndex == 0, "Expected both indexes 0, got %d, %d\n", policyStatus.lChainIndex, policyStatus.lElementIndex); ret = pCertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_BASE, chain, &policyPara, &policyStatus); ok(ret, "CertVerifyCertificateChainPolicy failed: %08x\n", GetLastError()); - ok(policyStatus.dwError == CERT_E_UNTRUSTEDROOT, - "Expected CERT_E_UNTRUSTEDROOT, got %08x\n", policyStatus.dwError); + ok(policyStatus.dwError == CERT_E_UNTRUSTEDROOT || + policyStatus.dwError == TRUST_E_CERT_SIGNATURE, /* win7 + win8 */ + "Expected CERT_E_UNTRUSTEDROOT or TRUST_E_CERT_SIGNATURE, got %08x\n", policyStatus.dwError); ok(policyStatus.lChainIndex == 0 && policyStatus.lElementIndex == 0, "Expected both indexes 0, got %d, %d\n", policyStatus.lChainIndex, policyStatus.lElementIndex);

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_DrawIndexedInstanced().
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: 7f62678c16495c3dc213444668cdd11af09fb939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f62678c16495c3dc21344466… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 26 22:52:41 2012 +0100 d3d10core: Implement d3d10_device_DrawIndexedInstanced(). --- dlls/d3d10core/device.c | 10 ++++++++-- dlls/wined3d/device.c | 22 +++++++++++++++------- dlls/wined3d/directx.c | 1 + dlls/wined3d/drawprim.c | 39 ++++++++++++++++++++++++++++----------- dlls/wined3d/glsl_shader.c | 3 ++- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_gl.h | 4 ++++ dlls/wined3d/wined3d_private.h | 9 ++------- include/wine/wined3d.h | 2 ++ 9 files changed, 63 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f62678c16495c3dc2134…

1 0

Henri Verbeet : wined3d: Properly handle scalar destinations in shader_glsl_conditional_move().
by Alexandre Julliard 27 Nov '12

27 Nov '12

Module: wine Branch: master Commit: eefe6346a9640bd42147281472d800f075720cf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eefe6346a9640bd4214728147… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 26 22:52:40 2012 +0100 wined3d: Properly handle scalar destinations in shader_glsl_conditional_move(). In particular, we modify dst.write_mask in the code further down in order to mask out unused channels, but the writemask is ignored for scalar registers. Since all that code is redundant anyway for scalar destinations, we can just reuse the special case for scalar src0. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a5df3c3..85c8437 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2878,7 +2878,7 @@ static void shader_glsl_conditional_move(const struct wined3d_shader_instruction break; } - if (shader_is_scalar(&ins->src[0].reg)) + if (shader_is_scalar(&ins->dst[0].reg) || shader_is_scalar(&ins->src[0].reg)) { write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param);

1 0

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

27 Nov '12

Module: wine Branch: master Commit: acfdb0b02f0ec6839937327e4b55944062e3bf37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acfdb0b02f0ec6839937327e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 26 22:52:39 2012 +0100 d3dx9: Avoid LPD3DXPATCHMESH. --- include/d3dx9anim.h | 2 +- include/d3dx9mesh.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 975f1df..62fa6c0 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -86,7 +86,7 @@ typedef struct _D3DXMESHDATA { LPD3DXMESH pMesh; LPD3DXPMESH pPMesh; - LPD3DXPATCHMESH pPatchMesh; + ID3DXPatchMesh *pPatchMesh; } DUMMYUNIONNAME; } D3DXMESHDATA, *LPD3DXMESHDATA; diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 2283f4e..3a26b54 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -492,7 +492,7 @@ DECLARE_INTERFACE_(ID3DXPatchMesh, IUnknown) STDMETHOD(UnlockAttributeBuffer)(THIS) PURE; STDMETHOD(GetTessSize)(THIS_ FLOAT tess_level, DWORD adaptive, DWORD* num_triangles, DWORD* num_vertices) PURE; STDMETHOD(GenerateAdjacency)(THIS_ FLOAT tolerance) PURE; - STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPD3DXPATCHMESH *clone_mesh) PURE; + STDMETHOD(CloneMesh)(THIS_ DWORD options, const D3DVERTEXELEMENT9 *declaration, ID3DXPatchMesh **clone_mesh) PURE; STDMETHOD(Optimize)(THIS_ DWORD flags) PURE; STDMETHOD(SetDisplaceParam)(THIS_ struct IDirect3DBaseTexture9 *texture, D3DTEXTUREFILTERTYPE min_filter, D3DTEXTUREFILTERTYPE mag_filter, D3DTEXTUREFILTERTYPE mip_filter, D3DTEXTUREADDRESS wrap, @@ -801,7 +801,8 @@ HRESULT WINAPI D3DXUVAtlasCreate(LPD3DXMESH, UINT, FLOAT, UINT, UINT, FLOAT, DWO HRESULT WINAPI D3DXUVAtlasPack(ID3DXMesh *, UINT, UINT, FLOAT, DWORD, CONST DWORD *, LPD3DXUVATLASCB, FLOAT, LPVOID, DWORD, LPD3DXBUFFER); HRESULT WINAPI D3DXUVAtlasPartition(LPD3DXMESH, UINT, FLOAT, DWORD, CONST DWORD *, CONST DWORD *, CONST FLOAT *, LPD3DXUVATLASCB, FLOAT, LPVOID, DWORD, LPD3DXMESH *, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *, FLOAT *, UINT *); HRESULT WINAPI D3DXValidMesh(LPD3DXMESH, CONST DWORD *, LPD3DXBUFFER *); -HRESULT WINAPI D3DXValidPatchMesh(LPD3DXPATCHMESH, DWORD *, DWORD *, LPD3DXBUFFER *); +HRESULT WINAPI D3DXValidPatchMesh(ID3DXPatchMesh *mesh, DWORD *degenerate_vertex_count, + DWORD *degenerate_patch_count, ID3DXBuffer **errors); HRESULT WINAPI D3DXWeldVertices(LPD3DXMESH, DWORD, CONST D3DXWELDEPSILONS *, CONST DWORD *, DWORD *, DWORD *, LPD3DXBUFFER *); #ifdef __cplusplus

1 0

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

27 Nov '12

Module: wine Branch: master Commit: c9920bafc63bd777cf59789ef5062f5b991bafdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9920bafc63bd777cf59789ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 26 22:52:38 2012 +0100 d3dx9: Avoid LPD3DXPRTBUFFER. --- include/d3dx9mesh.h | 63 ++++++++++++++++++++++++++------------------------- 1 files changed, 32 insertions(+), 31 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 586aa63..2283f4e 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -564,7 +564,7 @@ DECLARE_INTERFACE_(ID3DXPRTBuffer, IUnknown) STDMETHOD(LockBuffer)(THIS_ UINT start, UINT num_samples, FLOAT **data) PURE; STDMETHOD(UnlockBuffer)(THIS) PURE; STDMETHOD(ScaleBuffer)(THIS_ FLOAT scale) PURE; - STDMETHOD(AddBuffer)(THIS_ LPD3DXPRTBUFFER buffer) PURE; + STDMETHOD(AddBuffer)(THIS_ ID3DXPRTBuffer *buffer) PURE; STDMETHOD(AttachGH)(THIS_ struct ID3DXTextureGutterHelper *gh) PURE; STDMETHOD(ReleaseGH)(THIS) PURE; STDMETHOD(EvalGH)(THIS) PURE; @@ -613,7 +613,7 @@ DECLARE_INTERFACE_(ID3DXTextureGutterHelper, IUnknown) STDMETHOD(ApplyGuttersFloat)(THIS_ FLOAT *data_in, UINT num_coeffs, UINT width, UINT height) PURE; STDMETHOD(ApplyGuttersTex)(THIS_ struct IDirect3DTexture9 *texture) PURE; - STDMETHOD(ApplyGuttersPRT)(THIS_ LPD3DXPRTBUFFER buffer) PURE; + STDMETHOD(ApplyGuttersPRT)(THIS_ ID3DXPRTBuffer *buffer) PURE; STDMETHOD(ResampleTex)(THIS_ struct IDirect3DTexture9 *texture_in, struct ID3DXMesh *mesh_in, D3DDECLUSAGE usage, UINT usage_index, struct IDirect3DTexture9 *texture_out) PURE; STDMETHOD(GetFaceMap)(THIS_ UINT *face_data) PURE; @@ -643,7 +643,7 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown) STDMETHOD(GetVertexAlbedo)(THIS_ D3DXCOLOR *vert_colors, UINT num_verts) PURE; STDMETHOD(SetPerTexelNormals)(THIS_ struct IDirect3DTexture9 *normal_texture) PURE; STDMETHOD(ExtractPerVertexAlbedo)(THIS_ LPD3DXMESH mesh, D3DDECLUSAGE usage, UINT num_channels) PURE; - STDMETHOD(ResampleBuffer)(THIS_ LPD3DXPRTBUFFER buffer_in, LPD3DXPRTBUFFER buffer_out) PURE; + STDMETHOD(ResampleBuffer)(THIS_ ID3DXPRTBuffer *buffer_in, ID3DXPRTBuffer *buffer_out) PURE; STDMETHOD(GetAdaptedMesh)(THIS_ struct IDirect3DDevice9 *device, UINT *face_remap, UINT *vert_remap, float *vert_weights, struct ID3DXMesh **mesh) PURE; STDMETHOD_(UINT, GetNumVerts)(THIS) PURE; @@ -652,34 +652,34 @@ DECLARE_INTERFACE_(ID3DXPRTEngine, IUnknown) STDMETHOD(RobustMeshRefine)(THIS_ FLOAT min_edge_length, UINT max_subdiv) PURE; STDMETHOD(SetSamplingInfo)(THIS_ UINT num_rays, BOOL use_sphere, BOOL use_cosine, BOOL adaptive, FLOAT adpative_thresh) PURE; - STDMETHOD(ComputeDirectLightingSH)(THIS_ UINT sh_order, LPD3DXPRTBUFFER data_out) PURE; - STDMETHOD(ComputeDirectLightingSHAdaptive)(THIS_ UINT sh_order, FLOAT adaptive_thresh, - FLOAT min_edge_length, UINT max_subdiv, LPD3DXPRTBUFFER data_out) PURE; + STDMETHOD(ComputeDirectLightingSH)(THIS_ UINT sh_order, ID3DXPRTBuffer *data_out) PURE; + STDMETHOD(ComputeDirectLightingSHAdaptive)(THIS_ UINT sh_order, float adaptive_thresh, + float min_edge_length, UINT max_subdiv, ID3DXPRTBuffer *data_out) PURE; STDMETHOD(ComputeDirectLightingSHGPU)(THIS_ struct IDirect3DDevice9 *device, UINT flags, UINT sh_order, float zbias, float zangle_bias, struct ID3DXPRTBuffer *data_out) PURE; - STDMETHOD(ComputeSS)(THIS_ LPD3DXPRTBUFFER data_in, LPD3DXPRTBUFFER data_out, - LPD3DXPRTBUFFER data_total) PURE; - STDMETHOD(ComputeSSAdaptive)(THIS_ LPD3DXPRTBUFFER data_in, FLOAT adaptive_thres, - FLOAT min_edge_length, UINT max_subdiv, LPD3DXPRTBUFFER data_out, LPD3DXPRTBUFFER data_total) PURE; - STDMETHOD(ComputeBounce)(THIS_ LPD3DXPRTBUFFER data_in, LPD3DXPRTBUFFER data_out, - LPD3DXPRTBUFFER data_total) PURE; - STDMETHOD(ComputeBounceAdaptive)(THIS_ LPD3DXPRTBUFFER data_in, FLOAT adaptive_thres, - FLOAT min_edge_length, UINT max_subdiv, LPD3DXPRTBUFFER data_out, LPD3DXPRTBUFFER data_total) PURE; + STDMETHOD(ComputeSS)(THIS_ ID3DXPRTBuffer *data_in, ID3DXPRTBuffer *data_out, + ID3DXPRTBuffer *data_total) PURE; + STDMETHOD(ComputeSSAdaptive)(THIS_ ID3DXPRTBuffer *data_in, float adaptive_thres, + float min_edge_length, UINT max_subdiv, ID3DXPRTBuffer *data_out, ID3DXPRTBuffer *data_total) PURE; + STDMETHOD(ComputeBounce)(THIS_ ID3DXPRTBuffer *data_in, ID3DXPRTBuffer *data_out, + ID3DXPRTBuffer *data_total) PURE; + STDMETHOD(ComputeBounceAdaptive)(THIS_ ID3DXPRTBuffer *data_in, float adaptive_thres, + float min_edge_length, UINT max_subdiv, ID3DXPRTBuffer *data_out, ID3DXPRTBuffer *data_total) PURE; STDMETHOD(ComputeVolumeSamplesDirectSH)(THIS_ UINT sh_order_in, UINT sh_order_out, - UINT num_vol_samples, CONST D3DXVECTOR3 *sample_locs, LPD3DXPRTBUFFER data_out) PURE; - STDMETHOD(ComputeVolumeSamples)(THIS_ LPD3DXPRTBUFFER surf_data_in, UINT sh_order, - UINT num_vol_samples, CONST D3DXVECTOR3 *sample_locs, LPD3DXPRTBUFFER data_out) PURE; + UINT num_vol_samples, const D3DXVECTOR3 *sample_locs, ID3DXPRTBuffer *data_out) PURE; + STDMETHOD(ComputeVolumeSamples)(THIS_ ID3DXPRTBuffer *surf_data_in, UINT sh_order, + UINT num_vol_samples, const D3DXVECTOR3 *sample_locs, ID3DXPRTBuffer *data_out) PURE; STDMETHOD(ComputeSurfSamplesDirectSH)(THIS_ UINT sh_order, UINT num_samples, - CONST D3DXVECTOR3 *sample_locs, CONST D3DXVECTOR3 *sample_norms, LPD3DXPRTBUFFER data_out) PURE; - STDMETHOD(ComputeSurfSamplesBounce)(THIS_ LPD3DXPRTBUFFER surf_data_in, UINT num_samples, - CONST D3DXVECTOR3 *sample_locs, CONST D3DXVECTOR3 *sample_norms, LPD3DXPRTBUFFER data_out, - LPD3DXPRTBUFFER data_total) PURE; + const D3DXVECTOR3 *sample_locs, const D3DXVECTOR3 *sample_norms, ID3DXPRTBuffer *data_out) PURE; + STDMETHOD(ComputeSurfSamplesBounce)(THIS_ ID3DXPRTBuffer *surf_data_in, UINT num_samples, + const D3DXVECTOR3 *sample_locs, const D3DXVECTOR3 *sample_norms, ID3DXPRTBuffer *data_out, + ID3DXPRTBuffer *data_total) PURE; STDMETHOD(FreeSSData)(THIS) PURE; STDMETHOD(FreeBounceData)(THIS) PURE; - STDMETHOD(ComputeLDPRTCoeffs)(THIS_ LPD3DXPRTBUFFER data_in, UINT sh_order, D3DXVECTOR3 *norm_out, - LPD3DXPRTBUFFER data_out) PURE; - STDMETHOD(ScaleMeshChunk)(THIS_ UINT mesh_chunk, FLOAT scale, LPD3DXPRTBUFFER data_out) PURE; - STDMETHOD(MultiplyAlbedo)(THIS_ LPD3DXPRTBUFFER data_out) PURE; + STDMETHOD(ComputeLDPRTCoeffs)(THIS_ ID3DXPRTBuffer *data_in, UINT sh_order, D3DXVECTOR3 *norm_out, + ID3DXPRTBuffer *data_out) PURE; + STDMETHOD(ScaleMeshChunk)(THIS_ UINT mesh_chunk, float scale, ID3DXPRTBuffer *data_out) PURE; + STDMETHOD(MultiplyAlbedo)(THIS_ ID3DXPRTBuffer *data_out) PURE; STDMETHOD(SetCallback)(THIS_ LPD3DXSHPRTSIMCB cb, FLOAT frequency, LPVOID user_context) PURE; STDMETHOD_(BOOL, ShadowRayIntersects)(THIS_ CONST D3DXVECTOR3 *ray_pos, CONST D3DXVECTOR3 *ray_dir) PURE; STDMETHOD_(BOOL, ClosestRayIntersects)(THIS_ CONST D3DXVECTOR3 *ray_pos, CONST D3DXVECTOR3 *ray_dir, @@ -706,8 +706,9 @@ HRESULT WINAPI D3DXCreateSkinInfoFromBlendedMesh(LPD3DXBASEMESH, DWORD, CONST D3 HRESULT WINAPI D3DXCreatePatchMesh(const D3DXPATCHINFO *patch_info, DWORD patch_count, DWORD vertex_count, DWORD flags, const D3DVERTEXELEMENT9 *declaration, struct IDirect3DDevice9 *device, struct ID3DXPatchMesh **mesh); -HRESULT WINAPI D3DXCreatePRTBuffer(UINT, UINT, UINT, LPD3DXPRTBUFFER *); -HRESULT WINAPI D3DXCreatePRTBufferTex(UINT, UINT, UINT, UINT, LPD3DXPRTBUFFER *); +HRESULT WINAPI D3DXCreatePRTBuffer(UINT sample_count, UINT coeff_count, UINT channel_count, ID3DXPRTBuffer **buffer); +HRESULT WINAPI D3DXCreatePRTBufferTex(UINT width, UINT height, UINT coeff_count, + UINT channel_count, ID3DXPRTBuffer **buffer); 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, @@ -737,8 +738,8 @@ HRESULT WINAPI D3DXLoadPatchMeshFromXof(struct ID3DXFileData *file_data, DWORD f HRESULT WINAPI D3DXLoadSkinMeshFromXof(struct ID3DXFileData *file_data, DWORD flags, struct IDirect3DDevice9 *device, struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances, DWORD *material_count, struct ID3DXSkinInfo **skin_info, struct ID3DXMesh **mesh); -HRESULT WINAPI D3DXLoadPRTBufferFromFileA(LPCSTR, LPD3DXPRTBUFFER *); -HRESULT WINAPI D3DXLoadPRTBufferFromFileW(LPCWSTR, LPD3DXPRTBUFFER *); +HRESULT WINAPI D3DXLoadPRTBufferFromFileA(const char *filename, ID3DXPRTBuffer **buffer); +HRESULT WINAPI D3DXLoadPRTBufferFromFileW(const WCHAR *filename, ID3DXPRTBuffer **buffer); #define D3DXLoadPRTBufferFromFile WINELIB_NAME_AW(D3DXLoadPRTBufferFromFile) HRESULT WINAPI D3DXLoadPRTCompBufferFromFileA(const char *filename, ID3DXPRTCompBuffer **buffer); HRESULT WINAPI D3DXLoadPRTCompBufferFromFileW(const WCHAR *filename, ID3DXPRTCompBuffer **buffer); @@ -746,8 +747,8 @@ HRESULT WINAPI D3DXLoadPRTCompBufferFromFileW(const WCHAR *filename, ID3DXPRTCom 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); #define D3DXSaveMeshToX WINELIB_NAME_AW(D3DXSaveMeshToX) -HRESULT WINAPI D3DXSavePRTBufferToFileA(LPCSTR, LPD3DXPRTBUFFER); -HRESULT WINAPI D3DXSavePRTBufferToFileW(LPCWSTR, LPD3DXPRTBUFFER); +HRESULT WINAPI D3DXSavePRTBufferToFileA(const char *filename, ID3DXPRTBuffer *buffer); +HRESULT WINAPI D3DXSavePRTBufferToFileW(const WCHAR *filename, ID3DXPRTBuffer *buffer); #define D3DXSavePRTBufferToFile WINELIB_NAME_AW(D3DXSavePRTBufferToFile) HRESULT WINAPI D3DXSavePRTCompBufferToFileA(const char *filename, ID3DXPRTCompBuffer *buffer); HRESULT WINAPI D3DXSavePRTCompBufferToFileW(const WCHAR *filename, ID3DXPRTCompBuffer *buffer);

1 0

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