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

Andrew Nguyen : msxml3/tests: Correct the sense of a few test failure messages.
by Alexandre Julliard June 14, 2010

June 14, 2010

Module: wine Branch: master Commit: 6002cb06fbe60dea7c3fb91ee006b4c88e0e86ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=6002cb06fbe60dea7c3fb91ee… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jun 14 07:54:48 2010 -0500 msxml3/tests: Correct the sense of a few test failure messages. --- dlls/msxml3/tests/domdoc.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 818f628..605628f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -563,11 +563,11 @@ if (0) /* try some stupid things */ r = IXMLDOMDocument_loadXML( doc, NULL, NULL ); - ok( r == S_FALSE, "loadXML failed\n"); + ok( r == S_FALSE, "loadXML succeeded\n"); b = VARIANT_TRUE; r = IXMLDOMDocument_loadXML( doc, NULL, &b ); - ok( r == S_FALSE, "loadXML failed\n"); + ok( r == S_FALSE, "loadXML succeeded\n"); ok( b == VARIANT_FALSE, "failed to load XML string\n"); /* try to load a document from a nonexistent file */ @@ -578,16 +578,16 @@ if (0) V_BSTR(&var) = str; r = IXMLDOMDocument_load( doc, var, &b); - ok( r == S_FALSE, "load (from file) failed\n"); - ok( b == VARIANT_FALSE, "failed to load XML file\n"); + ok( r == S_FALSE, "loadXML succeeded\n"); + ok( b == VARIANT_FALSE, "succeeded in loading XML string\n"); SysFreeString( str ); /* try load an empty document */ b = VARIANT_TRUE; str = SysAllocString( szEmpty ); r = IXMLDOMDocument_loadXML( doc, str, &b ); - ok( r == S_FALSE, "loadXML failed\n"); - ok( b == VARIANT_FALSE, "failed to load XML string\n"); + ok( r == S_FALSE, "loadXML succeeded\n"); + ok( b == VARIANT_FALSE, "succeeded in loading XML string\n"); SysFreeString( str ); r = IXMLDOMDocument_get_async( doc, &b ); @@ -609,8 +609,8 @@ if (0) b = VARIANT_TRUE; str = SysAllocString( szIncomplete ); r = IXMLDOMDocument_loadXML( doc, str, &b ); - ok( r == S_FALSE, "loadXML failed\n"); - ok( b == VARIANT_FALSE, "failed to load XML string\n"); + ok( r == S_FALSE, "loadXML succeeded\n"); + ok( b == VARIANT_FALSE, "succeeded in loading XML string\n"); SysFreeString( str ); /* check that there's no document element */

1 0

Detlef Riekenberg : msvcr7x: Sync exports to msvcrt.
by Alexandre Julliard June 14, 2010

June 14, 2010

Module: wine Branch: master Commit: 717bb348187811e412b368fdaf62037f80130c34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=717bb348187811e412b368fda… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jun 14 14:32:27 2010 +0200 msvcr7x: Sync exports to msvcrt. --- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index edf3da4..7c84705 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -475,7 +475,7 @@ @ cdecl -arch=i386 _safe_fprem1() msvcrt._safe_fprem1 @ cdecl _scalb( double long) msvcrt._scalb @ stub _scprintf -@ stub _scwprintf +@ varargs _scwprintf(wstr) msvcrt._scwprintf @ cdecl _searchenv(str str ptr) msvcrt._searchenv @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind @ stub _set_SSE2_enable diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index f0d6255..8599efa 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -470,7 +470,7 @@ @ cdecl _safe_fprem1() msvcrt._safe_fprem1 @ cdecl _scalb( double long) msvcrt._scalb @ stub _scprintf -@ stub _scwprintf +@ varargs _scwprintf(wstr) msvcrt._scwprintf @ cdecl _searchenv(str str ptr) msvcrt._searchenv @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind @ stub _set_SSE2_enable

1 0

Jacek Caban : mshtml: Don' t crash in on_start_uri_open on nscontainer without associated document.
by Alexandre Julliard June 14, 2010

June 14, 2010

Module: wine Branch: master Commit: 95d98bdb537adb13d931c5104d1afe7da8e4ff7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d98bdb537adb13d931c5104… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 14 02:19:12 2010 +0200 mshtml: Don't crash in on_start_uri_open on nscontainer without associated document. --- dlls/mshtml/nsio.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 63c9a6a..d9e822d 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -222,13 +222,15 @@ nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, PRBool *_retva } if(!wine_uri->is_doc_uri) { + wine_uri->is_doc_uri = TRUE; + if(!wine_uri->container) { nsIWebBrowserChrome_AddRef(NSWBCHROME(nscontainer)); wine_uri->container = nscontainer; } - wine_uri->is_doc_uri = TRUE; - *_retval = translate_url(nscontainer->doc, wine_uri); + if(nscontainer->doc) + *_retval = translate_url(nscontainer->doc, wine_uri); } nsIURI_Release(NSURI(wine_uri));

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::open test.
by Alexandre Julliard June 14, 2010

June 14, 2010

Module: wine Branch: master Commit: 77a994db4216ed01b46b09b44926516d7cbf0c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77a994db4216ed01b46b09b44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 14 02:20:50 2010 +0200 mshtml: Added IHTMLWindow2::open test. --- dlls/mshtml/tests/htmldoc.c | 100 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 98 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 7e0d437..319e5fd 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -38,6 +38,7 @@ #include "idispids.h" #include "shlguid.h" #include "perhist.h" +#include "shobjidl.h" #include "mshtml_test.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -155,6 +156,7 @@ DEFINE_EXPECT(Frame_GetWindow); DEFINE_EXPECT(TranslateUrl); DEFINE_EXPECT(Advise_Close); DEFINE_EXPECT(OnViewChange); +DEFINE_EXPECT(EvaluateNewWindow); static IUnknown *doc_unk; static IMoniker *doc_mon; @@ -164,7 +166,7 @@ static BOOL ipsex, ipsw; static BOOL set_clientsite, container_locked, navigated_load; static BOOL readystate_set_loading = FALSE, readystate_set_interactive = FALSE, load_from_stream; static BOOL editmode = FALSE, show_failed; -static BOOL inplace_deactivated; +static BOOL inplace_deactivated, open_call; static int stream_read, protocol_read; static enum load_state_t { LD_DOLOAD, @@ -296,6 +298,9 @@ static void _test_GetCurMoniker(unsigned line, IUnknown *unk, IMoniker *exmon, L BSTR doc_url = (void*)0xdeadbeef; HRESULT hres; + if(open_call) + return; /* FIXME */ + hres = IUnknown_QueryInterface(unk, &IID_IPersistMoniker, (void**)&permon); ok(hres == S_OK, "QueryInterface(IID_IPersistMoniker) failed: %08x\n", hres); if(FAILED(hres)) @@ -332,7 +337,7 @@ static void _test_GetCurMoniker(unsigned line, IUnknown *unk, IMoniker *exmon, L }else if(exurl) { LPOLESTR url; - ok(hres == S_OK, "GetCurrentMoniker failed: %08x\n", hres); + ok_(__FILE__,line)(hres == S_OK, "GetCurrentMoniker failed: %08x\n", hres); hres = IMoniker_GetDisplayName(mon, NULL, NULL, &url); ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); @@ -737,6 +742,48 @@ static const IHlinkFrameVtbl HlinkFrameVtbl = { static IHlinkFrame HlinkFrame = { &HlinkFrameVtbl }; +static HRESULT WINAPI NewWindowManager_QueryInterface(INewWindowManager *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI NewWindowManager_AddRef(INewWindowManager *iface) +{ + return 2; +} + +static ULONG WINAPI NewWindowManager_Release(INewWindowManager *iface) +{ + return 1; +} + +static HRESULT WINAPI NewWindowManager_EvaluateNewWindow(INewWindowManager *iface, LPCWSTR pszUrl, + LPCWSTR pszName, LPCWSTR pszUrlContext, LPCWSTR pszFeatures, BOOL fReplace, DWORD dwFlags, + DWORD dwUserActionTime) +{ + CHECK_EXPECT(EvaluateNewWindow); + + ok(!strcmp_wa(pszUrl, "about:blank"), "pszUrl = %s\n", wine_dbgstr_w(pszUrl)); + ok(!strcmp_wa(pszName, "test"), "pszName = %s\n", wine_dbgstr_w(pszName)); + ok(!strcmp_wa(pszUrlContext, "about:blank"), "pszUrlContext = %s\n", wine_dbgstr_w(pszUrlContext)); + ok(!pszFeatures, "pszFeatures = %s\n", wine_dbgstr_w(pszFeatures)); + ok(!fReplace, "fReplace = %x\n", fReplace); + ok(dwFlags == NWMF_FIRST, "dwFlags = %x\n", dwFlags); + ok(!dwUserActionTime, "dwUserActionime = %d\n", dwUserActionTime); + + return E_FAIL; +} + +static const INewWindowManagerVtbl NewWindowManagerVtbl = { + NewWindowManager_QueryInterface, + NewWindowManager_AddRef, + NewWindowManager_Release, + NewWindowManager_EvaluateNewWindow +}; + +static INewWindowManager NewWindowManager = { &NewWindowManagerVtbl }; + static HRESULT WINAPI PropertyNotifySink_QueryInterface(IPropertyNotifySink *iface, REFIID riid, void**ppv) { @@ -2423,6 +2470,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID ok(V_BSTR(pvaIn) != NULL, "V_BSTR(pvaIn) = NULL\n"); test_readyState(NULL); return S_OK; + case OLECMDID_UPDATETRAVELENTRY_DATARECOVERY: + return E_FAIL; /* FIXME */ default: ok(0, "unexpected command %d\n", nCmdID); return E_FAIL; @@ -2701,6 +2750,12 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG return S_OK; } + if(IsEqualGUID(&SID_SNewWindowManager, guidService)) { + ok(IsEqualGUID(&IID_INewWindowManager, riid), "unexpected riid\n"); + *ppv = &NewWindowManager; + return S_OK; + } + return E_NOINTERFACE; } @@ -2941,6 +2996,9 @@ static void _test_readyState(unsigned line, IUnknown *unk) "uninitialized" }; + if(open_call) + return; /* FIXME */ + if(!unk) unk = doc_unk; @@ -3405,6 +3463,43 @@ static void test_put_href(IHTMLDocument2 *doc) test_download(DWL_VERBDONE); } +static void test_open_window(IHTMLDocument2 *doc) +{ + IHTMLWindow2 *window, *new_window; + BSTR name, url; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + + url = a2bstr("about:blank"); + name = a2bstr("test"); + new_window = (void*)0xdeadbeef; + + open_call = TRUE; + + SET_EXPECT(TranslateUrl); + SET_EXPECT(EvaluateNewWindow); + + hres = IHTMLWindow2_open(window, url, name, NULL, VARIANT_FALSE, &new_window); + todo_wine + ok(hres == S_OK, "open failed: %08x\n", hres); + todo_wine + ok(new_window == NULL, "new_window != NULL\n"); + + todo_wine + CHECK_CALLED(TranslateUrl); + todo_wine + CHECK_CALLED(EvaluateNewWindow); + + open_call = FALSE; + SysFreeString(url); + SysFreeString(name); + + IHTMLWindow2_Release(window); + SysFreeString(name); +} + static void test_clear(IHTMLDocument2 *doc) { HRESULT hres; @@ -4678,6 +4773,7 @@ static void test_HTMLDocument_http(void) test_GetCurMoniker((IUnknown*)doc, http_mon, NULL); test_put_href(doc); + test_open_window(doc); test_InPlaceDeactivate(doc, TRUE); test_Close(doc, FALSE);

1 0

Hans Leidekker : propsys: Return success from PSRegisterPropertySchema.
by Alexandre Julliard June 14, 2010

June 14, 2010

Module: wine Branch: master Commit: e7d8fd126beec24377f1e0e0a57e202ac527eae4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d8fd126beec24377f1e0e0a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 14 14:20:49 2010 +0200 propsys: Return success from PSRegisterPropertySchema. --- dlls/propsys/propsys_main.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index c5bcab7..d2b1744 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -50,14 +50,14 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) HRESULT WINAPI PSRegisterPropertySchema(PCWSTR path) { - FIXME("stub\n"); + FIXME("%s\n", debugstr_w(path)); - return E_NOTIMPL; + return S_OK; } -HRESULT WINAPI PSUnregisterPropertySchema(PCWSTR pszPath) +HRESULT WINAPI PSUnregisterPropertySchema(PCWSTR path) { - FIXME("stub\n"); + FIXME("%s\n", debugstr_w(path)); return E_NOTIMPL; }

1 0

Jacek Caban : shobjidl.idl: Added INewWindowManager declaration.
by Alexandre Julliard June 14, 2010

June 14, 2010

Module: wine Branch: master Commit: 5432c5d091f0ed69d888c093672172d6f238dc88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5432c5d091f0ed69d888c0936… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 14 02:18:52 2010 +0200 shobjidl.idl: Added INewWindowManager declaration. --- include/shobjidl.idl | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 6bd0244..c8d91b3 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -384,6 +384,25 @@ typedef enum tagNWMF { NWMF_USERALLOWED = 0x0100 } NWMF; +[ + uuid(d2bc4c84-3f72-4a52-a604-7bcbf3982cbb), + object, + pointer_default(unique) +] +interface INewWindowManager : IUnknown +{ + HRESULT EvaluateNewWindow( + [in, string] LPCWSTR pszUrl, + [in, string] LPCWSTR pszName, + [in, string] LPCWSTR pszUrlContext, + [in, string] LPCWSTR pszFeatures, + [in] BOOL fReplace, + [in] DWORD dwFlags, + [in] DWORD dwUserActionTime); +} + +cpp_quote("#define SID_SNewWindowManager IID_INewWindowManager") + /***************************************************************************** * FOLDERSETTINGS */

1 0

Hans Leidekker : msi: Don't trace the contents of an output buffer.
by Alexandre Julliard June 14, 2010

June 14, 2010

Module: wine Branch: master Commit: b4674a3c2b9cde2c2c24dee38475290ac2e6ec6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4674a3c2b9cde2c2c24dee38… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 14 14:21:12 2010 +0200 msi: Don't trace the contents of an output buffer. --- dlls/msi/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index def6a00..3e6a556 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -825,7 +825,7 @@ UINT WINAPI MsiGetProductCodeA(LPCSTR szComponent, LPSTR szBuffer) UINT r; WCHAR szwBuffer[GUID_SIZE]; - TRACE("%s %s\n",debugstr_a(szComponent), debugstr_a(szBuffer)); + TRACE("%s %p\n", debugstr_a(szComponent), szBuffer); if( szComponent ) {

1 0

Jacek Caban : shdocvw: Silence QueryService traces in non-interactive runs.
by Alexandre Julliard June 14, 2010

June 14, 2010

Module: wine Branch: master Commit: ddaf9171a136696af6c42e2a75798165462358a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddaf9171a136696af6c42e2a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 14 02:20:38 2010 +0200 shdocvw: Silence QueryService traces in non-interactive runs. They only pollute output making it harder to find useful informations. --- dlls/shdocvw/tests/webbrowser.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index f396373..17189fc 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1350,6 +1350,9 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, { *ppv = NULL; + if(!winetest_interactive) + return E_NOINTERFACE; + if (IsEqualGUID(&SID_STopLevelBrowser, guidService)) trace("Service SID_STopLevelBrowser\n"); else if (IsEqualGUID(&SID_SEditCommandTarget, guidService))

1 0

Jacek Caban : docobj.idl: Added OLECMDID_UPDATETRAVELENTRY_DATARECOVERY declaration.
by Alexandre Julliard June 14, 2010

June 14, 2010

Module: wine Branch: master Commit: e4bfae8306eb20230fec6412f63c10760f4413f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4bfae8306eb20230fec6412f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 14 02:19:02 2010 +0200 docobj.idl: Added OLECMDID_UPDATETRAVELENTRY_DATARECOVERY declaration. --- include/docobj.idl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/docobj.idl b/include/docobj.idl index c47d111..bc14b1d 100644 --- a/include/docobj.idl +++ b/include/docobj.idl @@ -274,7 +274,8 @@ interface IOleCommandTarget : IUnknown OLECMDID_OPTICAL_ZOOM = 63, OLECMDID_OPTICAL_GETZOOMRANGE = 64, OLECMDID_WINDOWSTATECHANGED = 65, - OLECMDID_ACTIVEXINSTALLSCOPE = 66 + OLECMDID_ACTIVEXINSTALLSCOPE = 66, + OLECMDID_UPDATETRAVELENTRY_DATARECOVERY = 67 } OLECMDID; HRESULT QueryStatus(

1 0

Damjan Jovanovic : kernel32: Revert 3f1404bf29676d79dd76ffd31e2630bb9f2b0b60 and add better CopyFile tests .
by Alexandre Julliard June 14, 2010

June 14, 2010

Module: wine Branch: master Commit: 44aa45036b2f4b4b367644a821c09453e1a4c432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44aa45036b2f4b4b367644a82… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Jun 14 07:48:10 2010 +0200 kernel32: Revert 3f1404bf29676d79dd76ffd31e2630bb9f2b0b60 and add better CopyFile tests. --- dlls/kernel32/path.c | 2 +- dlls/kernel32/tests/file.c | 59 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 55 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 2bfd062..c319cb5 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -911,7 +911,7 @@ BOOL WINAPI CopyFileW( LPCWSTR source, LPCWSTR dest, BOOL fail_if_exists ) return FALSE; } - if ((h2 = CreateFileW( dest, GENERIC_WRITE, FILE_SHARE_READ, NULL, + if ((h2 = CreateFileW( dest, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, fail_if_exists ? CREATE_NEW : CREATE_ALWAYS, info.dwFileAttributes, h1 )) == INVALID_HANDLE_VALUE) { diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index fcc7fc0..550fc95 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -591,6 +591,11 @@ static void test_CopyFileA(void) ret = MoveFileA(source, source); todo_wine ok(ret, "MoveFileA: failed, error %d\n", GetLastError()); + /* copying a file to itself must fail */ + retok = CopyFileA(source, source, FALSE); + todo_wine ok( !retok && (GetLastError() == ERROR_SHARING_VIOLATION || broken(GetLastError() == ERROR_FILE_EXISTS) /* Win 9x */), + "copying a file to itself didn't fail (ret=%d, err=%d)\n", retok, GetLastError()); + /* make the source have not zero size */ hfile = CreateFileA(source, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0 ); ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file\n"); @@ -598,10 +603,6 @@ static void test_CopyFileA(void) ok( retok && ret == sizeof(prefix), "WriteFile error %d\n", GetLastError()); ok(GetFileSize(hfile, NULL) == sizeof(prefix), "source file has wrong size\n"); - /* copying a file to itself must fail */ - retok = CopyFileA(source, source, FALSE); - ok( !retok && (GetLastError() == ERROR_SHARING_VIOLATION || broken(GetLastError() == ERROR_FILE_EXISTS) /* Win 9x */), - "copying a file to itself didn't fail (ret=%d, err=%d)\n", retok, GetLastError()); /* get the file time and change it to prove the difference */ ret = GetFileTime(hfile, NULL, NULL, &ft1); ok( ret, "GetFileTime error %d\n", GetLastError()); @@ -622,7 +623,35 @@ static void test_CopyFileA(void) ret = CopyFileA(source, dest, FALSE); ok(ret, "CopyFileA: error %d\n", GetLastError()); - /* destination file is write-locked during copy */ + /* copying from a read-locked source fails */ + hfile = CreateFileA(source, GENERIC_READ, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file, error %d\n", GetLastError()); + retok = CopyFileA(source, dest, FALSE); + ok(!retok && GetLastError() == ERROR_SHARING_VIOLATION, + "copying from a read-locked file succeeded when it shouldn't have\n"); + /* in addition, the source is opened before the destination */ + retok = CopyFileA("25f99d3b-4ba4-4f66-88f5-2906886993cc", dest, FALSE); + ok(!retok && GetLastError() == ERROR_FILE_NOT_FOUND, + "copying from a file that doesn't exist failed in an unexpected way (ret=%d, err=%d)\n", retok, GetLastError()); + CloseHandle(hfile); + + /* copying from a r+w opened, r shared source succeeds */ + hfile = CreateFileA(source, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file, error %d\n", GetLastError()); + retok = CopyFileA(source, dest, FALSE); + ok(retok, + "copying from an r+w opened and r shared file failed (ret=%d, err=%d)\n", ret, GetLastError()); + CloseHandle(hfile); + + /* copying from a delete-locked source is unreliable */ + hfile = CreateFileA(source, DELETE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file, error %d\n", GetLastError()); + retok = CopyFileA(source, dest, FALSE); + ok((!retok && GetLastError() == ERROR_SHARING_VIOLATION) || broken(retok) /* 98, Vista, 2k8, 7 */, + "copying from a delete-locked file failed (ret=%d, err=%d)\n", ret, GetLastError()); + CloseHandle(hfile); + + /* copying to a write-locked destination fails */ hfile = CreateFileA(dest, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %d\n", GetLastError()); retok = CopyFileA(source, dest, FALSE); @@ -630,6 +659,26 @@ static void test_CopyFileA(void) "copying to a write-locked file didn't fail (ret=%d, err=%d)\n", ret, GetLastError()); CloseHandle(hfile); + /* copying to a r+w opened, w shared destination mostly succeeds */ + hfile = CreateFileA(dest, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %d\n", GetLastError()); + retok = CopyFileA(source, dest, FALSE); + ok(retok || broken(!retok && GetLastError() == ERROR_SHARING_VIOLATION) /* Win 9x */, + "copying to a r+w opened and w shared file failed (ret=%d, err=%d)\n", ret, GetLastError()); + CloseHandle(hfile); + + /* copying to a delete-locked destination fails, even when the destination is delete-shared */ + hfile = CreateFileA(dest, DELETE, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* Win 9x */, + "failed to open destination file, error %d\n", GetLastError()); + if (hfile != INVALID_HANDLE_VALUE) + { + retok = CopyFileA(source, dest, FALSE); + ok(!retok && GetLastError() == ERROR_SHARING_VIOLATION, + "copying to a delete-locked shared file didn't fail (ret=%d, err=%d)\n", ret, GetLastError()); + CloseHandle(hfile); + } + /* make sure that destination has correct size */ hfile = CreateFileA(dest, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file\n");

1 0