June 2010 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll/tests: Add some tests for NtQuerySymbolicLinkObject.
by Alexandre Julliard 30 Jun '10

30 Jun '10

Module: wine Branch: master Commit: 929ba3f11dc5c37ddbd37ed97119367cb149b0cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=929ba3f11dc5c37ddbd37ed97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 30 16:11:55 2010 +0200 ntdll/tests: Add some tests for NtQuerySymbolicLinkObject. --- dlls/ntdll/tests/om.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index d052c35..24339bb 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -44,6 +44,7 @@ static NTSTATUS (WINAPI *pNtOpenDirectoryObject)(PHANDLE, ACCESS_MASK, POBJECT_A static NTSTATUS (WINAPI *pNtCreateDirectoryObject)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); static NTSTATUS (WINAPI *pNtOpenSymbolicLinkObject)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); static NTSTATUS (WINAPI *pNtCreateSymbolicLinkObject)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, PUNICODE_STRING); +static NTSTATUS (WINAPI *pNtQuerySymbolicLinkObject)(HANDLE,PUNICODE_STRING,PULONG); static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE,OBJECT_INFORMATION_CLASS,PVOID,ULONG,PULONG); @@ -402,13 +403,44 @@ static void test_directory(void) is_nt4 = (status == STATUS_OBJECT_NAME_NOT_FOUND); /* nt4 doesn't have Local\\ symlink */ if (!is_nt4) { + WCHAR buffer[256]; + ULONG len, full_len; + ok(status == STATUS_SUCCESS, "Failed to open SymbolicLink(%08x)\n", status); pRtlFreeUnicodeString(&str); InitializeObjectAttributes(&attr, &str, 0, dir, NULL); pRtlCreateUnicodeStringFromAsciiz(&str, "one more level"); DIR_TEST_CREATE_FAILURE(&h, STATUS_OBJECT_TYPE_MISMATCH) pRtlFreeUnicodeString(&str); - pNtClose(h); + + str.Buffer = buffer; + str.MaximumLength = sizeof(buffer); + len = 0xdeadbeef; + memset( buffer, 0xaa, sizeof(buffer) ); + status = pNtQuerySymbolicLinkObject( dir, &str, &len ); + ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); + full_len = str.Length + sizeof(WCHAR); + ok( len == full_len, "bad length %u/%u\n", len, full_len ); + ok( buffer[len / sizeof(WCHAR) - 1] == 0, "no terminating null\n" ); + + str.MaximumLength = str.Length; + len = 0xdeadbeef; + status = pNtQuerySymbolicLinkObject( dir, &str, &len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "NtQuerySymbolicLinkObject failed %08x\n", status ); + ok( len == full_len, "bad length %u/%u\n", len, full_len ); + + str.MaximumLength = 0; + len = 0xdeadbeef; + status = pNtQuerySymbolicLinkObject( dir, &str, &len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "NtQuerySymbolicLinkObject failed %08x\n", status ); + ok( len == full_len, "bad length %u/%u\n", len, full_len ); + + str.MaximumLength = str.Length + sizeof(WCHAR); + len = 0xdeadbeef; + status = pNtQuerySymbolicLinkObject( dir, &str, &len ); + ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); + ok( len == full_len, "bad length %u/%u\n", len, full_len ); + pNtClose(dir); } @@ -710,6 +742,7 @@ START_TEST(om) pNtCreateDirectoryObject= (void *)GetProcAddress(hntdll, "NtCreateDirectoryObject"); pNtOpenSymbolicLinkObject = (void *)GetProcAddress(hntdll, "NtOpenSymbolicLinkObject"); pNtCreateSymbolicLinkObject = (void *)GetProcAddress(hntdll, "NtCreateSymbolicLinkObject"); + pNtQuerySymbolicLinkObject = (void *)GetProcAddress(hntdll, "NtQuerySymbolicLinkObject"); pNtCreateSemaphore = (void *)GetProcAddress(hntdll, "NtCreateSemaphore"); pNtCreateTimer = (void *)GetProcAddress(hntdll, "NtCreateTimer"); pNtCreateSection = (void *)GetProcAddress(hntdll, "NtCreateSection");

1 0

Mikko Rasa : ddraw: Grow index buffer as needed.
by Alexandre Julliard 30 Jun '10

30 Jun '10

Module: wine Branch: master Commit: f18cb4c2f45878c40bbc27f826c4d97ddba304a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f18cb4c2f45878c40bbc27f82… Author: Mikko Rasa <tdb(a)tdb.fi> Date: Wed Jun 30 11:40:29 2010 +0300 ddraw: Grow index buffer as needed. --- dlls/ddraw/device.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index aba7bdc..6b00d4f 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4299,6 +4299,7 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, DWORD stride = get_flexible_vertex_size(vb->fvf); WORD *LockedIndices; HRESULT hr; + WINED3DBUFFER_DESC desc; TRACE("(%p)->(%08x,%p,%d,%d,%p,%d,%08x)\n", This, PrimitiveType, vb, StartVertex, NumVertices, Indices, IndexCount, Flags); @@ -4320,6 +4321,37 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, return hr; } + /* check that the buffer is large enough to hold the indices, + * reallocate if necessary. + */ + hr = IWineD3DBuffer_GetDesc(This->indexbuffer, &desc); + if(desc.Size < IndexCount * sizeof(WORD)) + { + UINT size = max(desc.Size * 2, IndexCount * sizeof(WORD)); + IWineD3DBuffer *buffer; + IUnknown *parent; + + TRACE("Growing index buffer to %u bytes\n", size); + + IWineD3DBuffer_GetParent(This->indexbuffer, &parent); + hr = IWineD3DDevice_CreateIndexBuffer(This->wineD3DDevice, size, + WINED3DUSAGE_DYNAMIC /* Usage */, WINED3DPOOL_DEFAULT, &buffer, parent, + &ddraw_null_wined3d_parent_ops); + if(hr != D3D_OK) + { + ERR("(%p) IWineD3DDevice::CreateIndexBuffer failed with hr = %08x\n", This, hr); + IParent_Release(parent); + LeaveCriticalSection(&ddraw_cs); + return hr; + } + + IWineD3DBuffer_Release(This->indexbuffer); + This->indexbuffer = buffer; + + ((IParentImpl *)parent)->child = (IUnknown *)buffer; + IParent_Release(parent); + } + /* copy the index stream into the index buffer. * A new IWineD3DDevice method could be created * which takes an user pointer containing the indices @@ -4331,7 +4363,6 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, IndexCount * sizeof(WORD), (BYTE **) &LockedIndices, 0 /* Flags */); - assert(IndexCount < 0x100000); if(hr != D3D_OK) { ERR("(%p) IWineD3DBuffer::Map failed with hr = %08x\n", This, hr);

1 0

Alexander Nicolaysen Sørnes : wordpad: Update Norwegian Bokmål translation.
by Alexandre Julliard 30 Jun '10

30 Jun '10

Module: wine Branch: master Commit: 6cf3823a8cb6c7fbd119b77642ed9d6c10618427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf3823a8cb6c7fbd119b7764… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jun 30 16:08:13 2010 +0200 wordpad: Update Norwegian Bokmål translation. --- programs/wordpad/No.rc | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 7fa0c84..592f93b 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -128,7 +128,7 @@ BEGIN MENUITEM "Fuchsia" ID_COLOR_FUCHSIA MENUITEM "Aqua" ID_COLOR_AQUA MENUITEM "Hvit" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC + MENUITEM "Automatisk" ID_COLOR_AUTOMATIC END END @@ -192,7 +192,7 @@ Caption "" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Linjebryting", -1, 10, 10, 130, 85 - RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "Ingen linjebryting", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "Bryt tekst etter v&indusbredden", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "Bryt tekst etter &margen", IDC_PAGEFMT_WM, 18, 65, 117, 15 GROUPBOX "Verktøylinjer", -1, 150, 10, 120, 85 @@ -247,6 +247,12 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Zoom in" STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Lukk" + STRING_PREVIEW_PAGE, "Side" + STRING_PREVIEW_PAGES, "Sider" + STRING_UNITS_CM, "cm" + STRING_UNITS_IN, "in" + STRING_UNITS_INCH, "inch" + STRING_UNITS_PT, "pt" END STRINGTABLE DISCARDABLE @@ -259,7 +265,7 @@ BEGIN "vil føre til at all formatering går tapt. Er du " \ "sikker på at du vil fortsette?" STRING_INVALID_NUMBER, "Ugyldig tallformat" - STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage-dokumenter støttes ikke" STRING_WRITE_FAILED, "Klarte ikke lagre filen." STRING_WRITE_ACCESS_DENIED, "Du har ikke tilgang til å lagre filen." STRING_OPEN_FAILED, "Klarte ikke åpne filen."

1 0

Alexander Nicolaysen Sørnes : mapi32: Add Norwegian Bokmål translation.
by Alexandre Julliard 30 Jun '10

30 Jun '10

Module: wine Branch: master Commit: 7f0273a98f1aeb29d621d99df073c242213aff2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f0273a98f1aeb29d621d99df… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jun 30 16:11:21 2010 +0200 mapi32: Add Norwegian Bokmål translation. --- dlls/mapi32/Makefile.in | 1 + dlls/mapi32/No.rc | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 41140e5..6197cd5 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -25,6 +25,7 @@ RC_SRCS = \ Ko.rc \ Lt.rc \ Nl.rc \ + No.rc \ Pl.rc \ Pt.rc \ Ro.rc \ diff --git a/dlls/mapi32/No.rc b/dlls/mapi32/No.rc new file mode 100644 index 0000000..5e4d8c5 --- /dev/null +++ b/dlls/mapi32/No.rc @@ -0,0 +1,32 @@ +/* +* MAPI32 Norwegian Bokmål resources +* +* Copyright 2010 Alexander N. Sørnes <alex(a)thehandofagony.com> +* +* 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 +* +*/ + +#include "res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "Klarte ikke sende e-post fordi en MAPI-klient ikke er installert." + IDS_SEND_MAIL, "Send e-post" +}

1 0

Vitaly Lipatov : kernel32: Add Russian translation.
by Alexandre Julliard 30 Jun '10

30 Jun '10

Module: wine Branch: master Commit: 43ed0c177cc93985f701ec694e789d5343f13c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43ed0c177cc93985f701ec694… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sat Jun 26 18:08:56 2010 +0400 kernel32: Add Russian translation. --- .gitignore | 1 + dlls/kernel32/Makefile.in | 3 +- dlls/kernel32/nls/winerr_rus.mc | 3736 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 3739 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43ed0c177cc93985f701e…

1 0

André Hentschel : wineusr: Add WINEARCH description.
by Alexandre Julliard 30 Jun '10

30 Jun '10

Module: docs Branch: master Commit: 621c6e936c46cd75170c8a51e3576d083715b8fe URL: http://source.winehq.org/git/docs.git/?a=commit;h=621c6e936c46cd75170c8a51e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 29 21:56:35 2010 +0200 wineusr: Add WINEARCH description. --- en/wineusr-running.sgml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/en/wineusr-running.sgml b/en/wineusr-running.sgml index 9c5ae2f..1ec71e9 100644 --- a/en/wineusr-running.sgml +++ b/en/wineusr-running.sgml @@ -279,6 +279,18 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\" </para> </sect2> <sect2> + <title>WINEARCH</title> + <para> + Specifies the Windows architecture to support. It can be set either to + win32 (support only 32-bit applications), or to win64 + (support both 64-bit applications and 32-bit ones in WoW64 mode). + The architecture supported by a given Wine prefix is set at prefix + creation time and cannot be changed afterwards. When running with an + existing prefix, Wine will refuse to start if WINEARCH doesn't match + the prefix architecture. + </para> + </sect2> + <sect2> <title>OSS Audio Driver Settings</title> <para> If you are using the OSS audio driver and you have multiple devices,

1 0

Nikolay Sivov : msxml3: Use proper pointer types for IPersistStreamInit methods.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: 4edfeefa646fff67588f971d9ee9c6e4b43cd036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4edfeefa646fff67588f971d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 28 21:34:00 2010 +0400 msxml3: Use proper pointer types for IPersistStreamInit methods. --- dlls/msxml3/domdoc.c | 54 ++++++++++++++++++++++++------------------------- 1 files changed, 26 insertions(+), 28 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index eb98c29..0007503 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -317,30 +317,30 @@ static inline domdoc *impl_from_ISupportErrorInfo(ISupportErrorInfo *iface) } /************************************************************************ - * xmldoc implementation of IPersistStream. + * domdoc implementation of IPersistStream. */ -static HRESULT WINAPI xmldoc_IPersistStreamInit_QueryInterface( - IPersistStreamInit *iface, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI domdoc_IPersistStreamInit_QueryInterface( + IPersistStreamInit *iface, REFIID riid, void **ppvObj) { domdoc *this = impl_from_IPersistStreamInit(iface); - return IXMLDocument_QueryInterface((IXMLDocument *)this, riid, ppvObj); + return IXMLDOMDocument2_QueryInterface((IXMLDOMDocument2 *)this, riid, ppvObj); } -static ULONG WINAPI xmldoc_IPersistStreamInit_AddRef( +static ULONG WINAPI domdoc_IPersistStreamInit_AddRef( IPersistStreamInit *iface) { domdoc *this = impl_from_IPersistStreamInit(iface); - return IXMLDocument_AddRef((IXMLDocument *)this); + return IXMLDOMDocument2_AddRef((IXMLDOMDocument2 *)this); } -static ULONG WINAPI xmldoc_IPersistStreamInit_Release( +static ULONG WINAPI domdoc_IPersistStreamInit_Release( IPersistStreamInit *iface) { domdoc *this = impl_from_IPersistStreamInit(iface); - return IXMLDocument_Release((IXMLDocument *)this); + return IXMLDOMDocument2_Release((IXMLDOMDocument2 *)this); } -static HRESULT WINAPI xmldoc_IPersistStreamInit_GetClassID( +static HRESULT WINAPI domdoc_IPersistStreamInit_GetClassID( IPersistStreamInit *iface, CLSID *classid) { TRACE("(%p,%p): stub!\n", iface, classid); @@ -353,17 +353,15 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_GetClassID( return S_OK; } -static HRESULT WINAPI xmldoc_IPersistStreamInit_IsDirty( +static HRESULT WINAPI domdoc_IPersistStreamInit_IsDirty( IPersistStreamInit *iface) { domdoc *This = impl_from_IPersistStreamInit(iface); - FIXME("(%p): stub!\n", This); - return S_FALSE; } -static HRESULT WINAPI xmldoc_IPersistStreamInit_Load( +static HRESULT WINAPI domdoc_IPersistStreamInit_Load( IPersistStreamInit *iface, LPSTREAM pStm) { domdoc *This = impl_from_IPersistStreamInit(iface); @@ -416,7 +414,7 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_Load( return attach_xmldoc( &This->node, xmldoc ); } -static HRESULT WINAPI xmldoc_IPersistStreamInit_Save( +static HRESULT WINAPI domdoc_IPersistStreamInit_Save( IPersistStreamInit *iface, LPSTREAM pStm, BOOL fClearDirty) { domdoc *This = impl_from_IPersistStreamInit(iface); @@ -441,7 +439,7 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_Save( return hr; } -static HRESULT WINAPI xmldoc_IPersistStreamInit_GetSizeMax( +static HRESULT WINAPI domdoc_IPersistStreamInit_GetSizeMax( IPersistStreamInit *iface, ULARGE_INTEGER *pcbSize) { domdoc *This = impl_from_IPersistStreamInit(iface); @@ -449,7 +447,7 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_GetSizeMax( return E_NOTIMPL; } -static HRESULT WINAPI xmldoc_IPersistStreamInit_InitNew( +static HRESULT WINAPI domdoc_IPersistStreamInit_InitNew( IPersistStreamInit *iface) { domdoc *This = impl_from_IPersistStreamInit(iface); @@ -459,15 +457,15 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_InitNew( static const IPersistStreamInitVtbl xmldoc_IPersistStreamInit_VTable = { - xmldoc_IPersistStreamInit_QueryInterface, - xmldoc_IPersistStreamInit_AddRef, - xmldoc_IPersistStreamInit_Release, - xmldoc_IPersistStreamInit_GetClassID, - xmldoc_IPersistStreamInit_IsDirty, - xmldoc_IPersistStreamInit_Load, - xmldoc_IPersistStreamInit_Save, - xmldoc_IPersistStreamInit_GetSizeMax, - xmldoc_IPersistStreamInit_InitNew + domdoc_IPersistStreamInit_QueryInterface, + domdoc_IPersistStreamInit_AddRef, + domdoc_IPersistStreamInit_Release, + domdoc_IPersistStreamInit_GetClassID, + domdoc_IPersistStreamInit_IsDirty, + domdoc_IPersistStreamInit_Load, + domdoc_IPersistStreamInit_Save, + domdoc_IPersistStreamInit_GetSizeMax, + domdoc_IPersistStreamInit_InitNew }; /* ISupportErrorInfo interface */ @@ -476,21 +474,21 @@ static HRESULT WINAPI support_error_QueryInterface( REFIID riid, void** ppvObj ) { domdoc *This = impl_from_ISupportErrorInfo(iface); - return IXMLDocument_QueryInterface((IXMLDocument *)This, riid, ppvObj); + return IXMLDOMDocument2_QueryInterface((IXMLDOMDocument2 *)This, riid, ppvObj); } static ULONG WINAPI support_error_AddRef( ISupportErrorInfo *iface ) { domdoc *This = impl_from_ISupportErrorInfo(iface); - return IXMLDocument_AddRef((IXMLDocument *)This); + return IXMLDOMDocument2_AddRef((IXMLDOMDocument2 *)This); } static ULONG WINAPI support_error_Release( ISupportErrorInfo *iface ) { domdoc *This = impl_from_ISupportErrorInfo(iface); - return IXMLDocument_Release((IXMLDocument *)This); + return IXMLDOMDocument2_Release((IXMLDOMDocument2 *)This); } static HRESULT WINAPI support_error_InterfaceSupportsErrorInfo(

1 0

André Hentschel : urlmon: Partially implement HlinkSimpleNavigateToString.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: 855912cda5f62b791a14969a22d4a335d13dbacb URL: http://source.winehq.org/git/wine.git/?a=commit;h=855912cda5f62b791a14969a2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 28 21:16:51 2010 +0200 urlmon: Partially implement HlinkSimpleNavigateToString. --- dlls/urlmon/Makefile.in | 2 +- dlls/urlmon/umon.c | 24 +++++++++++++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in index 91277a5..71567ec 100644 --- a/dlls/urlmon/Makefile.in +++ b/dlls/urlmon/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = urlmon.dll IMPORTLIB = urlmon -IMPORTS = uuid ole32 oleaut32 rpcrt4 shlwapi wininet user32 advapi32 kernel32 ntdll +IMPORTS = uuid ole32 oleaut32 shell32 rpcrt4 shlwapi wininet user32 advapi32 kernel32 ntdll EXTRADEFS = -D_URLMON_ -DENTRY_PREFIX=URLMON_ -DPROXY_DELEGATION -DREGISTER_PROXY_DLL \ -DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}" diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 7ce22cc..9a54e11 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -24,6 +24,8 @@ #include "winreg.h" #include "shlwapi.h" +#include "hlink.h" +#include "shellapi.h" #include "wine/debug.h" @@ -742,7 +744,27 @@ HRESULT WINAPI HlinkSimpleNavigateToString( LPCWSTR szTarget, LPCWSTR szLocation, LPCWSTR szTargetFrameName, IUnknown *pUnk, IBindCtx *pbc, IBindStatusCallback *pbsc, DWORD grfHLNF, DWORD dwReserved) { - FIXME("%s\n", debugstr_w( szTarget ) ); + FIXME("%s %s %s %p %p %p %u %u partial stub\n", debugstr_w( szTarget ), debugstr_w( szLocation ), + debugstr_w( szTargetFrameName ), pUnk, pbc, pbsc, grfHLNF, dwReserved); + + /* undocumented: 0 means HLNF_OPENINNEWWINDOW*/ + if (!grfHLNF) grfHLNF = HLNF_OPENINNEWWINDOW; + + if (grfHLNF == HLNF_OPENINNEWWINDOW) + { + SHELLEXECUTEINFOW sei; + static const WCHAR openW[] = { 'o', 'p', 'e', 'n', 0 }; + + memset(&sei, 0, sizeof(sei)); + sei.cbSize = sizeof(sei); + sei.lpVerb = openW; + sei.nShow = SW_SHOWNORMAL; + sei.fMask = SEE_MASK_FLAG_NO_UI | SEE_MASK_NO_CONSOLE; + sei.lpFile = szTarget; + + if (ShellExecuteExW(&sei)) return S_OK; + } + return E_NOTIMPL; }

1 0

Marko Nikolic : advapi32/tests: Replaced function lstrlen with strlen in condition check.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: ff08a6866820221ba134239c957465ce458a182c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff08a6866820221ba134239c9… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Mon Jun 28 22:36:10 2010 +0200 advapi32/tests: Replaced function lstrlen with strlen in condition check. --- dlls/advapi32/tests/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 2b14ae5..1f1b697 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2807,7 +2807,7 @@ static void test_ConvertSecurityDescriptorToString(void) * don't replicate this feature so we only test len >= strlen+1. */ #define CHECK_RESULT_AND_FREE(exp_str) \ ok(strcmp(string, (exp_str)) == 0, "String mismatch (expected \"%s\", got \"%s\")\n", (exp_str), string); \ - ok(len >= (lstrlen(exp_str) + 1), "Length mismatch (expected %d, got %d)\n", lstrlen(exp_str) + 1, len); \ + ok(len >= (strlen(exp_str) + 1), "Length mismatch (expected %d, got %d)\n", lstrlen(exp_str) + 1, len); \ LocalFree(string); #define CHECK_ONE_OF_AND_FREE(exp_str1, exp_str2) \

1 0

Andrew Eikum : shell32: Use ParseURL to detect URLs.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: da31fc06a44b38d441a8310724989ea35d512e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=da31fc06a44b38d441a831072… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 28 12:06:24 2010 -0500 shell32: Use ParseURL to detect URLs. --- dlls/shell32/shfldr_desktop.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 30aea3b..46a725f 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -152,6 +152,7 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, WCHAR szElement[MAX_PATH]; LPCWSTR szNext = NULL; LPITEMIDLIST pidlTemp = NULL; + PARSEDURLW urldata; HRESULT hr = S_OK; CLSID clsid; @@ -167,6 +168,8 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, if (pchEaten) *pchEaten = 0; /* strange but like the original */ + urldata.cbSize = sizeof(urldata); + if (lpszDisplayName[0] == ':' && lpszDisplayName[1] == ':') { szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH); @@ -193,13 +196,8 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, *ppidl = pidlTemp; return S_OK; } - else if (strchrW(lpszDisplayName,':')) + else if (SUCCEEDED(ParseURLW(lpszDisplayName, &urldata))) { - PARSEDURLW urldata; - - urldata.cbSize = sizeof(urldata); - ParseURLW(lpszDisplayName,&urldata); - if (urldata.nScheme == URL_SCHEME_SHELL) /* handle shell: urls */ { TRACE ("-- shell url: %s\n", debugstr_w(urldata.pszSuffix));

1 0