wine-commits November 2013

wine-commits@winehq.org

2 participants
566 discussions

Alexandre Julliard : explorer: Remove SWP_NOACTIVATE to ensure that the foreground window is set to the desktop .
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 1483bfa21d4945a1f62d957edafbd179cd518865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1483bfa21d4945a1f62d957ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 4 19:40:13 2013 +0100 explorer: Remove SWP_NOACTIVATE to ensure that the foreground window is set to the desktop. --- programs/explorer/desktop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index c3abe6d..1a8db99 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -839,7 +839,7 @@ void manage_desktop( WCHAR *arg ) if (name) set_desktop_window_title( hwnd, name ); SetWindowPos( hwnd, 0, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN), - SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW ); + SWP_SHOWWINDOW ); SystemParametersInfoW( SPI_SETDESKWALLPAPER, 0, NULL, FALSE ); ClipCursor( NULL ); initialize_display_settings();

1 0

André Hentschel : kernel32/tests: Test ResolveDelayLoadedAPI with generated dll.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: cb1806db264cc9b2794a030173f0011f30f626f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb1806db264cc9b2794a03017… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 31 18:43:54 2013 +0100 kernel32/tests: Test ResolveDelayLoadedAPI with generated dll. --- dlls/kernel32/tests/loader.c | 265 +++++++++++++++++++++++++++++++++--------- 1 files changed, 211 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb1806db264cc9b2794a0…

1 0

Huw Davies : riched20: Revert to the default paragraph style when all text is deleted.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 58e83ebdea14dbc3e4839b17ec4cbcd59fa67293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58e83ebdea14dbc3e4839b17e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 4 14:23:53 2013 +0000 riched20: Revert to the default paragraph style when all text is deleted. --- dlls/riched20/caret.c | 7 +++++-- dlls/riched20/tests/editor.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index b39a8c7..fd7034d 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -284,13 +284,15 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, int nChars, BOOL bForce) { ME_Cursor c = *start; - int nOfs = ME_GetCursorOfs(start); + int nOfs = ME_GetCursorOfs(start), text_len = ME_GetTextLength( editor ); int shift = 0; int totalChars = nChars; ME_DisplayItem *start_para; + BOOL delete_all = FALSE; /* Prevent deletion past last end of paragraph run. */ - nChars = min(nChars, ME_GetTextLength(editor) - nOfs); + nChars = min(nChars, text_len - nOfs); + if (nChars == text_len) delete_all = TRUE; start_para = c.pPara; if (!bForce) @@ -424,6 +426,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, continue; } } + if (delete_all) ME_SetDefaultParaFormat( start_para->member.para.pFmt ); return TRUE; } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 3abd8d2..8ec5e9f 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7429,6 +7429,42 @@ static void test_WM_CREATE(void) DestroyWindow(rich_edit); } +/******************************************************************* + * Test that after deleting all of the text, the first paragraph + * format reverts to the default. + */ +static void test_reset_default_para_fmt( void ) +{ + HWND richedit = new_richeditW( NULL ); + PARAFORMAT2 fmt; + WORD def_align, new_align; + + memset( &fmt, 0, sizeof(fmt) ); + fmt.cbSize = sizeof(PARAFORMAT2); + fmt.dwMask = -1; + SendMessageA( richedit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); + def_align = fmt.wAlignment; + new_align = (def_align == PFA_LEFT) ? PFA_RIGHT : PFA_LEFT; + + simulate_typing_characters( richedit, "123" ); + + SendMessageA( richedit, EM_SETSEL, 0, -1 ); + fmt.dwMask = PFM_ALIGNMENT; + fmt.wAlignment = new_align; + SendMessageA( richedit, EM_SETPARAFORMAT, 0, (LPARAM)&fmt ); + + SendMessageA( richedit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); + ok( fmt.wAlignment == new_align, "got %d expect %d\n", fmt.wAlignment, new_align ); + + SendMessageA( richedit, EM_SETSEL, 0, -1 ); + SendMessageA( richedit, WM_CUT, 0, 0 ); + + SendMessageA( richedit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); + ok( fmt.wAlignment == def_align, "got %d exppect %d\n", fmt.wAlignment, def_align ); + + DestroyWindow( richedit ); +} + START_TEST( editor ) { BOOL ret; @@ -7490,6 +7526,7 @@ START_TEST( editor ) test_EM_FINDWORDBREAK_A(); test_enter(); test_WM_CREATE(); + test_reset_default_para_fmt(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Stefan Dösinger : wined3d: GL_ARB_instanced_arrays provides glDrawElementsInstanced.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 292612cf4b4a906d273d096ffc2a8c25a0e735ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=292612cf4b4a906d273d096ff… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 4 12:38:34 2013 +0100 wined3d: GL_ARB_instanced_arrays provides glDrawElementsInstanced. --- dlls/wined3d/drawprim.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 2475644..14149b5 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -44,7 +44,7 @@ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primit GLenum idxtype = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; if (instance_count) { - if (!gl_info->supported[ARB_DRAW_INSTANCED]) + if (!gl_info->supported[ARB_DRAW_INSTANCED] && !gl_info->supported[ARB_INSTANCED_ARRAYS]) { FIXME("Instanced drawing not supported.\n"); }

1 0

Stefan Dösinger : wined3d: Check for support before calling glDrawElementsInstancedBaseVertex.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 84a1e60e48d99efdaa6d7f4648d51bf938a98f98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a1e60e48d99efdaa6d7f464… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 4 12:38:33 2013 +0100 wined3d: Check for support before calling glDrawElementsInstancedBaseVertex. --- dlls/wined3d/drawprim.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 3c9a780..2475644 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -52,9 +52,18 @@ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primit { if (start_instance) FIXME("Start instance (%u) not supported.\n", start_instance); - GL_EXTCALL(glDrawElementsInstancedBaseVertex(primitive_type, count, idxtype, - (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_index)); - checkGLcall("glDrawElementsInstancedBaseVertex"); + if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) + { + GL_EXTCALL(glDrawElementsInstancedBaseVertex(primitive_type, count, idxtype, + (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_index)); + checkGLcall("glDrawElementsInstancedBaseVertex"); + } + else + { + GL_EXTCALL(glDrawElementsInstancedARB(primitive_type, count, idxtype, + (const char *)idx_data + (idx_size * start_idx), instance_count)); + checkGLcall("glDrawElementsInstancedARB"); + } } } else if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX])

1 0

Hans Leidekker : wbemprox: Add a partial implementation of Win32_NetworkAdapterConfiguration.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: ec1a57f25b25dba1ed47e8456cc64c2cc1ee0aa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1a57f25b25dba1ed47e8456… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 4 11:54:51 2013 +0100 wbemprox: Add a partial implementation of Win32_NetworkAdapterConfiguration. --- dlls/wbemprox/builtin.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9a50f29..4efb17b 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -66,6 +66,9 @@ static const WCHAR class_logicaldisk2W[] = {'C','I','M','_','L','o','g','i','c','a','l','D','i','s','k',0}; static const WCHAR class_networkadapterW[] = {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r',0}; +static const WCHAR class_networkadapterconfigW[] = + {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r', + 'C','o','n','f','i','g','u','r','a','t','i','o','n',0}; static const WCHAR class_osW[] = {'W','i','n','3','2','_','O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; static const WCHAR class_paramsW[] = @@ -160,6 +163,8 @@ static const WCHAR prop_interfaceindexW[] = {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; static const WCHAR prop_intvalueW[] = {'I','n','t','e','g','e','r','V','a','l','u','e',0}; +static const WCHAR prop_ipenabledW[] = + {'I','P','E','n','a','b','l','e','d',0}; static const WCHAR prop_lastbootuptimeW[] = {'L','a','s','t','B','o','o','t','U','p','T','i','m','e',0}; static const WCHAR prop_localdatetimeW[] = @@ -342,6 +347,12 @@ static const struct column col_networkadapter[] = { prop_pnpdeviceidW, CIM_STRING }, { prop_speedW, CIM_UINT64 } }; +static const struct column col_networkadapterconfig[] = +{ + { prop_indexW, CIM_UINT32|COL_FLAG_KEY }, + { prop_ipenabledW, CIM_BOOLEAN }, + { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC } +}; static const struct column col_os[] = { { prop_captionW, CIM_STRING }, @@ -601,6 +612,12 @@ struct record_networkadapter const WCHAR *pnpdevice_id; UINT64 speed; }; +struct record_networkadapterconfig +{ + UINT32 index; + int ipenabled; + const WCHAR *mac_address; +}; struct record_operatingsystem { const WCHAR *caption; @@ -1602,6 +1619,50 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e return status; } +static enum fill_status fill_networkadapterconfig( struct table *table, const struct expr *cond ) +{ + struct record_networkadapterconfig *rec; + IP_ADAPTER_ADDRESSES *aa, *buffer; + UINT row = 0, offset = 0, count = 0; + DWORD size = 0, ret; + enum fill_status status = FILL_STATUS_UNFILTERED; + + ret = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ); + if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED; + + if (!(buffer = heap_alloc( size ))) return FILL_STATUS_FAILED; + if (GetAdaptersAddresses( AF_UNSPEC, 0, NULL, buffer, &size )) + { + heap_free( buffer ); + return FILL_STATUS_FAILED; + } + for (aa = buffer; aa; aa = aa->Next) count++; + if (!resize_table( table, count, sizeof(*rec) )) + { + heap_free( buffer ); + return FILL_STATUS_FAILED; + } + for (aa = buffer; aa; aa = aa->Next) + { + rec = (struct record_networkadapterconfig *)(table->data + offset); + rec->index = aa->u.s.IfIndex; + rec->ipenabled = -1; + rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); + if (!match_row( table, row, cond, &status )) + { + free_row_values( table, row ); + continue; + } + offset += sizeof(*rec); + row++; + } + TRACE("created %u rows\n", row); + table->num_rows = row; + + heap_free( buffer ); + return status; +} + static WCHAR *get_cmdline( DWORD process_id ) { if (process_id == GetCurrentProcessId()) return heap_strdupW( GetCommandLineW() ); @@ -2130,6 +2191,8 @@ static struct table builtin_classes[] = { class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, { class_logicaldisk2W, SIZEOF(col_logicaldisk), col_logicaldisk, 0, 0, NULL, fill_logicaldisk }, { class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, 0, NULL, fill_networkadapter }, + { class_networkadapterconfigW, SIZEOF(col_networkadapterconfig), col_networkadapterconfig, 0, 0, NULL, + fill_networkadapterconfig }, { class_osW, SIZEOF(col_os), col_os, 0, 0, NULL, fill_os }, { class_paramsW, SIZEOF(col_param), col_param, SIZEOF(data_param), 0, (BYTE *)data_param }, { class_processW, SIZEOF(col_process), col_process, 0, 0, NULL, fill_process },

1 0

Hans Leidekker : wbemprox: Implement Win32_BIOS. IdentificationCode and Win32_BIOS.SMBIOSBIOSVersion.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 1eefe9dd8eb04234f86369974c629e0a78c6b311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eefe9dd8eb04234f86369974… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 4 11:54:10 2013 +0100 wbemprox: Implement Win32_BIOS.IdentificationCode and Win32_BIOS.SMBIOSBIOSVersion. --- dlls/wbemprox/builtin.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 912a6b1..9a50f29 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -152,6 +152,8 @@ static const WCHAR prop_handleW[] = {'H','a','n','d','l','e',0}; static const WCHAR prop_idW[] = {'I','D',0}; +static const WCHAR prop_identificationcodeW[] = + {'I','d','e','n','t','i','f','i','c','a','t','i','o','n','C','o','d','e',0}; static const WCHAR prop_indexW[] = {'I','n','d','e','x',0}; static const WCHAR prop_interfaceindexW[] = @@ -216,6 +218,8 @@ static const WCHAR prop_servicepackminorW[] = {'S','e','r','v','i','c','e','P','a','c','k','M','i','n','o','r','V','e','r','s','i','o','n',0}; static const WCHAR prop_servicetypeW[] = {'S','e','r','v','i','c','e','T','y','p','e',0}; +static const WCHAR prop_smbiosbiosversionW[] = + {'S','M','B','I','O','S','B','I','O','S','V','e','r','s','i','o','n',0}; static const WCHAR prop_startmodeW[] = {'S','t','a','r','t','M','o','d','e',0}; static const WCHAR prop_sizeW[] = @@ -260,11 +264,13 @@ static const struct column col_baseboard[] = }; static const struct column col_bios[] = { - { prop_descriptionW, CIM_STRING }, - { prop_manufacturerW, CIM_STRING }, - { prop_releasedateW, CIM_DATETIME }, - { prop_serialnumberW, CIM_STRING }, - { prop_versionW, CIM_STRING|COL_FLAG_KEY } + { prop_descriptionW, CIM_STRING }, + { prop_identificationcodeW, CIM_STRING }, + { prop_manufacturerW, CIM_STRING }, + { prop_releasedateW, CIM_DATETIME }, + { prop_serialnumberW, CIM_STRING }, + { prop_smbiosbiosversionW, CIM_STRING }, + { prop_versionW, CIM_STRING|COL_FLAG_KEY } }; static const struct column col_cdromdrive[] = { @@ -457,6 +463,8 @@ static const WCHAR bios_releasedateW[] = {'2','0','1','2','0','6','0','8','0','0','0','0','0','0','.','0','0','0','0','0','0','+','0','0','0',0}; static const WCHAR bios_serialnumberW[] = {'0',0}; +static const WCHAR bios_smbiosbiosversionW[] = + {'W','i','n','e',0}; static const WCHAR bios_versionW[] = {'W','I','N','E',' ',' ',' ','-',' ','1',0}; static const WCHAR cdromdrive_nameW[] = @@ -516,9 +524,11 @@ struct record_baseboard struct record_bios { const WCHAR *description; + const WCHAR *identificationcode; const WCHAR *manufacturer; const WCHAR *releasedate; const WCHAR *serialnumber; + const WCHAR *smbiosbiosversion; const WCHAR *version; }; struct record_cdromdrive @@ -705,7 +715,8 @@ static const struct record_baseboard data_baseboard[] = }; static const struct record_bios data_bios[] = { - { bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW, bios_versionW } + { bios_descriptionW, bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW, + bios_smbiosbiosversionW, bios_versionW } }; static const struct record_diskdrive data_diskdrive[] = {

1 0

Hans Leidekker : wbemprox: Implement Win32_BaseBoard. Model and Win32_BaseBoard.Name.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 796d4d0ccf780842a0f4b2e098add56df0288fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=796d4d0ccf780842a0f4b2e09… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 4 11:53:46 2013 +0100 wbemprox: Implement Win32_BaseBoard.Model and Win32_BaseBoard.Name. --- dlls/wbemprox/builtin.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 8dca46e..912a6b1 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -253,6 +253,8 @@ static const WCHAR prop_versionW[] = static const struct column col_baseboard[] = { { prop_manufacturerW, CIM_STRING }, + { prop_modelW, CIM_STRING }, + { prop_nameW, CIM_STRING }, { prop_serialnumberW, CIM_STRING }, { prop_tagW, CIM_STRING|COL_FLAG_KEY } }; @@ -506,6 +508,8 @@ static const WCHAR videocontroller_deviceidW[] = struct record_baseboard { const WCHAR *manufacturer; + const WCHAR *model; + const WCHAR *name; const WCHAR *serialnumber; const WCHAR *tag; }; @@ -697,7 +701,7 @@ struct record_videocontroller static const struct record_baseboard data_baseboard[] = { - { baseboard_manufacturerW, baseboard_serialnumberW, baseboard_tagW } + { baseboard_manufacturerW, baseboard_tagW, baseboard_tagW, baseboard_serialnumberW, baseboard_tagW } }; static const struct record_bios data_bios[] = {

1 0

Nikolay Sivov : msxml3: Implement url() property of IXMLDOMDocument.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: e0344e1a28db14ff7f194055f88558e1d846cde7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0344e1a28db14ff7f194055f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 4 14:17:12 2013 +0400 msxml3: Implement url() property of IXMLDOMDocument. --- dlls/msxml3/bsc.c | 2 +- dlls/msxml3/domdoc.c | 31 ++++++++++++++++++++++++++--- dlls/msxml3/tests/domdoc.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index c8683d5..d9519f3 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -259,7 +259,7 @@ HRESULT create_moniker_from_url(LPCWSTR url, IMoniker **mon) return E_FAIL; } - if(FAILED(UrlCreateFromPathW(url, fileUrl, &needed, 0))) + if(FAILED(UrlCreateFromPathW(fullpath, fileUrl, &needed, 0))) { ERR("can't create url from path\n"); return E_FAIL; diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 26a2dad..e3dd792 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -131,7 +131,9 @@ struct domdoc domdoc_properties* properties; HRESULT error; - /* IObjectWithSite*/ + WCHAR *url; + + /* IObjectWithSite */ IUnknown *site; /* IObjectSafety */ @@ -946,6 +948,7 @@ static ULONG WINAPI domdoc_Release( IXMLDOMDocument3 *iface ) for (eid = 0; eid < EVENTID_LAST; eid++) if (This->events[eid]) IDispatch_Release(This->events[eid]); + CoTaskMemFree(This->url); release_namespaces(This); heap_free(This); } @@ -2199,10 +2202,15 @@ static HRESULT WINAPI domdoc_load( { IMoniker *mon; + CoTaskMemFree(This->url); + This->url = NULL; + hr = create_moniker_from_url( filename, &mon); if ( SUCCEEDED(hr) ) { hr = domdoc_load_moniker( This, mon ); + if (hr == S_OK) + IMoniker_GetDisplayName(mon, NULL, NULL, &This->url); IMoniker_Release(mon); } @@ -2265,11 +2273,25 @@ static HRESULT WINAPI domdoc_get_parseError( static HRESULT WINAPI domdoc_get_url( IXMLDOMDocument3 *iface, - BSTR* urlString ) + BSTR* url ) { domdoc *This = impl_from_IXMLDOMDocument3(iface); - FIXME("(%p)->(%p)\n", This, urlString); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, url); + + if (!url) + return E_INVALIDARG; + + if (This->url) + { + *url = SysAllocString(This->url); + if (!*url) + return E_OUTOFMEMORY; + + return S_OK; + } + else + return return_null_bstr(url); } @@ -3546,6 +3568,7 @@ HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) doc->safeopt = 0; doc->cp_list = NULL; doc->namespaces = NULL; + doc->url = NULL; memset(doc->events, 0, sizeof(doc->events)); /* events connection points */ diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3a18f9f..8e17885 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1258,6 +1258,11 @@ if (0) ok( b == VARIANT_FALSE, "succeeded in loading XML string\n"); SysFreeString( str ); + str = (BSTR)0x1; + hr = IXMLDOMDocument_get_url(doc, &str); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(str == NULL, "got %p\n", str); + /* try load an empty document */ b = VARIANT_TRUE; str = SysAllocString( szEmpty ); @@ -9583,6 +9588,11 @@ static void test_load(void) EXPECT_HR(hr, S_OK); ok(b == VARIANT_TRUE, "got %d\n", b); + bstr1 = NULL; + hr = IXMLDOMDocument_get_url(doc, &bstr1); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(bstr1); + /* load from a path: VT_BSTR|VT_BYREF */ V_VT(&src) = VT_BSTR | VT_BYREF; V_BSTRREF(&src) = &path; @@ -9590,6 +9600,11 @@ static void test_load(void) EXPECT_HR(hr, S_OK); ok(b == VARIANT_TRUE, "got %d\n", b); + bstr1 = NULL; + hr = IXMLDOMDocument_get_url(doc, &bstr1); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(bstr1); + /* load from a path: VT_BSTR|VT_BYREF, null ptr */ V_VT(&src) = VT_BSTR | VT_BYREF; V_BSTRREF(&src) = NULL; @@ -9597,6 +9612,11 @@ static void test_load(void) EXPECT_HR(hr, E_INVALIDARG); ok(b == VARIANT_FALSE, "got %d\n", b); + bstr1 = NULL; + hr = IXMLDOMDocument_get_url(doc, &bstr1); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(bstr1); + DeleteFileA("test.xml"); /* load from existing path, no xml content */ @@ -9609,6 +9629,11 @@ static void test_load(void) ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(b == VARIANT_FALSE, "got %d\n", b); + bstr1 = (BSTR)0x1; + hr = IXMLDOMDocument_get_url(doc, &bstr1); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(bstr1 == NULL, "got %p\n", bstr1); + DeleteFileA("test.xml"); IXMLDOMDocument_Release(doc); @@ -11737,6 +11762,25 @@ static void test_create_attribute(void) free_bstrs(); } +static void test_url(void) +{ + IXMLDOMDocument *doc; + HRESULT hr; + BSTR s; + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_get_url(doc, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + s = (BSTR)0x1; + hr = IXMLDOMDocument_get_url(doc, &s); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(s == NULL, "got %s\n", wine_dbgstr_w(s)); + + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { HRESULT hr; @@ -11815,6 +11859,7 @@ START_TEST(domdoc) test_putref_schemas(); test_namedmap_newenum(); test_xmlns_attribute(); + test_url(); test_xsltemplate(); test_xsltext();

1 0

Nikolay Sivov : msxml3/tests: Consolidate check for available class versions.
by Alexandre Julliard 04 Nov '13

04 Nov '13

Module: wine Branch: master Commit: 61c8a4e6eac55c5e8f2d4578d9d884f55812fac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61c8a4e6eac55c5e8f2d4578d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 4 14:16:55 2013 +0400 msxml3/tests: Consolidate check for available class versions. --- dlls/msxml3/tests/domdoc.c | 245 +++++++++++++++++++++++--------------------- 1 files changed, 129 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61c8a4e6eac55c5e8f2d4…

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
57
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 November 2013