February 2014 - Wine-Commits

Frédéric Delanoy : start: Use BOOL type where appropriate.
by Alexandre Julliard Feb. 27, 2014

Feb. 27, 2014

Module: wine Branch: master Commit: c60e81b7c9ea937ae36c33ba7313487030c81555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c60e81b7c9ea937ae36c33ba7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Feb 27 15:33:27 2014 +0100 start: Use BOOL type where appropriate. --- programs/start/start.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index a27aad7..7bf8ea8 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -181,8 +181,8 @@ int wmain (int argc, WCHAR *argv[]) DWORD creation_flags; WCHAR *args = NULL; int i; - int unix_mode = 0; - int progid_open = 0; + BOOL unix_mode = FALSE; + BOOL progid_open = FALSE; WCHAR *title = NULL; WCHAR *dos_filename = NULL; WCHAR *parent_directory = NULL; @@ -313,10 +313,10 @@ int wmain (int argc, WCHAR *argv[]) /* Wine extensions */ else if (is_option(argv[i], unixW)) { - unix_mode = 1; + unix_mode = TRUE; } else if (is_option(argv[i], progIDOpenW)) { - progid_open = 1; + progid_open = TRUE; } else {

1 0

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

Feb. 27, 2014

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 Feb. 27, 2014

Feb. 27, 2014

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

Hans Leidekker : winspool: Add stub implementations of UploadPrinterDriverPackageA/W.
by Alexandre Julliard Feb. 27, 2014

Feb. 27, 2014

Module: wine Branch: master Commit: ec082c3102776f1f6a0e5a9a755bddb3d00a4982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec082c3102776f1f6a0e5a9a7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 27 13:26:25 2014 +0100 winspool: Add stub implementations of UploadPrinterDriverPackageA/W. --- dlls/winspool.drv/info.c | 22 ++++++++++++++++++++++ dlls/winspool.drv/winspool.drv.spec | 2 ++ include/winspool.h | 8 ++++++++ 3 files changed, 32 insertions(+) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index e554f94..e33b257 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -8569,3 +8569,25 @@ LPWSTR WINAPI StartDocDlgW( HANDLE hPrinter, DOCINFOW *doc ) } return ret; } + +/***************************************************************************** + * UploadPrinterDriverPackageA [WINSPOOL.@] + */ +HRESULT WINAPI UploadPrinterDriverPackageA( LPCSTR server, LPCSTR path, LPCSTR env, + DWORD flags, HWND hwnd, LPSTR dst, PULONG dstlen ) +{ + FIXME("%s, %s, %s, %x, %p, %p, %p\n", debugstr_a(server), debugstr_a(path), debugstr_a(env), + flags, hwnd, dst, dstlen); + return E_NOTIMPL; +} + +/***************************************************************************** + * UploadPrinterDriverPackageW [WINSPOOL.@] + */ +HRESULT WINAPI UploadPrinterDriverPackageW( LPCWSTR server, LPCWSTR path, LPCWSTR env, + DWORD flags, HWND hwnd, LPWSTR dst, PULONG dstlen ) +{ + FIXME("%s, %s, %s, %x, %p, %p, %p\n", debugstr_w(server), debugstr_w(path), debugstr_w(env), + flags, hwnd, dst, dstlen); + return E_NOTIMPL; +} diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index e83faec..b0d30b8 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -176,6 +176,8 @@ @ stdcall StartDocPrinterA(long long ptr) @ stdcall StartDocPrinterW(long long ptr) @ stdcall StartPagePrinter(long) +@ stdcall UploadPrinterDriverPackageA(str str str long long ptr ptr) +@ stdcall UploadPrinterDriverPackageW(wstr wstr wstr long long ptr ptr) @ stub WaitForPrinterChange @ stdcall WritePrinter(long ptr long ptr) @ stdcall XcvDataW(long wstr ptr long ptr long ptr ptr) diff --git a/include/winspool.h b/include/winspool.h index 4648ec4..42097fb 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -297,6 +297,10 @@ extern "C" { #define DSPRINT_REPUBLISH 0x00000008 #define DSPRINT_PENDING 0x80000000 +#define UPDP_SILENT_UPLOAD 0x00000001 +#define UPDP_UPLOAD_ALWAYS 0x00000002 +#define UPDP_CHECK_DRIVERSTORE 0x00000004 + /* ##################################### */ /* TYPES */ @@ -1801,6 +1805,10 @@ LPSTR WINAPI StartDocDlgA(HANDLE hPrinter, DOCINFOA *doc); LPWSTR WINAPI StartDocDlgW(HANDLE hPrinter, DOCINFOW *doc); #define StartDocDlg WINELIB_NAME_AW(StartDocDlg) +HRESULT WINAPI UploadPrinterDriverPackageA(LPCSTR,LPCSTR,LPCSTR,DWORD,HWND,LPSTR,PULONG); +HRESULT WINAPI UploadPrinterDriverPackageW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,HWND,LPWSTR,PULONG); +#define UploadPrinterDriverPackage WINELIB_NAME_AW(UploadPrinterDriverPackage) + BOOL WINAPI XcvDataW(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded, PDWORD pdwStatus);

1 0

Aric Stewart : shell32: Improve the FO_MOVE operation.
by Alexandre Julliard Feb. 27, 2014

Feb. 27, 2014

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

Francois Gouget : ddraw/tests: Simplify the 'NT4 testbot' special case a bit.
by Alexandre Julliard Feb. 27, 2014

Feb. 27, 2014

Module: wine Branch: master Commit: af0bf54bd0b9e7f1f9d93054116ffb7c2cb2e8bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=af0bf54bd0b9e7f1f9d930541… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 27 02:13:01 2014 +0100 ddraw/tests: Simplify the 'NT4 testbot' special case a bit. --- dlls/ddraw/tests/ddraw1.c | 10 ++++------ dlls/ddraw/tests/ddraw2.c | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 66a2662..3f8d2bd 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2316,15 +2316,14 @@ static void test_coop_level_mode_set(void) screen_size.cy = 0; hr = IDirectDraw_SetDisplayMode(ddraw, 640, 480, 32); - ok(SUCCEEDED(hr) || broken(hr == DDERR_NOEXCLUSIVEMODE) /* NT4 testbot */, - "SetDisplayMode failed, hr %#x.\n", hr); - if (hr == DDERR_NOEXCLUSIVEMODE) + if (hr == DDERR_NOEXCLUSIVEMODE /* NT4 testbot */) { win_skip("Broken SetDisplayMode(), skipping remaining tests.\n"); IDirectDrawSurface_Release(primary); IDirectDraw_Release(ddraw); goto done; } + ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; @@ -2593,15 +2592,14 @@ static void test_coop_level_mode_set_multi(void) /* With just a single ddraw object, the display mode is restored on * release. */ hr = IDirectDraw_SetDisplayMode(ddraw1, 800, 600, 32); - ok(SUCCEEDED(hr) || broken(hr == DDERR_NOEXCLUSIVEMODE) /* NT4 testbot */, - "SetDisplayMode failed, hr %#x.\n", hr); - if (hr == DDERR_NOEXCLUSIVEMODE) + if (hr == DDERR_NOEXCLUSIVEMODE /* NT4 testbot */) { win_skip("Broken SetDisplayMode(), skipping test.\n"); IDirectDraw_Release(ddraw1); DestroyWindow(window); return; } + ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); w = GetSystemMetrics(SM_CXSCREEN); ok(w == 800, "Got unexpected screen width %u.\n", w); h = GetSystemMetrics(SM_CYSCREEN); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2a69a2f..3aca6e2 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2527,15 +2527,14 @@ static void test_coop_level_mode_set(void) screen_size.cy = 0; hr = IDirectDraw2_SetDisplayMode(ddraw, 640, 480, 32, 0, 0); - ok(SUCCEEDED(hr) || broken(hr == DDERR_NOEXCLUSIVEMODE) /* NT4 testbot */, - "SetDisplayMode failed, hr %#x.\n", hr); - if (hr == DDERR_NOEXCLUSIVEMODE) + if (hr == DDERR_NOEXCLUSIVEMODE /* NT4 testbot */) { win_skip("Broken SetDisplayMode(), skipping remaining tests.\n"); IDirectDrawSurface_Release(primary); IDirectDraw2_Release(ddraw); goto done; } + ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); expect_messages = NULL; @@ -2893,15 +2892,14 @@ static void test_coop_level_mode_set_multi(void) /* With just a single ddraw object, the display mode is restored on * release. */ hr = IDirectDraw2_SetDisplayMode(ddraw1, 800, 600, 32, 0, 0); - ok(SUCCEEDED(hr) || broken(hr == DDERR_NOEXCLUSIVEMODE) /* NT4 testbot */, - "SetDisplayMode failed, hr %#x.\n", hr); - if (hr == DDERR_NOEXCLUSIVEMODE) + if (hr == DDERR_NOEXCLUSIVEMODE /* NT4 testbot */) { win_skip("Broken SetDisplayMode(), skipping test.\n"); IDirectDraw2_Release(ddraw1); DestroyWindow(window); return; } + ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); w = GetSystemMetrics(SM_CXSCREEN); ok(w == 800, "Got unexpected screen width %u.\n", w); h = GetSystemMetrics(SM_CYSCREEN);

1 0

Jacek Caban : wmp: Added version info resources.
by Alexandre Julliard Feb. 27, 2014

Feb. 27, 2014

Module: wine Branch: master Commit: 28d3d7a02671afb530533d63978093e7c5be4dc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28d3d7a02671afb530533d639… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 27 16:36:21 2014 +0100 wmp: Added version info resources. --- dlls/wmp/rsrc.rc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wmp/rsrc.rc b/dlls/wmp/rsrc.rc index cc6c199..ced1a64 100644 --- a/dlls/wmp/rsrc.rc +++ b/dlls/wmp/rsrc.rc @@ -22,3 +22,12 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: wmp.rgs */ 2 WINE_REGISTRY wmp.rgs + +#define WINE_FILEDESCRIPTION_STR "Wine Media Player" +#define WINE_FILENAME_STR "wmp.dll" +#define WINE_FILEVERSION 12,0,7601,16982 +#define WINE_FILEVERSION_STR "12.0.7601.16982" +#define WINE_PRODUCTVERSION 12,0,7601,16982 +#define WINE_PRODUCTVERSION_STR "12.0.7601.16982" + +#include "wine/wine_common_ver.rc"

1 0

Jacek Caban : urlmon: Fixed url.c tests on IE11.
by Alexandre Julliard Feb. 27, 2014

Feb. 27, 2014

Module: wine Branch: master Commit: f88b51731f90242f808788740cc8e7ca3101e928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f88b51731f90242f808788740… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 27 16:36:10 2014 +0100 urlmon: Fixed url.c tests on IE11. --- dlls/urlmon/tests/url.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 98e5187..1b32f34 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -42,6 +42,7 @@ static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b); +static const IID IID_undocumentedIE11 = {0xd5ae15f6,0x2032,0x488e,{0x8f,0x96,0xf9,0x24,0x06,0xd8,0xd8,0xb4}}; extern CLSID CLSID_AboutProtocol; #define DEFINE_EXPECT(func) \ @@ -88,7 +89,6 @@ DEFINE_EXPECT(QueryInterface_IHttpNegotiate); DEFINE_EXPECT(QueryInterface_IBindStatusCallback); DEFINE_EXPECT(QueryInterface_IBindStatusCallbackEx); DEFINE_EXPECT(QueryInterface_IBindStatusCallbackHolder); -DEFINE_EXPECT(QueryInterface_IInternetBindInfo); DEFINE_EXPECT(QueryInterface_IAuthenticate); DEFINE_EXPECT(QueryInterface_IInternetProtocol); DEFINE_EXPECT(QueryInterface_IWindowForBindingUI); @@ -694,11 +694,9 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, static const WCHAR wszMimes[] = {'*','/','*',0}; - SET_EXPECT(QueryInterface_IInternetBindInfo); SET_EXPECT(QueryService_IInternetBindInfo); hres = IInternetBindInfo_GetBindString(pOIBindInfo, BINDSTRING_USER_AGENT, &ua, 1, &fetched); - CLEAR_CALLED(QueryInterface_IInternetBindInfo); /* IE <8 */ CLEAR_CALLED(QueryService_IInternetBindInfo); /* IE <8 */ ok(hres == E_NOINTERFACE, @@ -1437,6 +1435,12 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, return E_NOINTERFACE; } + if(IsEqualGUID(&IID_undocumentedIE11, guidService)) { + trace("QueryService(IID_undocumentedIE11)\n"); + *ppv = NULL; + return E_NOINTERFACE; + } + ok(0, "unexpected service %s\n", wine_dbgstr_guid(guidService)); return E_NOINTERFACE; } @@ -1543,7 +1547,6 @@ static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallbackEx *iface, REF return S_OK; }else if(IsEqualGUID(&IID_IInternetBindInfo, riid)) { /* TODO */ - CHECK_EXPECT2(QueryInterface_IInternetBindInfo); }else if(IsEqualGUID(&IID_IWindowForBindingUI, riid)) { CHECK_EXPECT2(QueryInterface_IWindowForBindingUI); return E_NOINTERFACE; @@ -1558,6 +1561,10 @@ static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallbackEx *iface, REF trace("QI(IID_undocumentedIE10)\n"); *ppv = NULL; return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_undocumentedIE11, riid)) { + trace("QI(IID_undocumentedIE11)\n"); + *ppv = NULL; + return E_NOINTERFACE; }else { ok(0, "unexpected interface %s\n", wine_dbgstr_guid(riid)); } @@ -2950,7 +2957,6 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) SET_EXPECT(UnlockRequest); }else { if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST) { - SET_EXPECT(QueryInterface_IInternetBindInfo); SET_EXPECT(QueryService_IInternetBindInfo); if(!abort_start) SET_EXPECT(QueryInterface_IHttpNegotiate); @@ -3082,7 +3088,7 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) } if(emulate_protocol) { if(is_urlmon_protocol(test_protocol)) - CHECK_CALLED(SetPriority); + CLEAR_CALLED(SetPriority); /* Not called by IE11 */ CHECK_CALLED(Start); if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST || test_protocol == WINETEST_SYNC_TEST) { @@ -3094,7 +3100,6 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) CHECK_CALLED(UnlockRequest); }else { if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST) { - CLEAR_CALLED(QueryInterface_IInternetBindInfo); CLEAR_CALLED(QueryService_IInternetBindInfo); if(!abort_start) CHECK_CALLED(QueryInterface_IHttpNegotiate); @@ -3335,7 +3340,7 @@ static void test_BindToObject(int protocol, DWORD flags, HRESULT exhres) CHECK_CALLED(Obj_OnStartBinding); if(emulate_protocol) { if(is_urlmon_protocol(test_protocol)) - CHECK_CALLED(SetPriority); + CLEAR_CALLED(SetPriority); /* Not called by IE11 */ CHECK_CALLED(Start); if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST) CHECK_CALLED(Terminate); @@ -3415,10 +3420,9 @@ static void test_URLDownloadToFile(DWORD prot, BOOL emul) SET_EXPECT(GetBindInfo); SET_EXPECT(QueryInterface_IInternetProtocol); - if(!emulate_protocol) { - SET_EXPECT(QueryInterface_IServiceProvider); + SET_EXPECT(QueryInterface_IServiceProvider); + if(!emulate_protocol) SET_EXPECT(QueryService_IInternetProtocol); - } SET_EXPECT(OnStartBinding); if(emulate_protocol) { if(is_urlmon_protocol(test_protocol)) @@ -3458,11 +3462,13 @@ static void test_URLDownloadToFile(DWORD prot, BOOL emul) if(!emulate_protocol) { CHECK_CALLED(QueryInterface_IServiceProvider); CHECK_CALLED(QueryService_IInternetProtocol); + }else { + CLEAR_CALLED(QueryInterface_IServiceProvider); } CHECK_CALLED(OnStartBinding); if(emulate_protocol) { if(is_urlmon_protocol(test_protocol)) - CHECK_CALLED(SetPriority); + CLEAR_CALLED(SetPriority); /* Not called by IE11 */ CHECK_CALLED(Start); CHECK_CALLED(UnlockRequest); }else { @@ -3715,7 +3721,7 @@ static void test_ReportResult(HRESULT exhres) CHECK_CALLED(QueryInterface_IInternetProtocol); CHECK_CALLED(OnStartBinding); if(is_urlmon_protocol(test_protocol)) - CHECK_CALLED(SetPriority); + CLEAR_CALLED(SetPriority); /* Not called by IE11 */ CHECK_CALLED(Start); ok(unk == NULL, "unk=%p\n", unk);

1 0

Piotr Caban : user32: Check WS_CHILD style in IsChild function.
by Alexandre Julliard Feb. 27, 2014

Feb. 27, 2014

Module: wine Branch: master Commit: 367577c0d67c6cbca3d35c6ad119cbf7502c991d URL: http://source.winehq.org/git/wine.git/?a=commit;h=367577c0d67c6cbca3d35c6ad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 26 15:40:00 2014 +0100 user32: Check WS_CHILD style in IsChild function. --- dlls/user32/tests/win.c | 13 +++++++++++++ dlls/user32/win.c | 18 +++++++++++++----- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 3c63c8a..d693172 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3675,6 +3675,19 @@ static void test_SetParent(void) ok(SetParent(sibling, parent) != 0, "SetParent should not fail\n"); ok(GetMenu(sibling) == hMenu, "SetParent should not remove menu\n"); + ok(SetParent(parent, desktop) != 0, "SetParent should not fail\n"); + ok(SetParent(child4, child3) != 0, "SetParent should not fail\n"); + ok(SetParent(child3, child2) != 0, "SetParent should not fail\n"); + ok(SetParent(child2, child1) != 0, "SetParent should not fail\n"); + ok(!IsChild(child3, child4), "wrong parent/child %p/%p\n", child3, child4); + SetWindowLongW(child4, GWL_STYLE, WS_CHILD); + ok(IsChild(child3, child4), "wrong parent/child %p/%p\n", child3, child4); + ok(IsChild(child2, child4), "wrong parent/child %p/%p\n", child2, child4); + ok(!IsChild(child1, child4), "wrong parent/child %p/%p\n", child1, child4); + SetWindowLongW(child2, GWL_STYLE, WS_CHILD); + ok(IsChild(child1, child4), "wrong parent/child %p/%p\n", child1, child4); + ok(IsChild(parent, child4), "wrong parent/child %p/%p\n", parent, child4); + ok(DestroyWindow(parent), "DestroyWindow() failed\n"); ok(!IsWindow(parent), "parent still exists\n"); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d60427f..29f2365 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3043,14 +3043,22 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) */ BOOL WINAPI IsChild( HWND parent, HWND child ) { - HWND *list = list_window_parents( child ); + HWND *list; int i; - BOOL ret; + BOOL ret = FALSE; - if (!list) return FALSE; + if (!(GetWindowLongW( child, GWL_STYLE ) & WS_CHILD)) return FALSE; + if (!(list = list_window_parents( child ))) return FALSE; parent = WIN_GetFullHandle( parent ); - for (i = 0; list[i]; i++) if (list[i] == parent) break; - ret = list[i] && list[i+1]; + for (i = 0; list[i]; i++) + { + if (list[i] == parent) + { + ret = list[i] && list[i+1]; + break; + } + if (!(GetWindowLongW( list[i], GWL_STYLE ) & WS_CHILD)) break; + } HeapFree( GetProcessHeap(), 0, list ); return ret; }

1 0

Hans Leidekker : msi: Correctly [un] register progids when associated class and extensions change state.
by Alexandre Julliard Feb. 27, 2014

Feb. 27, 2014

Module: wine Branch: master Commit: a547027b0199ffa96165b75012d23c4ab64f3b30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a547027b0199ffa96165b7501… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 27 11:03:48 2014 +0100 msi: Correctly [un]register progids when associated class and extensions change state. --- dlls/msi/classes.c | 124 +++++++++++++++++++++++------------------------ dlls/msi/msipriv.h | 1 - dlls/msi/tests/action.c | 30 +++++++++--- 3 files changed, 86 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a547027b0199ffa96165b…

1 0