February 2014 - Wine-commits

Aric Stewart : shell32: Improve the FO_MOVE operation.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: a2c905244b0e2c0b58026b70571b58f0d9646ccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c905244b0e2c0b58026b705… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 27 20:09:11 2014 +0900 shell32: Improve the FO_MOVE operation. --- dlls/shell32/shlfileop.c | 42 ++++++++++++---- dlls/shell32/tests/shlfileop.c | 105 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 136 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 4ef7803..e6d44b0 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -53,6 +53,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); #define FO_MASK 0xF +#define DE_SAMEFILE 0x71 +#define DE_DESTSAMETREE 0x7D + static const WCHAR wWildcardFile[] = {'*',0}; static const WCHAR wWildcardChars[] = {'*','?',0}; @@ -1428,11 +1431,15 @@ static void move_to_dir(LPSHFILEOPSTRUCTW lpFileOp, const FILE_ENTRY *feFrom, co static DWORD move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, const FILE_LIST *flTo) { DWORD i; + INT mismatched = 0; const FILE_ENTRY *entryToMove; const FILE_ENTRY *fileDest; - if (!flFrom->dwNumFiles || !flTo->dwNumFiles) - return ERROR_CANCELLED; + if (!flFrom->dwNumFiles) + return ERROR_SUCCESS; + + if (!flTo->dwNumFiles) + return ERROR_FILE_NOT_FOUND; if (!(lpFileOp->fFlags & FOF_MULTIDESTFILES) && flTo->dwNumFiles > 1 && flFrom->dwNumFiles > 1) @@ -1450,29 +1457,44 @@ static DWORD move_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom, con if (!PathFileExistsW(flTo->feFiles[0].szDirectory)) return ERROR_CANCELLED; - if ((lpFileOp->fFlags & FOF_MULTIDESTFILES) && - flFrom->dwNumFiles != flTo->dwNumFiles) - { - return ERROR_CANCELLED; - } + if (lpFileOp->fFlags & FOF_MULTIDESTFILES) + mismatched = flFrom->dwNumFiles - flTo->dwNumFiles; fileDest = &flTo->feFiles[0]; for (i = 0; i < flFrom->dwNumFiles; i++) { entryToMove = &flFrom->feFiles[i]; - if (lpFileOp->fFlags & FOF_MULTIDESTFILES) - fileDest = &flTo->feFiles[i]; - if (!PathFileExistsW(fileDest->szDirectory)) return ERROR_CANCELLED; + if (lpFileOp->fFlags & FOF_MULTIDESTFILES) + { + if (i >= flTo->dwNumFiles) + break; + fileDest = &flTo->feFiles[i]; + if (mismatched && !fileDest->bExists) + { + create_dest_dirs(flTo->feFiles[i].szFullPath); + flTo->feFiles[i].bExists = TRUE; + flTo->feFiles[i].attributes = FILE_ATTRIBUTE_DIRECTORY; + } + } + if (fileDest->bExists && IsAttribDir(fileDest->attributes)) move_to_dir(lpFileOp, entryToMove, fileDest); else SHNotifyMoveFileW(entryToMove->szFullPath, fileDest->szFullPath); } + if (mismatched > 0) + { + if (flFrom->bAnyDirectories) + return DE_DESTSAMETREE; + else + return DE_SAMEFILE; + } + return ERROR_SUCCESS; } diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 14ace24..64d0fbc 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1871,7 +1871,8 @@ static void test_move(void) init_shfo_tests(); - /* number of sources do not correspond to number of targets */ + /* number of sources do not correspond to number of targets, + include directories */ set_curr_dir_path(from, "test1.txt\0test2.txt\0test4.txt\0"); set_curr_dir_path(to, "test6.txt\0test7.txt\0"); retval = SHFileOperationA(&shfo2); @@ -1903,6 +1904,108 @@ static void test_move(void) } init_shfo_tests(); + /* number of sources do not correspond to number of targets, + files only, + from exceeds to */ + set_curr_dir_path(from, "test1.txt\0test2.txt\0test3.txt\0"); + set_curr_dir_path(to, "test6.txt\0test7.txt\0"); + retval = SHFileOperationA(&shfo2); + if (dir_exists("test6.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_SAMEFILE, "Expected DE_SAMEFILE, 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"); + ok(file_exists("test3.txt"), "File should not be moved\n"); + } + } + else + { + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); + ok(!file_exists("test6.txt"), "The file is not moved - many files are " + "specified as a target\n"); + } + + init_shfo_tests(); + /* number of sources do not correspond to number of targets, + files only, + too exceeds from */ + set_curr_dir_path(from, "test1.txt\0test2.txt\0"); + set_curr_dir_path(to, "test6.txt\0test7.txt\0test8.txt\0"); + retval = SHFileOperationA(&shfo2); + if (dir_exists("test6.txt")) + { + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(DeleteFileA("test6.txt\\test1.txt"),"The file is not moved\n"); + ok(DeleteFileA("test7.txt\\test2.txt"),"The file is not moved\n"); + ok(!dir_exists("test8.txt") && !file_exists("test8.txt"), + "Directory should not be created\n"); + RemoveDirectoryA("test6.txt"); + RemoveDirectoryA("test7.txt"); + } + else + { + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* WinXp, Win2k */); + ok(!file_exists("test6.txt"), "The file is not moved - many files are " + "specified as a target\n"); + } + + init_shfo_tests(); + /* number of sources do not correspond to number of targets, + target directories */ + set_curr_dir_path(from, "test1.txt\0test2.txt\0test3.txt\0"); + set_curr_dir_path(to, "test4.txt\0test5.txt\0"); + retval = SHFileOperationA(&shfo2); + if (dir_exists("test5.txt")) + { + ok(retval == DE_SAMEFILE, "Expected DE_SAMEFILE, got %d\n", retval); + ok(DeleteFileA("test4.txt\\test1.txt"),"The file is not moved\n"); + ok(DeleteFileA("test5.txt\\test2.txt"),"The file is not moved\n"); + ok(file_exists("test3.txt"), "The file is not moved\n"); + RemoveDirectoryA("test4.txt"); + RemoveDirectoryA("test5.txt"); + } + else + { + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(DeleteFileA("test4.txt\\test1.txt"),"The file is not moved\n"); + ok(DeleteFileA("test4.txt\\test2.txt"),"The file is not moved\n"); + ok(DeleteFileA("test4.txt\\test3.txt"),"The file is not moved\n"); + } + + + init_shfo_tests(); + /* 0 incomming files */ + set_curr_dir_path(from, "\0\0"); + set_curr_dir_path(to, "test6.txt\0\0"); + retval = SHFileOperationA(&shfo2); + ok(retval == ERROR_SUCCESS || retval == ERROR_ACCESS_DENIED + , "Expected ERROR_SUCCESS || ERROR_ACCESS_DENIED, got %d\n", retval); + ok(!file_exists("test6.txt"), "The file should not exist\n"); + + init_shfo_tests(); + /* 0 outgoing files */ + set_curr_dir_path(from, "test1\0\0"); + set_curr_dir_path(to, "\0\0"); + retval = SHFileOperationA(&shfo2); + ok(retval == ERROR_FILE_NOT_FOUND || + broken(retval == 1026) + , "Expected ERROR_FILE_NOT_FOUND, got %d\n", retval); + ok(!file_exists("test6.txt"), "The file should not exist\n"); + + init_shfo_tests(); set_curr_dir_path(from, "test3.txt\0"); set_curr_dir_path(to, "test4.txt\\test1.txt\0");

1 0

Dmitry Timoshkov : taskschd: Add more tests for RegisterTask, GetTask and DeleteTask.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: ee806d9af7c2ce8aa441c591370e9bf33827401e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee806d9af7c2ce8aa441c5913… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 27 16:53:44 2014 +0900 taskschd: Add more tests for RegisterTask, GetTask and DeleteTask. --- dlls/taskschd/folder.c | 2 ++ dlls/taskschd/tests/scheduler.c | 41 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index ab3f8f1..7caad77 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -325,6 +325,8 @@ static HRESULT WINAPI TaskFolder_RegisterTask(ITaskFolder *iface, BSTR name, BST TRACE("%p,%s,%s,%x,%s,%s,%d,%s,%p\n", iface, debugstr_w(name), debugstr_w(xml), flags, debugstr_variant(&user), debugstr_variant(&password), logon, debugstr_variant(&sddl), task); + if (!xml) return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); + hr = TaskDefinition_create(&taskdef); if (hr != S_OK) return hr; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 5720a7f..d554779 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -711,6 +711,7 @@ static void test_GetTask(void) ITaskService *service; ITaskFolder *root, *folder; IRegisteredTask *task1, *task2; + IID iid; hr = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskService, (void **)&service); if (hr != S_OK) @@ -732,11 +733,28 @@ static void test_GetTask(void) ITaskFolder_DeleteTask(root, Wine_Task2, 0); ITaskFolder_DeleteFolder(root, Wine, 0); + if (0) /* FIXME: Uncomment once implemented */ + { + hr = ITaskFolder_GetTask(root, Wine_Task1, &task1); + ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); + } hr = ITaskFolder_CreateFolder(root, Wine, v_null, &folder); ok(hr == S_OK, "CreateFolder error %#x\n", hr); + if (0) /* FIXME: Uncomment once implemented */ + { + hr = ITaskFolder_GetTask(root, Wine, &task1); + ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); + } MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + hr = ITaskFolder_RegisterTask(root, Wine_Task1, NULL, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); + ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "expected RPC_X_NULL_REF_POINTER, got %#x\n", hr); + + hr = ITaskFolder_RegisterTask(root, Wine, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED), "expected ERROR_ACCESS_DENIED, got %#x\n", hr); + hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); ok(hr == S_OK, "RegisterTask error %#x\n", hr); @@ -744,6 +762,10 @@ static void test_GetTask(void) todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); + hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, 0, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); + hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, TASK_CREATE_OR_UPDATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); ok(hr == S_OK, "RegisterTask error %#x\n", hr); @@ -851,11 +873,30 @@ todo_wine IRegisteredTask_Release(task2); + hr = ITaskFolder_DeleteTask(folder, NULL, 0); + ok(hr == HRESULT_FROM_WIN32(ERROR_DIR_NOT_EMPTY), "expected ERROR_DIR_NOT_EMPTY, got %#x\n", hr); + hr = ITaskFolder_DeleteTask(root, Wine_Task1, 0); ok(hr == S_OK, "DeleteTask error %#x\n", hr); hr = ITaskFolder_DeleteTask(folder, Task2, 0); ok(hr == S_OK, "DeleteTask error %#x\n", hr); + hr = ITaskFolder_DeleteTask(folder, Task2, 0); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); + + hr = ITaskFolder_RegisterTask(root, NULL, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); + ok(hr == S_OK, "RegisterTask error %#x\n", hr); + + hr = IRegisteredTask_get_Name(task1, &bstr); + ok(hr == S_OK, "get_Name error %#x\n", hr); + hr = IIDFromString(bstr, &iid); + ok(hr == S_OK, "IIDFromString error %#x\n", hr); + + IRegisteredTask_Release(task1); + + hr = ITaskFolder_DeleteTask(root, bstr, 0); + ok(hr == S_OK, "DeleteTask error %#x\n", hr); + failed: ITaskFolder_Release(folder);

1 0

Stefan Leichter : fltlib: Add a version resource.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: 0eb626587b2f75e9904ba827eec1cd8a7f5789a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eb626587b2f75e9904ba827e… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Feb 27 21:14:52 2014 +0100 fltlib: Add a version resource. --- dlls/fltlib/Makefile.in | 2 ++ dlls/fltlib/rsrc.rc | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/fltlib/Makefile.in b/dlls/fltlib/Makefile.in index b8f56c7..65dca20 100644 --- a/dlls/fltlib/Makefile.in +++ b/dlls/fltlib/Makefile.in @@ -2,3 +2,5 @@ MODULE = fltlib.dll C_SRCS = \ fltlib.c + +RC_SRCS = rsrc.rc diff --git a/dlls/fltlib/rsrc.rc b/dlls/fltlib/rsrc.rc new file mode 100644 index 0000000..164a1e5 --- /dev/null +++ b/dlls/fltlib/rsrc.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2014 Stefan Leichter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Filter Library" +#define WINE_FILENAME_STR "fltlib.dll" + +#define WINE_FILEVERSION 5,1,2600,5512 +#define WINE_FILEVERSION_STR "5.1.2600.5512" +#define WINE_PRODUCTVERSION 5,1,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.1.2600.5512" + +#include "wine/wine_common_ver.rc"

1 0

Erich E. Hoover : hhctrl.ocx: Support delimited filenames for HH_DISPLAY_TOPIC data.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: 5eb040253c90a20ed070f643e479ed32b83e49fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eb040253c90a20ed070f643e… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Tue Feb 25 19:10:58 2014 -0700 hhctrl.ocx: Support delimited filenames for HH_DISPLAY_TOPIC data. --- dlls/hhctrl.ocx/hhctrl.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 8b42569..86a31f5 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -203,7 +203,20 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat case HH_DISPLAY_TOPIC: case HH_DISPLAY_TOC: if (data) - index = (const WCHAR *)data; + { + static const WCHAR delimW[] = {':',':',0}; + const WCHAR *i = (const WCHAR *)data; + + index = strstrW(i, delimW); + if(index) + { + if(memcmp(info->pCHMInfo->szFile, i, index-i)) + FIXME("Opening a CHM file in the context of another is not supported.\n"); + index += strlenW(delimW); + } + else + index = i; + } break; }

1 0

Erich E. Hoover : hhctrl.ocx: Permit HTML start/ end tags within quoted attributes.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: ee484b3140ee7637f297ed8ed4af86dd1e626416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee484b3140ee7637f297ed8ed… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Tue Feb 25 19:20:31 2014 -0700 hhctrl.ocx: Permit HTML start/end tags within quoted attributes. --- dlls/hhctrl.ocx/stream.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/hhctrl.ocx/stream.c b/dlls/hhctrl.ocx/stream.c index eb2bcc3..4dc9645 100644 --- a/dlls/hhctrl.ocx/stream.c +++ b/dlls/hhctrl.ocx/stream.c @@ -110,12 +110,52 @@ BOOL next_content(stream_t *stream, strbuf_t *buf) return TRUE; } +static BOOL find_node_end(stream_t *stream, strbuf_t *buf) +{ + int tag_count = 0, b = buf->len; + char *p; + + while(1) + { + if(!stream_chr(stream, buf, '>')) + return FALSE; + if(buf->len == 0) + break; + p = &buf->buf[b]; + while((p = memchr(p+1, '"', buf->len-(p-buf->buf))) != NULL) + tag_count++; + b = buf->len; + if(tag_count % 2 != 0) + { + if(!stream_chr(stream, buf, '"')) + return FALSE; + tag_count++; + } + else + break; + } + return TRUE; +} + BOOL next_node(stream_t *stream, strbuf_t *buf) { + strbuf_t tmpbuf; + + /* search through the end of the current node */ + strbuf_init(&tmpbuf); + if(!find_node_end(stream, &tmpbuf)) + { + strbuf_free(buf); + return FALSE; + } + strbuf_free(&tmpbuf); + + /* find the beginning of the next node */ if(!stream_chr(stream, NULL, '<')) return FALSE; - if(!stream_chr(stream, buf, '>')) + /* read out the data of the next node */ + if(!find_node_end(stream, buf)) return FALSE; strbuf_append(buf, ">", 2);

1 0

Frédéric Delanoy : dplayx: Use BOOL type where appropriate.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: 7e17eec75005e0e1c16b9b56422544246d772e7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e17eec75005e0e1c16b9b564… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Feb 27 00:21:02 2014 +0100 dplayx: Use BOOL type where appropriate. --- dlls/dplayx/dplay.c | 2 +- dlls/dplayx/dplayx_global.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 0314597..36e97a6 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -1660,7 +1660,7 @@ static HRESULT DP_IF_CreatePlayer( IDirectPlayImpl *This, void *lpMsgHdr, DPID * } #if 1 - if( This->dp2->bHostInterface == FALSE ) + if( !This->dp2->bHostInterface ) { /* Let the name server know about the creation of this player */ /* FIXME: Is this only to be done for the creation of a server player or diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index 64c4bc3..55a7386 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -83,7 +83,7 @@ static LPVOID lpSharedStaticData = NULL; typedef struct { - DWORD used; + BOOL used; DWORD data[dwBlockSize-sizeof(DWORD)]; } DPLAYX_MEM_SLICE; @@ -103,7 +103,7 @@ static void DPLAYX_PrivHeapFree( LPVOID addr ) lpAddrStart = (char*)addr - sizeof(DWORD); /* Find block header */ dwBlockUsed = ((BYTE*)lpAddrStart - (BYTE*)lpMemArea)/dwBlockSize; - lpMemArea[ dwBlockUsed ].used = 0; + lpMemArea[ dwBlockUsed ].used = FALSE; } static LPVOID DPLAYX_PrivHeapAlloc( DWORD flags, DWORD size ) @@ -119,12 +119,12 @@ static LPVOID DPLAYX_PrivHeapAlloc( DWORD flags, DWORD size ) /* Find blank area */ uBlockUsed = 0; - while( ( lpMemArea[ uBlockUsed ].used != 0 ) && ( uBlockUsed <= dwMaxBlock ) ) { uBlockUsed++; } + while( lpMemArea[ uBlockUsed ].used && uBlockUsed <= dwMaxBlock ) { uBlockUsed++; } if( uBlockUsed <= dwMaxBlock ) { /* Set the area used */ - lpMemArea[ uBlockUsed ].used = 1; + lpMemArea[ uBlockUsed ].used = TRUE; lpvArea = lpMemArea[ uBlockUsed ].data; } else

1 0

Frédéric Delanoy : shlwapi/tests: Use BOOL type where appropriate.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: b89f92181a0f681d012fb3637f7f5044c62a9d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b89f92181a0f681d012fb3637… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Feb 27 00:21:03 2014 +0100 shlwapi/tests: Use BOOL type where appropriate. --- dlls/shlwapi/tests/clsid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/clsid.c b/dlls/shlwapi/tests/clsid.c index cf9be96..e664f63 100644 --- a/dlls/shlwapi/tests/clsid.c +++ b/dlls/shlwapi/tests/clsid.c @@ -107,7 +107,7 @@ static void test_ClassIDs(void) DWORD dwLen; BOOL bRet; int i = 0; - int is_vista = 0; + BOOL is_vista = FALSE; if (!pSHLWAPI_269 || !pSHLWAPI_23) return; @@ -115,7 +115,7 @@ static void test_ClassIDs(void) while (*guids) { dwLen = pSHLWAPI_23(*guids, szBuff, 256); - if (!i && dwLen == S_OK) is_vista = 1; /* seems to return an HRESULT on vista */ + if (!i && dwLen == S_OK) is_vista = TRUE; /* seems to return an HRESULT on vista */ ok(dwLen == (is_vista ? S_OK : 39), "wrong size %u for id %d\n", dwLen, i); bRet = pSHLWAPI_269(szBuff, &guid);

1 0

Nikolay Sivov : dmime: COM cleanup of IDirectMusicSegmentState8 interface.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: 347da355bac706b2b77774c16c4ce410f9624007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=347da355bac706b2b77774c16… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 27 09:34:27 2014 +0400 dmime: COM cleanup of IDirectMusicSegmentState8 interface. --- dlls/dmime/dmime_private.h | 12 --- dlls/dmime/segmentstate.c | 193 ++++++++++++++++++++++++-------------------- 2 files changed, 107 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=347da355bac706b2b7777…

1 0

Piotr Caban : qcap/tests: Add more Avi Mux tests.
by Alexandre Julliard 26 Feb '14

26 Feb '14

Module: wine Branch: master Commit: f6986991be686f8ba3230ab8737e3d03140add63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6986991be686f8ba3230ab87… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 26 13:37:41 2014 +0100 qcap/tests: Add more Avi Mux tests. --- dlls/qcap/tests/qcap.c | 576 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 558 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6986991be686f8ba3230…

1 0

Piotr Caban : qcap/tests: Add option to save generated avi file.
by Alexandre Julliard 26 Feb '14

26 Feb '14

Module: wine Branch: master Commit: 99298f85e458e13cf9e9332e2a85b2e5f5958100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99298f85e458e13cf9e9332e2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 26 13:38:00 2014 +0100 qcap/tests: Add option to save generated avi file. --- dlls/qcap/tests/qcap.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 105c2f9..9479e5d 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1645,7 +1645,7 @@ static const IMediaSampleVtbl MediaSampleVtbl = { }; IMediaSample MediaSample = {&MediaSampleVtbl}; -static void test_AviMux(void) +static void test_AviMux(char *arg) { test_filter source_filter, sink_filter; VIDEOINFO videoinfo; @@ -1924,6 +1924,35 @@ static void test_AviMux(void) ref = IBaseFilter_Release(avimux); ok(ref == 0, "Avi Mux filter was not destroyed (%d)\n", ref); + if(arg && !strcmp(arg, "save")) { + LARGE_INTEGER li; + char buf[1024]; + ULONG read; + HANDLE *f; + + f = CreateFileA("avimux.avi", GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(f != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + + li.QuadPart = 0; + hr = IStream_Seek(avi_stream, li, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek failed: %x\n", hr); + + while(1) { + hr = IStream_Read(avi_stream, buf, sizeof(buf), &read); + if(FAILED(hr)) { + ok(0, "IStream_Read failed: %x\n", hr); + break; + } + if(!read) + break; + ok(WriteFile(f, buf, read, &read, NULL), "WriteFile failed\n"); + if(hr == S_FALSE) + break; + } + CloseHandle(f); + } + ref = IStream_Release(avi_stream); ok(ref == 0, "IStream was not destroyed (%d)\n", ref); } @@ -2045,10 +2074,15 @@ START_TEST(qcap) { if (SUCCEEDED(CoInitialize(NULL))) { + int arg_c; + char **arg_v; + + arg_c = winetest_get_mainargs(&arg_v); + test_smart_tee_filter(); test_CaptureGraphBuilder_RenderStream(); test_AviMux_QueryInterface(); - test_AviMux(); + test_AviMux(arg_c>2 ? arg_v[2] : NULL); test_AviCo(); CoUninitialize();

1 0