October 2009 - Wine-Commits

Alexandre Julliard : kernel32: Fix handling of overflows in GetPrivateProfileSectionA.
by Alexandre Julliard Oct. 9, 2009

Oct. 9, 2009

Module: wine Branch: master Commit: 362ecd06f6abc2d1296c4ba2aa522825d2fe7c35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=362ecd06f6abc2d1296c4ba2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 8 16:28:17 2009 +0200 kernel32: Fix handling of overflows in GetPrivateProfileSectionA. --- dlls/kernel32/profile.c | 14 +++++++------- dlls/kernel32/tests/profile.c | 8 ++++++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 8a787da..aa223c7 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1386,23 +1386,23 @@ INT WINAPI GetPrivateProfileSectionA( LPCSTR section, LPSTR buffer, return 0; } - bufferW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + bufferW = HeapAlloc(GetProcessHeap(), 0, len * 2 * sizeof(WCHAR)); RtlCreateUnicodeStringFromAsciiz(&sectionW, section); if (filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); else filenameW.Buffer = NULL; - retW = GetPrivateProfileSectionW(sectionW.Buffer, bufferW, len, filenameW.Buffer); - if (len > 2) + retW = GetPrivateProfileSectionW(sectionW.Buffer, bufferW, len * 2, filenameW.Buffer); + if (retW) { + if (retW == len * 2 - 2) retW++; /* overflow */ ret = WideCharToMultiByte(CP_ACP, 0, bufferW, retW + 1, buffer, len, NULL, NULL); - if (ret > 2) - ret -= 1; - else + if (!ret || ret == len) /* overflow */ { - ret = 0; + ret = len - 2; buffer[len-2] = 0; buffer[len-1] = 0; } + else ret--; } else { diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index a1bf967..e3f7156 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -236,6 +236,14 @@ static void test_profile_sections(void) broken(GetLastError() == 0xdeadbeef), /* Win9x, WinME */ "expected ERROR_SUCCESS, got %d\n", GetLastError()); + /* Overflow*/ + ret=GetPrivateProfileSectionA("section1", buf, 24, testfile4); + for( p = buf + strlen(buf) + 1; *p;p += strlen(p)+1) + p[-1] = ','; + ok( ret == 22 && !strcmp( buf, "name1=val1,name2=,name"), "wrong section returned(%d): %s\n", + ret, buf); + ok( buf[ret] == 0 && buf[ret+1] == 0, "returned buffer not terminated with double-null\n" ); + DeleteFileA( testfile4 ); }

1 0

Alexandre Julliard : kernel32: Move the DOS file handle functions to file16 .c.
by Alexandre Julliard Oct. 9, 2009

Oct. 9, 2009

Module: wine Branch: master Commit: e5288bf42f8d8a356996516428b99549297faaaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5288bf42f8d8a35699651642… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 8 19:22:17 2009 +0200 kernel32: Move the DOS file handle functions to file16.c. --- dlls/kernel32/file.c | 104 ---------------------------------------- dlls/kernel32/file16.c | 104 +++++++++++++++++++++++++++++++++++++++- dlls/kernel32/kernel_private.h | 4 -- 3 files changed, 103 insertions(+), 109 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index d9fbddb..5432c31 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -49,8 +49,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); -HANDLE dos_handles[DOS_TABLE_SIZE]; - /* info structure for FindFirstFile handle */ typedef struct { @@ -316,32 +314,6 @@ BOOL WINAPI AreFileApisANSI(void) * Operations on file handles * **************************************************************************/ -/*********************************************************************** - * FILE_InitProcessDosHandles - * - * Allocates the default DOS handles for a process. Called either by - * Win32HandleToDosFileHandle below or by the DOSVM stuff. - */ -static void FILE_InitProcessDosHandles( void ) -{ - static BOOL init_done /* = FALSE */; - HANDLE cp = GetCurrentProcess(); - - if (init_done) return; - init_done = TRUE; - DuplicateHandle(cp, GetStdHandle(STD_INPUT_HANDLE), cp, &dos_handles[0], - 0, TRUE, DUPLICATE_SAME_ACCESS); - DuplicateHandle(cp, GetStdHandle(STD_OUTPUT_HANDLE), cp, &dos_handles[1], - 0, TRUE, DUPLICATE_SAME_ACCESS); - DuplicateHandle(cp, GetStdHandle(STD_ERROR_HANDLE), cp, &dos_handles[2], - 0, TRUE, DUPLICATE_SAME_ACCESS); - DuplicateHandle(cp, GetStdHandle(STD_ERROR_HANDLE), cp, &dos_handles[3], - 0, TRUE, DUPLICATE_SAME_ACCESS); - DuplicateHandle(cp, GetStdHandle(STD_ERROR_HANDLE), cp, &dos_handles[4], - 0, TRUE, DUPLICATE_SAME_ACCESS); -} - - /****************************************************************** * FILE_ReadWriteApc (internal) */ @@ -1205,59 +1177,6 @@ BOOL WINAPI UnlockFileEx( HANDLE hFile, DWORD reserved, DWORD count_low, DWORD c } -/*********************************************************************** - * Win32HandleToDosFileHandle (KERNEL32.21) - * - * Allocate a DOS handle for a Win32 handle. The Win32 handle is no - * longer valid after this function (even on failure). - * - * Note: this is not exactly right, since on Win95 the Win32 handles - * are on top of DOS handles and we do it the other way - * around. Should be good enough though. - */ -HFILE WINAPI Win32HandleToDosFileHandle( HANDLE handle ) -{ - int i; - - if (!handle || (handle == INVALID_HANDLE_VALUE)) - return HFILE_ERROR; - - FILE_InitProcessDosHandles(); - for (i = 0; i < DOS_TABLE_SIZE; i++) - if (!dos_handles[i]) - { - dos_handles[i] = handle; - TRACE("Got %d for h32 %p\n", i, handle ); - return (HFILE)i; - } - CloseHandle( handle ); - SetLastError( ERROR_TOO_MANY_OPEN_FILES ); - return HFILE_ERROR; -} - - -/*********************************************************************** - * DosFileHandleToWin32Handle (KERNEL32.20) - * - * Return the Win32 handle for a DOS handle. - * - * Note: this is not exactly right, since on Win95 the Win32 handles - * are on top of DOS handles and we do it the other way - * around. Should be good enough though. - */ -HANDLE WINAPI DosFileHandleToWin32Handle( HFILE handle ) -{ - HFILE16 hfile = (HFILE16)handle; - if (hfile < 5) FILE_InitProcessDosHandles(); - if ((hfile >= DOS_TABLE_SIZE) || !dos_handles[hfile]) - { - SetLastError( ERROR_INVALID_HANDLE ); - return INVALID_HANDLE_VALUE; - } - return dos_handles[hfile]; -} - - /************************************************************************* * SetHandleCount (KERNEL32.@) */ @@ -1267,29 +1186,6 @@ UINT WINAPI SetHandleCount( UINT count ) } -/*********************************************************************** - * DisposeLZ32Handle (KERNEL32.22) - * - * Note: this is not entirely correct, we should only close the - * 32-bit handle and not the 16-bit one, but we cannot do - * this because of the way our DOS handles are implemented. - * It shouldn't break anything though. - */ -void WINAPI DisposeLZ32Handle( HANDLE handle ) -{ - int i; - - if (!handle || (handle == INVALID_HANDLE_VALUE)) return; - - for (i = 5; i < DOS_TABLE_SIZE; i++) - if (dos_handles[i] == handle) - { - dos_handles[i] = 0; - CloseHandle( handle ); - break; - } -} - /************************************************************************** * Operations on file names * **************************************************************************/ diff --git a/dlls/kernel32/file16.c b/dlls/kernel32/file16.c index 3ca3039..30c7bdd 100644 --- a/dlls/kernel32/file16.c +++ b/dlls/kernel32/file16.c @@ -37,12 +37,114 @@ #include "winbase.h" #include "winternl.h" #include "wine/winbase16.h" -#include "kernel_private.h" +#include "kernel16_private.h" #include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(file); +#define DOS_TABLE_SIZE 256 + +static HANDLE dos_handles[DOS_TABLE_SIZE]; + +/*********************************************************************** + * FILE_InitProcessDosHandles + * + * Allocates the default DOS handles for a process. Called either by + * Win32HandleToDosFileHandle below or by the DOSVM stuff. + */ +static void FILE_InitProcessDosHandles( void ) +{ + static BOOL init_done /* = FALSE */; + HANDLE cp = GetCurrentProcess(); + + if (init_done) return; + init_done = TRUE; + DuplicateHandle(cp, GetStdHandle(STD_INPUT_HANDLE), cp, &dos_handles[0], + 0, TRUE, DUPLICATE_SAME_ACCESS); + DuplicateHandle(cp, GetStdHandle(STD_OUTPUT_HANDLE), cp, &dos_handles[1], + 0, TRUE, DUPLICATE_SAME_ACCESS); + DuplicateHandle(cp, GetStdHandle(STD_ERROR_HANDLE), cp, &dos_handles[2], + 0, TRUE, DUPLICATE_SAME_ACCESS); + DuplicateHandle(cp, GetStdHandle(STD_ERROR_HANDLE), cp, &dos_handles[3], + 0, TRUE, DUPLICATE_SAME_ACCESS); + DuplicateHandle(cp, GetStdHandle(STD_ERROR_HANDLE), cp, &dos_handles[4], + 0, TRUE, DUPLICATE_SAME_ACCESS); +} + +/*********************************************************************** + * DosFileHandleToWin32Handle (KERNEL32.20) + * + * Return the Win32 handle for a DOS handle. + * + * Note: this is not exactly right, since on Win95 the Win32 handles + * are on top of DOS handles and we do it the other way + * around. Should be good enough though. + */ +HANDLE WINAPI DosFileHandleToWin32Handle( HFILE handle ) +{ + HFILE16 hfile = (HFILE16)handle; + if (hfile < 5) FILE_InitProcessDosHandles(); + if ((hfile >= DOS_TABLE_SIZE) || !dos_handles[hfile]) + { + SetLastError( ERROR_INVALID_HANDLE ); + return INVALID_HANDLE_VALUE; + } + return dos_handles[hfile]; +} + +/*********************************************************************** + * Win32HandleToDosFileHandle (KERNEL32.21) + * + * Allocate a DOS handle for a Win32 handle. The Win32 handle is no + * longer valid after this function (even on failure). + * + * Note: this is not exactly right, since on Win95 the Win32 handles + * are on top of DOS handles and we do it the other way + * around. Should be good enough though. + */ +HFILE WINAPI Win32HandleToDosFileHandle( HANDLE handle ) +{ + int i; + + if (!handle || (handle == INVALID_HANDLE_VALUE)) + return HFILE_ERROR; + + FILE_InitProcessDosHandles(); + for (i = 0; i < DOS_TABLE_SIZE; i++) + if (!dos_handles[i]) + { + dos_handles[i] = handle; + TRACE("Got %d for h32 %p\n", i, handle ); + return (HFILE)i; + } + CloseHandle( handle ); + SetLastError( ERROR_TOO_MANY_OPEN_FILES ); + return HFILE_ERROR; +} + +/*********************************************************************** + * DisposeLZ32Handle (KERNEL32.22) + * + * Note: this is not entirely correct, we should only close the + * 32-bit handle and not the 16-bit one, but we cannot do + * this because of the way our DOS handles are implemented. + * It shouldn't break anything though. + */ +void WINAPI DisposeLZ32Handle( HANDLE handle ) +{ + int i; + + if (!handle || (handle == INVALID_HANDLE_VALUE)) return; + + for (i = 5; i < DOS_TABLE_SIZE; i++) + if (dos_handles[i] == handle) + { + dos_handles[i] = 0; + CloseHandle( handle ); + break; + } +} /*********************************************************************** * GetProfileInt (KERNEL.57) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index a65d93f..236f9f8 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -65,10 +65,6 @@ static inline obj_handle_t console_handle_unmap(HANDLE h) extern HMODULE kernel32_handle; -/* Size of per-process table of DOS handles */ -#define DOS_TABLE_SIZE 256 -extern HANDLE dos_handles[DOS_TABLE_SIZE]; - extern const WCHAR *DIR_Windows; extern const WCHAR *DIR_System; extern const WCHAR *DIR_SysWow64;

1 0

Paul Vriens : shell32/tests: Fix some test failures on WinMe ( SHPathPrepareForWrite).
by Alexandre Julliard Oct. 8, 2009

Oct. 8, 2009

Module: wine Branch: master Commit: d62d442d6d2fbb4a892f2448830aaabcda449b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62d442d6d2fbb4a892f24488… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 8 14:56:53 2009 +0200 shell32/tests: Fix some test failures on WinMe (SHPathPrepareForWrite). --- dlls/shell32/tests/shlfileop.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 1949d4b..14fe7cf 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1978,6 +1978,7 @@ static void test_sh_path_prepare(void) { HRESULT res; CHAR path[MAX_PATH]; + CHAR UNICODE_PATH_A[MAX_PATH]; if(!pSHPathPrepareForWriteA) { @@ -2010,12 +2011,14 @@ static void test_sh_path_prepare(void) set_curr_dir_path(path, "test1.txt\0"); res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_NONE); ok(res == HRESULT_FROM_WIN32(ERROR_DIRECTORY) || + res == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || /* WinMe */ res == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), /* Vista */ "Unexpected result : 0x%08x\n", res); /* file exists, SHPPFW_DIRCREATE */ res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_DIRCREATE); ok(res == HRESULT_FROM_WIN32(ERROR_DIRECTORY) || + res == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || /* WinMe */ res == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), /* Vista */ "Unexpected result : 0x%08x\n", res); @@ -2023,6 +2026,7 @@ static void test_sh_path_prepare(void) set_curr_dir_path(path, "test1.txt\\\0"); res = pSHPathPrepareForWriteA(0, 0, path, SHPPFW_NONE); ok(res == HRESULT_FROM_WIN32(ERROR_DIRECTORY) || + res == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || /* WinMe */ res == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), /* Vista */ "Unexpected result : 0x%08x\n", res); @@ -2063,19 +2067,21 @@ static void test_sh_path_prepare(void) if(!pSHPathPrepareForWriteW) { - skip("Skipping SHPathPrepareForWriteW tests\n"); + win_skip("Skipping SHPathPrepareForWriteW tests\n"); return; } + WideCharToMultiByte(CP_ACP, 0, UNICODE_PATH, -1, UNICODE_PATH_A, sizeof(UNICODE_PATH_A), NULL, NULL); + /* unicode directory doesn't exist, SHPPFW_NONE */ res = pSHPathPrepareForWriteW(0, 0, UNICODE_PATH, SHPPFW_NONE); ok(res == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "res == %08x, expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND)\n", res); ok(!file_existsW(UNICODE_PATH), "unicode path was created but shouldn't be\n"); - RemoveDirectoryW(UNICODE_PATH); + RemoveDirectoryA(UNICODE_PATH_A); /* unicode directory doesn't exist, SHPPFW_DIRCREATE */ res = pSHPathPrepareForWriteW(0, 0, UNICODE_PATH, SHPPFW_DIRCREATE); ok(res == S_OK, "res == %08x, expected S_OK\n", res); - ok(file_existsW(UNICODE_PATH), "unicode path should've been created\n"); + ok(file_exists(UNICODE_PATH_A), "unicode path should've been created\n"); /* unicode directory exists, SHPPFW_NONE */ res = pSHPathPrepareForWriteW(0, 0, UNICODE_PATH, SHPPFW_NONE); @@ -2084,7 +2090,7 @@ static void test_sh_path_prepare(void) /* unicode directory exists, SHPPFW_DIRCREATE */ res = pSHPathPrepareForWriteW(0, 0, UNICODE_PATH, SHPPFW_DIRCREATE); ok(res == S_OK, "ret == %08x, expected S_OK\n", res); - RemoveDirectoryW(UNICODE_PATH); + RemoveDirectoryA(UNICODE_PATH_A); } static void test_sh_new_link_info(void)

1 0

Paul Vriens : shell32/tests: Fix some test failures on WinMe (FO_COPY).
by Alexandre Julliard Oct. 8, 2009

Oct. 8, 2009

Module: wine Branch: master Commit: 012af0bd00b1aff29c84805ec54968aee538278f URL: http://source.winehq.org/git/wine.git/?a=commit;h=012af0bd00b1aff29c84805ec… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 8 14:20:57 2009 +0200 shell32/tests: Fix some test failures on WinMe (FO_COPY). --- dlls/shell32/tests/shlfileop.c | 55 ++++++++++++++++++++++++++++----------- 1 files changed, 39 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index f89fa49..1949d4b 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1042,10 +1042,13 @@ static void test_copy(void) shfo.pTo = "testdir2\\a.txt\0testdir2\\b.txt\0testdir2\\c.txt\0"; shfo.fAnyOperationsAborted = FALSE; retval = SHFileOperation(&shfo); - ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(retval == ERROR_SUCCESS || + broken(retval == 0x100a1), /* WinMe */ + "Expected ERROR_SUCCESS, got %d\n", retval); ok(DeleteFile("testdir2\\a.txt"), "Expected testdir2\\a.txt to exist\n"); ok(DeleteFile("testdir2\\b.txt"), "Expected testdir2\\b.txt to exist\n"); - ok(RemoveDirectory("testdir2\\c.txt"), "Expected testdir2\\c.txt to exist\n"); + if (retval == ERROR_SUCCESS) + ok(RemoveDirectory("testdir2\\c.txt"), "Expected testdir2\\c.txt to exist\n"); /* try many dest files without FOF_MULTIDESTFILES flag */ shfo.pFrom = "test1.txt\0test2.txt\0test3.txt\0"; @@ -1073,7 +1076,9 @@ static void test_copy(void) shfo.pTo = "testdir2\0"; shfo.fFlags &= ~FOF_MULTIDESTFILES; retval = SHFileOperation(&shfo); - ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(retval == ERROR_SUCCESS || + broken(retval == 0x100a1), /* WinMe */ + "Expected ERROR_SUCCESS, got %d\n", retval); ok(file_exists("testdir2\\test1.txt"), "Expected testdir2\\test1.txt to exist\n"); /* try a glob with FOF_FILESONLY */ @@ -1190,18 +1195,28 @@ static void test_copy(void) shfo.fFlags &= ~FOF_MULTIDESTFILES; shfo.fAnyOperationsAborted = FALSE; retval = SHFileOperation(&shfo); - ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); - ok(DeleteFile("testdir2\\test1.txt"), "Expected testdir2\\test1.txt to exist\n"); - ok(DeleteFile("testdir2\\test4.txt\\a.txt"), "Expected a.txt to exist\n"); - ok(RemoveDirectory("testdir2\\test4.txt"), "Expected testdir2\\test4.txt to exist\n"); + ok(retval == ERROR_SUCCESS || + broken(retval == 0x100a1), /* WinMe */ + "Expected ERROR_SUCCESS, got %d\n", retval); + if (retval == ERROR_SUCCESS) + { + ok(DeleteFile("testdir2\\test1.txt"), "Expected testdir2\\test1.txt to exist\n"); + ok(DeleteFile("testdir2\\test4.txt\\a.txt"), "Expected a.txt to exist\n"); + ok(RemoveDirectory("testdir2\\test4.txt"), "Expected testdir2\\test4.txt to exist\n"); + } /* copy one directory and a file in that dir to another dir */ shfo.pFrom = "test4.txt\0test4.txt\\a.txt\0"; shfo.pTo = "testdir2\0"; retval = SHFileOperation(&shfo); - ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); - ok(DeleteFile("testdir2\\test4.txt\\a.txt"), "Expected a.txt to exist\n"); - ok(DeleteFile("testdir2\\a.txt"), "Expected testdir2\\a.txt to exist\n"); + ok(retval == ERROR_SUCCESS || + broken(retval == 0x100a1), /* WinMe */ + "Expected ERROR_SUCCESS, got %d\n", retval); + if (retval == ERROR_SUCCESS) + { + ok(DeleteFile("testdir2\\test4.txt\\a.txt"), "Expected a.txt to exist\n"); + ok(DeleteFile("testdir2\\a.txt"), "Expected testdir2\\a.txt to exist\n"); + } /* copy a file in a directory first, and then the directory to a nonexistent dir */ shfo.pFrom = "test4.txt\\a.txt\0test4.txt\0"; @@ -1362,13 +1377,21 @@ static void test_copy(void) createTestFile("test4.txt\\test1.txt"); shfo.pFrom = "test4.txt\0"; shfo.pTo = "testdir2\0"; - shfo.fFlags = FOF_NOCONFIRMATION; - ok(!SHFileOperation(&shfo), "First SHFileOperation failed\n"); - createTestFile("test4.txt\\.\\test1.txt"); /* modify the content of the file */ - /* without FOF_NOCONFIRMATION the confirmation is "This folder already contains a folder named ..." */ + /* WinMe needs FOF_NOERRORUI */ + shfo.fFlags = FOF_NOCONFIRMATION | FOF_NOERRORUI; retval = SHFileOperation(&shfo); - ok(retval == 0, "Expected 0, got %d\n", retval); - ok(file_has_content("testdir2\\test4.txt\\test1.txt", "test4.txt\\.\\test1.txt\n"), "The file was not copied\n"); + ok(retval == ERROR_SUCCESS || + broken(retval == 0x100a1), /* WinMe */ + "Expected ERROR_SUCCESS, got %d\n", retval); + shfo.fFlags = FOF_NOCONFIRMATION; + if (ERROR_SUCCESS) + { + createTestFile("test4.txt\\.\\test1.txt"); /* modify the content of the file */ + /* without FOF_NOCONFIRMATION the confirmation is "This folder already contains a folder named ..." */ + retval = SHFileOperation(&shfo); + ok(retval == 0, "Expected 0, got %d\n", retval); + ok(file_has_content("testdir2\\test4.txt\\test1.txt", "test4.txt\\.\\test1.txt\n"), "The file was not copied\n"); + } createTestFile("one.txt");

1 0

Henri Verbeet : d3d8: Don' t test D3DRS_DEBUGMONITORTOKEN in the stateblock tests.
by Alexandre Julliard Oct. 8, 2009

Oct. 8, 2009

Module: wine Branch: master Commit: a5b27217064ef76e4672082406a33d03a009e740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5b27217064ef76e467208240… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 8 09:23:21 2009 +0200 d3d8: Don't test D3DRS_DEBUGMONITORTOKEN in the stateblock tests. It looks like this render state isn't stored in the stateblock but directly in the device. I doubt a lot of applications depend on that though, so just disable the test for the moment. --- dlls/d3d8/tests/stateblock.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index e31a964..9865566 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -1058,7 +1058,7 @@ const D3DRENDERSTATETYPE render_state_indices[] = D3DRS_EMISSIVEMATERIALSOURCE, D3DRS_VERTEXBLEND, D3DRS_CLIPPLANEENABLE, -#if 0 /* Driver dependent, increase array size to enable */ +#if 0 /* Driver dependent */ D3DRS_POINTSIZE, #endif D3DRS_POINTSIZE_MIN, @@ -1070,7 +1070,9 @@ const D3DRENDERSTATETYPE render_state_indices[] = D3DRS_MULTISAMPLEANTIALIAS, D3DRS_MULTISAMPLEMASK, D3DRS_PATCHEDGESTYLE, +#if 0 /* Apparently not recorded in the stateblock */ D3DRS_DEBUGMONITORTOKEN, +#endif D3DRS_POINTSIZE_MAX, D3DRS_INDEXEDVERTEXBLENDENABLE, D3DRS_COLORWRITEENABLE, @@ -1202,7 +1204,7 @@ static void render_state_default_data_init(const struct render_state_arg *rsarg, data->states[idx++] = TRUE; /* MULTISAMPLEANTIALIAS */ data->states[idx++] = 0xFFFFFFFF; /* MULTISAMPLEMASK */ data->states[idx++] = D3DPATCHEDGE_DISCRETE; /* PATCHEDGESTYLE */ - data->states[idx++] = 0xbaadcafe; /* DEBUGMONITORTOKEN */ + if (0) data->states[idx++] = 0xbaadcafe; /* DEBUGMONITORTOKEN, not recorded in the stateblock */ data->states[idx++] = to_dword(rsarg->pointsize_max); /* POINTSIZE_MAX */ data->states[idx++] = FALSE; /* INDEXEDVERTEXBLENDENABLE */ data->states[idx++] = 0x0000000F; /* COLORWRITEENABLE */ @@ -1286,7 +1288,7 @@ static void render_state_test_data_init(struct render_state_data *data) data->states[idx++] = FALSE; /* MULTISAMPLEANTIALIAS */ data->states[idx++] = 0xABCDDBCA; /* MULTISAMPLEMASK */ data->states[idx++] = D3DPATCHEDGE_CONTINUOUS; /* PATCHEDGESTYLE */ - data->states[idx++] = D3DDMT_DISABLE; /* DEBUGMONITORTOKEN */ + if (0) data->states[idx++] = D3DDMT_DISABLE; /* DEBUGMONITORTOKEN, not recorded in the stateblock */ data->states[idx++] = to_dword(77.0f); /* POINTSIZE_MAX */ data->states[idx++] = TRUE; /* INDEXEDVERTEXBLENDENABLE */ data->states[idx++] = 0x00000009; /* COLORWRITEENABLE */

1 0

Henri Verbeet : d3d9: Don' t test D3DRS_DEBUGMONITORTOKEN in the stateblock tests.
by Alexandre Julliard Oct. 8, 2009

Oct. 8, 2009

Module: wine Branch: master Commit: dfe07023c4a762883a4dfb93277d4082ccbedb9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfe07023c4a762883a4dfb932… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 8 09:23:22 2009 +0200 d3d9: Don't test D3DRS_DEBUGMONITORTOKEN in the stateblock tests. --- dlls/d3d9/tests/stateblock.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 4a01664..88eaec9 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -1100,7 +1100,7 @@ const D3DRENDERSTATETYPE render_state_indices[] = D3DRS_EMISSIVEMATERIALSOURCE, D3DRS_VERTEXBLEND, D3DRS_CLIPPLANEENABLE, -#if 0 /* Driver dependent, increase array size to enable */ +#if 0 /* Driver dependent */ D3DRS_POINTSIZE, #endif D3DRS_POINTSIZE_MIN, @@ -1112,7 +1112,9 @@ const D3DRENDERSTATETYPE render_state_indices[] = D3DRS_MULTISAMPLEANTIALIAS, D3DRS_MULTISAMPLEMASK, D3DRS_PATCHEDGESTYLE, +#if 0 /* Apparently not recorded in the stateblock */ D3DRS_DEBUGMONITORTOKEN, +#endif D3DRS_POINTSIZE_MAX, D3DRS_INDEXEDVERTEXBLENDENABLE, D3DRS_COLORWRITEENABLE, @@ -1277,7 +1279,7 @@ static void render_state_default_data_init(const struct render_state_arg *rsarg, data->states[idx++] = TRUE; /* MULTISAMPLEANTIALIAS */ data->states[idx++] = 0xFFFFFFFF; /* MULTISAMPLEMASK */ data->states[idx++] = D3DPATCHEDGE_DISCRETE; /* PATCHEDGESTYLE */ - data->states[idx++] = 0xbaadcafe; /* DEBUGMONITORTOKEN */ + if (0) data->states[idx++] = 0xbaadcafe; /* DEBUGMONITORTOKEN, not recorded in the stateblock */ data->states[idx++] = to_dword(rsarg->pointsize_max); /* POINTSIZE_MAX */ data->states[idx++] = FALSE; /* INDEXEDVERTEXBLENDENABLE */ data->states[idx++] = 0x0000000F; /* COLORWRITEENABLE */ @@ -1397,7 +1399,7 @@ static void render_state_test_data_init(struct render_state_data *data) data->states[idx++] = FALSE; /* MULTISAMPLEANTIALIAS */ data->states[idx++] = 0xABCDDBCA; /* MULTISAMPLEMASK */ data->states[idx++] = D3DPATCHEDGE_CONTINUOUS; /* PATCHEDGESTYLE */ - data->states[idx++] = D3DDMT_DISABLE; /* DEBUGMONITORTOKEN */ + if (0) data->states[idx++] = D3DDMT_DISABLE; /* DEBUGMONITORTOKEN, not recorded in the stateblock */ data->states[idx++] = to_dword(77.0f); /* POINTSIZE_MAX */ data->states[idx++] = TRUE; /* INDEXEDVERTEXBLENDENABLE */ data->states[idx++] = 0x00000009; /* COLORWRITEENABLE */

1 0

Henri Verbeet : d3d8: Rename abort_stateblock() to release_stateblock() in the stateblock tests.
by Alexandre Julliard Oct. 8, 2009

Oct. 8, 2009

Module: wine Branch: master Commit: ffcfbc2aeb4384a6931ee91e255fc6aea60acff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffcfbc2aeb4384a6931ee91e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 8 09:23:20 2009 +0200 d3d8: Rename abort_stateblock() to release_stateblock() in the stateblock tests. --- dlls/d3d9/tests/stateblock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 5a22b4a..4a01664 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -314,7 +314,7 @@ static int end_stateblock(IDirect3DDevice9 *device, struct event_data *event_dat return EVENT_OK; } -static int abort_stateblock(IDirect3DDevice9 *device, struct event_data *event_data) +static int release_stateblock(IDirect3DDevice9 *device, struct event_data *event_data) { IUnknown_Release(event_data->stateblock); return EVENT_OK; @@ -368,7 +368,7 @@ static void execute_test_chain_all(IDirect3DDevice9 *device, struct state_test * { {begin_stateblock, SB_DATA_NONE, SB_DATA_TEST_IN}, {end_stateblock, SB_DATA_NONE, SB_DATA_NONE}, - {abort_stateblock, SB_DATA_DEFAULT, SB_DATA_NONE}, + {release_stateblock, SB_DATA_DEFAULT, SB_DATA_NONE}, }; struct event apply_stateblock_events[] =

1 0

Henri Verbeet : d3d8: Add some tests for CreateStateBlock().
by Alexandre Julliard Oct. 8, 2009

Oct. 8, 2009

Module: wine Branch: master Commit: 00e7ec9cd680700a12d47e0c2a8372c0a2a282b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00e7ec9cd680700a12d47e0c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 8 09:23:23 2009 +0200 d3d8: Add some tests for CreateStateBlock(). --- dlls/d3d8/tests/stateblock.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index 9865566..076ac58 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -297,6 +297,16 @@ static int revert_render_target(IDirect3DDevice8 *device, struct event_data *eve return EVENT_OK; } +static int create_stateblock(IDirect3DDevice8 *device, struct event_data *event_data) +{ + HRESULT hr; + + hr = IDirect3DDevice8_CreateStateBlock(device, D3DSBT_ALL, &event_data->stateblock); + ok(SUCCEEDED(hr), "CreateStateBlock returned %#x.\n", hr); + if (FAILED(hr)) return EVENT_ERROR; + return EVENT_OK; +} + static int begin_stateblock(IDirect3DDevice8 *device, struct event_data *event_data) { HRESULT hr; @@ -385,6 +395,20 @@ static void execute_test_chain_all(IDirect3DDevice8 *device, struct state_test * {apply_stateblock, SB_DATA_DEFAULT, SB_DATA_NONE}, }; + struct event create_stateblock_capture_apply_events[] = + { + {create_stateblock, SB_DATA_DEFAULT, SB_DATA_TEST_IN}, + {capture_stateblock, SB_DATA_TEST, SB_DATA_DEFAULT}, + {apply_stateblock, SB_DATA_TEST, SB_DATA_NONE}, + }; + + struct event create_stateblock_apply_events[] = + { + {NULL, SB_DATA_DEFAULT, SB_DATA_TEST_IN}, + {create_stateblock, SB_DATA_TEST, SB_DATA_DEFAULT}, + {apply_stateblock, SB_DATA_TEST, SB_DATA_NONE}, + }; + struct event rendertarget_switch_events[] = { {NULL, SB_DATA_NONE, SB_DATA_TEST_IN}, @@ -424,6 +448,12 @@ static void execute_test_chain_all(IDirect3DDevice8 *device, struct state_test * trace("Running stateblock capture/reapply state tests\n"); execute_test_chain(device, test, ntests, capture_reapply_stateblock_events, 4, &arg); + trace("Running create stateblock capture/apply state tests\n"); + execute_test_chain(device, test, ntests, create_stateblock_capture_apply_events, 3, &arg); + + trace("Running create stateblock apply state tests\n"); + execute_test_chain(device, test, ntests, create_stateblock_apply_events, 3, &arg); + trace("Running rendertarget switch state tests\n"); execute_test_chain(device, test, ntests, rendertarget_switch_events, 3, &arg);

1 0

Peter Dons Tychsen : cmd: Fix handling of quotes when line includes redirections and/or pipes.
by Alexandre Julliard Oct. 8, 2009

Oct. 8, 2009

Module: wine Branch: master Commit: a78ccf11602215c51d664bea4ced1141f0470425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a78ccf11602215c51d664bea4… Author: Peter Dons Tychsen <donpedro(a)tdcadsl.dk> Date: Sun Oct 4 04:28:26 2009 +0200 cmd: Fix handling of quotes when line includes redirections and/or pipes. --- programs/cmd/wcmdmain.c | 58 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 56 insertions(+), 2 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 249526f..9f5b6df 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1649,6 +1649,60 @@ static void WCMD_addCommand(WCHAR *command, int *commandLen, *lastEntry = thisEntry; } + +/*************************************************************************** + * WCMD_IsEndQuote + * + * Checks if the quote pointet to is the end-quote. + * + * Quotes end if: + * + * 1) The current parameter ends at EOL or at the beginning + * of a redirection or pipe and not in a quote section. + * + * 2) If the next character is a space and not in a quote section. + * + * Returns TRUE if this is an end quote, and FALSE if it is not. + * + */ +static BOOL WCMD_IsEndQuote(WCHAR *quote, int quoteIndex) +{ + int quoteCount = quoteIndex; + int i; + + /* If we are not in a quoted section, then we are not an end-quote */ + if(quoteIndex == 0) + { + return FALSE; + } + + /* Check how many quotes are left for this parameter */ + for(i=0;quote[i];i++) + { + if(quote[i] == '"') + { + quoteCount++; + } + + /* Quote counting ends at EOL, redirection, space or pipe if current quote is complete */ + else if(((quoteCount % 2) == 0) + && ((quote[i] == '<') || (quote[i] == '>') || (quote[i] == '|') || (quote[i] == ' '))) + { + break; + } + } + + /* If the quote is part of the last part of a series of quotes-on-quotes, then it must + be an end-quote */ + if(quoteIndex >= (quoteCount / 2)) + { + return TRUE; + } + + /* No cigar */ + return FALSE; +} + /*************************************************************************** * WCMD_ReadAndParseLine * @@ -1897,8 +1951,8 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF } break; - case '"': if (inQuotes && *(curPos+1) == ' ') { - inQuotes--; /* An end quote must be proceeded by a space */ + case '"': if (WCMD_IsEndQuote(curPos, inQuotes)) { + inQuotes--; } else { inQuotes++; /* Quotes within quotes are fun! */ }

1 0

Austin English : ntdll: Add a stub for NtQuerySystemEnvironmentValue.
by Alexandre Julliard Oct. 8, 2009

Oct. 8, 2009

Module: wine Branch: master Commit: 93aa9ebceaf4e9681568d0a21b322f07ab734559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93aa9ebceaf4e9681568d0a21… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Oct 3 15:41:03 2009 -0500 ntdll: Add a stub for NtQuerySystemEnvironmentValue. --- dlls/ntdll/env.c | 13 +++++++++++++ dlls/ntdll/ntdll.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 5ac3543..91ad6bc 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -30,10 +30,23 @@ #include "wine/unicode.h" #include "wine/debug.h" #include "ntdll_misc.h" +#include "winnt.h" WINE_DEFAULT_DEBUG_CHANNEL(environ); /****************************************************************************** + * NtQuerySystemEnvironmentValue [NTDLL.@] + */ +NTSYSAPI NTSTATUS WINAPI NtQuerySystemEnvironmentValue(PUNICODE_STRING VariableName, + PWCHAR Value, + ULONG ValueBufferLength, + PULONG RequiredLength) +{ + FIXME("stub!\n"); + return STATUS_NOT_IMPLEMENTED; +} + +/****************************************************************************** * RtlCreateEnvironment [NTDLL.@] */ NTSTATUS WINAPI RtlCreateEnvironment(BOOLEAN inherit, PWSTR* env) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index dade90a..8787611 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -264,7 +264,7 @@ @ stdcall NtQuerySecurityObject (long long long long long) @ stdcall NtQuerySemaphore (long long ptr long ptr) @ stdcall NtQuerySymbolicLinkObject(long ptr ptr) -@ stub NtQuerySystemEnvironmentValue +@ stdcall NtQuerySystemEnvironmentValue(ptr ptr long ptr) # @ stub NtQuerySystemEnvironmentValueEx @ stdcall NtQuerySystemInformation(long long long long) @ stdcall NtQuerySystemTime(ptr)

1 0