wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Piotr Caban : msvcp90: Fix class functions invocation on 64bit systems.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: c4b8793996bd7c8497ecabffd4eed0849404170a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4b8793996bd7c8497ecabffd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 29 12:44:39 2011 +0100 msvcp90: Fix class functions invocation on 64bit systems. --- dlls/msvcp90/ios.c | 41 ++++---- dlls/msvcp90/locale.c | 142 +++++++++++++---------------- dlls/msvcp90/msvcp90.h | 11 -- dlls/msvcp90/string.c | 237 +++++++++++++++++++++++++----------------------- 4 files changed, 205 insertions(+), 226 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4b8793996bd7c8497eca…

1 0

Francois Gouget : taskmgr: Use sentence capitalization for group box labels .
by Alexandre Julliard 29 Dec '11

29 Dec '11

1 0

Francois Gouget : notepad: Don' t assign access keys to group box labels or give them trailing punctuation.
by Alexandre Julliard 29 Dec '11

29 Dec '11

1 0

Francois Gouget : winefile: Fix the group box labels to follow the Windows GUI guidelines, .
by Alexandre Julliard 29 Dec '11

29 Dec '11

1 0

Francois Gouget : winemine: Use sentence capitalization for group box labels.
by Alexandre Julliard 29 Dec '11

29 Dec '11

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 06566b6427954ac62d5c5d35c25ff4fe8255dac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06566b6427954ac62d5c5d35c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 29 17:20:22 2011 +0300 po: Update Russian translation. --- po/ru.po | 109 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 56 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06566b6427954ac62d5c5…

1 0

Jacek Caban : actxprxy: Added htiface.idl interfaces.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 676c017bc9670f90d1bfb6e6c2a6813e07310da6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=676c017bc9670f90d1bfb6e6c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 15:26:30 2011 +0100 actxprxy: Added htiface.idl interfaces. --- .gitignore | 2 ++ dlls/actxprxy/Makefile.in | 2 ++ dlls/actxprxy/actxprxy_htiface.idl | 27 +++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index f8756f7..22d7762 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,8 @@ dlls/actxprxy/actxprxy_docobj.h dlls/actxprxy/actxprxy_docobj_p.c dlls/actxprxy/actxprxy_hlink.h dlls/actxprxy/actxprxy_hlink_p.c +dlls/actxprxy/actxprxy_htiface.h +dlls/actxprxy/actxprxy_htiface_p.c dlls/actxprxy/actxprxy_htiframe.h dlls/actxprxy/actxprxy_htiframe_p.c dlls/actxprxy/actxprxy_objsafe.h diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in index b879903..6fabb3d 100644 --- a/dlls/actxprxy/Makefile.in +++ b/dlls/actxprxy/Makefile.in @@ -12,6 +12,7 @@ IDL_P_SRCS = \ actxprxy_comcat.idl \ actxprxy_docobj.idl \ actxprxy_hlink.idl \ + actxprxy_htiface.idl \ actxprxy_htiframe.idl \ actxprxy_objsafe.idl \ actxprxy_ocmm.idl \ @@ -25,6 +26,7 @@ IDL_R_SRCS = \ actxprxy_comcat.idl \ actxprxy_docobj.idl \ actxprxy_hlink.idl \ + actxprxy_htiface.idl \ actxprxy_htiframe.idl \ actxprxy_objsafe.idl \ actxprxy_ocmm.idl \ diff --git a/dlls/actxprxy/actxprxy_htiface.idl b/dlls/actxprxy/actxprxy_htiface.idl new file mode 100644 index 0000000..8ecf7e6 --- /dev/null +++ b/dlls/actxprxy/actxprxy_htiface.idl @@ -0,0 +1,27 @@ +/* + * Copyright 2011 Jacek 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 + */ + +/* just a wrapper for htiface.idl */ + +#include "htiface.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; }

1 0

Jacek Caban : mshtml: Reorder nsIURL functions to match vtbl order.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 5c8c46db181aa74371513bab157f7be1c712dfc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8c46db181aa74371513bab1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 13:49:36 2011 +0100 mshtml: Reorder nsIURL functions to match vtbl order. --- dlls/mshtml/nsio.c | 102 ++++++++++++++++++++++++++-------------------------- 1 files changed, 51 insertions(+), 51 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 251c4b2..4e31534 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2174,57 +2174,6 @@ static nsresult NSAPI nsURI_SetPath(nsIURL *iface, const nsACString *aPath) return NS_OK; } -static nsresult NSAPI nsURL_GetRef(nsIURL *iface, nsACString *aRef) -{ - nsWineURI *This = impl_from_nsIURL(iface); - char *refa = NULL; - BSTR ref; - HRESULT hres; - - TRACE("(%p)->(%p)\n", This, aRef); - - if(!ensure_uri(This)) - return NS_ERROR_UNEXPECTED; - - hres = IUri_GetFragment(This->uri, &ref); - if(FAILED(hres)) - return NS_ERROR_UNEXPECTED; - - refa = heap_strdupWtoA(ref); - SysFreeString(ref); - if(ref && !refa) - return NS_ERROR_OUT_OF_MEMORY; - - nsACString_SetData(aRef, refa && *refa == '#' ? refa+1 : refa); - heap_free(refa); - return NS_OK; -} - -static nsresult NSAPI nsURL_SetRef(nsIURL *iface, const nsACString *aRef) -{ - nsWineURI *This = impl_from_nsIURL(iface); - const char *refa; - WCHAR *ref; - HRESULT hres; - - TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aRef)); - - if(!ensure_uri_builder(This)) - return NS_ERROR_UNEXPECTED; - - nsACString_GetData(aRef, &refa); - ref = heap_strdupAtoW(refa); - if(!ref) - return NS_ERROR_OUT_OF_MEMORY; - - hres = IUriBuilder_SetFragment(This->uri_builder, ref); - heap_free(ref); - if(FAILED(hres)) - return NS_ERROR_UNEXPECTED; - - return NS_OK; -} - static nsresult NSAPI nsURI_Equals(nsIURL *iface, nsIURI *other, PRBool *_retval) { nsWineURI *This = impl_from_nsIURL(iface); @@ -2386,6 +2335,57 @@ static nsresult NSAPI nsURI_GetOriginCharset(nsIURL *iface, nsACString *aOriginC return NS_ERROR_NOT_IMPLEMENTED; } +static nsresult NSAPI nsURL_GetRef(nsIURL *iface, nsACString *aRef) +{ + nsWineURI *This = impl_from_nsIURL(iface); + char *refa = NULL; + BSTR ref; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, aRef); + + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; + + hres = IUri_GetFragment(This->uri, &ref); + if(FAILED(hres)) + return NS_ERROR_UNEXPECTED; + + refa = heap_strdupWtoA(ref); + SysFreeString(ref); + if(ref && !refa) + return NS_ERROR_OUT_OF_MEMORY; + + nsACString_SetData(aRef, refa && *refa == '#' ? refa+1 : refa); + heap_free(refa); + return NS_OK; +} + +static nsresult NSAPI nsURL_SetRef(nsIURL *iface, const nsACString *aRef) +{ + nsWineURI *This = impl_from_nsIURL(iface); + const char *refa; + WCHAR *ref; + HRESULT hres; + + TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aRef)); + + if(!ensure_uri_builder(This)) + return NS_ERROR_UNEXPECTED; + + nsACString_GetData(aRef, &refa); + ref = heap_strdupAtoW(refa); + if(!ref) + return NS_ERROR_OUT_OF_MEMORY; + + hres = IUriBuilder_SetFragment(This->uri_builder, ref); + heap_free(ref); + if(FAILED(hres)) + return NS_ERROR_UNEXPECTED; + + return NS_OK; +} + static nsresult NSAPI nsURI_EqualsExceptRef(nsIURL *iface, nsIURI *other, PRBool *_retval) { nsWineURI *This = impl_from_nsIURL(iface);

1 0

Jacek Caban : mshtml: Use IUri in IHTMLLocation:: get_protocol implementation.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 98b8ebaff79c27861415e1f01d859b913e0becf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98b8ebaff79c27861415e1f01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 12:02:41 2011 +0100 mshtml: Use IUri in IHTMLLocation::get_protocol implementation. --- dlls/mshtml/htmllocation.c | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index cd24f12..b5d6b5e 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -276,7 +276,8 @@ static HRESULT WINAPI HTMLLocation_put_protocol(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_protocol(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = impl_from_IHTMLLocation(iface); - URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; + BSTR protocol, ret; + unsigned len; HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -284,22 +285,28 @@ static HRESULT WINAPI HTMLLocation_get_protocol(IHTMLLocation *iface, BSTR *p) if(!p) return E_POINTER; - url.dwSchemeLength = 1; - hres = get_url_components(This, &url); + if(!This->window || !This->window->uri) { + FIXME("No current URI\n"); + return E_NOTIMPL; + } + + hres = IUri_GetSchemeName(This->window->uri, &protocol); if(FAILED(hres)) return hres; - - if(!url.dwSchemeLength) { - FIXME("Unexpected blank protocol\n"); - return E_NOTIMPL; - }else { - WCHAR *buf; - buf = *p = SysAllocStringLen(NULL, url.dwSchemeLength + 1); - memcpy(buf, url.lpszScheme, url.dwSchemeLength * sizeof(WCHAR)); - buf[url.dwSchemeLength] = ':'; + if(hres == S_FALSE) { + SysFreeString(protocol); + *p = NULL; + return S_OK; } - if(!*p) + + len = SysStringLen(protocol); + ret = SysAllocStringLen(protocol, len+1); + SysFreeString(protocol); + if(!ret) return E_OUTOFMEMORY; + + ret[len] = ':'; + *p = ret; return S_OK; }

1 0

André Hentschel : d3drm: Add IDirect3DRM3 interface.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 723ae056b90bfc5fbdb0c2a116cd7bb39c59633d URL: http://source.winehq.org/git/wine.git/?a=commit;h=723ae056b90bfc5fbdb0c2a11… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 29 02:26:40 2011 +0100 d3drm: Add IDirect3DRM3 interface. --- dlls/d3drm/d3drm.c | 491 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 491 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=723ae056b90bfc5fbdb0c…

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
81
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 December 2011