wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Matteo Bruni : wpp: Explicitly pass include type to the lookup callback function.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 80034de2433d6c11900c47c998550af9b3bc860a URL: http://source.winehq.org/git/wine.git/?a=commit;h=80034de2433d6c11900c47c99… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 13 18:04:21 2012 +0200 wpp: Explicitly pass include type to the lookup callback function. Also, always pass the parent name to the callback, d3dcompiler needs that information. --- dlls/d3dcompiler_43/compiler.c | 2 +- include/wine/wpp.h | 8 ++++---- libs/wpp/ppl.l | 2 +- libs/wpp/preproc.c | 12 ++++++------ libs/wpp/wpp_private.h | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 5159db8..27d6504 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -143,7 +143,7 @@ static void wpp_warning(const char *file, int line, int col, const char *near, wpp_write_message_var("\n"); } -static char *wpp_lookup_mem(const char *filename, const char *parent_name, +static char *wpp_lookup_mem(const char *filename, int type, const char *parent_name, char **include_path, int include_path_count) { /* Here we return always ok. We will maybe fail on the next wpp_open_mem */ diff --git a/include/wine/wpp.h b/include/wine/wpp.h index 2d284f1..ac180be 100644 --- a/include/wine/wpp.h +++ b/include/wine/wpp.h @@ -29,12 +29,12 @@ struct wpp_callbacks /* I/O callbacks */ /* Looks for a file to include, returning the path where it is found */ - /* parent_name is the directory of the parent source file (for local - * includes), includepath is an array of additional include paths */ - char *(*lookup)( const char *filename, const char *parent_name, + /* The type param is true for local (#include "filename.h") includes */ + /* parent_name is the directory of the parent source file, includepath + * is an array of additional include paths */ + char *(*lookup)( const char *filename, int type, const char *parent_name, char **include_path, int include_path_count ); /* Opens an include file */ - /* The type param is true if it is a local ("...") include */ void *(*open)( const char *filename, int type ); /* Closes a previously opened file */ void (*close)( void *file ); diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 8d979dc..70bd213 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -1601,7 +1601,7 @@ void pp_do_include(char *fname, int type) /* Undo the effect of the quotation */ fname[n-1] = '\0'; - if((fp = pp_open_include(fname+1, type ? pp_status.input : NULL, &newpath)) == NULL) + if((fp = pp_open_include(fname+1, type, pp_status.input, &newpath)) == NULL) { ppy_error("Unable to open include file %s", fname+1); return; diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c index b9d8443..233d260 100644 --- a/libs/wpp/preproc.c +++ b/libs/wpp/preproc.c @@ -115,7 +115,7 @@ char *pp_xstrdup(const char *str) return memcpy(s, str, len); } -static char *wpp_default_lookup(const char *name, const char *parent_name, +static char *wpp_default_lookup(const char *name, int type, const char *parent_name, char **include_path, int include_path_count) { char *cpy; @@ -144,7 +144,7 @@ static char *wpp_default_lookup(const char *name, const char *parent_name, } *cptr = '\0'; - if(parent_name) + if(type && parent_name) { /* Search directory of parent include and then -I path */ const char *p; @@ -507,17 +507,17 @@ int wpp_add_include_path(const char *path) char *wpp_find_include(const char *name, const char *parent_name) { - return wpp_default_lookup(name, parent_name, includepath, nincludepath); + return wpp_default_lookup(name, !!parent_name, parent_name, includepath, nincludepath); } -void *pp_open_include(const char *name, const char *parent_name, char **newpath) +void *pp_open_include(const char *name, int type, const char *parent_name, char **newpath) { char *path; void *fp; - if (!(path = wpp_callbacks->lookup(name, parent_name, includepath, + if (!(path = wpp_callbacks->lookup(name, type, parent_name, includepath, nincludepath))) return NULL; - fp = wpp_callbacks->open(path, !!parent_name); + fp = wpp_callbacks->open(path, type); if (fp) { diff --git a/libs/wpp/wpp_private.h b/libs/wpp/wpp_private.h index 288d709..4e2aa5b 100644 --- a/libs/wpp/wpp_private.h +++ b/libs/wpp/wpp_private.h @@ -207,7 +207,7 @@ void pp_pop_define_state(void); pp_entry_t *pp_add_define(const char *def, const char *text); pp_entry_t *pp_add_macro(char *ident, marg_t *args[], int nargs, mtext_t *exp); void pp_del_define(const char *name); -void *pp_open_include(const char *name, const char *parent_name, char **newpath); +void *pp_open_include(const char *name, int type, const char *parent_name, char **newpath); void pp_push_if(pp_if_state_t s); void pp_next_if_state(int); pp_if_state_t pp_pop_if(void);

1 0

Matteo Bruni : wpp: Invert 'type' callback parameter value, to match comment.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 8b0d3d9f9abf6cd4a690323f078ed74844ad2a14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b0d3d9f9abf6cd4a690323f0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 13 18:04:20 2012 +0200 wpp: Invert 'type' callback parameter value, to match comment. --- dlls/d3dcompiler_43/compiler.c | 2 +- libs/wpp/preproc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 1eb07ce..5159db8 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -193,7 +193,7 @@ static void *wpp_open_mem(const char *filename, int type) return NULL; } hr = ID3DInclude_Open(current_include, - type ? D3D_INCLUDE_SYSTEM : D3D_INCLUDE_LOCAL, + type ? D3D_INCLUDE_LOCAL : D3D_INCLUDE_SYSTEM, filename, parent_include, (LPCVOID *)&desc->buffer, &desc->size); if(FAILED(hr)) diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c index 99934d6..b9d8443 100644 --- a/libs/wpp/preproc.c +++ b/libs/wpp/preproc.c @@ -517,7 +517,7 @@ void *pp_open_include(const char *name, const char *parent_name, char **newpath) if (!(path = wpp_callbacks->lookup(name, parent_name, includepath, nincludepath))) return NULL; - fp = wpp_callbacks->open(path, parent_name == NULL ? 1 : 0); + fp = wpp_callbacks->open(path, !!parent_name); if (fp) {

1 0

Henri Verbeet : ddraw: Merge ddraw_surface_destroy() into ddraw_surface_cleanup().
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: c722f2d31ec61fe372e466957605b222ee6f9a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c722f2d31ec61fe372e466957… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 13 18:23:35 2012 +0200 ddraw: Merge ddraw_surface_destroy() into ddraw_surface_cleanup(). --- dlls/ddraw/surface.c | 51 ++++++++++-------------------------------- dlls/ddraw/tests/dsurface.c | 2 +- 2 files changed, 13 insertions(+), 40 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d1309ee..3f9f78f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -444,37 +444,6 @@ static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface) return IUnknown_AddRef(surface->texture_outer); } -/***************************************************************************** - * ddraw_surface_destroy - * - * A helper function for IDirectDrawSurface7::Release - * - * Frees the surface, regardless of its refcount. - * See IDirectDrawSurface7::Release for more information - * - * Params: - * This: Surface to free - * - *****************************************************************************/ -static void ddraw_surface_destroy(struct ddraw_surface *This) -{ - TRACE("surface %p.\n", This); - - /* Check the iface count and give a warning */ - if(This->iface_count > 1) - { - /* This can happen when a complex surface is destroyed, - * because the 2nd surface was addref()ed when the app - * called GetAttachedSurface - */ - WARN("(%p): Destroying surface with refcounts 7: %d 4: %d 3: %d 2: %d 1: %d\n", - This, This->ref7, This->ref4, This->ref3, This->ref2, This->ref1); - } - - if (This->wined3d_surface) - wined3d_surface_decref(This->wined3d_surface); -} - static void ddraw_surface_cleanup(struct ddraw_surface *surface) { struct ddraw_surface *surf; @@ -498,20 +467,24 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) surf = surface->complex_array[i]; surface->complex_array[i] = NULL; - while (surf) - { - struct ddraw_surface *destroy = surf; - surf = surf->complex_array[0]; /* Iterate through the "tree" */ - ddraw_surface_destroy(destroy); /* Destroy it */ - } + ddraw_surface_cleanup(surf); } if (surface->device1) IUnknown_Release(&surface->device1->IUnknown_inner); ifaceToRelease = surface->ifaceToRelease; - /* Destroy the root surface. */ - ddraw_surface_destroy(surface); + if (surface->iface_count > 1) + { + /* This can happen when a complex surface is destroyed, because the + * 2nd surface was addref()ed when the app called + * GetAttachedSurface(). */ + WARN("Destroying surface %p with refcounts 7: %u 4: %u 3: %u 2: %u 1: %u.\n", + surface, surface->ref7, surface->ref4, surface->ref3, surface->ref2, surface->ref1); + } + + if (surface->wined3d_surface) + wined3d_surface_decref(surface->wined3d_surface); /* Reduce the ddraw refcount */ if (ifaceToRelease) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index ecc54f1..e3cd085 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1958,7 +1958,7 @@ static void CubeMapTest(void) IDirectDrawSurface7_Release(cubemap); ref = getRefcount((IUnknown *) palette); - todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + ok(ref == 1, "Refcount is %u, expected 1\n", ref); IDirectDrawPalette_Release(palette);

1 0

Huw Davies : localspl: Remove a bunch of casts.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: af8228f02a6cc3b05028f29a8f2621f847e85f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=af8228f02a6cc3b05028f29a8… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 13 16:29:26 2012 +0100 localspl: Remove a bunch of casts. --- dlls/localspl/provider.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index a599113..4a6e2d2 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1059,6 +1059,7 @@ static BOOL WINAPI fpGetPrinterDriverDirectory(LPWSTR pName, LPWSTR pEnvironment { DWORD needed; const printenv_t * env; + WCHAR * const dir = (WCHAR *)pDriverDirectory; TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_w(pName), debugstr_w(pEnvironment), Level, pDriverDirectory, cbBuf, pcbNeeded); @@ -1087,18 +1088,18 @@ static BOOL WINAPI fpGetPrinterDriverDirectory(LPWSTR pName, LPWSTR pEnvironment return FALSE; } - if (pDriverDirectory == NULL) { + if (dir == NULL) { /* ERROR_INVALID_USER_BUFFER is NT, ERROR_INVALID_PARAMETER is win9x */ SetLastError(ERROR_INVALID_USER_BUFFER); return FALSE; } - GetSystemDirectoryW((LPWSTR) pDriverDirectory, cbBuf/sizeof(WCHAR)); + GetSystemDirectoryW( dir, cbBuf / sizeof(WCHAR) ); /* add the Subdirectories */ - lstrcatW((LPWSTR) pDriverDirectory, spooldriversW); - lstrcatW((LPWSTR) pDriverDirectory, env->subdir); + lstrcatW( dir, spooldriversW ); + lstrcatW( dir, env->subdir ); - TRACE("=> %s\n", debugstr_w((LPWSTR) pDriverDirectory)); + TRACE( "=> %s\n", debugstr_w( dir ) ); return TRUE; }

1 0

Piotr Caban : msvcp90: Specify open mode in basic_ifstream<char> functions.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 30a1ed53d7a6680e48dce7db1a9fcfb9efe310bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=30a1ed53d7a6680e48dce7db1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 13 15:23:35 2012 +0200 msvcp90: Specify open mode in basic_ifstream<char> functions. --- dlls/msvcp90/ios.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a2bf8b0..d5949ff 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5037,7 +5037,7 @@ basic_ifstream_char* __thiscall basic_ifstream_char_ctor_name(basic_ifstream_cha basic_ifstream_char_ctor(this, virt_init); - if(!basic_filebuf_char_open(&this->filebuf, name, mode, prot)) { + if(!basic_filebuf_char_open(&this->filebuf, name, mode|OPENMODE_in, prot)) { basic_ios_char *basic_ios = basic_istream_char_get_basic_ios(&this->base); basic_ios_char_setstate(basic_ios, IOSTATE_failbit); } @@ -5046,6 +5046,8 @@ basic_ifstream_char* __thiscall basic_ifstream_char_ctor_name(basic_ifstream_cha /* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAE@PBGHH@Z */ /* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAA@PEBGHH@Z */ +/* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAE@PB_WHH@Z */ +/* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAA@PEB_WHH@Z */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_ctor_name_wchar, 20) basic_ifstream_char* __thiscall basic_ifstream_char_ctor_name_wchar(basic_ifstream_char *this, const wchar_t *name, int mode, int prot, MSVCP_bool virt_init) @@ -5054,7 +5056,7 @@ basic_ifstream_char* __thiscall basic_ifstream_char_ctor_name_wchar(basic_ifstre basic_ifstream_char_ctor(this, virt_init); - if(!basic_filebuf_char_open_wchar(&this->filebuf, name, mode, prot)) { + if(!basic_filebuf_char_open_wchar(&this->filebuf, name, mode|OPENMODE_in, prot)) { basic_ios_char *basic_ios = basic_istream_char_get_basic_ios(&this->base); basic_ios_char_setstate(basic_ios, IOSTATE_failbit); } @@ -5136,7 +5138,7 @@ void __thiscall basic_ifstream_char_open(basic_ifstream_char *this, { TRACE("(%p %s %d %d)\n", this, name, mode, prot); - if(!basic_filebuf_char_open(&this->filebuf, name, mode, prot)) { + if(!basic_filebuf_char_open(&this->filebuf, name, mode|OPENMODE_in, prot)) { basic_ios_char *basic_ios = basic_istream_char_get_basic_ios(&this->base); basic_ios_char_setstate(basic_ios, IOSTATE_failbit); } @@ -5146,20 +5148,22 @@ void __thiscall basic_ifstream_char_open(basic_ifstream_char *this, /* ?open@?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAAXPEBDI@Z */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_open_old, 12) void __thiscall basic_ifstream_char_open_old(basic_ifstream_char *this, - const char *name, unsigned int mod) + const char *name, unsigned int mode) { - basic_ifstream_char_open(this, name, mod, _SH_DENYNO); + basic_ifstream_char_open(this, name, mode, _SH_DENYNO); } /* ?open@?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAEXPBGHH@Z */ /* ?open@?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAAXPEBGHH@Z */ +/* ?open@?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAEXPB_WHH@Z */ +/* ?open@?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAAXPEB_WHH@Z */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_open_wchar, 16) void __thiscall basic_ifstream_char_open_wchar(basic_ifstream_char *this, const wchar_t *name, int mode, int prot) { TRACE("(%p %s %d %d)\n", this, debugstr_w(name), mode, prot); - if(!basic_filebuf_char_open_wchar(&this->filebuf, name, mode, prot)) { + if(!basic_filebuf_char_open_wchar(&this->filebuf, name, mode|OPENMODE_in, prot)) { basic_ios_char *basic_ios = basic_istream_char_get_basic_ios(&this->base); basic_ios_char_setstate(basic_ios, IOSTATE_failbit); } @@ -5167,6 +5171,8 @@ void __thiscall basic_ifstream_char_open_wchar(basic_ifstream_char *this, /* ?open@?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAEXPBGI@Z */ /* ?open@?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAAXPEBGI@Z */ +/* ?open@?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAEXPB_WI@Z */ +/* ?open@?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAAXPEB_WI@Z */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_open_wchar_old, 12) void __thiscall basic_ifstream_char_open_wchar_old(basic_ifstream_char *this, const wchar_t *name, unsigned int mode)

1 0

Piotr Caban : msvcp90: Added basic_ofstream<char> implementation.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 43d99a1b684e9cd7c68e16f553cdf3a79afbac2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d99a1b684e9cd7c68e16f55… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 13 15:22:29 2012 +0200 msvcp90: Added basic_ofstream<char> implementation. --- dlls/msvcp90/ios.c | 235 ++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/msvcp90.spec | 68 +++++++------- 2 files changed, 265 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43d99a1b684e9cd7c68e1…

1 0

Piotr Caban : msvcp90: Added basic_iostream<char> implementation.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: de5cf35cb78404ca4e4fd16e9667a07a4008c9df URL: http://source.winehq.org/git/wine.git/?a=commit;h=de5cf35cb78404ca4e4fd16e9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 13 15:22:13 2012 +0200 msvcp90: Added basic_iostream<char> implementation. --- dlls/msvcp90/ios.c | 94 ++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/msvcp90.h | 22 +++++++---- dlls/msvcp90/msvcp90.spec | 22 +++++----- 3 files changed, 117 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de5cf35cb78404ca4e4fd…

1 0

Jacek Caban : mshtml: Release script hosts in window_set_docnode.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: e120ca06c36a6ed6dc3303099fca030fa7a87b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e120ca06c36a6ed6dc3303099… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 13 14:11:36 2012 +0200 mshtml: Release script hosts in window_set_docnode. --- dlls/mshtml/htmlwindow.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 43c65d9..ff17f95 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -49,6 +49,7 @@ static void window_set_docnode(HTMLWindow *window, HTMLDocumentNode *doc_node) window->doc->basedoc.cp_container.forward_container = NULL; detach_events(window->doc); abort_document_bindings(window->doc); + release_script_hosts(window); window->doc->basedoc.window = NULL; htmldoc_release(&window->doc->basedoc); }

1 0

Ulrik Dickow : msxml3/tests: Test namespace change for all document versions.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: fc8ab63563663f5076d86fa814289d2e046e5125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc8ab63563663f5076d86fa81… Author: Ulrik Dickow <u.dickow(a)gmail.com> Date: Wed Jun 13 16:19:02 2012 +0200 msxml3/tests: Test namespace change for all document versions. --- dlls/msxml3/tests/domdoc.c | 159 +++++++++++++++++++++++--------------------- 1 files changed, 82 insertions(+), 77 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d4ff6a2..0c9d65a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7160,7 +7160,86 @@ static void test_testTransforms(void) free_bstrs(); } -static void test_namespaces(void) +struct namespaces_change_t { + const CLSID *clsid; + const char *name; +}; + +static const struct namespaces_change_t namespaces_change_test_data[] = { + { &CLSID_DOMDocument, "CLSID_DOMDocument" }, + { &CLSID_DOMDocument2, "CLSID_DOMDocument2" }, + { &CLSID_DOMDocument26, "CLSID_DOMDocument26" }, + { &CLSID_DOMDocument30, "CLSID_DOMDocument30" }, + { &CLSID_DOMDocument40, "CLSID_DOMDocument40" }, + { &CLSID_DOMDocument60, "CLSID_DOMDocument60" }, + { 0 } +}; + +static void test_namespaces_change(void) +{ + const struct namespaces_change_t *class_ptr = namespaces_change_test_data; + + while (class_ptr->clsid) + { + IXMLDOMDocument *doc = NULL; + IXMLDOMElement *elem = NULL; + IXMLDOMNode *node = NULL; + + VARIANT var; + HRESULT hr; + BSTR str; + + hr = CoCreateInstance(class_ptr->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDOMDocument, (void**)&doc); + if (hr != S_OK) + { + win_skip("failed to create class instance for %s\n", class_ptr->name); + class_ptr++; + continue; + } + + V_VT(&var) = VT_I2; + V_I2(&var) = NODE_ELEMENT; + + hr = IXMLDOMDocument_createNode(doc, var, _bstr_("ns:elem"), _bstr_("ns/uri"), &node); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_appendChild(doc, node, NULL); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + /* try same prefix, different uri */ + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_("ns/uri2"); + + hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); + EXPECT_HR(hr, E_INVALIDARG); + + /* try same prefix and uri */ + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_("ns/uri"); + + hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_get_xml(elem, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("<ns:elem xmlns:ns=\"ns/uri\"/>")), "got element %s for %s\n", + wine_dbgstr_w(str), class_ptr->name); + SysFreeString(str); + + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); + + free_bstrs(); + + class_ptr++; + } +} + +static void test_namespaces_basic(void) { static const CHAR namespaces_xmlA[] = "<?xml version=\"1.0\"?>\n" @@ -7175,7 +7254,6 @@ static void test_namespaces(void) IXMLDOMNode *node; VARIANT_BOOL b; - VARIANT var; HRESULT hr; BSTR str; @@ -7252,80 +7330,6 @@ static void test_namespaces(void) IXMLDOMDocument_Release(doc); - /* create on element and try to alter namespace after that */ - doc = create_document(&IID_IXMLDOMDocument); - if (!doc) return; - - V_VT(&var) = VT_I2; - V_I2(&var) = NODE_ELEMENT; - - hr = IXMLDOMDocument_createNode(doc, var, _bstr_("ns:elem"), _bstr_("ns/uri"), &node); - EXPECT_HR(hr, S_OK); - - hr = IXMLDOMDocument_appendChild(doc, node, NULL); - EXPECT_HR(hr, S_OK); - - hr = IXMLDOMDocument_get_documentElement(doc, &elem); - EXPECT_HR(hr, S_OK); - - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = _bstr_("ns/uri2"); - - hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); - EXPECT_HR(hr, E_INVALIDARG); - - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = _bstr_("ns/uri"); - - hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); - EXPECT_HR(hr, S_OK); - - hr = IXMLDOMElement_get_xml(elem, &str); - EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("<ns:elem xmlns:ns=\"ns/uri\"/>")), "got element %s\n", wine_dbgstr_w(str)); - SysFreeString(str); - - IXMLDOMElement_Release(elem); - IXMLDOMDocument_Release(doc); - - /* create on element and try to alter namespace after that */ - doc = create_document_version(60, &IID_IXMLDOMDocument); - if (!doc) return; - - V_VT(&var) = VT_I2; - V_I2(&var) = NODE_ELEMENT; - - hr = IXMLDOMDocument_createNode(doc, var, _bstr_("ns:elem"), _bstr_("ns/uri"), &node); - EXPECT_HR(hr, S_OK); - - hr = IXMLDOMDocument_appendChild(doc, node, NULL); - EXPECT_HR(hr, S_OK); - - hr = IXMLDOMDocument_get_documentElement(doc, &elem); - EXPECT_HR(hr, S_OK); - - /* try same prefix, different uri */ - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = _bstr_("ns/uri2"); - - hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); - EXPECT_HR(hr, E_INVALIDARG); - - /* try same prefix and uri */ - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = _bstr_("ns/uri"); - - hr = IXMLDOMElement_setAttribute(elem, _bstr_("xmlns:ns"), var); - EXPECT_HR(hr, S_OK); - - hr = IXMLDOMElement_get_xml(elem, &str); - EXPECT_HR(hr, S_OK); - ok(!lstrcmpW(str, _bstr_("<ns:elem xmlns:ns=\"ns/uri\"/>")), "got element %s\n", wine_dbgstr_w(str)); - SysFreeString(str); - - IXMLDOMElement_Release(elem); - IXMLDOMDocument_Release(doc); - free_bstrs(); } @@ -11851,7 +11855,8 @@ START_TEST(domdoc) test_xmlTypes(); test_save(); test_testTransforms(); - test_namespaces(); + test_namespaces_basic(); + test_namespaces_change(); test_FormattingXML(); test_nodeTypedValue(); test_TransformWithLoadingLocalFile();

1 0

Alexandre Julliard : mountmgr: Add support for UDisks2.
by Alexandre Julliard 13 Jun '12

13 Jun '12

Module: wine Branch: master Commit: 2ffc57821fc2b1d5094ed2e0746c9718cdbab077 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ffc57821fc2b1d5094ed2e07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 13 17:51:00 2012 +0200 mountmgr: Add support for UDisks2. --- dlls/mountmgr.sys/dbus.c | 215 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 203 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ffc57821fc2b1d5094ed…

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
83
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 June 2012