November 2009 - Wine-Commits

Rob Shearman : oleaut32: Make BSTR and VARIANT marshalling for typelibs use the user marshalling functions .
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 9cffed2c75cd3b4af6ab937be5948e82e671a756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cffed2c75cd3b4af6ab937be… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 15 17:13:21 2009 +0000 oleaut32: Make BSTR and VARIANT marshalling for typelibs use the user marshalling functions. Remove now redundant cases in serialize_param and deserialize_param. --- dlls/oleaut32/tmarshal.c | 201 +++++++++------------------------------------- 1 files changed, 40 insertions(+), 161 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 0e9d7eb..9f10981 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -615,8 +615,6 @@ serialize_param( vartype = VT_SAFEARRAY; switch (vartype) { - case VT_EMPTY: /* nothing. empty variant for instance */ - return S_OK; case VT_I8: case VT_UI8: case VT_R8: @@ -652,56 +650,23 @@ serialize_param( if (writeit) hres = xbuf_add(buf,(LPBYTE)arg,sizeof(DWORD)); return hres; - case VT_I4|VT_BYREF: - hres = S_OK; - if (debugout) TRACE_(olerelay)("&0x%x\n",*arg); - if (writeit) - hres = xbuf_add(buf,(LPBYTE)(DWORD*)*arg,sizeof(DWORD)); - /* do not dealloc at this time */ - return hres; case VT_VARIANT: { - TYPEDESC tdesc2; - VARIANT *vt = (VARIANT*)arg; - DWORD vttype = V_VT(vt); - - if (debugout) TRACE_(olerelay)("Vt(%s%s)(",debugstr_vt(vttype),debugstr_vf(vttype)); - tdesc2.vt = vttype; - if (writeit) { - hres = xbuf_add(buf,(LPBYTE)&vttype,sizeof(vttype)); - if (hres) return hres; - } - /* need to recurse since we need to free the stuff */ - hres = serialize_param(tinfo,writeit,debugout,dealloc,&tdesc2,(DWORD*)&(V_I4(vt)),buf); - if (debugout) TRACE_(olerelay)(")"); - return hres; - } - case VT_BSTR|VT_BYREF: { - if (debugout) TRACE_(olerelay)("[byref]'%s'", *(BSTR*)*arg ? relaystr(*((BSTR*)*arg)) : "<bstr NULL>"); - if (writeit) { - /* ptr to ptr to magic widestring, basically */ - BSTR *bstr = (BSTR *) *arg; - DWORD len; - if (!*bstr) { - /* -1 means "null string" which is equivalent to empty string */ - len = -1; - hres = xbuf_add(buf, (LPBYTE)&len,sizeof(DWORD)); - if (hres) return hres; - } else { - len = *((DWORD*)*bstr-1)/sizeof(WCHAR); - hres = xbuf_add(buf,(LPBYTE)&len,sizeof(DWORD)); - if (hres) return hres; - hres = xbuf_add(buf,(LPBYTE)*bstr,len * sizeof(WCHAR)); - if (hres) return hres; - } + if (debugout) TRACE_(olerelay)("Vt(%s%s)(",debugstr_vt(V_VT((VARIANT *)arg)),debugstr_vf(V_VT((VARIANT *)arg))); + if (writeit) + { + ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); + ULONG size = VARIANT_UserSize(&flags, buf->curoff, (VARIANT *)arg); + xbuf_resize(buf, size); + VARIANT_UserMarshal(&flags, buf->base + buf->curoff, (VARIANT *)arg); + buf->curoff = size; } - - if (dealloc && arg) { - BSTR *str = *((BSTR **)arg); - SysFreeString(*str); + if (dealloc) + { + ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); + VARIANT_UserFree(&flags, (VARIANT *)arg); } return S_OK; } - case VT_BSTR: { if (debugout) { if (*arg) @@ -709,25 +674,20 @@ serialize_param( else TRACE_(olerelay)("<bstr NULL>"); } - if (writeit) { - BSTR bstr = (BSTR)*arg; - DWORD len; - if (!bstr) { - len = -1; - hres = xbuf_add(buf,(LPBYTE)&len,sizeof(DWORD)); - if (hres) return hres; - } else { - len = *((DWORD*)bstr-1)/sizeof(WCHAR); - hres = xbuf_add(buf,(LPBYTE)&len,sizeof(DWORD)); - if (hres) return hres; - hres = xbuf_add(buf,(LPBYTE)bstr,len * sizeof(WCHAR)); - if (hres) return hres; - } - } - - if (dealloc && arg) - SysFreeString((BSTR)*arg); - return S_OK; + if (writeit) + { + ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); + ULONG size = BSTR_UserSize(&flags, buf->curoff, (BSTR *)arg); + xbuf_resize(buf, size); + BSTR_UserMarshal(&flags, buf->base + buf->curoff, (BSTR *)arg); + buf->curoff = size; + } + if (dealloc) + { + ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); + BSTR_UserFree(&flags, (BSTR *)arg); + } + return S_OK; } case VT_PTR: { DWORD cookie; @@ -941,34 +901,15 @@ deserialize_param( while (1) { switch (vartype) { - case VT_EMPTY: - if (debugout) TRACE_(olerelay)("<empty>\n"); - return S_OK; - case VT_NULL: - if (debugout) TRACE_(olerelay)("<null>\n"); - return S_OK; case VT_VARIANT: { - VARIANT *vt = (VARIANT*)arg; - - if (readit) { - DWORD vttype; - TYPEDESC tdesc2; - hres = xbuf_get(buf,(LPBYTE)&vttype,sizeof(vttype)); - if (hres) { - FIXME("vt type not read?\n"); - return hres; - } - memset(&tdesc2,0,sizeof(tdesc2)); - tdesc2.vt = vttype; - V_VT(vt) = vttype; - if (debugout) TRACE_(olerelay)("Vt(%s%s)(",debugstr_vt(vttype),debugstr_vf(vttype)); - hres = deserialize_param(tinfo, readit, debugout, alloc, &tdesc2, (DWORD*)&(V_I4(vt)), buf); - TRACE_(olerelay)(")"); - return hres; - } else { - VariantInit(vt); - return S_OK; + if (readit) + { + ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); + unsigned char *buffer; + buffer = VARIANT_UserUnmarshal(&flags, buf->base + buf->curoff, (VARIANT *)arg); + buf->curoff = buffer - buf->base; } + return S_OK; } case VT_I8: case VT_UI8: @@ -1013,76 +954,14 @@ deserialize_param( } if (debugout) TRACE_(olerelay)("%02x",*arg & 0xff); return hres; - case VT_I4|VT_BYREF: - hres = S_OK; - if (alloc) - *arg = (DWORD)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(DWORD)); - if (readit) { - hres = xbuf_get(buf,(LPBYTE)*arg,sizeof(DWORD)); - if (hres) ERR("Failed to read integer 4 byte\n"); - } - if (debugout) TRACE_(olerelay)("&0x%x",*(DWORD*)*arg); - return hres; - case VT_BSTR|VT_BYREF: { - BSTR **bstr = (BSTR **)arg; - WCHAR *str; - DWORD len; - - if (readit) { - hres = xbuf_get(buf,(LPBYTE)&len,sizeof(DWORD)); - if (hres) { - ERR("failed to read bstr klen\n"); - return hres; - } - if (len == -1) { - *bstr = CoTaskMemAlloc(sizeof(BSTR *)); - **bstr = NULL; - if (debugout) TRACE_(olerelay)("<bstr NULL>"); - } else { - str = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,(len+1)*sizeof(WCHAR)); - hres = xbuf_get(buf,(LPBYTE)str,len*sizeof(WCHAR)); - if (hres) { - ERR("Failed to read BSTR.\n"); - HeapFree(GetProcessHeap(),0,str); - return hres; - } - *bstr = CoTaskMemAlloc(sizeof(BSTR *)); - **bstr = SysAllocStringLen(str,len); - if (debugout) TRACE_(olerelay)("%s",relaystr(str)); - HeapFree(GetProcessHeap(),0,str); - } - } else { - *bstr = NULL; - } - return S_OK; - } case VT_BSTR: { - WCHAR *str; - DWORD len; - - if (readit) { - hres = xbuf_get(buf,(LPBYTE)&len,sizeof(DWORD)); - if (hres) { - ERR("failed to read bstr klen\n"); - return hres; - } - if (len == -1) { - *arg = 0; - if (debugout) TRACE_(olerelay)("<bstr NULL>"); - } else { - str = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,(len+1)*sizeof(WCHAR)); - hres = xbuf_get(buf,(LPBYTE)str,len*sizeof(WCHAR)); - if (hres) { - ERR("Failed to read BSTR.\n"); - HeapFree(GetProcessHeap(),0,str); - return hres; - } - *arg = (DWORD)SysAllocStringLen(str,len); - if (debugout) TRACE_(olerelay)("%s",relaystr(str)); - HeapFree(GetProcessHeap(),0,str); - } - } else { - *arg = 0; + if (readit) + { + ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); + unsigned char *buffer; + buffer = BSTR_UserUnmarshal(&flags, buf->base + buf->curoff, (BSTR *)arg); + buf->curoff = buffer - buf->base; + if (debugout) TRACE_(olerelay)("%s",relaystr(*(BSTR *)arg)); } return S_OK; }

1 0

Rob Shearman : oleaut32: Zero initialize the stack used on the server side of typelib marshalling.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: b5139f45b35213161284f4b4505430624de7699d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5139f45b35213161284f4b45… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 15 17:12:42 2009 +0000 oleaut32: Zero initialize the stack used on the server side of typelib marshalling. This is needed to allow for NDR marshalling rules in reusing memory on the client side. --- dlls/oleaut32/tmarshal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index b3d1734..eae17e2 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -2105,7 +2105,7 @@ TMStubImpl_Invoke( nrofargs = 0; for (i=0;i<fdesc->cParams;i++) nrofargs += _argsize(&fdesc->lprgelemdescParam[i].tdesc, tinfo); - args = HeapAlloc(GetProcessHeap(),0,(nrofargs+1)*sizeof(DWORD)); + args = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,(nrofargs+1)*sizeof(DWORD)); if (!args) { hres = E_OUTOFMEMORY;

1 0

Damjan Jovanovic : winemenubuilder: Escape XML special characters in menus.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 03e9fbb515585fa7d42e04e1d96c5a10a14d006c URL: http://source.winehq.org/git/wine.git/?a=commit;h=03e9fbb515585fa7d42e04e1d… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Nov 14 09:10:30 2009 +0200 winemenubuilder: Escape XML special characters in menus. --- programs/winemenubuilder/winemenubuilder.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 7bcdd44..e14fe81 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -991,8 +991,12 @@ static BOOL write_menu_file(const char *unix_link, const char *filename) struct stat st; name[i] = 0; fprintf(tempfile, " <Menu>\n"); - fprintf(tempfile, " <Name>%s%s</Name>\n", count ? "" : "wine-", name); - fprintf(tempfile, " <Directory>%s%s.directory</Directory>\n", count ? "" : "wine-", name); + fprintf(tempfile, " <Name>%s", count ? "" : "wine-"); + write_xml_text(tempfile, name); + fprintf(tempfile, "</Name>\n"); + fprintf(tempfile, " <Directory>%s", count ? "" : "wine-"); + write_xml_text(tempfile, name); + fprintf(tempfile, ".directory</Directory>\n"); dir_file_name = heap_printf("%s/desktop-directories/%s%s.directory", xdg_data_dir, count ? "" : "wine-", name); if (dir_file_name) @@ -1009,7 +1013,9 @@ static BOOL write_menu_file(const char *unix_link, const char *filename) name[i] = 0; fprintf(tempfile, " <Include>\n"); - fprintf(tempfile, " <Filename>%s</Filename>\n", name); + fprintf(tempfile, " <Filename>"); + write_xml_text(tempfile, name); + fprintf(tempfile, "</Filename>\n"); fprintf(tempfile, " </Include>\n"); for (i = 0; i < count; i++) fprintf(tempfile, " </Menu>\n");

1 0

Rob Shearman : rpcrt4: Fix potential NULL pointer access in process_bind_packet.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: eb0d2828b243a751628dd4b5467d1dace9f32767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb0d2828b243a751628dd4b54… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Nov 13 22:47:10 2009 +0000 rpcrt4: Fix potential NULL pointer access in process_bind_packet. Upon failure to allocate results in process_bind_packet, build nack packet and send right away, instead of falling into the normal path and potentially dereferencing the NULL pointer. --- dlls/rpcrt4/rpc_server.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 1bd1235..84e8854 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -203,6 +203,7 @@ static RPC_STATUS process_bind_packet(RpcConnection *conn, RpcPktBindHdr *hdr, R response = RPCRT4_BuildBindNackHeader(NDR_LOCAL_DATA_REPRESENTATION, RPC_VER_MAJOR, RPC_VER_MINOR, REJECT_LOCAL_LIMIT_EXCEEDED); + goto send; } for (i = 0, ctxt_elem = (RpcContextElement *)msg->Buffer;

1 0

Andrew Eikum : mshtml: Add stub implementation of IHTMLWindow4.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 334f2ce07433c6c15ba3ccd7d89897b399a9e89f URL: http://source.winehq.org/git/wine.git/?a=commit;h=334f2ce07433c6c15ba3ccd7d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Nov 13 14:12:54 2009 -0600 mshtml: Add stub implementation of IHTMLWindow4. --- dlls/mshtml/dispex.c | 1 + dlls/mshtml/htmlwindow.c | 91 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 + 3 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 980b13b..382ab25 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -144,6 +144,7 @@ static REFIID tid_ids[] = { &IID_IHTMLUniqueName, &IID_IHTMLWindow2, &IID_IHTMLWindow3, + &IID_IHTMLWindow4, &IID_IOmNavigator }; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 9f3b3e7..a3a8f04 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -126,6 +126,9 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii }else if(IsEqualGUID(&IID_IHTMLWindow3, riid)) { TRACE("(%p)->(IID_IHTMLWindow3 %p)\n", This, ppv); *ppv = HTMLWINDOW3(This); + }else if(IsEqualGUID(&IID_IHTMLWindow4, riid)) { + TRACE("(%p)->(IID_IHTMLWindow4 %p)\n", This, ppv); + *ppv = HTMLWINDOW4(This); }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; } @@ -1354,6 +1357,92 @@ static const IHTMLWindow3Vtbl HTMLWindow3Vtbl = { HTMLWindow3_showModelessDialog }; +#define HTMLWINDOW4_THIS(iface) DEFINE_THIS(HTMLWindow, HTMLWindow4, iface) + +static HRESULT WINAPI HTMLWindow4_QueryInterface(IHTMLWindow4 *iface, REFIID riid, void **ppv) +{ + HTMLWindow *This = HTMLWINDOW4_THIS(iface); + + return IHTMLWindow2_QueryInterface(HTMLWINDOW2(This), riid, ppv); +} + +static ULONG WINAPI HTMLWindow4_AddRef(IHTMLWindow4 *iface) +{ + HTMLWindow *This = HTMLWINDOW4_THIS(iface); + + return IHTMLWindow2_AddRef(HTMLWINDOW2(This)); +} + +static ULONG WINAPI HTMLWindow4_Release(IHTMLWindow4 *iface) +{ + HTMLWindow *This = HTMLWINDOW4_THIS(iface); + + return IHTMLWindow2_Release(HTMLWINDOW2(This)); +} + +static HRESULT WINAPI HTMLWindow4_GetTypeInfoCount(IHTMLWindow4 *iface, UINT *pctinfo) +{ + HTMLWindow *This = HTMLWINDOW4_THIS(iface); + + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(This), pctinfo); +} + +static HRESULT WINAPI HTMLWindow4_GetTypeInfo(IHTMLWindow4 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLWindow *This = HTMLWINDOW4_THIS(iface); + + return IDispatchEx_GetTypeInfo(DISPATCHEX(This), iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLWindow4_GetIDsOfNames(IHTMLWindow4 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLWindow *This = HTMLWINDOW4_THIS(iface); + + return IDispatchEx_GetIDsOfNames(DISPATCHEX(This), riid, rgszNames, cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLWindow4_Invoke(IHTMLWindow4 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLWindow *This = HTMLWINDOW4_THIS(iface); + + return IDispatchEx_Invoke(DISPATCHEX(This), dispIdMember, riid, lcid, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLWindow4_createPopup(IHTMLWindow4 *iface, VARIANT *varArgIn, + IDispatch **ppPopup) +{ + HTMLWindow *This = HTMLWINDOW4_THIS(iface); + FIXME("(%p)->(%p %p)\n", This, varArgIn, ppPopup); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow4_get_frameElement(IHTMLWindow4 *iface, IHTMLFrameBase **p) +{ + HTMLWindow *This = HTMLWINDOW4_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +#undef HTMLWINDOW4_THIS + +static const IHTMLWindow4Vtbl HTMLWindow4Vtbl = { + HTMLWindow4_QueryInterface, + HTMLWindow4_AddRef, + HTMLWindow4_Release, + HTMLWindow4_GetTypeInfoCount, + HTMLWindow4_GetTypeInfo, + HTMLWindow4_GetIDsOfNames, + HTMLWindow4_Invoke, + HTMLWindow4_createPopup, + HTMLWindow4_get_frameElement +}; + #define DISPEX_THIS(iface) DEFINE_THIS(HTMLWindow, IDispatchEx, iface) static HRESULT WINAPI WindowDispEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) @@ -1601,6 +1690,7 @@ static const IDispatchExVtbl WindowDispExVtbl = { static const tid_t HTMLWindow_iface_tids[] = { IHTMLWindow2_tid, IHTMLWindow3_tid, + IHTMLWindow4_tid, 0 }; @@ -1633,6 +1723,7 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML window->lpHTMLWindow2Vtbl = &HTMLWindow2Vtbl; window->lpHTMLWindow3Vtbl = &HTMLWindow3Vtbl; + window->lpHTMLWindow4Vtbl = &HTMLWindow4Vtbl; window->lpIDispatchExVtbl = &WindowDispExVtbl; window->ref = 1; window->doc_obj = doc_obj; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 43601ae..cc04106 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -120,6 +120,7 @@ typedef enum { IHTMLUniqueName_tid, IHTMLWindow2_tid, IHTMLWindow3_tid, + IHTMLWindow4_tid, IOmNavigator_tid, LAST_tid } tid_t; @@ -215,6 +216,7 @@ struct HTMLWindow { DispatchEx dispex; const IHTMLWindow2Vtbl *lpHTMLWindow2Vtbl; const IHTMLWindow3Vtbl *lpHTMLWindow3Vtbl; + const IHTMLWindow4Vtbl *lpHTMLWindow4Vtbl; const IDispatchExVtbl *lpIDispatchExVtbl; LONG ref; @@ -514,6 +516,7 @@ struct HTMLDocumentNode { #define HTMLWINDOW2(x) ((IHTMLWindow2*) &(x)->lpHTMLWindow2Vtbl) #define HTMLWINDOW3(x) ((IHTMLWindow3*) &(x)->lpHTMLWindow3Vtbl) +#define HTMLWINDOW4(x) ((IHTMLWindow4*) &(x)->lpHTMLWindow4Vtbl) #define HTMLDOC(x) ((IHTMLDocument2*) &(x)->lpHTMLDocument2Vtbl) #define HTMLDOC3(x) ((IHTMLDocument3*) &(x)->lpHTMLDocument3Vtbl)

1 0

André Hentschel : mshtml: Update German Gecko installer dialog.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 79307e596ee0c0e1cf9cbd9e0b1f11f80ad39f50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79307e596ee0c0e1cf9cbd9e0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 13 22:27:23 2009 +0100 mshtml: Update German Gecko installer dialog. --- dlls/mshtml/De.rc | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/De.rc b/dlls/mshtml/De.rc index 2b58b41..50d519d 100644 --- a/dlls/mshtml/De.rc +++ b/dlls/mshtml/De.rc @@ -37,9 +37,11 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Wine-Gecko-Installation" FONT 8, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "Wine kann das Gecko-Paket nicht finden. Es wird von Programmen mit eingebettetem HTML benötigt, " \ + "damit diese richtig funktionieren.\n" \ + "Wine kann das Paket für Sie herunterladen und installieren.\n\n" \ + "Hinweis: Es wird empfohlen das Paket ihrer Distribution zu verwenden. " \ + "Weitere Hinweise finden Sie unter http://wiki.winehq.org/Gecko", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Fortschritt", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 DEFPUSHBUTTON "&Installieren", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP

1 0

Vincent Povirk : ole32: Rename rootPropertyName to rootEntryName.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 390e2711f649191fbd3353b2a96838136b260f0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=390e2711f649191fbd3353b2a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 13:37:58 2009 -0600 ole32: Rename rootPropertyName to rootEntryName. --- dlls/ole32/storage32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 2ac8127..9682a1e 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -65,7 +65,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); static const BYTE STORAGE_magic[8] ={0xd0,0xcf,0x11,0xe0,0xa1,0xb1,0x1a,0xe1}; static const BYTE STORAGE_oldmagic[8] ={0xd0,0xcf,0x11,0xe0,0x0e,0x11,0xfc,0x0d}; -static const char rootPropertyName[] = "Root Entry"; +static const char rootEntryName[] = "Root Entry"; /**************************************************************************** * Storage32InternalImpl definitions. @@ -2266,7 +2266,7 @@ static HRESULT StorageImpl_Construct( * Initialize the property chain */ memset(&rootProp, 0, sizeof(rootProp)); - MultiByteToWideChar( CP_ACP, 0, rootPropertyName, -1, rootProp.name, + MultiByteToWideChar( CP_ACP, 0, rootEntryName, -1, rootProp.name, sizeof(rootProp.name)/sizeof(WCHAR) ); rootProp.sizeOfNameString = (strlenW(rootProp.name)+1) * sizeof(WCHAR); rootProp.stgType = STGTY_ROOT;

1 0

Detlef Riekenberg : commdlg: Fix a copy&paste typo.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: c49606e8a04a6bda2f0822ef7d57b785516ddf04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c49606e8a04a6bda2f0822ef7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Nov 13 18:08:56 2009 +0100 commdlg: Fix a copy&paste typo. --- dlls/commdlg.dll16/printdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/commdlg.dll16/printdlg.c b/dlls/commdlg.dll16/printdlg.c index a01411f..64bb395 100644 --- a/dlls/commdlg.dll16/printdlg.c +++ b/dlls/commdlg.dll16/printdlg.c @@ -126,7 +126,7 @@ BOOL16 WINAPI PrintDlg16( LPPRINTDLG16 lppd ) if (lppd->Flags & PD_ENABLEPRINTHOOK) FIXME( "custom print hook %p no longer supported\n", lppd->lpfnPrintHook ); if (lppd->Flags & PD_ENABLESETUPHOOK) - FIXME( "custom print hook %p no longer supported\n", lppd->lpfnSetupHook ); + FIXME( "custom setup hook %p no longer supported\n", lppd->lpfnSetupHook ); if ((ret = PrintDlgA( &pd32 ))) {

1 0

Juan Lang : crypt32: Update a comment.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: f6c482467593ed936996706ddc18a6d4f0737312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c482467593ed936996706dd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 13 08:33:34 2009 -0800 crypt32: Update a comment. --- dlls/crypt32/chain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 17471d5..c508c25 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2382,8 +2382,8 @@ static BOOL match_dns_to_subject_alt_name(PCERT_EXTENSION ext, * in section 4.2.1.6: * "Multiple name forms, and multiple instances of each name form, * MAY be included." - * It doesn't specify the behavior in such cases, but common usage is - * to accept a certificate if any name matches. + * It doesn't specify the behavior in such cases, but both RFC 2818 + * and RFC 2595 explicitly accept a certificate if any name matches. */ for (i = 0; !matches && i < subjectName->cAltEntry; i++) {

1 0

Vincent Povirk : ole32: Rename SmallBlockChainStream. ownerPropertyIndex to ownerDirEntry.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 93db14e79ae3db0f44824736552ea7a23b40b89f URL: http://source.winehq.org/git/wine.git/?a=commit;h=93db14e79ae3db0f448247365… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 13:36:07 2009 -0600 ole32: Rename SmallBlockChainStream.ownerPropertyIndex to ownerDirEntry. --- dlls/ole32/storage32.c | 20 ++++++++++---------- dlls/ole32/storage32.h | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 0701c5a..2ac8127 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3375,7 +3375,7 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( /* * Destroy the small block chain. */ - propertyIndex = (*ppsbChain)->ownerPropertyIndex; + propertyIndex = (*ppsbChain)->ownerDirEntry; SmallBlockChainStream_SetSize(*ppsbChain, size); SmallBlockChainStream_Destroy(*ppsbChain); *ppsbChain = 0; @@ -4657,7 +4657,7 @@ static ULARGE_INTEGER BlockChainStream_GetSize(BlockChainStream* This) SmallBlockChainStream* SmallBlockChainStream_Construct( StorageImpl* parentStorage, ULONG* headOfStreamPlaceHolder, - ULONG propertyIndex) + ULONG dirEntry) { SmallBlockChainStream* newStream; @@ -4665,7 +4665,7 @@ SmallBlockChainStream* SmallBlockChainStream_Construct( newStream->parentStorage = parentStorage; newStream->headOfStreamPlaceHolder = headOfStreamPlaceHolder; - newStream->ownerPropertyIndex = propertyIndex; + newStream->ownerDirEntry = dirEntry; return newStream; } @@ -4690,11 +4690,11 @@ static ULONG SmallBlockChainStream_GetHeadOfChain( if (This->headOfStreamPlaceHolder != NULL) return *(This->headOfStreamPlaceHolder); - if (This->ownerPropertyIndex) + if (This->ownerDirEntry) { readSuccessful = StorageImpl_ReadDirEntry( This->parentStorage, - This->ownerPropertyIndex, + This->ownerDirEntry, &chainProperty); if (readSuccessful) @@ -5178,13 +5178,13 @@ static BOOL SmallBlockChainStream_Shrink( DirEntry chainProp; StorageImpl_ReadDirEntry(This->parentStorage, - This->ownerPropertyIndex, + This->ownerDirEntry, &chainProp); chainProp.startingBlock = BLOCK_END_OF_CHAIN; StorageImpl_WriteDirEntry(This->parentStorage, - This->ownerPropertyIndex, + This->ownerDirEntry, &chainProp); /* @@ -5255,12 +5255,12 @@ static BOOL SmallBlockChainStream_Enlarge( { DirEntry chainProp; - StorageImpl_ReadDirEntry(This->parentStorage, This->ownerPropertyIndex, + StorageImpl_ReadDirEntry(This->parentStorage, This->ownerDirEntry, &chainProp); chainProp.startingBlock = blockIndex; - StorageImpl_WriteDirEntry(This->parentStorage, This->ownerPropertyIndex, + StorageImpl_WriteDirEntry(This->parentStorage, This->ownerDirEntry, &chainProp); } } @@ -5385,7 +5385,7 @@ static ULARGE_INTEGER SmallBlockChainStream_GetSize(SmallBlockChainStream* This) StorageImpl_ReadDirEntry( This->parentStorage, - This->ownerPropertyIndex, + This->ownerDirEntry, &chainProperty); return chainProperty.size; diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 41dd9bd..07d4048 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -476,7 +476,7 @@ BOOL BlockChainStream_SetSize( struct SmallBlockChainStream { StorageImpl* parentStorage; - ULONG ownerPropertyIndex; + ULONG ownerDirEntry; ULONG* headOfStreamPlaceHolder; }; @@ -486,7 +486,7 @@ struct SmallBlockChainStream SmallBlockChainStream* SmallBlockChainStream_Construct( StorageImpl* parentStorage, ULONG* headOfStreamPlaceHolder, - ULONG propertyIndex); + ULONG dirEntry); void SmallBlockChainStream_Destroy( SmallBlockChainStream* This);

1 0