January 2010 - Wine-commits

Paul Vriens : shell32/tests: Fix FO_RENAME tests for old shell32.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: 1bd7956a7d85c9c1c6188f7f5a50c2fa10a56eaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd7956a7d85c9c1c6188f7f5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jan 25 13:13:54 2010 +0100 shell32/tests: Fix FO_RENAME tests for old shell32. --- dlls/shell32/tests/shlfileop.c | 48 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 4d74b93..200791a 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -47,6 +47,8 @@ broken(retval == ret_prewin32),\ "Expected %d, got %d\n", ret, retval) +static BOOL old_shell32 = FALSE; + static CHAR CURR_DIR[MAX_PATH]; static const WCHAR UNICODE_PATH[] = {'c',':','\\',0x00ae,'\0','\0'}; /* "c:\®" can be used in all codepages */ @@ -764,6 +766,8 @@ static void test_rename(void) /* pTo already exist */ shfo.pFrom = "test1.txt\0"; shfo.pTo = "test2.txt\0"; + if (old_shell32) + shfo.fFlags |= FOF_NOCONFIRMMKDIR; retval = SHFileOperationA(&shfo); if (retval == ERROR_SUCCESS) { @@ -2235,6 +2239,44 @@ test_shlmenu(void) { ok (hres == 0x4242, "expected 0x4242 but got %x\n", hres); } +/* Check for old shell32 (4.0.x) */ +static BOOL is_old_shell32(void) +{ + SHFILEOPSTRUCTA shfo; + CHAR from[5*MAX_PATH]; + CHAR to[5*MAX_PATH]; + DWORD retval; + + shfo.hwnd = NULL; + shfo.wFunc = FO_COPY; + shfo.pFrom = from; + shfo.pTo = to; + /* FOF_NOCONFIRMMKDIR is needed for old shell32 */ + shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI | FOF_MULTIDESTFILES | FOF_NOCONFIRMMKDIR; + shfo.hNameMappings = NULL; + shfo.lpszProgressTitle = NULL; + + set_curr_dir_path(from, "test1.txt\0test2.txt\0test3.txt"); + set_curr_dir_path(to, "test6.txt\0test7.txt\0"); + retval = SHFileOperationA(&shfo); + + /* Delete extra files on old shell32 and Vista+*/ + DeleteFileA("test6.txt\\test1.txt"); + /* Delete extra files on old shell32 */ + DeleteFileA("test6.txt\\test2.txt"); + DeleteFileA("test6.txt\\test3.txt"); + /* Delete extra directory on old shell32 and Vista+ */ + RemoveDirectoryA("test6.txt"); + /* Delete extra files/directories on Vista+*/ + DeleteFileA("test7.txt\\test2.txt"); + RemoveDirectoryA("test7.txt"); + + if (retval == ERROR_SUCCESS) + return TRUE; + + return FALSE; +} + START_TEST(shlfileop) { InitFunctionPointers(); @@ -2242,6 +2284,12 @@ START_TEST(shlfileop) clean_after_shfo_tests(); init_shfo_tests(); + old_shell32 = is_old_shell32(); + if (old_shell32) + win_skip("Need to cater for old shell32 (4.0.x) on Win95\n"); + clean_after_shfo_tests(); + + init_shfo_tests(); test_get_file_info(); test_get_file_info_iconlist(); clean_after_shfo_tests();

1 0

Paul Vriens : shell32/tests: Skip FO_COPY tests on old shell32.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: b3eeb4163cfdf1de9d593a9bb028cdec351f7cd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3eeb4163cfdf1de9d593a9bb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jan 25 14:18:43 2010 +0100 shell32/tests: Skip FO_COPY tests on old shell32. --- dlls/shell32/tests/shlfileop.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 200791a..858a98e 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -821,6 +821,12 @@ static void test_copy(void) LPSTR ptr; BOOL on_nt4 = FALSE; + if (old_shell32) + { + win_skip("Too many differences for old shell32\n"); + return; + } + shfo.hwnd = NULL; shfo.wFunc = FO_COPY; shfo.pFrom = from;

1 0

Paul Vriens : shell32/tests: Fix test failures on old shell32 for FO_MOVE.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: edf050cf5d484c729d53d1c027ead405c81358a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edf050cf5d484c729d53d1c02… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jan 25 15:14:32 2010 +0100 shell32/tests: Fix test failures on old shell32 for FO_MOVE. --- dlls/shell32/tests/shlfileop.c | 70 +++++++++++++++++++++++++++++++-------- 1 files changed, 55 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 858a98e..681d464 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1761,6 +1761,8 @@ static void test_move(void) set_curr_dir_path(from, "test1.txt\0test2.txt\0test4.txt\0"); set_curr_dir_path(to, "test6.txt\0test7.txt\0test8.txt\0"); + if (old_shell32) + shfo2.fFlags |= FOF_NOCONFIRMMKDIR; ok(!SHFileOperationA(&shfo2), "Move many files\n"); ok(DeleteFileA("test6.txt"), "The file is not moved - many files are " "specified as a target\n"); @@ -1775,12 +1777,23 @@ static void test_move(void) retval = SHFileOperationA(&shfo2); if (dir_exists("test6.txt")) { - /* Vista and W2K8 (broken or new behavior ?) */ - ok(retval == DE_DESTSAMETREE, "Expected DE_DESTSAMETREE, got %d\n", retval); - ok(DeleteFileA("test6.txt\\test1.txt"), "The file is not moved\n"); - RemoveDirectoryA("test6.txt"); - ok(DeleteFileA("test7.txt\\test2.txt"), "The file is not moved\n"); - RemoveDirectoryA("test7.txt"); + if (retval == ERROR_SUCCESS) + { + /* Old shell32 */ + DeleteFileA("test6.txt\\test1.txt"); + DeleteFileA("test6.txt\\test2.txt"); + RemoveDirectoryA("test6.txt\\test4.txt"); + RemoveDirectoryA("test6.txt"); + } + else + { + /* Vista and W2K8 (broken or new behavior ?) */ + ok(retval == DE_DESTSAMETREE, "Expected DE_DESTSAMETREE, got %d\n", retval); + ok(DeleteFileA("test6.txt\\test1.txt"), "The file is not moved\n"); + RemoveDirectoryA("test6.txt"); + ok(DeleteFileA("test7.txt\\test2.txt"), "The file is not moved\n"); + RemoveDirectoryA("test7.txt"); + } } else { @@ -1798,9 +1811,12 @@ static void test_move(void) set_curr_dir_path(from, "test1.txt\0test2.txt\0test4.txt\0"); set_curr_dir_path(to, "test6.txt\0test7.txt\0test8.txt\0"); + if (old_shell32) + shfo.fFlags |= FOF_NOCONFIRMMKDIR; retval = SHFileOperationA(&shfo); if (dir_exists("test6.txt")) { + /* Old shell32 */ /* Vista and W2K8 (broken or new behavior ?) */ ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); ok(DeleteFileA("test6.txt\\test1.txt"), "The file is not moved. Many files are specified\n"); @@ -1849,8 +1865,14 @@ static void test_move(void) else { ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + if (old_shell32) + { + DeleteFile("a.txt\\a.txt"); + RemoveDirectoryA("a.txt"); + } + else + ok(DeleteFile("a.txt"), "Expected a.txt to exist\n"); ok(!file_exists("test1.txt"), "Expected test1.txt to not exist\n"); - ok(DeleteFile("a.txt"), "Expected a.txt to exist\n"); } ok(!file_exists("b.txt"), "Expected b.txt to not exist\n"); @@ -1860,6 +1882,7 @@ static void test_move(void) retval = SHFileOperationA(&shfo); if (dir_exists("test1.txt")) { + /* Old shell32 */ /* Vista and W2K8 (broken or new behavior ?) */ ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); ok(DeleteFileA("test1.txt\\test2.txt"), "Expected test1.txt\\test2.txt to exist\n"); @@ -1892,6 +1915,7 @@ static void test_move(void) retval = SHFileOperationA(&shfo); if (dir_exists("d.txt")) { + /* Old shell32 */ /* Vista and W2K8 (broken or new behavior ?) */ ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); ok(DeleteFileA("d.txt\\test2.txt"), "Expected d.txt\\test2.txt to exist\n"); @@ -1913,13 +1937,23 @@ static void test_move(void) retval = SHFileOperationA(&shfo); if (dir_exists("d.txt")) { - /* Vista and W2K8 (broken or new behavior ?) */ - ok(retval == DE_SAMEFILE, - "Expected DE_SAMEFILE, got %d\n", retval); - ok(DeleteFileA("d.txt\\test2.txt"), "Expected d.txt\\test2.txt to exist\n"); - ok(!file_exists("d.txt\\test3.txt"), "Expected d.txt\\test3.txt to not exist\n"); - RemoveDirectoryA("d.txt"); - createTestFile("test2.txt"); + if (old_shell32) + { + DeleteFileA("d.txt\\test2.txt"); + DeleteFileA("d.txt\\test3.txt"); + RemoveDirectoryA("d.txt"); + createTestFile("test2.txt"); + } + else + { + /* Vista and W2K8 (broken or new behavior ?) */ + ok(retval == DE_SAMEFILE, + "Expected DE_SAMEFILE, got %d\n", retval); + ok(DeleteFileA("d.txt\\test2.txt"), "Expected d.txt\\test2.txt to exist\n"); + ok(!file_exists("d.txt\\test3.txt"), "Expected d.txt\\test3.txt to not exist\n"); + RemoveDirectoryA("d.txt"); + createTestFile("test2.txt"); + } } else { @@ -1957,7 +1991,13 @@ static void test_move(void) { ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); ok(!file_exists("test2.txt"), "Expected test2.txt to not exist\n"); - ok(file_exists("test3.txt"), "Expected test3.txt to exist\n"); + if (old_shell32) + { + DeleteFileA("test3.txt\\test3.txt"); + RemoveDirectoryA("test3.txt"); + } + else + ok(file_exists("test3.txt"), "Expected test3.txt to exist\n"); } }

1 0

Andrew Nguyen : shlwapi: Change a magic HRESULT value to the appropriate name.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: b2b8770b020f18dc6be384d313bc68cf599d41e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2b8770b020f18dc6be384d31… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Jan 25 06:44:45 2010 -0600 shlwapi: Change a magic HRESULT value to the appropriate name. --- dlls/shlwapi/tests/url.c | 13 +++++++------ dlls/shlwapi/url.c | 9 +++++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index b69ab00..2205e09 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -27,6 +27,7 @@ #include "winreg.h" #include "shlwapi.h" #include "wininet.h" +#include "intshcut.h" /* ################ */ static HMODULE hShlwapi; @@ -1013,17 +1014,17 @@ static const struct parse_url_test_t { {"http://www.winehq.org/",S_OK,4,URL_SCHEME_HTTP}, {"https://www.winehq.org/",S_OK,5,URL_SCHEME_HTTPS}, {"ftp://www.winehq.org/",S_OK,3,URL_SCHEME_FTP}, - {"test.txt?test=c:/dir",0x80041001}, - {"test.txt",0x80041001}, + {"test.txt?test=c:/dir",URL_E_INVALID_SYNTAX}, + {"test.txt",URL_E_INVALID_SYNTAX}, {"xxx://www.winehq.org/",S_OK,3,URL_SCHEME_UNKNOWN}, {"1xx://www.winehq.org/",S_OK,3,URL_SCHEME_UNKNOWN}, {"-xx://www.winehq.org/",S_OK,3,URL_SCHEME_UNKNOWN}, {"xx0://www.winehq.org/",S_OK,3,URL_SCHEME_UNKNOWN}, - {"x://www.winehq.org/",0x80041001}, - {"xx$://www.winehq.org/",0x80041001}, - {"htt?p://www.winehq.org/",0x80041001}, + {"x://www.winehq.org/",URL_E_INVALID_SYNTAX}, + {"xx$://www.winehq.org/",URL_E_INVALID_SYNTAX}, + {"htt?p://www.winehq.org/",URL_E_INVALID_SYNTAX}, {"ab-://www.winehq.org/",S_OK,3,URL_SCHEME_UNKNOWN}, - {" http://www.winehq.org/",0x80041001}, + {" http://www.winehq.org/",URL_E_INVALID_SYNTAX}, }; static void test_ParseURL(void) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index d1b6e26..d266069 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -33,6 +33,7 @@ #include "winternl.h" #define NO_SHLWAPI_STREAM #include "shlwapi.h" +#include "intshcut.h" #include "wine/debug.h" HMODULE WINAPI MLLoadLibraryW(LPCWSTR,HMODULE,DWORD); @@ -157,8 +158,8 @@ HRESULT WINAPI ParseURLA(LPCSTR x, PARSEDURLA *y) ptr++; if (*ptr != ':' || ptr <= x+1) { - y->pszProtocol = NULL; - return 0x80041001; + y->pszProtocol = NULL; + return URL_E_INVALID_SYNTAX; } y->pszProtocol = x; @@ -191,8 +192,8 @@ HRESULT WINAPI ParseURLW(LPCWSTR x, PARSEDURLW *y) ptr++; if (*ptr != ':' || ptr <= x+1) { - y->pszProtocol = NULL; - return 0x80041001; + y->pszProtocol = NULL; + return URL_E_INVALID_SYNTAX; } y->pszProtocol = x;

1 0

Alexandre Julliard : ntdll: Use the heap flags instead of debug channels to test for enabled debug features .
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: aa9c7b070ee498799a275ce0929c7c80a35cd7e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa9c7b070ee498799a275ce09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 25 15:02:31 2010 +0100 ntdll: Use the heap flags instead of debug channels to test for enabled debug features. --- dlls/ntdll/heap.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index a1fc764..cbabe4e 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -166,9 +166,9 @@ static HEAP *processHeap; /* main process heap */ static BOOL HEAP_IsRealArena( HEAP *heapPtr, DWORD flags, LPCVOID block, BOOL quiet ); /* mark a block of memory as free for debugging purposes */ -static inline void mark_block_free( void *ptr, SIZE_T size ) +static inline void mark_block_free( void *ptr, SIZE_T size, DWORD flags ) { - if (TRACE_ON(heap) || WARN_ON(heap)) memset( ptr, ARENA_FREE_FILLER, size ); + if (flags & HEAP_FREE_CHECKING_ENABLED) memset( ptr, ARENA_FREE_FILLER, size ); #if defined(VALGRIND_MAKE_MEM_NOACCESS) VALGRIND_DISCARD( VALGRIND_MAKE_MEM_NOACCESS( ptr, size )); #elif defined( VALGRIND_MAKE_NOACCESS) @@ -187,14 +187,14 @@ static inline void mark_block_initialized( void *ptr, SIZE_T size ) } /* mark a block of memory as uninitialized for debugging purposes */ -static inline void mark_block_uninitialized( void *ptr, SIZE_T size ) +static inline void mark_block_uninitialized( void *ptr, SIZE_T size, DWORD flags ) { #if defined(VALGRIND_MAKE_MEM_UNDEFINED) VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size )); #elif defined(VALGRIND_MAKE_WRITABLE) VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size )); #endif - if (TRACE_ON(heap) || WARN_ON(heap)) + if (flags & HEAP_FREE_CHECKING_ENABLED) { memset( ptr, ARENA_INUSE_FILLER, size ); #if defined(VALGRIND_MAKE_MEM_UNDEFINED) @@ -403,7 +403,7 @@ static HEAP *HEAP_GetPtr( ERR("Invalid heap %p!\n", heap ); return NULL; } - if (TRACE_ON(heap) && !HEAP_IsRealArena( heapPtr, 0, NULL, NOISY )) + if ((heapPtr->flags & HEAP_VALIDATE_ALL) && !HEAP_IsRealArena( heapPtr, 0, NULL, NOISY )) { HEAP_Dump( heapPtr ); assert( FALSE ); @@ -524,9 +524,10 @@ static void HEAP_CreateFreeBlock( SUBHEAP *subheap, void *ptr, SIZE_T size ) ARENA_FREE *pFree; char *pEnd; BOOL last; + DWORD flags = subheap->heap->flags; /* Create a free arena */ - mark_block_uninitialized( ptr, sizeof( ARENA_FREE ) ); + mark_block_uninitialized( ptr, sizeof(ARENA_FREE), flags ); pFree = ptr; pFree->magic = ARENA_FREE_MAGIC; @@ -535,7 +536,7 @@ static void HEAP_CreateFreeBlock( SUBHEAP *subheap, void *ptr, SIZE_T size ) pEnd = (char *)ptr + size; if (pEnd > (char *)subheap->base + subheap->commitSize) pEnd = (char *)subheap->base + subheap->commitSize; - if (pEnd > (char *)(pFree + 1)) mark_block_free( pFree + 1, pEnd - (char *)(pFree + 1) ); + if (pEnd > (char *)(pFree + 1)) mark_block_free( pFree + 1, pEnd - (char *)(pFree + 1), flags ); /* Check if next block is free also */ @@ -546,7 +547,7 @@ static void HEAP_CreateFreeBlock( SUBHEAP *subheap, void *ptr, SIZE_T size ) ARENA_FREE *pNext = (ARENA_FREE *)((char *)ptr + size); list_remove( &pNext->entry ); size += (pNext->size & ARENA_SIZE_MASK) + sizeof(*pNext); - mark_block_free( pNext, sizeof(ARENA_FREE) ); + mark_block_free( pNext, sizeof(ARENA_FREE), flags ); } /* Set the next block PREV_FREE flag and pointer */ @@ -1247,6 +1248,8 @@ void heap_set_debug_flags( HANDLE handle ) ULONG global_flags = RtlGetNtGlobalFlags(); ULONG flags = 0; + if (TRACE_ON(heap)) global_flags |= FLG_HEAP_VALIDATE_ALL; + if (global_flags & FLG_HEAP_ENABLE_TAIL_CHECK) flags |= HEAP_TAIL_CHECKING_ENABLED; if (global_flags & FLG_HEAP_ENABLE_FREE_CHECK) flags |= HEAP_FREE_CHECKING_ENABLED; if (global_flags & FLG_HEAP_DISABLE_COALESCING) flags |= HEAP_DISABLE_COALESCE_ON_FREE; @@ -1259,6 +1262,8 @@ void heap_set_debug_flags( HANDLE handle ) flags |= HEAP_VALIDATE | HEAP_VALIDATE_ALL | HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED; + if (WARN_ON(heap)) flags |= HEAP_VALIDATE | HEAP_VALIDATE_PARAMS | HEAP_FREE_CHECKING_ENABLED; + heap->flags |= flags; heap->force_flags |= flags & ~(HEAP_VALIDATE | HEAP_DISABLE_COALESCE_ON_FREE); } @@ -1456,10 +1461,10 @@ PVOID WINAPI RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size ) if (flags & HEAP_ZERO_MEMORY) { clear_block( pInUse + 1, size ); - mark_block_uninitialized( (char *)(pInUse + 1) + size, pInUse->unused_bytes ); + mark_block_uninitialized( (char *)(pInUse + 1) + size, pInUse->unused_bytes, flags ); } else - mark_block_uninitialized( pInUse + 1, pInUse->size & ARENA_SIZE_MASK ); + mark_block_uninitialized( pInUse + 1, pInUse->size & ARENA_SIZE_MASK, flags ); if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection ); @@ -1670,11 +1675,11 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size if (flags & HEAP_ZERO_MEMORY) { clear_block( (char *)(pArena + 1) + oldActualSize, size - oldActualSize ); - mark_block_uninitialized( (char *)(pArena + 1) + size, pArena->unused_bytes ); + mark_block_uninitialized( (char *)(pArena + 1) + size, pArena->unused_bytes, flags ); } else mark_block_uninitialized( (char *)(pArena + 1) + oldActualSize, - (pArena->size & ARENA_SIZE_MASK) - oldActualSize ); + (pArena->size & ARENA_SIZE_MASK) - oldActualSize, flags ); } /* Return the new arena */

1 0

Andrew Eikum : wininet: Handle PROXY_TYPE_PROXY | PROXY_TYPE_DIRECT per-connection flags.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: 0a84bd728a3d29097b6b101770de8a7ab92bb188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a84bd728a3d29097b6b10177… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 25 10:17:31 2010 -0600 wininet: Handle PROXY_TYPE_PROXY | PROXY_TYPE_DIRECT per-connection flags. --- dlls/wininet/internet.c | 13 ++---- dlls/wininet/tests/Makefile.in | 2 +- dlls/wininet/tests/internet.c | 86 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 78a0c4f..d03d1b3 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2518,16 +2518,13 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, break; case INTERNET_PER_CONN_FLAGS: - switch(option->Value.dwValue) { - case PROXY_TYPE_PROXY: + if(option->Value.dwValue & PROXY_TYPE_PROXY) pi.dwProxyEnabled = 1; - break; - case PROXY_TYPE_DIRECT: + else + { + if(option->Value.dwValue != PROXY_TYPE_DIRECT) + FIXME("Unhandled flags: 0x%x\n", option->Value.dwValue); pi.dwProxyEnabled = 0; - break; - default: - FIXME("Unhandled flag: %d\n", option->Value.dwValue); - break; } break; diff --git a/dlls/wininet/tests/Makefile.in b/dlls/wininet/tests/Makefile.in index ba8f662..6b313fd 100644 --- a/dlls/wininet/tests/Makefile.in +++ b/dlls/wininet/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = wininet.dll -IMPORTS = wininet ws2_32 kernel32 +IMPORTS = wininet ws2_32 advapi32 kernel32 CTESTS = \ ftp.c \ diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 8fd251a..9e010da 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "wininet.h" #include "winerror.h" +#include "winreg.h" #include "wine/test.h" @@ -848,6 +849,30 @@ static void test_Option_Policy(void) ok(ret == TRUE, "InternetCloseHandle failed: 0x%08x\n", GetLastError()); } +#define verifyProxyEnable(e) r_verifyProxyEnable(__LINE__, e) +static void r_verifyProxyEnable(LONG l, DWORD exp) +{ + HKEY hkey; + DWORD type, val, size = sizeof(DWORD); + LONG ret; + static const WCHAR szInternetSettings[] = + { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s',0 }; + static const WCHAR szProxyEnable[] = { 'P','r','o','x','y','E','n','a','b','l','e', 0 }; + + ret = RegOpenKeyW(HKEY_CURRENT_USER, szInternetSettings, &hkey); + ok_(__FILE__,l) (!ret, "RegOpenKeyW failed: 0x%08x\n", ret); + + ret = RegQueryValueExW(hkey, szProxyEnable, 0, &type, (BYTE*)&val, &size); + ok_(__FILE__,l) (!ret, "RegQueryValueExW failed: 0x%08x\n", ret); + ok_(__FILE__,l) (type == REG_DWORD, "Expected regtype to be REG_DWORD, was: %d\n", type); + ok_(__FILE__,l) (val == exp, "Expected ProxyEnabled to be %d, got: %d\n", exp, val); + + ret = RegCloseKey(hkey); + ok_(__FILE__,l) (!ret, "RegCloseKey failed: 0x%08x\n", ret); +} + static void test_Option_PerConnectionOption(void) { BOOL ret; @@ -900,6 +925,67 @@ static void test_Option_PerConnectionOption(void) ok(list.pOptions[1].Value.dwValue == PROXY_TYPE_PROXY, "Retrieved flags should've been PROXY_TYPE_PROXY, was: %d\n", list.pOptions[1].Value.dwValue); + verifyProxyEnable(1); + + HeapFree(GetProcessHeap(), 0, list.pOptions); + + /* disable the proxy server */ + list.dwOptionCount = 1; + list.pOptions = HeapAlloc(GetProcessHeap(), 0, sizeof(INTERNET_PER_CONN_OPTIONW)); + + list.pOptions[0].dwOption = INTERNET_PER_CONN_FLAGS; + list.pOptions[0].Value.dwValue = PROXY_TYPE_DIRECT; + + ret = InternetSetOptionW(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, + &list, size); + ok(ret == TRUE, "InternetSetOption should've succeeded\n"); + + HeapFree(GetProcessHeap(), 0, list.pOptions); + + /* verify that the proxy is disabled */ + list.dwOptionCount = 1; + list.dwOptionError = 0; + list.pOptions = HeapAlloc(GetProcessHeap(), 0, sizeof(INTERNET_PER_CONN_OPTIONW)); + + list.pOptions[0].dwOption = INTERNET_PER_CONN_FLAGS; + + ret = InternetQueryOptionW(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, + &list, &size); + ok(ret == TRUE, "InternetQueryOption should've succeeded\n"); + ok(list.pOptions[0].Value.dwValue == PROXY_TYPE_DIRECT, + "Retrieved flags should've been PROXY_TYPE_DIRECT, was: %d\n", + list.pOptions[0].Value.dwValue); + verifyProxyEnable(0); + + HeapFree(GetProcessHeap(), 0, list.pOptions); + + /* set the proxy flags to 'invalid' value */ + list.dwOptionCount = 1; + list.pOptions = HeapAlloc(GetProcessHeap(), 0, sizeof(INTERNET_PER_CONN_OPTIONW)); + + list.pOptions[0].dwOption = INTERNET_PER_CONN_FLAGS; + list.pOptions[0].Value.dwValue = PROXY_TYPE_PROXY | PROXY_TYPE_DIRECT; + + ret = InternetSetOptionW(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, + &list, size); + ok(ret == TRUE, "InternetSetOption should've succeeded\n"); + + HeapFree(GetProcessHeap(), 0, list.pOptions); + + /* verify that the proxy is enabled */ + list.dwOptionCount = 1; + list.dwOptionError = 0; + list.pOptions = HeapAlloc(GetProcessHeap(), 0, sizeof(INTERNET_PER_CONN_OPTIONW)); + + list.pOptions[0].dwOption = INTERNET_PER_CONN_FLAGS; + + ret = InternetQueryOptionW(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, + &list, &size); + ok(ret == TRUE, "InternetQueryOption should've succeeded\n"); + todo_wine ok(list.pOptions[0].Value.dwValue == (PROXY_TYPE_PROXY | PROXY_TYPE_DIRECT), + "Retrieved flags should've been PROXY_TYPE_PROXY | PROXY_TYPE_DIRECT, was: %d\n", + list.pOptions[0].Value.dwValue); + verifyProxyEnable(1); HeapFree(GetProcessHeap(), 0, list.pOptions);

1 0

Nikolay Sivov : xmllite: Initial support for just created reader state.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: 02da36631ec7f3de6f762fa7ecc16916c75a04e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02da36631ec7f3de6f762fa7e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jan 23 23:03:14 2010 +0300 xmllite: Initial support for just created reader state. --- dlls/xmllite/reader.c | 37 ++++++++++++++++++-- dlls/xmllite/tests/reader.c | 78 +++++++++++++++++++++++++++++++++++++++++++ include/xmllite.idl | 24 +++++++++++++ 3 files changed, 135 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 51fe44d..ee4a00c 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -43,6 +43,7 @@ typedef struct _xmlreader IXmlReaderInput *input; ISequentialStream *stream;/* stored as sequential stream, cause currently optimizations possible with IStream aren't implemented */ + XmlReadState state; } xmlreader; typedef struct _xmlreaderinput @@ -122,11 +123,21 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) if (This->input) { IUnknown_Release(This->input); - This->input = NULL; + This->input = NULL; + } + + if (This->stream) + { + IUnknown_Release(This->stream); + This->stream = NULL; } /* just reset current input */ - if (!input) return S_OK; + if (!input) + { + This->state = XmlReadState_Closed; + return S_OK; + } /* now try IXmlReaderInput, ISequentialStream, IStream */ hr = IUnknown_QueryInterface(input, &IID_IXmlReaderInput, (void**)&This->input); @@ -146,14 +157,31 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) IUnknown_Release(This->input); This->input = NULL; } + else + This->state = XmlReadState_Initial; return hr; } static HRESULT WINAPI xmlreader_GetProperty(IXmlReader* iface, UINT property, LONG_PTR *value) { - FIXME("(%p %u %p): stub\n", iface, property, value); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p %u %p)\n", This, property, value); + + if (!value) return E_INVALIDARG; + + switch (property) + { + case XmlReaderProperty_ReadState: + *value = This->state; + break; + default: + FIXME("Unimplemented property (%u)\n", property); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI xmlreader_SetProperty(IXmlReader* iface, UINT property, LONG_PTR value) @@ -418,6 +446,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc) reader->ref = 1; reader->stream = NULL; reader->input = NULL; + reader->state = XmlReadState_Closed; *pObject = &reader->lpVtbl; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index e64b63b..18ae499 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -107,6 +107,53 @@ static void ok_iids_(const input_iids_t *iids, const IID **expected, const IID * } #define ok_iids(got, exp, brk, todo) ok_iids_(got, exp, brk, todo, __LINE__) +static const char *state_to_str(XmlReadState state) +{ + static const char* state_names[] = { + "XmlReadState_Initial", + "XmlReadState_Interactive", + "XmlReadState_Error", + "XmlReadState_EndOfFile", + "XmlReadState_Closed" + }; + + static const char unknown[] = "unknown"; + + switch (state) + { + case XmlReadState_Initial: + case XmlReadState_Interactive: + case XmlReadState_Error: + case XmlReadState_EndOfFile: + case XmlReadState_Closed: + return state_names[state]; + default: + return unknown; + } +} + +static void test_read_state_(IXmlReader *reader, XmlReadState expected, int todo, int line) +{ + XmlReadState state; + HRESULT hr; + + state = -1; /* invalid value */ + hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, (LONG_PTR*)&state); + ok_(__FILE__, line)(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + if (todo) + { + todo_wine + ok_(__FILE__, line)(state == expected, "Expected (%s), got (%s)\n", + state_to_str(expected), state_to_str(state)); + } + else + ok_(__FILE__, line)(state == expected, "Expected (%s), got (%s)\n", + state_to_str(expected), state_to_str(state)); +} + +#define test_read_sate(reader, exp, todo) test_read_state_(reader, exp, todo, __LINE__) + typedef struct _testinput { const IUnknownVtbl *lpVtbl; @@ -211,10 +258,14 @@ static void test_reader_create(void) hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + test_read_sate(reader, XmlReadState_Closed, FALSE); + /* Null input pointer, releases previous input */ hr = IXmlReader_SetInput(reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + test_read_sate(reader, XmlReadState_Closed, FALSE); + /* test input interface selection sequence */ hr = testinput_createinstance((void**)&input); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -267,6 +318,9 @@ static void test_readerinput(void) hr = IXmlReader_SetInput(reader, reader_input); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + test_read_sate(reader, XmlReadState_Initial, FALSE); + /* IXmlReader grabs a IXmlReaderInput reference */ ref = IUnknown_AddRef(reader_input); ok(ref == 3, "Expected 3, got %d\n", ref); @@ -276,6 +330,12 @@ static void test_readerinput(void) ok(ref == 4, "Expected 4, got %d\n", ref); IStream_Release(stream); + /* reset input and check state */ + hr = IXmlReader_SetInput(reader, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + test_read_sate(reader, XmlReadState_Closed, FALSE); + IXmlReader_Release(reader); ref = IStream_AddRef(stream); @@ -330,6 +390,8 @@ static void test_readerinput(void) ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); ok_iids(&input_iids, setinput_readerinput, NULL, FALSE); + test_read_sate(reader, XmlReadState_Closed, FALSE); + ref = IUnknown_AddRef(input); ok(ref == 3, "Expected 3, got %d\n", ref); IUnknown_Release(input); @@ -361,6 +423,21 @@ static void test_readerinput(void) IUnknown_Release(input); } +static void test_reader_state(void) +{ + IXmlReader *reader; + HRESULT hr; + + hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* invalid arguments */ + hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + IXmlReader_Release(reader); +} + START_TEST(reader) { HRESULT r; @@ -376,6 +453,7 @@ START_TEST(reader) test_reader_create(); test_readerinput(); + test_reader_state(); CoUninitialize(); } diff --git a/include/xmllite.idl b/include/xmllite.idl index dbbb0d9..552b5d6 100644 --- a/include/xmllite.idl +++ b/include/xmllite.idl @@ -78,6 +78,30 @@ interface IXmlReader : IUnknown BOOL IsEOF(void); } +/* IXmlReader state */ +cpp_quote("typedef enum XmlReadState") +cpp_quote("{") +cpp_quote(" XmlReadState_Initial = 0,") +cpp_quote(" XmlReadState_Interactive = 1,") +cpp_quote(" XmlReadState_Error = 2,") +cpp_quote(" XmlReadState_EndOfFile = 3,") +cpp_quote(" XmlReadState_Closed = 4") +cpp_quote("} XmlReadState;") + +/* IXmlReader properties */ +cpp_quote("typedef enum XmlReaderProperty") +cpp_quote("{") +cpp_quote(" XmlReaderProperty_MultiLanguage = 0,") +cpp_quote(" XmlReaderProperty_ConformanceLevel = XmlReaderProperty_MultiLanguage + 1,") +cpp_quote(" XmlReaderProperty_RandomAccess = XmlReaderProperty_ConformanceLevel + 1,") +cpp_quote(" XmlReaderProperty_XmlResolver = XmlReaderProperty_RandomAccess + 1,") +cpp_quote(" XmlReaderProperty_DtdProcessing = XmlReaderProperty_XmlResolver + 1,") +cpp_quote(" XmlReaderProperty_ReadState = XmlReaderProperty_DtdProcessing + 1,") +cpp_quote(" XmlReaderProperty_MaxElementDepth = XmlReaderProperty_ReadState + 1,") +cpp_quote(" XmlReaderProperty_MaxEntityExpansion = XmlReaderProperty_MaxElementDepth + 1,") +cpp_quote(" _XmlReaderProperty_Last = XmlReaderProperty_MaxEntityExpansion") +cpp_quote("} XmlReaderProperty;") + /* IXmlReader construction */ cpp_quote("STDAPI CreateXmlReader(REFIID riid, void **ppvObject, IMalloc *pMalloc);")

1 0

Hans Leidekker : winhttp: Store the context passed to WinHttpSendRequest.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: e4471d5f80ed4cf0cfe5fedd0b01e66e92356255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4471d5f80ed4cf0cfe5fedd0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 25 14:00:08 2010 +0100 winhttp: Store the context passed to WinHttpSendRequest. --- dlls/winhttp/request.c | 1 + dlls/winhttp/tests/winhttp.c | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f6c9bce..8bb825c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1057,6 +1057,7 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len TRACE("full request: %s\n", debugstr_a(req_ascii)); len = strlen(req_ascii); + if (context) request->hdr.context = context; send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, NULL, 0 ); ret = netconn_send( &request->netconn, req_ascii, len, 0, &bytes_sent ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index d9966ea..4a4e7f4 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -248,8 +248,8 @@ static void test_empty_headers_param(void) static void test_SendRequest (void) { HINTERNET session, request, connection; - DWORD header_len, optional_len, total_len; - DWORD bytes_rw; + DWORD header_len, optional_len, total_len, bytes_rw, size; + DWORD_PTR context; BOOL ret; CHAR buffer[256]; int i; @@ -284,9 +284,20 @@ static void test_SendRequest (void) } ok(request != NULL, "WinHttpOpenrequest failed to open a request, error: %u.\n", GetLastError()); - ret = WinHttpSendRequest(request, content_type, header_len, post_data, optional_len, total_len, 0); + context = 0xdeadbeef; + ret = WinHttpSetOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(context)); + ok(ret, "WinHttpSetOption failed: %u\n", GetLastError()); + + context++; + ret = WinHttpSendRequest(request, content_type, header_len, post_data, optional_len, total_len, context); ok(ret == TRUE, "WinHttpSendRequest failed: %u\n", GetLastError()); + context = 0; + size = sizeof(context); + ret = WinHttpQueryOption(request, WINHTTP_OPTION_CONTEXT_VALUE, &context, &size); + ok(ret, "WinHttpQueryOption failed: %u\n", GetLastError()); + ok(context == 0xdeadbef0, "expected 0xdeadbef0, got %lx\n", context); + for (i = 3; post_data[i]; i++) { bytes_rw = -1;

1 0

Rico Schüller : d3d10: Implement ID3D10EffectType:: IsValid().
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: f811cd3e0dfa6ba7adff07ae0c060f5221231d32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f811cd3e0dfa6ba7adff07ae0… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Jan 24 14:26:39 2010 +0100 d3d10: Implement ID3D10EffectType::IsValid(). --- dlls/d3d10/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 7c38c57..8a16dbc 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -6017,9 +6017,9 @@ static const struct ID3D10EffectSamplerVariableVtbl d3d10_effect_sampler_variabl static BOOL STDMETHODCALLTYPE d3d10_effect_type_IsValid(ID3D10EffectType *iface) { - FIXME("iface %p stub!\n", iface); + TRACE("iface %p\n", iface); - return FALSE; + return (struct d3d10_effect_type *)iface != &null_type; } static HRESULT STDMETHODCALLTYPE d3d10_effect_type_GetDesc(ID3D10EffectType *iface, D3D10_EFFECT_TYPE_DESC *desc)

1 0

Rico Schüller : d3d10: Add D3D10_EOO_PARSED_OBJECT in parse_fx10_object().
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: 7a12bf9841ad7e10646d3449da17f7311266fd92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a12bf9841ad7e10646d3449d… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Jan 24 14:26:46 2010 +0100 d3d10: Add D3D10_EOO_PARSED_OBJECT in parse_fx10_object(). --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 9 +++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index a782419..4d80241 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -48,6 +48,7 @@ enum d3d10_effect_object_type enum d3d10_effect_object_operation { D3D10_EOO_VALUE = 1, + D3D10_EOO_PARSED_OBJECT = 2, D3D10_EOO_ANONYMOUS_SHADER = 7, }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 8a16dbc..e5240e6 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -910,6 +910,7 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr enum d3d10_effect_object_operation operation; HRESULT hr; struct d3d10_effect *effect = o->pass->technique->effect; + ID3D10Effect *e = (ID3D10Effect *)effect; read_dword(ptr, &o->type); TRACE("Effect object is of type %#x.\n", o->type); @@ -956,6 +957,14 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr } break; + case D3D10_EOO_PARSED_OBJECT: + /* This is a local object, we've parsed in parse_fx10_local_object. */ + TRACE("Shader = %s.\n", data + offset); + + o->data = e->lpVtbl->GetVariableByName(e, data + offset); + hr = S_OK; + break; + case D3D10_EOO_ANONYMOUS_SHADER: TRACE("Anonymous shader\n");

1 0