May 2007 - Wine-Commits - list.winehq.org

Frank Richter : shdoclc: Update German translation.
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: 7e5886435c710d06b215868dd8998dffd2f23be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e5886435c710d06b215868dd… Author: Frank Richter <frank.richter(a)gmail.com> Date: Sun May 13 16:27:04 2007 +0200 shdoclc: Update German translation. --- dlls/shdoclc/De.rc | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/shdoclc/De.rc b/dlls/shdoclc/De.rc index 4c79022..c202773 100644 --- a/dlls/shdoclc/De.rc +++ b/dlls/shdoclc/De.rc @@ -21,6 +21,17 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ + IDS_MESSAGE_BOX_TITLE, "Wine Internet Explorer" +} + +STRINGTABLE DISCARDABLE +{ + IDS_PRINT_HEADER_TEMPLATE "&w&bSeite &p" /* FIXME: should be "&w&bSeite &p von &P" */ + IDS_PRINT_FOOTER_TEMPLATE "&u&b&d" +} + IDR_BROWSE_CONTEXT_MENU MENU { POPUP "Standard"

1 0

Rolf Kalbermatter : advapi32: Add service state request definitions.
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: 56e447c6092cf6af9af9fc5b9750530d4c7709f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e447c6092cf6af9af9fc5b9… Author: Rolf Kalbermatter <r.kalbermatter(a)hccnet.nl> Date: Sun May 13 14:57:10 2007 +0200 advapi32: Add service state request definitions. --- include/winsvc.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/winsvc.h b/include/winsvc.h index 8f6184d..a6cc7e5 100644 --- a/include/winsvc.h +++ b/include/winsvc.h @@ -38,6 +38,11 @@ extern "C" { #define SERVICES_ACTIVE_DATABASE WINELIB_NAME_AW( SERVICES_ACTIVE_DATABASE ) #define SERVICES_FAILED_DATABASE WINELIB_NAME_AW( SERVICES_FAILED_DATABASE ) +/* Service State requests */ +#define SERVICE_ACTIVE 0x00000001 +#define SERVICE_INACTIVE 0x00000002 +#define SERVICE_STATE_ALL (SERVICE_ACTIVE | SERVICE_INACTIVE) + /* Controls */ #define SERVICE_CONTROL_STOP 0x00000001 #define SERVICE_CONTROL_PAUSE 0x00000002

1 0

Frank Richter : cmd: Updated German translation.
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: 0fa2cbab76af5eab1c7827d2fafeca061b74988e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa2cbab76af5eab1c7827d2f… Author: Frank Richter <frank.richter(a)gmail.com> Date: Sun May 13 16:13:18 2007 +0200 cmd: Updated German translation. --- programs/cmd/De.rc | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/programs/cmd/De.rc b/programs/cmd/De.rc index 05c4326..9d2802d 100644 --- a/programs/cmd/De.rc +++ b/programs/cmd/De.rc @@ -215,6 +215,13 @@ Das Verify Flag hat keine Funktion in Wine.\n" WCMD_VOL, "Hilfe f�r VOL\n" + WCMD_PUSHD, "PUSHD <Verzeichnisname> speichert das aktuelle\n\ +Verzeichnis auf einem Stack und wecheselt das Arbeitsverzeichnis\n\ +zu dem angegebenen.\n" + + WCMD_POPD, "POPD wechselt das Arbeitsverzeichnis zu dem zuletzt\n\ +mit PUSHD gespeicherten.\n" + WCMD_MORE, "MORE displays output of files or piped input in pages.\n" WCMD_EXIT, @@ -251,11 +258,11 @@ EXIT\t\tBeendet den CMD\n\n\ Geben Sie HELP <Befehl> ein, damit Sie weitere Informationen f�r einen der\n\ obigen Befehle erhalten.\n" - WCMD_CONFIRM, "Are you sure" - WCMD_YES, "Y" + WCMD_CONFIRM, "Sind sie sicher" + WCMD_YES, "J" WCMD_NO, "N" - WCMD_NOASSOC, "File association missing for extension %s\n" - WCMD_NOFTYPE, "No open command associated with file type '%s'\n" + WCMD_NOASSOC, "Verkn�pfung f�r Dateiendung %s fehlt\n" + WCMD_NOFTYPE, "Kein Befehl zum �ffnen f�r Dateityp '%s'\n" WCMD_OVERWRITE, "Overwrite" WCMD_MORESTR, "More..." }

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: 72ed2149326f7570f41b9efa3b4cad1bfd44651c URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ed2149326f7570f41b9efa3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 12 23:06:51 2007 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/dsurface.c | 64 +++++++++++++++++++++--------------------- 1 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=72ed2149326f7570f41b9…

1 0

Dan Hipschman : widl: Remove an unnecessary assignment in write_pointers.
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: faf50715493df83b38e43176cb2d13c4149a0ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faf50715493df83b38e43176c… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri May 11 17:26:43 2007 -0700 widl: Remove an unnecessary assignment in write_pointers. --- tools/widl/typegen.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index e8385ec..3bd133b 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -728,8 +728,7 @@ static int write_pointers(FILE *file, const attr_list_t *attrs, } else { - pointers_written = write_pointers(file, attrs, type->ref, array, - level + 1, typestring_offset); + write_pointers(file, attrs, type->ref, array, level + 1, typestring_offset); if (1 < level) {

1 0

José Manuel Ferrer Ortiz : winecfg: Updated Spanish translation.
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: d1c56cb44aa3c7ef1630a2ea08103785796ffed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c56cb44aa3c7ef1630a2ea0… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Sat May 12 17:06:25 2007 -0700 winecfg: Updated Spanish translation. --- programs/winecfg/Es.rc | 204 +++++++++++++++++++++++++++--------------------- 1 files changed, 114 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1c56cb44aa3c7ef1630a…

1 0

Marcus Meissner : wined3d: Fixed swapchain context NULL ptr checks.
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: 4b9fedbb067ca484a0e04c447cf18be6b415c49e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9fedbb067ca484a0e04c447… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat May 12 10:22:42 2007 +0200 wined3d: Fixed swapchain context NULL ptr checks. --- dlls/wined3d/device.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 16df8a5..223cdb4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1366,15 +1366,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic /** FIXME: Handle stencil appropriately via EnableAutoDepthStencil / AutoDepthStencilFormat **/ object->context = HeapAlloc(GetProcessHeap(), 0, sizeof(object->context)); - if(!object->context) { - } + if(!object->context) + return E_OUTOFMEMORY; object->num_contexts = 1; ENTER_GL(); object->context[0] = CreateContext(This, (IWineD3DSurfaceImpl *) object->frontBuffer, display, object->win); LEAVE_GL(); - if (!object->context) { + if (!object->context[0]) { ERR("Failed to create a new context\n"); hr = WINED3DERR_NOTAVAILABLE; goto error; @@ -1517,9 +1517,8 @@ error: HeapFree(GetProcessHeap(), 0, object->backBuffer); object->backBuffer = NULL; } - if(object->context) { + if(object->context[0]) DestroyContext(This, object->context[0]); - } if(object->frontBuffer) { IWineD3DSurface_GetParent(object->frontBuffer, &bufferParent); IUnknown_Release(bufferParent); /* once for the get parent */

1 0

Dan Hipschman : widl: Handle pointers fields that point to structures.
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: d9c120490fbea62f5696ed99c7f4d8390f9dfef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9c120490fbea62f5696ed99c… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri May 11 17:27:40 2007 -0700 widl: Handle pointers fields that point to structures. --- dlls/rpcrt4/tests/server.c | 9 +++++++++ dlls/rpcrt4/tests/server.idl | 7 +++++++ tools/widl/typegen.c | 9 +++++++-- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 0086b97..8fd107b 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -126,6 +126,12 @@ s_ptypes_sum(ptypes_t *pt) return *pt->pc + *pt->ps + *pt->pl + *pt->pf + *pt->pd; } +int +s_dot_pvectors(pvectors_t *p) +{ + return p->pu->x * (*p->pv)->x + p->pu->y * (*p->pv)->y + p->pu->z * (*p->pv)->z; +} + void s_stop(void) { @@ -167,6 +173,8 @@ basic_tests(void) static char string[] = "I am a string"; static int f[5] = {1, 3, 0, -2, -4}; static vector_t a = {1, 3, 7}; + static vector_t vec1 = {4, -2, 1}, vec2 = {-5, 2, 3}, *pvec2 = &vec2; + static pvectors_t pvecs = {&vec1, &pvec2}; pints_t pints; ptypes_t ptypes; int i1, i2, i3, *pi2, *pi3, **ppi3; @@ -231,6 +239,7 @@ basic_tests(void) ptypes.pd = &u; ok(ptypes_sum(&ptypes) == 33.0, "RPC ptypes_sum\n"); + ok(dot_pvectors(&pvecs) == -21, "RPC dot_pvectors\n"); ok(sum_fixed_array(f) == -2, "RPC sum_fixed_array\n"); } diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 4830e8c..e087f1e 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -47,6 +47,12 @@ interface IServer double *pd; } ptypes_t; + typedef struct + { + vector_t *pu; + vector_t **pv; + } pvectors_t; + int int_return(void); int square(int x); int sum(int x, int y); @@ -60,5 +66,6 @@ interface IServer int sum_fixed_array(int a[5]); int pints_sum(pints_t *pints); double ptypes_sum(ptypes_t *ptypes); + int dot_pvectors(pvectors_t *pvectors); void stop(void); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 3bd133b..d2597b3 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -675,8 +675,10 @@ static size_t write_nonsimple_pointer(FILE *file, const type_t *type, size_t off { short absoff = type->ref->typestring_offset; short reloff = absoff - (offset + 2); - print_file(file, 2, "0x%02x, 0x10,\t/* %s */\n", - type->type, string_of_type(type->type)); + int ptr_attr = is_ptr(type->ref) ? 0x10 : 0x0; + + print_file(file, 2, "0x%02x, 0x%x,\t/* %s */\n", + type->type, ptr_attr, string_of_type(type->type)); print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%hd) */\n", reloff, reloff, absoff); return 4; @@ -1207,6 +1209,7 @@ static size_t write_struct_tfs(FILE *file, type_t *type, write_pointers(file, NULL, type, NULL, 0, typestring_offset); start_offset = *typestring_offset; + type->typestring_offset = start_offset; if (type->type == RPC_FC_STRUCT) WRITE_FCTYPE(file, FC_STRUCT, *typestring_offset); else @@ -1249,6 +1252,7 @@ static size_t write_struct_tfs(FILE *file, type_t *type, write_pointers(file, NULL, type, NULL, 0, typestring_offset); start_offset = *typestring_offset; + type->typestring_offset = start_offset; if (type->type == RPC_FC_CSTRUCT) WRITE_FCTYPE(file, FC_CSTRUCT, *typestring_offset); else @@ -1300,6 +1304,7 @@ static size_t write_struct_tfs(FILE *file, type_t *type, has_pointers = write_pointers(file, NULL, type, NULL, 0, typestring_offset); start_offset = *typestring_offset; + type->typestring_offset = start_offset; WRITE_FCTYPE(file, FC_CVSTRUCT, *typestring_offset); /* alignment */ print_file(file, 2, "0x%02x,\n", align - 1);

1 0

Andrew Talbot : advapi32: Fix a typo.
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: eb48a472602cb232a6513f0d3085ddd2d78efe59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb48a472602cb232a6513f0d3… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat May 12 23:09:58 2007 +0100 advapi32: Fix a typo. --- dlls/advapi32/advapi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 126f8d1..b92d3de 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -120,7 +120,7 @@ BOOL WINAPI GetCurrentHwProfileA(LPHW_PROFILE_INFOA pInfo) { FIXME("(%p) semi-stub\n", pInfo); pInfo->dwDockInfo = DOCKINFO_DOCKED; - strcpy(pInfo->szHwProfileGuid,"{12340001-1234-1234-1234-1233456789012}"); + strcpy(pInfo->szHwProfileGuid,"{12340001-1234-1234-1234-123456789012}"); strcpy(pInfo->szHwProfileName,"Wine Profile"); return 1; }

1 0

Mikołaj Zalewski : msxml3: Implement IXMLDOMDocument2: :setProperty("SelectionLanguage", ...).
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: bf3849ad6f4205c9e11e3ef26a67ef192a99fbe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf3849ad6f4205c9e11e3ef26… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed May 9 20:09:11 2007 +0200 msxml3: Implement IXMLDOMDocument2::setProperty("SelectionLanguage", ...). --- dlls/msxml3/domdoc.c | 58 ++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 91 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 8b3f561..a0264ca 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -43,6 +43,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 +static const WCHAR SZ_PROPERTY_SELECTION_LANGUAGE[] = {'S','e','l','e','c','t','i','o','n','L','a','n','g','u','a','g','e',0}; +static const WCHAR SZ_VALUE_XPATH[] = {'X','P','a','t','h',0}; +static const WCHAR SZ_VALUE_XSLPATTERN[] = {'X','S','L','P','a','t','t','e','r','n',0}; + typedef struct { const struct IBindStatusCallbackVtbl *lpVtbl; } bsc; @@ -169,6 +173,7 @@ typedef struct _domdoc VARIANT_BOOL validating; VARIANT_BOOL resolving; VARIANT_BOOL preserving; + BOOL bUseXPath; IUnknown *node_unk; IXMLDOMNode *node; IXMLDOMSchemaCollection *schema; @@ -1374,8 +1379,38 @@ static HRESULT WINAPI domdoc_setProperty( BSTR p, VARIANT var) { - FIXME("\n"); - return E_NOTIMPL; + domdoc *This = impl_from_IXMLDOMDocument2( iface ); + + if (lstrcmpiW(p, SZ_PROPERTY_SELECTION_LANGUAGE) == 0) + { + VARIANT varStr; + HRESULT hr; + BSTR bstr; + + V_VT(&varStr) = VT_EMPTY; + if (V_VT(&var) != VT_BSTR) + { + if (FAILED(hr = VariantChangeType(&varStr, &var, 0, VT_BSTR))) + return hr; + bstr = V_BSTR(&varStr); + } + else + bstr = V_BSTR(&var); + + hr = S_OK; + if (lstrcmpiW(bstr, SZ_VALUE_XPATH) == 0) + This->bUseXPath = TRUE; + else if (lstrcmpiW(bstr, SZ_VALUE_XSLPATTERN) == 0) + This->bUseXPath = FALSE; + else + hr = E_FAIL; + + VariantClear(&varStr); + return hr; + } + + FIXME("Unknown property %s\n", wine_dbgstr_w(p)); + return E_FAIL; } static HRESULT WINAPI domdoc_getProperty( @@ -1383,8 +1418,22 @@ static HRESULT WINAPI domdoc_getProperty( BSTR p, VARIANT* var) { - FIXME("\n"); - return E_NOTIMPL; + domdoc *This = impl_from_IXMLDOMDocument2( iface ); + + if (var == NULL) + return E_INVALIDARG; + if (lstrcmpiW(p, SZ_PROPERTY_SELECTION_LANGUAGE) == 0) + { + V_VT(var) = VT_BSTR; + if (This->bUseXPath) + V_BSTR(var) = SysAllocString(SZ_VALUE_XPATH); + else + V_BSTR(var) = SysAllocString(SZ_VALUE_XSLPATTERN); + return S_OK; + } + + FIXME("Unknown property %s\n", wine_dbgstr_w(p)); + return E_FAIL; } static const struct IXMLDOMDocument2Vtbl domdoc_vtbl = @@ -1491,6 +1540,7 @@ HRESULT DOMDocument_create(IUnknown *pUnkOuter, LPVOID *ppObj) doc->validating = 0; doc->resolving = 0; doc->preserving = 0; + doc->bUseXPath = FALSE; doc->error = S_OK; doc->schema = NULL; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index cdf3fac..02e8bf9 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -26,6 +26,7 @@ #include "xmldom.h" #include "msxml2.h" #include <stdio.h> +#include <assert.h> #include "wine/test.h" @@ -101,6 +102,59 @@ static const WCHAR szstr2[] = { 's','t','r','2',0 }; static const WCHAR szstar[] = { '*',0 }; static const WCHAR szfn1_txt[] = {'f','n','1','.','t','x','t',0}; +#define expect_bstr_eq_and_free(bstr, expect) { \ + BSTR bstrExp = alloc_str_from_narrow(expect); \ + ok(lstrcmpW(bstr, bstrExp) == 0, "String differs\n"); \ + SysFreeString(bstr); \ + SysFreeString(bstrExp); \ +} + +#define expect_eq(expr, value, type, format) { type ret = (expr); ok((value) == ret, #expr " expected " format " got " format "\n", value, ret); } + +#define ole_check(expr) { \ + HRESULT r = expr; \ + ok(r == S_OK, #expr " returned %x\n", r); \ +} + +#define ole_expect(expr, expect) { \ + HRESULT r = expr; \ + ok(r == (expect), #expr " returned %x, expected %x\n", r, expect); \ +} + +static BSTR alloc_str_from_narrow(const char *str) +{ + int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + BSTR ret = SysAllocStringLen(NULL, len - 1); /* NUL character added automatically */ + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} + +BSTR alloced_bstrs[256]; +int alloced_bstrs_count = 0; + +static BSTR _bstr_(const char *str) +{ + assert(alloced_bstrs_count < sizeof(alloced_bstrs)/sizeof(alloced_bstrs[0])); + alloced_bstrs[alloced_bstrs_count] = alloc_str_from_narrow(str); + return alloced_bstrs[alloced_bstrs_count++]; +} + +static void free_bstrs() +{ + int i; + for (i = 0; i < alloced_bstrs_count; i++) + SysFreeString(alloced_bstrs[i]); + alloced_bstrs_count = 0; +} + +static VARIANT _variantbstr_(const char *str) +{ + VARIANT v; + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_(str); + return v; +} + static void test_domdoc( void ) { HRESULT r; @@ -1162,6 +1216,8 @@ static void test_IXMLDOMDocument2(void) BSTR str; IXMLDOMDocument *doc; IXMLDOMDocument2 *doc2; + VARIANT var; + int ref; r = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc ); @@ -1177,8 +1233,43 @@ static void test_IXMLDOMDocument2(void) r = IXMLDOMDocument_QueryInterface( doc, &IID_IXMLDOMDocument2, (void**)&doc2 ); ok( r == S_OK, "ret %08x\n", r ); ok( doc == (IXMLDOMDocument*)doc2, "interfaces differ\n"); + + /* we will check if the variant got cleared */ + ref = IXMLDOMDocument2_AddRef(doc2); + expect_eq(ref, 3, int, "%d"); /* doc, doc2, AddRef*/ + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown *)doc2; + + /* invalid calls */ + ole_expect(IXMLDOMDocument2_getProperty(doc2, _bstr_("askldhfaklsdf"), &var), E_FAIL); + expect_eq(V_VT(&var), VT_UNKNOWN, int, "%x"); + ole_expect(IXMLDOMDocument2_getProperty(doc2, _bstr_("SelectionLanguage"), NULL), E_INVALIDARG); + + /* valid call */ + ole_check(IXMLDOMDocument2_getProperty(doc2, _bstr_("SelectionLanguage"), &var)); + expect_eq(V_VT(&var), VT_BSTR, int, "%x"); + expect_bstr_eq_and_free(V_BSTR(&var), "XSLPattern"); + V_VT(&var) = VT_R4; + + /* the variant didn't get cleared*/ + expect_eq(IXMLDOMDocument2_Release(doc2), 2, int, "%d"); + + /* setProperty tests */ + ole_expect(IXMLDOMDocument2_setProperty(doc2, _bstr_("askldhfaklsdf"), var), E_FAIL); + ole_expect(IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionLanguage"), var), E_FAIL); + ole_expect(IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionLanguage"), _variantbstr_("alskjdh faklsjd hfk")), E_FAIL); + ole_check(IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionLanguage"), _variantbstr_("XSLPattern"))); + ole_check(IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionLanguage"), _variantbstr_("XPath"))); + ole_check(IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionLanguage"), _variantbstr_("XSLPattern"))); + + /* contrary to what MSDN calims you can switch back from XPath to XSLPattern */ + ole_check(IXMLDOMDocument2_getProperty(doc2, _bstr_("SelectionLanguage"), &var)); + expect_eq(V_VT(&var), VT_BSTR, int, "%x"); + expect_bstr_eq_and_free(V_BSTR(&var), "XSLPattern"); + IXMLDOMDocument2_Release( doc2 ); IXMLDOMDocument_Release( doc ); + free_bstrs(); } START_TEST(domdoc)

1 0