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

Robert Shearman : ole32: When CoLockObjectExternal with fLock= TRUE is used on an object
by Alexandre Julliard 30 Jun '06

30 Jun '06

Module: wine Branch: refs/heads/master Commit: 628371021bddc7440724ed4b79e5fe4a9c335d1d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=628371021bddc7440724ed4… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jun 30 11:07:43 2006 +0100 ole32: When CoLockObjectExternal with fLock=TRUE is used on an object that hasn't yet been marshaled then it should create a new stub manager. --- dlls/ole32/compobj.c | 16 ++++++++++++++++ dlls/ole32/tests/marshal.c | 20 +++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index fc65ddb..f66926c 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2098,6 +2098,10 @@ static void COM_RevokeAllClasses() * RETURNS * Success: S_OK. * Failure: HRESULT code. + * + * NOTES + * If fLock is TRUE and an object is passed in that doesn't have a stub + * manager then a new stub manager is created for the object. */ HRESULT WINAPI CoLockObjectExternal( LPUNKNOWN pUnk, @@ -2126,6 +2130,18 @@ HRESULT WINAPI CoLockObjectExternal( return S_OK; } + else if (fLock) + { + stubmgr = new_stub_manager(apt, pUnk); + + if (stubmgr) + { + stub_manager_ext_addref(stubmgr, 1); + stub_manager_int_release(stubmgr); + } + + return S_OK; + } else { WARN("stub object not found %p\n", pUnk); diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 102be87..fc7c205 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -998,6 +998,20 @@ static void test_lock_object_external(vo cLocks = 0; + /* test the stub manager creation aspect of CoLockObjectExternal when the + * object hasn't been marshaled yet */ + CoLockObjectExternal((IUnknown*)&Test_ClassFactory, TRUE, TRUE); + + ok_more_than_one_lock(); + + CoDisconnectObject((IUnknown*)&Test_ClassFactory, 0); + + ok_no_locks(); + + /* test our empty stub manager being handled correctly in + * CoMarshalInterface */ + CoLockObjectExternal((IUnknown*)&Test_ClassFactory, TRUE, TRUE); + hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); ok_ole_success(hr, CreateStreamOnHGlobal); hr = CoMarshalInterface(pStream, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); @@ -1006,7 +1020,7 @@ static void test_lock_object_external(vo CoLockObjectExternal((IUnknown*)&Test_ClassFactory, TRUE, TRUE); ok_more_than_one_lock(); - + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); hr = CoReleaseMarshalData(pStream); ok_ole_success(hr, CoReleaseMarshalData); @@ -1016,6 +1030,10 @@ static void test_lock_object_external(vo CoLockObjectExternal((IUnknown*)&Test_ClassFactory, FALSE, TRUE); + ok_more_than_one_lock(); + + CoLockObjectExternal((IUnknown*)&Test_ClassFactory, FALSE, TRUE); + ok_no_locks(); }

1 0

Robert Shearman : oleaut32: Fix a typo where the FIXME doesn' t match the code.
by Alexandre Julliard 30 Jun '06

30 Jun '06

Module: wine Branch: refs/heads/master Commit: 2fa3cc03a58325fe1061fa1391fdfc245a739f71 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2fa3cc03a58325fe1061fa1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jun 30 11:07:26 2006 +0100 oleaut32: Fix a typo where the FIXME doesn't match the code. --- dlls/oleaut32/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 11302be..71dec16 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4981,7 +4981,7 @@ static HRESULT userdefined_to_variantvt( break; case TKIND_UNION: - FIXME("TKIND_RECORD unhandled.\n"); + FIXME("TKIND_UNION unhandled.\n"); hr = E_NOTIMPL; break;

1 0

Robert Shearman : advapi32: Implement RegDisablePredefinedCache.
by Alexandre Julliard 30 Jun '06

30 Jun '06

Module: wine Branch: refs/heads/master Commit: 52aaddcd3493c263d3e60533ac3473804aad3f47 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=52aaddcd3493c263d3e6053… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jun 30 11:06:48 2006 +0100 advapi32: Implement RegDisablePredefinedCache. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/registry.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 438b671..4826df9 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -475,7 +475,7 @@ # @ stub ReadEncryptedFileRaw @ stdcall RegDeleteKeyW(long wstr) @ stdcall RegDeleteValueA(long str) @ stdcall RegDeleteValueW(long wstr) -# @ stub RegDisablePredefinedCache +@ stdcall RegDisablePredefinedCache() @ stdcall RegEnumKeyA(long long ptr long) @ stdcall RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr) @ stdcall RegEnumKeyExW(long long ptr ptr ptr ptr ptr ptr) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 7790862..e99cce7 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -52,6 +52,7 @@ #define HKEY_SPECIAL_ROOT_LAST HKEY_D #define NB_SPECIAL_ROOT_KEYS ((UINT)HKEY_SPECIAL_ROOT_LAST - (UINT)HKEY_SPECIAL_ROOT_FIRST + 1) static HKEY special_root_keys[NB_SPECIAL_ROOT_KEYS]; +static BOOL hkcu_cache_disabled; static const WCHAR name_CLASSES_ROOT[] = {'M','a','c','h','i','n','e','\\', @@ -108,6 +109,10 @@ static HKEY create_special_root_hkey( HA { if (RtlOpenCurrentUser( access, &hkey )) return 0; TRACE( "HKEY_CURRENT_USER -> %p\n", hkey ); + + /* don't cache the key in the table if caching is disabled */ + if (hkcu_cache_disabled) + return hkey; } else { @@ -2565,3 +2570,34 @@ cleanup: return result; } + +/****************************************************************************** + * RegDisablePredefinedCache [ADVAPI32.@] + * + * Disables the caching of the HKEY_CLASSES_ROOT key for the process. + * + * PARAMS + * None. + * + * RETURNS + * Success: ERROR_SUCCESS + * Failure: nonzero error code from Winerror.h + * + * NOTES + * This is useful for services that use impersonation. + */ +LONG WINAPI RegDisablePredefinedCache(void) +{ + HKEY hkey_current_user; + int idx = (UINT_PTR)HKEY_CURRENT_USER - (UINT_PTR)HKEY_SPECIAL_ROOT_FIRST; + + /* prevent caching of future requests */ + hkcu_cache_disabled = TRUE; + + hkey_current_user = InterlockedExchangePointer( (void **)&special_root_keys[idx], NULL ); + + if (hkey_current_user) + NtClose( hkey_current_user ); + + return ERROR_SUCCESS; +}

1 0

Robert Shearman : rpcrt4: Add a stub for RpcMgmtSetServerStackSize.
by Alexandre Julliard 30 Jun '06

30 Jun '06

Module: wine Branch: refs/heads/master Commit: e7df38c27f78bf9fb00073f40955190c95804b2b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e7df38c27f78bf9fb00073f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jun 30 11:07:07 2006 +0100 rpcrt4: Add a stub for RpcMgmtSetServerStackSize. --- dlls/rpcrt4/rpc_server.c | 11 ++++++++++- dlls/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 3f3c9ca..7dceb2d 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -997,10 +997,19 @@ RPC_STATUS WINAPI RpcMgmtEpEltInqBegin(R } /*********************************************************************** - * RpcMgmtEpEltInqBegin (RPCRT4.@) + * RpcMgmtIsServerListening (RPCRT4.@) */ RPC_STATUS WINAPI RpcMgmtIsServerListening(RPC_BINDING_HANDLE Binding) { FIXME("(%p): stub\n", Binding); return RPC_S_INVALID_BINDING; } + +/*********************************************************************** + * RpcMgmtSetServerStackSize (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcMgmtSetServerStackSize(unsigned int ThreadStackSize) +{ + FIXME("(0x%x): stub\n", ThreadStackSize); + return RPC_S_OK; +} diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index cd1bcf2..5141165 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -441,7 +441,7 @@ # 9x version of I_RpcBindingSetAsync has @ stub RpcMgmtSetCancelTimeout @ stdcall RpcMgmtSetComTimeout(ptr long) @ stub RpcMgmtSetParameter # win9x -@ stub RpcMgmtSetServerStackSize +@ stdcall RpcMgmtSetServerStackSize(long) @ stub RpcMgmtStatsVectorFree @ stdcall RpcMgmtStopServerListening(ptr) @ stdcall RpcMgmtWaitServerListen()

1 0

Paul Vriens : ntdll: Fix return codes for NtCreateKey (with tests).
by Alexandre Julliard 30 Jun '06

30 Jun '06

Module: wine Branch: refs/heads/master Commit: 8a42a8c11a125c5a08518342faf53ec20006473c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8a42a8c11a125c5a0851834… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Jun 30 09:04:03 2006 +0200 ntdll: Fix return codes for NtCreateKey (with tests). --- dlls/ntdll/reg.c | 3 ++- dlls/ntdll/tests/reg.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index d0c5e62..5a1f5c2 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -58,8 +58,9 @@ NTSTATUS WINAPI NtCreateKey( PHANDLE ret TRACE( "(%p,%s,%s,%lx,%lx,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName), debugstr_us(class), options, access, retkey ); + if (!retkey || !attr) return STATUS_ACCESS_VIOLATION; + if (attr->Length > sizeof(OBJECT_ATTRIBUTES)) return STATUS_INVALID_PARAMETER; if (attr->ObjectName->Length > MAX_NAME_LENGTH) return STATUS_BUFFER_OVERFLOW; - if (!retkey) return STATUS_INVALID_PARAMETER; SERVER_START_REQ( create_key ) { diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 0b1cc43..654ae64 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -298,10 +298,38 @@ static void test_NtCreateKey(void) ACCESS_MASK am = GENERIC_ALL; NTSTATUS status; + /* All NULL */ + status = pNtCreateKey(NULL, 0, NULL, 0, 0, 0, 0); + ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08lx\n", status); + + /* Only the key */ + status = pNtCreateKey(&key, 0, NULL, 0, 0, 0, 0); + ok(status == STATUS_ACCESS_VIOLATION /* W2K3/XP/W2K */ || status == STATUS_INVALID_PARAMETER /* NT4 */, + "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER(NT4), got: 0x%08lx\n", status); + + /* Only accessmask */ + status = pNtCreateKey(NULL, am, NULL, 0, 0, 0, 0); + ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08lx\n", status); + + /* Key and accessmask */ + status = pNtCreateKey(&key, am, NULL, 0, 0, 0, 0); + ok(status == STATUS_ACCESS_VIOLATION /* W2K3/XP/W2K */ || status == STATUS_INVALID_PARAMETER /* NT4 */, + "Expected STATUS_ACCESS_VIOLATION or STATUS_INVALID_PARAMETER(NT4), got: 0x%08lx\n", status); + InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); + + /* Only attributes */ + status = pNtCreateKey(NULL, 0, &attr, 0, 0, 0, 0); + ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08lx\n", status); + status = pNtCreateKey(&key, am, &attr, 0, 0, 0, 0); ok(status == STATUS_SUCCESS, "NtCreateKey Failed: 0x%08lx\n", status); + /* Length > sizeof(OBJECT_ATTRIBUTES) */ + attr.Length *= 2; + status = pNtCreateKey(&key, am, &attr, 0, 0, 0, 0); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got: 0x%08lx\n", status); + pNtClose(&key); }

1 0

James Hawkins : shlwapi: Add tests for PathFindExtensionA.
by Alexandre Julliard 30 Jun '06

30 Jun '06

Module: wine Branch: refs/heads/master Commit: ad064915c957dd89e322bfe868c3b4c0d0c8e70a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ad064915c957dd89e322bfe… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jun 29 13:33:18 2006 -0700 shlwapi: Add tests for PathFindExtensionA. --- dlls/shlwapi/tests/path.c | 67 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 49d378a..183c936 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -1419,6 +1419,72 @@ static void test_PathCanonicalizeA(void) ok(lstrlen(too_long) == LONG_LEN - 1, "Expected length LONG_LEN - 1, got %i\n", lstrlen(too_long)); } +static void test_PathFindExtensionA(void) +{ + LPSTR ext; + char path[MAX_PATH]; + char too_long[LONG_LEN]; + + /* try a NULL path */ + SetLastError(0xdeadbeef); + ext = PathFindExtensionA(NULL); + ok(ext == NULL, "Expected NULL, got %p\n", ext); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + + /* try an empty path */ + path[0] = '\0'; + SetLastError(0xdeadbeef); + ext = PathFindExtensionA(path); + ok(ext == path, "Expected ext == path, got %p\n", ext); + ok(lstrlen(ext) == 0, "Expected length 0, got %i\n", lstrlen(ext)); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + + /* try a path without an extension */ + lstrcpy(path, "file"); + SetLastError(0xdeadbeef); + ext = PathFindExtensionA(path); + ok(ext == path + lstrlen(path), "Expected ext == path, got %p\n", ext); + ok(lstrlen(ext) == 0, "Expected length 0, got %i\n", lstrlen(ext)); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + + /* try a path with an extension */ + lstrcpy(path, "file.txt"); + SetLastError(0xdeadbeef); + ext = PathFindExtensionA(path); + ok(ext == path + lstrlen("file"), + "Expected ext == path + lstrlen(\"file\"), got %p\n", ext); + ok(!lstrcmp(ext, ".txt"), "Expected .txt, got %s\n", ext); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + + /* try a path with two extensions */ + lstrcpy(path, "file.txt.doc"); + SetLastError(0xdeadbeef); + ext = PathFindExtensionA(path); + ok(ext == path + lstrlen("file.txt"), + "Expected ext == path + lstrlen(\"file.txt\"), got %p\n", ext); + ok(!lstrcmp(ext, ".doc"), "Expected .txt, got %s\n", ext); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + + /* try a path longer than MAX_PATH without an extension*/ + memset(too_long, 'a', LONG_LEN); + too_long[LONG_LEN - 1] = '\0'; + SetLastError(0xdeadbeef); + ext = PathFindExtensionA(too_long); + ok(ext == too_long + LONG_LEN - 1, "Expected ext == too_long + LONG_LEN - 1, got %p\n", ext); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + + /* try a path longer than MAX_PATH with an extension*/ + memset(too_long, 'a', LONG_LEN); + too_long[LONG_LEN - 1] = '\0'; + lstrcpy(too_long + 300, ".abcde"); + too_long[lstrlen(too_long)] = 'a'; + SetLastError(0xdeadbeef); + ext = PathFindExtensionA(too_long); + ok(ext == too_long + 300, "Expected ext == too_long + 300, got %p\n", ext); + ok(lstrlen(ext) == LONG_LEN - 301, "Expected LONG_LEN - 301, got %i\n", lstrlen(ext)); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); +} + START_TEST(path) { hShlwapi = LoadLibraryA("shlwapi.dll"); @@ -1460,4 +1526,5 @@ START_TEST(path) test_PathCombineA(); test_PathAppendA(); test_PathCanonicalizeA(); + test_PathFindExtensionA(); }

1 0

James Hawkins : shlwapi: Add tests for PathCanonicalize.
by Alexandre Julliard 30 Jun '06

30 Jun '06

Module: wine Branch: refs/heads/master Commit: b333f0c4d2babe40ab16a7a3f558266c94fd96b5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b333f0c4d2babe40ab16a7a… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jun 29 13:33:05 2006 -0700 shlwapi: Add tests for PathCanonicalize. --- dlls/shlwapi/tests/path.c | 124 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 124 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 826b6b6..49d378a 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -1296,6 +1296,129 @@ static void test_PathAppendA(void) ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); } +static void test_PathCanonicalizeA(void) +{ + char dest[MAX_PATH]; + char too_long[LONG_LEN]; + BOOL res; + + /* try a NULL source */ + lstrcpy(dest, "test"); + SetLastError(0xdeadbeef); + res = PathCanonicalizeA(dest, NULL); + ok(!res, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + todo_wine + { + ok(!lstrcmp(dest, "test"), "Expected test, got %s\n", dest); + } + + /* try an empty source */ + lstrcpy(dest, "test"); + SetLastError(0xdeadbeef); + res = PathCanonicalizeA(dest, ""); + ok(res, "Expected success\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(!lstrcmp(dest, "\\"), "Expected \\, got %s\n", dest); + + /* try a NULL dest */ + SetLastError(0xdeadbeef); + res = PathCanonicalizeA(NULL, "C:\\"); + ok(!res, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + + /* try empty dest */ + dest[0] = '\0'; + SetLastError(0xdeadbeef); + res = PathCanonicalizeA(dest, "C:\\"); + ok(res, "Expected success\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(!lstrcmp(dest, "C:\\"), "Expected C:\\, got %s\n", dest); + + /* try non-empty dest */ + lstrcpy(dest, "test"); + SetLastError(0xdeadbeef); + res = PathCanonicalizeA(dest, "C:\\"); + ok(res, "Expected success\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(!lstrcmp(dest, "C:\\"), "Expected C:\\, got %s\n", dest); + + /* try a space for source */ + lstrcpy(dest, "test"); + SetLastError(0xdeadbeef); + res = PathCanonicalizeA(dest, " "); + ok(res, "Expected success\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(!lstrcmp(dest, " "), "Expected ' ', got %s\n", dest); + + /* try a relative path */ + lstrcpy(dest, "test"); + SetLastError(0xdeadbeef); + res = PathCanonicalizeA(dest, "one\\two"); + ok(res, "Expected success\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(!lstrcmp(dest, "one\\two"), "Expected one\\two, got %s\n", dest); + + /* try current dir and previous dir */ + lstrcpy(dest, "test"); + SetLastError(0xdeadbeef); + res = PathCanonicalizeA(dest, "C:\\one\\.\\..\\two\\three\\.."); + ok(res, "Expected success\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(!lstrcmp(dest, "C:\\two"), "Expected C:\\two, got %s\n", dest); + + /* try simple forward slashes */ + lstrcpy(dest, "test"); + SetLastError(0xdeadbeef); + res = PathCanonicalizeA(dest, "C:\\one/two/three\\four/five\\six"); + ok(res, "Expected success\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(!lstrcmp(dest, "C:\\one/two/three\\four/five\\six"), + "Expected C:\\one/two/three\\four/five\\six, got %s\n", dest); + + /* try simple forward slashes with same dir */ + lstrcpy(dest, "test"); + SetLastError(0xdeadbeef); + res = PathCanonicalizeA(dest, "C:\\one/.\\two"); + ok(res, "Expected success\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(!lstrcmp(dest, "C:\\one/.\\two"), "Expected C:\\one/.\\two, got %s\n", dest); + + /* try simple forward slashes with change dir */ + lstrcpy(dest, "test"); + SetLastError(0xdeadbeef); + res = PathCanonicalizeA(dest, "C:\\one/.\\two\\.."); + ok(res, "Expected success\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(!lstrcmp(dest, "C:\\one/."), "Expected C:\\one/., got %s\n", dest); + + /* try forward slashes with change dirs + * NOTE: if there is a forward slash in between two backslashes, + * everything in between the two backslashes is considered on dir + */ + lstrcpy(dest, "test"); + SetLastError(0xdeadbeef); + res = PathCanonicalizeA(dest, "C:\\one/.\\..\\two/three\\..\\four/.five"); + ok(res, "Expected success\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(!lstrcmp(dest, "C:\\four/.five"), "Expected C:\\four/.five, got %s\n", dest); + + /* try src is too long */ + memset(too_long, 'a', LONG_LEN); + too_long[LONG_LEN - 1] = '\0'; + lstrcpy(dest, "test"); + SetLastError(0xdeadbeef); + res = PathCanonicalizeA(dest, too_long); + todo_wine + { + ok(!res, "Expected failure\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + } + ok(lstrlen(too_long) == LONG_LEN - 1, "Expected length LONG_LEN - 1, got %i\n", lstrlen(too_long)); +} + START_TEST(path) { hShlwapi = LoadLibraryA("shlwapi.dll"); @@ -1336,4 +1459,5 @@ START_TEST(path) test_PathCombineA(); test_PathAppendA(); + test_PathCanonicalizeA(); }

1 0

Mikołaj Zalewski : shell32: Use SHFileOperationW to delete files.
by Alexandre Julliard 30 Jun '06

30 Jun '06

Module: wine Branch: refs/heads/master Commit: 86fe1a0d5fc63c3eef9271a46cba8350e6d38b5d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=86fe1a0d5fc63c3eef9271a… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jun 29 21:03:41 2006 +0200 shell32: Use SHFileOperationW to delete files. --- dlls/shell32/shfldr_fs.c | 107 ++++++++++++++++++++++++++++++---------------- 1 files changed, 69 insertions(+), 38 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index d683007..4e1c878 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1155,6 +1155,36 @@ ISFHelper_fnAddFolder (ISFHelper * iface } /**************************************************************************** + * build_paths_list + * + * Builds a list of paths like the one used in SHFileOperation from a table of + * PIDLs relative to the given base folder + */ +WCHAR *build_paths_list(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls) +{ + WCHAR *wszPathsList; + WCHAR *wszListPos; + int iPathLen; + int i; + + iPathLen = lstrlenW(wszBasePath); + wszPathsList = HeapAlloc(GetProcessHeap(), 0, MAX_PATH*sizeof(WCHAR)*cidl+1); + wszListPos = wszPathsList; + + for (i = 0; i < cidl; i++) { + if (!_ILIsFolder(pidls[i]) && !_ILIsValue(pidls[i])) + continue; + + lstrcpynW(wszListPos, wszBasePath, MAX_PATH); + /* FIXME: abort if path too long */ + _ILSimpleGetTextW(pidls[i], wszListPos+iPathLen, MAX_PATH-iPathLen); + wszListPos += lstrlenW(wszListPos)+1; + } + *wszListPos=0; + return wszPathsList; +} + +/**************************************************************************** * ISFHelper_fnDeleteItems * * deletes items in folder @@ -1164,59 +1194,60 @@ ISFHelper_fnDeleteItems (ISFHelper * ifa { IGenericSFImpl *This = impl_from_ISFHelper(iface); UINT i; + SHFILEOPSTRUCTW op; WCHAR wszPath[MAX_PATH]; - int iPathLen; - BOOL bConfirm = TRUE; + WCHAR *wszPathsList; + HRESULT ret; + WCHAR *wszCurrentPath; TRACE ("(%p)(%u %p)\n", This, cidl, apidl); - - /* deleting multiple items so give a slightly different warning */ - if (cidl != 1) { - WCHAR tmp[8]; - static const WCHAR format[] = {'%','d',0}; - - wnsprintfW (tmp, sizeof(tmp)/sizeof(tmp[0]), format, cidl); - if (!SHELL_ConfirmDialogW(ASK_DELETE_MULTIPLE_ITEM, tmp)) - return E_FAIL; - bConfirm = FALSE; - } + if (cidl==0) return S_OK; if (This->sPathTarget) lstrcpynW(wszPath, This->sPathTarget, MAX_PATH); else wszPath[0] = '\0'; PathAddBackslashW(wszPath); - iPathLen = lstrlenW(wszPath); - - for (i = 0; i < cidl; i++) { - _ILSimpleGetTextW (apidl[i], wszPath+iPathLen, MAX_PATH-iPathLen); + wszPathsList = build_paths_list(wszPath, cidl, apidl); + + ZeroMemory(&op, sizeof(op)); + op.hwnd = GetActiveWindow(); + op.wFunc = FO_DELETE; + op.pFrom = wszPathsList; + op.fFlags = 0; + if (SHFileOperationW(&op)) + { + WARN("SHFileOperation failed\n"); + ret = E_FAIL; + } + else + ret = S_OK; - if (_ILIsFolder (apidl[i])) { - LPITEMIDLIST pidl; + /* we currently need to manually send the notifies */ + wszCurrentPath = wszPathsList; + for (i = 0; i < cidl; i++) + { + LONG wEventId; - TRACE ("delete %s\n", debugstr_w(wszPath)); - if (!SHELL_DeleteDirectoryW (wszPath, bConfirm)) { - TRACE ("delete %s failed, bConfirm=%d\n", debugstr_w(wszPath), bConfirm); - return E_FAIL; - } - pidl = ILCombine (This->pidlRoot, apidl[i]); - SHChangeNotify (SHCNE_RMDIR, SHCNF_IDLIST, pidl, NULL); - SHFree (pidl); - } else if (_ILIsValue (apidl[i])) { - LPITEMIDLIST pidl; + if (_ILIsFolder(apidl[i])) + wEventId = SHCNE_RMDIR; + else if (_ILIsValue(apidl[i])) + wEventId = SHCNE_DELETE; + else + continue; - TRACE ("delete %s\n", debugstr_w(wszPath)); - if (!SHELL_DeleteFileW (wszPath, bConfirm)) { - TRACE ("delete %s failed, bConfirm=%d\n", debugstr_w(wszPath), bConfirm); - return E_FAIL; - } - pidl = ILCombine (This->pidlRoot, apidl[i]); - SHChangeNotify (SHCNE_DELETE, SHCNF_IDLIST, pidl, NULL); - SHFree (pidl); + /* check if file exists */ + if (GetFileAttributesW(wszCurrentPath) == INVALID_FILE_ATTRIBUTES) + { + LPITEMIDLIST pidl = ILCombine(This->pidlRoot, apidl[i]); + SHChangeNotify(wEventId, SHCNF_IDLIST, pidl, NULL); + SHFree(pidl); } + wszCurrentPath += lstrlenW(wszCurrentPath)+1; } - return S_OK; + HeapFree(GetProcessHeap(), 0, wszPathsList); + return ret; } /****************************************************************************

1 0

Stefan Dösinger : ddraw: Matrix values in the execute buffer are handles.
by Alexandre Julliard 30 Jun '06

30 Jun '06

Module: wine Branch: refs/heads/master Commit: 44ace2244560f0569b99ae3721ffe87d661872d0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=44ace2244560f0569b99ae3… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Jun 29 14:15:03 2006 +0200 ddraw: Matrix values in the execute buffer are handles. --- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/executebuffer.c | 41 +++++++++++++++++++++++++++++------------ 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a3436d9..8417340 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1232,8 +1232,8 @@ IDirect3DDeviceImpl_1_CreateMatrix(IDire HeapFree(GetProcessHeap(), 0, Matrix); return DDERR_OUTOFMEMORY; } - This->Handles[(DWORD) D3DMatHandle - 1].ptr = Matrix; - This->Handles[(DWORD) D3DMatHandle - 1].type = DDrawHandle_Matrix; + This->Handles[(DWORD) *D3DMatHandle - 1].ptr = Matrix; + This->Handles[(DWORD) *D3DMatHandle - 1].type = DDrawHandle_Matrix; TRACE(" returning matrix handle %ld\n", *D3DMatHandle); return D3D_OK; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 79ad46d..3f5069d 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -192,16 +192,26 @@ IDirect3DExecuteBufferImpl_Execute(IDire for (i = 0; i < count; i++) { LPD3DMATRIXMULTIPLY ci = (LPD3DMATRIXMULTIPLY) instr; - LPD3DMATRIX a = (LPD3DMATRIX) ci->hDestMatrix; - LPD3DMATRIX b = (LPD3DMATRIX) ci->hSrcMatrix1; - LPD3DMATRIX c = (LPD3DMATRIX) ci->hSrcMatrix2; - - TRACE(" Dest : %08lx Src1 : %08lx Src2 : %08lx\n", - ci->hDestMatrix, ci->hSrcMatrix1, ci->hSrcMatrix2); - - multiply_matrix(a,c,b); + LPD3DMATRIX a, b, c; + + if(!ci->hDestMatrix || ci->hDestMatrix > lpDevice->numHandles || + !ci->hSrcMatrix1 || ci->hSrcMatrix1 > lpDevice->numHandles || + !ci->hSrcMatrix2 || ci->hSrcMatrix2 > lpDevice->numHandles) { + ERR("Handles out of bounds\n"); + } else if (lpDevice->Handles[ci->hDestMatrix - 1].type != DDrawHandle_Matrix || + lpDevice->Handles[ci->hSrcMatrix1 - 1].type != DDrawHandle_Matrix || + lpDevice->Handles[ci->hSrcMatrix2 - 1].type != DDrawHandle_Matrix) { + ERR("Handle types invalid\n"); + } else { + a = (LPD3DMATRIX) lpDevice->Handles[ci->hDestMatrix - 1].ptr; + b = (LPD3DMATRIX) lpDevice->Handles[ci->hSrcMatrix1 - 1].ptr; + c = (LPD3DMATRIX) lpDevice->Handles[ci->hSrcMatrix2 - 1].ptr; + TRACE(" Dest : %p Src1 : %p Src2 : %p\n", + a, b, c); + multiply_matrix(a,c,b); + } - instr += size; + instr += size; } } break; @@ -212,9 +222,16 @@ IDirect3DExecuteBufferImpl_Execute(IDire for (i = 0; i < count; i++) { LPD3DSTATE ci = (LPD3DSTATE) instr; - IDirect3DDevice7_SetTransform(ICOM_INTERFACE(lpDevice, IDirect3DDevice7), - ci->u1.drstRenderStateType, (LPD3DMATRIX)ci->u2.dwArg[0]); - + if(!ci->u2.dwArg[0]) { + ERR("Setting a NULL matrix handle, what should I do?\n"); + } else if(ci->u2.dwArg[0] > lpDevice->numHandles) { + ERR("Handle %ld is out of bounds\n", ci->u2.dwArg[0]); + } else if(lpDevice->Handles[ci->u2.dwArg[0] - 1].type != DDrawHandle_Matrix) { + ERR("Handle %ld is not a matrix handle\n", ci->u2.dwArg[0]); + } else { + IDirect3DDevice7_SetTransform(ICOM_INTERFACE(lpDevice, IDirect3DDevice7), + ci->u1.drstRenderStateType, (LPD3DMATRIX) lpDevice->Handles[ci->u2.dwArg[0] - 1].ptr); + } instr += size; } } break;

1 0

Stefan Dösinger : ddraw: Fix some material related bugs.
by Alexandre Julliard 30 Jun '06

30 Jun '06

Module: wine Branch: refs/heads/master Commit: b0c7bee2ef4f64279dfd03367629f084444f83fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b0c7bee2ef4f64279dfd033… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Jun 29 14:20:39 2006 +0200 ddraw: Fix some material related bugs. --- dlls/ddraw/device.c | 20 ++++++++++++++++++-- dlls/ddraw/material.c | 1 + dlls/ddraw/viewport.c | 2 +- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 8417340..63f272b 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1639,7 +1639,7 @@ IDirect3DDeviceImpl_3_GetCurrentViewport *Direct3DViewport3 = ICOM_INTERFACE(This->current_viewport, IDirect3DViewport3); /* AddRef the returned viewport */ - IDirect3DViewport3_AddRef(*Direct3DViewport3); + if(*Direct3DViewport3) IDirect3DViewport3_AddRef(*Direct3DViewport3); TRACE(" returning interface %p\n", *Direct3DViewport3); @@ -2279,7 +2279,23 @@ IDirect3DDeviceImpl_3_SetLightState(IDir if (LightStateType == D3DLIGHTSTATE_MATERIAL /* 1 */) { - IDirect3DMaterialImpl *mat = (IDirect3DMaterialImpl *) Value; + IDirect3DMaterialImpl *mat; + + if(Value == 0) mat = NULL; + else if(Value > This->numHandles) + { + ERR("Material handle out of range(%ld)\n", Value); + return DDERR_INVALIDPARAMS; + } + else if(This->Handles[Value - 1].type != DDrawHandle_Material) + { + ERR("Invalid handle %ld\n", Value); + return DDERR_INVALIDPARAMS; + } + else + { + mat = (IDirect3DMaterialImpl *) This->Handles[Value - 1].ptr; + } if (mat != NULL) { diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index c2acce1..3483c72 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -311,6 +311,7 @@ IDirect3DMaterialImpl_GetHandle(IDirect3 IDirect3DDeviceImpl *device = ICOM_OBJECT(IDirect3DDeviceImpl, IDirect3DDevice3, lpDirect3DDevice3); TRACE("(%p/%p)->(%p,%p)\n", This, iface, device, lpHandle); + This->active_device = device; if(!This->Handle) { This->Handle = IDirect3DDeviceImpl_CreateHandle(device); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 29acebf..71c426b 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -310,7 +310,7 @@ IDirect3DViewportImpl_SetViewport(IDirec IDirect3DDevice3_GetCurrentViewport(ICOM_INTERFACE(This->active_device, IDirect3DDevice3), &current_viewport); if (ICOM_OBJECT(IDirect3DViewportImpl, IDirect3DViewport3, current_viewport) == This) This->activate(This); - IDirect3DViewport3_Release(current_viewport); + if(current_viewport) IDirect3DViewport3_Release(current_viewport); } return DD_OK;

1 0