wine-commits July 2008

wine-commits@winehq.org

3 participants
1114 discussions

Piotr Caban : msxml3: Added ISAXXMLReader_parseURL implementation.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: b15345d4a87716a4839663fddf8399cbd4c61938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b15345d4a87716a4839663fdd… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 27 19:54:48 2008 +0200 msxml3: Added ISAXXMLReader_parseURL implementation. --- dlls/msxml3/saxreader.c | 82 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 57 insertions(+), 25 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 3b67d01..ce27496 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1098,17 +1098,11 @@ static HRESULT WINAPI isaxxmlreader_putSecureBaseURL( return E_NOTIMPL; } -static HRESULT WINAPI isaxxmlreader_parse( - ISAXXMLReader* iface, - VARIANT varInput) +static HRESULT parse_buffer(saxreader *This, xmlChar *buffer) { - saxreader *This = impl_from_ISAXXMLReader( iface ); saxlocator *locator; - xmlChar *data = NULL; HRESULT hr; - TRACE("(%p)\n", This); - hr = SAXLocator_create(This, &locator); if(FAILED(hr)) return E_FAIL; @@ -1123,12 +1117,38 @@ static HRESULT WINAPI isaxxmlreader_parse( locator->pParserCtxt->sax = &locator->saxreader->sax; locator->pParserCtxt->userData = locator; + xmlSetupParserForBuffer(locator->pParserCtxt, buffer, NULL); + + if(xmlParseDocument(locator->pParserCtxt)) hr = E_FAIL; + else hr = locator->ret; + + if(locator->pParserCtxt) + { + locator->pParserCtxt->sax = NULL; + xmlFreeParserCtxt(locator->pParserCtxt); + locator->pParserCtxt = NULL; + } + + ISAXLocator_Release((ISAXLocator*)&locator->lpSAXLocatorVtbl); + return S_OK; +} + +static HRESULT WINAPI isaxxmlreader_parse( + ISAXXMLReader* iface, + VARIANT varInput) +{ + saxreader *This = impl_from_ISAXXMLReader( iface ); + xmlChar *data = NULL; + HRESULT hr; + + TRACE("(%p)\n", This); + hr = S_OK; switch(V_VT(&varInput)) { case VT_BSTR: data = xmlChar_from_wchar(V_BSTR(&varInput)); - xmlSetupParserForBuffer(locator->pParserCtxt, data, NULL); + hr = parse_buffer(This, data); break; case VT_ARRAY|VT_UI1: { void *pSAData; @@ -1146,7 +1166,7 @@ static HRESULT WINAPI isaxxmlreader_parse( if(hr != S_OK) break; memcpy(data, pSAData, dataRead); data[dataRead] = '\0'; - xmlSetupParserForBuffer(locator->pParserCtxt, data, NULL); + hr = parse_buffer(This, data); SafeArrayUnaccessData(V_ARRAY(&varInput)); break; } @@ -1185,7 +1205,7 @@ static HRESULT WINAPI isaxxmlreader_parse( break; } data[dataInfo.cbSize.QuadPart] = '\0'; - xmlSetupParserForBuffer(locator->pParserCtxt, data, NULL); + hr = parse_buffer(This, data); IStream_Release(stream); break; } @@ -1196,7 +1216,7 @@ static HRESULT WINAPI isaxxmlreader_parse( IXMLDOMDocument_get_xml(xmlDoc, &bstrData); data = xmlChar_from_wchar(bstrData); - xmlSetupParserForBuffer(locator->pParserCtxt, data, NULL); + hr = parse_buffer(This, data); IXMLDOMDocument_Release(xmlDoc); hr = E_NOTIMPL; break; @@ -1207,20 +1227,23 @@ static HRESULT WINAPI isaxxmlreader_parse( hr = E_INVALIDARG; } - if(hr == S_OK) - { - if(xmlParseDocument(locator->pParserCtxt)) hr = E_FAIL; - else hr = locator->ret; - } + HeapFree(GetProcessHeap(), 0, data); + return hr; +} + +static HRESULT saxreader_onDataAvailable(void *obj, char *ptr, DWORD len) +{ + saxreader *This = obj; + xmlChar *data; + HRESULT hr; + + data = HeapAlloc(GetProcessHeap(), 0, len+1); + memcpy(data, ptr, len); + data[len] = 0; + + hr = parse_buffer(This, data); - if(locator->pParserCtxt) - { - locator->pParserCtxt->sax = NULL; - xmlFreeParserCtxt(locator->pParserCtxt); - locator->pParserCtxt = NULL; - } HeapFree(GetProcessHeap(), 0, data); - ISAXLocator_Release((ISAXLocator*)&locator->lpSAXLocatorVtbl); return hr; } @@ -1229,9 +1252,18 @@ static HRESULT WINAPI isaxxmlreader_parseURL( const WCHAR *url) { saxreader *This = impl_from_ISAXXMLReader( iface ); + bsc_t *bsc; + HRESULT hr; - FIXME("(%p)->(%s) stub\n", This, debugstr_w(url)); - return E_NOTIMPL; + TRACE("(%p)->(%s) stub\n", This, debugstr_w(url)); + + hr = bind_url(url, saxreader_onDataAvailable, This, &bsc); + if(FAILED(hr)) + return hr; + + detach_bsc(bsc); + + return S_OK; } static const struct ISAXXMLReaderVtbl isaxreader_vtbl =

1 0

Piotr Caban : msxml3: Generalize bsc_t implementation.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: 6b2e7a18ba56c1cf585604ea4f45eb0f3d4a6e79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b2e7a18ba56c1cf585604ea4… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 27 19:54:38 2008 +0200 msxml3: Generalize bsc_t implementation. --- dlls/msxml3/Makefile.in | 1 + dlls/msxml3/bsc.c | 310 +++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/domdoc.c | 299 +++-------------------------------------- dlls/msxml3/msxml_private.h | 5 + 4 files changed, 339 insertions(+), 276 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b2e7a18ba56c1cf58560…

1 0

Francois Gouget : Add some API documentation stubs to make winapi_check happy.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: eb16f43bdfa2c742d94e846f9d3ffaeeb310faa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb16f43bdfa2c742d94e846f9… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 26 19:20:33 2008 +0200 Add some API documentation stubs to make winapi_check happy. --- dlls/d3dx9_36/font.c | 6 ++++++ dlls/gdi32/font.c | 10 +++++----- dlls/gdiplus/font.c | 35 ++++++++++++++++++++++++++++++++++- dlls/gdiplus/image.c | 22 ++++++++++++++++++++++ dlls/gdiplus/region.c | 6 ++++++ dlls/inetmib1/main.c | 9 +++++++++ dlls/rpcrt4/rpc_epmap.c | 3 +++ dlls/shell32/shellpath.c | 9 +++------ dlls/wininet/urlcache.c | 3 +++ 9 files changed, 91 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb16f43bdfa2c742d94e8…

1 0

Francois Gouget : mscoree: Fix the ND_WI8() prototype.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: e59ef5658b3d725bbedfcf936d7e82cb7fa0b549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e59ef5658b3d725bbedfcf936… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 26 19:13:22 2008 +0200 mscoree: Fix the ND_WI8() prototype. --- dlls/mscoree/mscoree.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 0a75722..0195b62 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -80,7 +80,7 @@ @ stdcall ND_RU1(ptr long) @ stdcall ND_WI2(ptr long long) @ stdcall ND_WI4(ptr long long) -@ stdcall ND_WI8(ptr long long long) +@ stdcall ND_WI8(ptr long double) @ stdcall ND_WU1(ptr long long) @ stub OpenCtrs @ stub ReOpenMetaDataWithMemoryEx

1 0

Francois Gouget : winex11.drv: Fix the SysCommand() and ImeGetRegisterWordStyle() prototypes.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: c5acad84a8dcc51a09c9ec8bfcabe062499b1f39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5acad84a8dcc51a09c9ec8bf… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 26 19:12:46 2008 +0200 winex11.drv: Fix the SysCommand() and ImeGetRegisterWordStyle() prototypes. --- dlls/winex11.drv/winex11.drv.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 459ea9e..5dbe40f 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -111,7 +111,7 @@ @ cdecl SetWindowRgn(long long long) X11DRV_SetWindowRgn @ cdecl SetWindowStyle(ptr long) X11DRV_SetWindowStyle @ cdecl SetWindowText(long wstr) X11DRV_SetWindowText -@ cdecl SysCommand(long long) X11DRV_SysCommand +@ cdecl SysCommand(long long long) X11DRV_SysCommand @ cdecl WindowMessage(long long long long) X11DRV_WindowMessage @ cdecl WindowPosChanging(long long long ptr ptr ptr) X11DRV_WindowPosChanging @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr) X11DRV_WindowPosChanged @@ -163,5 +163,5 @@ @ stdcall ImeSetCompositionString(long long ptr long ptr long) @ stdcall ImeConversionList(long wstr ptr long long) @ stdcall ImeProcessKey(long long long ptr) -@ stdcall ImeGetRegisterWordStyle(wstr long wstr) +@ stdcall ImeGetRegisterWordStyle(long ptr) @ stdcall ImeGetImeMenuItems(long long long ptr ptr long)

1 0

Francois Gouget : quartz: assert.h is not a local include.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: a516f27c2f5bc4d3c5bf90765a08e078813ed5bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a516f27c2f5bc4d3c5bf90765… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 26 19:12:32 2008 +0200 quartz: assert.h is not a local include. --- dlls/quartz/videorenderer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 629ad1d..c7d6582 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -37,7 +37,7 @@ #include "ddraw.h" #include "dvdmedia.h" -#include "assert.h" +#include <assert.h> #include "wine/unicode.h" #include "wine/debug.h"

1 0

Francois Gouget : gdi32: Include config.h before using HAVE_XXX.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: 56aab13ecc8e8cb2cb75fa6972a72583fabfe2ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=56aab13ecc8e8cb2cb75fa697… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 26 19:12:15 2008 +0200 gdi32: Include config.h before using HAVE_XXX. --- dlls/gdi32/bitblt.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index f446e26..cff45be 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> #include <math.h>

1 0

Francois Gouget : appwiz.cpl: Fix the CPlApplet() prototype.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: 4627e86046d8ba4f10003f8c14e2418483a97ea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4627e86046d8ba4f10003f8c1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 26 19:13:27 2008 +0200 appwiz.cpl: Fix the CPlApplet() prototype. --- dlls/appwiz.cpl/appwiz.cpl.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.cpl.spec b/dlls/appwiz.cpl/appwiz.cpl.spec index 7ae3a01..3896019 100644 --- a/dlls/appwiz.cpl/appwiz.cpl.spec +++ b/dlls/appwiz.cpl/appwiz.cpl.spec @@ -1 +1 @@ -1 stdcall CPlApplet() +1 stdcall CPlApplet(long long long long)

1 0

Francois Gouget : appwiz.cpl: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: a5ef61e0d312bcb12655ebff0d4793503a05c353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5ef61e0d312bcb12655ebff0… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 26 19:11:37 2008 +0200 appwiz.cpl: Fix compilation on systems that don't support nameless unions. --- dlls/appwiz.cpl/appwiz.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index e06d810..6da1a77 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -23,6 +23,8 @@ * */ +#define NONAMELESSUNION + #include "config.h" #include "wine/port.h" #include "wine/unicode.h" @@ -708,8 +710,8 @@ static void StartApplet(HWND hWnd) psp.dwSize = sizeof (PROPSHEETPAGEW); psp.dwFlags = PSP_USETITLE; psp.hInstance = hInst; - psp.pszTemplate = MAKEINTRESOURCEW (IDD_MAIN); - psp.pszIcon = NULL; + psp.u.pszTemplate = MAKEINTRESOURCEW (IDD_MAIN); + psp.u2.pszIcon = NULL; psp.pfnDlgProc = (DLGPROC) MainDlgProc; psp.pszTitle = tab_title; psp.lParam = 0; @@ -719,12 +721,12 @@ static void StartApplet(HWND hWnd) psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID; psh.hwndParent = hWnd; psh.hInstance = hInst; - psh.pszIcon = NULL; + psh.u.pszIcon = NULL; psh.pszCaption = app_title; psh.nPages = 1; - psh.ppsp = &psp; + psh.u3.ppsp = &psp; psh.pfnCallback = NULL; - psh.nStartPage = 0; + psh.u2.nStartPage = 0; /* Display the property sheet */ PropertySheetW (&psh);

1 0

Francois Gouget : gdiplus: Add a trailing '\n' to a Wine trace.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: fe1ce0e34102749eb968d473e612b5bdd63e893b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe1ce0e34102749eb968d473e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 26 19:10:42 2008 +0200 gdiplus: Add a trailing '\n' to a Wine trace. --- dlls/gdiplus/region.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 6c52623..4a11623 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -330,7 +330,7 @@ GpStatus WINGDIPAPI GdipSetInfinite(GpRegion *region) if (!region) return InvalidParameter; - TRACE("%p", region); + TRACE("%p\n", region); delete_element(&region->node); stat = init_region(region, RegionDataInfiniteRect);

1 0

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 July 2008