January 2022 - Wine-commits

Fabian Maurer : schedsvc/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 55741aead378c8ee4e6cd8f6bbbf187332533f7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=55741aead378c8ee4e6cd8f6… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:45 2022 +0100 schedsvc/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/tests/rpcapi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index a8f75ded7a5..09523df4fd6 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -493,15 +493,15 @@ START_TEST(rpcapi) ok(state == TASK_STATE_DISABLED, "expected TASK_STATE_DISABLED, got %u\n", state); hr = SchRpcEnableTask(L"\\Wine\\Task1", 0xdeadbeef); -todo_wine + todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); enabled = state = 0xdeadbeef; hr = SchRpcGetTaskInfo(L"\\Wine\\Task1", SCH_FLAG_STATE, &enabled, &state); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -todo_wine + todo_wine ok(enabled == 1, "expected 1, got %u\n", enabled); -todo_wine + todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %u\n", state); hr = SchRpcDelete(L"Wine\\Task1", 0);

1 0

Fabian Maurer : scrrun/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: ea58b3dbe90c6ec280c4b469f9b2137e8a77b3f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea58b3dbe90c6ec280c4b469… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:46 2022 +0100 scrrun/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/dictionary.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 4259bc71c8e..d20456a5096 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -769,8 +769,8 @@ static void test_Exists(void) &IID_IDictionary, (void**)&dict); ok(hr == S_OK, "got 0x%08x\n", hr); -if (0) /* crashes on native */ - hr = IDictionary_Exists(dict, NULL, NULL); + if (0) /* crashes on native */ + hr = IDictionary_Exists(dict, NULL, NULL); V_VT(&key) = VT_I2; V_I2(&key) = 0; @@ -875,8 +875,8 @@ static void test_Remove(void) &IID_IDictionary, (void**)&dict); ok(hr == S_OK, "got 0x%08x\n", hr); -if (0) - hr = IDictionary_Remove(dict, NULL); + if (0) + hr = IDictionary_Remove(dict, NULL); /* nothing added yet */ V_VT(&key) = VT_R4;

1 0

Fabian Maurer : secur32/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 362802c49abfcd350d361942057df29ae123861a URL: https://source.winehq.org/git/wine.git/?a=commit;h=362802c49abfcd350d361942… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:47 2022 +0100 secur32/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index abddfa138ab..028e1e933dc 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -1074,9 +1074,9 @@ static void test_communication(void) status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); -todo_wine + todo_wine ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status); -todo_wine + todo_wine ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); buffers[1].cBuffers = 1;

1 0

Fabian Maurer : setupapi/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 87acd4021848afffc4c2060c0494db1045c060d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87acd4021848afffc4c2060c… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:48 2022 +0100 setupapi/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 35823788605..91eaba84a3c 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -121,7 +121,7 @@ static void test_open_class_key(void) SetLastError(0xdeadbeef); class_key = SetupDiOpenClassRegKeyExA(&guid, KEY_ALL_ACCESS, DIOCR_INSTALLER, NULL, NULL); ok(class_key == INVALID_HANDLE_VALUE, "Expected failure.\n"); -todo_wine + todo_wine ok(GetLastError() == ERROR_INVALID_CLASS, "Got unexpected error %#x.\n", GetLastError()); root_key = SetupDiOpenClassRegKey(NULL, KEY_ALL_ACCESS); @@ -1567,7 +1567,7 @@ static void test_registry_property_a(void) SetLastError(0xdeadbeef); ret = SetupDiSetDeviceRegistryPropertyA(set, &device, -1, NULL, 0); ok(!ret, "Expected failure.\n"); -todo_wine + todo_wine ok(GetLastError() == ERROR_INVALID_REG_PROPERTY, "Got unexpected error %#x.\n", GetLastError()); ret = SetupDiSetDeviceRegistryPropertyA(set, &device, SPDRP_FRIENDLYNAME, NULL, 0); @@ -1592,7 +1592,7 @@ todo_wine SetLastError(0xdeadbeef); ret = SetupDiGetDeviceRegistryPropertyA(set, &device, -1, NULL, NULL, 0, NULL); ok(!ret, "Expected failure.\n"); -todo_wine + todo_wine ok(GetLastError() == ERROR_INVALID_REG_PROPERTY, "Got unexpected error %#x.\n", GetLastError()); ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_FRIENDLYNAME, NULL, NULL, sizeof("Bogus"), NULL); @@ -1727,7 +1727,7 @@ static void test_registry_property_w(void) SetLastError(0xdeadbeef); ret = SetupDiSetDeviceRegistryPropertyW(set, &device, -1, NULL, 0); ok(!ret, "Expected failure.\n"); -todo_wine + todo_wine ok(GetLastError() == ERROR_INVALID_REG_PROPERTY, "Got unexpected error %#x.\n", GetLastError()); ret = SetupDiSetDeviceRegistryPropertyW(set, &device, SPDRP_FRIENDLYNAME, NULL, 0); @@ -1752,7 +1752,7 @@ todo_wine SetLastError(0xdeadbeef); ret = SetupDiGetDeviceRegistryPropertyW(set, &device, -1, NULL, NULL, 0, NULL); ok(!ret, "Expected failure.\n"); -todo_wine + todo_wine ok(GetLastError() == ERROR_INVALID_REG_PROPERTY, "Got unexpected error %#x.\n", GetLastError()); ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_FRIENDLYNAME, NULL, NULL, sizeof(buf), NULL);

1 0

Fabian Maurer : shell32/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: f94e3d183cbf81129e604be2b904f6e3f990a42c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f94e3d183cbf81129e604be2… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:49 2022 +0100 shell32/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/appbar.c | 2 +- dlls/shell32/tests/shelldispatch.c | 12 ++++++------ dlls/shell32/tests/shelllink.c | 10 +++++----- dlls/shell32/tests/shlfolder.c | 22 +++++++++++----------- dlls/shell32/tests/shlview.c | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index 229d616c6f0..e1c050bbc16 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -431,7 +431,7 @@ static void test_GetCurrentProcessExplicitAppUserModelID(void) appid = (void*)0xdeadbeef; hr = pGetCurrentProcessExplicitAppUserModelID(&appid); -todo_wine + todo_wine ok(hr == E_FAIL, "got 0x%08x\n", hr); ok(appid == NULL, "got %p\n", appid); } diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 8e69a0bfa4e..f243ba053d0 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -781,16 +781,16 @@ static void test_items(void) } r = FolderItems__NewEnum(items, &unk); -todo_wine + todo_wine ok(r == S_OK, "FolderItems::_NewEnum failed: %08x\n", r); -todo_wine + todo_wine ok(!!unk, "unk is null\n"); if (unk) IUnknown_Release(unk); if (items3) { r = FolderItems3_Filter(items3, 0, NULL); -todo_wine + todo_wine ok(r == S_OK, "expected S_OK, got %08x\n", r); if (0) /* crashes on xp */ @@ -800,7 +800,7 @@ todo_wine } r = FolderItems3_get_Verbs(items3, &verbs); -todo_wine + todo_wine ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); ok(!verbs, "verbs is not null\n"); } @@ -1137,7 +1137,7 @@ static void test_ShellWindows(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IWebBrowser2_Refresh(wb); -todo_wine + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IWebBrowser2_get_Application(wb, &app); @@ -1219,7 +1219,7 @@ if (hr == S_OK) { V_I4(&v) = cookie; VariantInit(&v2); hr = IShellWindows_FindWindowSW(shellwindows, &v, &v2, SWC_BROWSER, &ret, SWFO_COOKIEPASSED, &disp); -todo_wine + todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(disp == NULL, "got %p\n", disp); ok(ret == 0, "got %d\n", ret); diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index edd536c3a01..5caebcd776c 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -1181,7 +1181,7 @@ static void test_ExtractIcon(void) /* specified instance handle */ hicon = ExtractIconA(GetModuleHandleA("shell32.dll"), NULL, 0); -todo_wine + todo_wine ok(hicon == NULL, "Got icon %p\n", hicon); hicon2 = ExtractIconA(GetModuleHandleA("shell32.dll"), "shell32.dll", -1); ok(hicon2 != NULL, "Got icon %p\n", hicon2); @@ -1207,14 +1207,14 @@ todo_wine CloseHandle(file); hicon = ExtractIconA(NULL, path, 0); -todo_wine + todo_wine ok(hicon == NULL, "Got icon %p\n", hicon); hicon = ExtractIconA(NULL, path, -1); ok(hicon == NULL, "Got icon %p\n", hicon); hicon = ExtractIconA(NULL, path, 1); -todo_wine + todo_wine ok(hicon == NULL, "Got icon %p\n", hicon); r = DeleteFileA(path); @@ -1255,14 +1255,14 @@ if (0) CloseHandle(file); hicon = ExtractIconW(NULL, pathW, 0); -todo_wine + todo_wine ok(hicon == NULL, "Got icon %p\n", hicon); hicon = ExtractIconW(NULL, pathW, -1); ok(hicon == NULL, "Got icon %p\n", hicon); hicon = ExtractIconW(NULL, pathW, 1); -todo_wine + todo_wine ok(hicon == NULL, "Got icon %p\n", hicon); r = DeleteFileW(pathW); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 29fcd0b7754..f593f8b821d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -208,7 +208,7 @@ static void test_ParseDisplayName(void) for (i = 0; i < ARRAY_SIZE(parse_tests); i++) { hr = IShellFolder_ParseDisplayName(desktop, NULL, NULL, parse_tests[i].path, NULL, &pidl, NULL); -todo_wine_if(parse_tests[i].todo) + todo_wine_if(parse_tests[i].todo) ok(hr == parse_tests[i].hr, "%s: expected %#x, got %#x\n", wine_dbgstr_w(parse_tests[i].path), parse_tests[i].hr, hr); if (SUCCEEDED(hr)) @@ -4334,16 +4334,16 @@ static void test_contextmenu_qi(IContextMenu *menu, BOOL todo) HRESULT hr; hr = IContextMenu_QueryInterface(menu, &IID_IShellExtInit, (void **)&unk); -todo_wine_if(todo) + todo_wine_if(todo) ok(hr == S_OK, "Failed to get IShellExtInit, hr %#x.\n", hr); -if (hr == S_OK) - IUnknown_Release(unk); + if (hr == S_OK) + IUnknown_Release(unk); hr = IContextMenu_QueryInterface(menu, &IID_IObjectWithSite, (void **)&unk); -todo_wine_if(todo) + todo_wine_if(todo) ok(hr == S_OK, "Failed to get IShellExtInit, hr %#x.\n", hr); -if (hr == S_OK) - IUnknown_Release(unk); + if (hr == S_OK) + IUnknown_Release(unk); } static void test_contextmenu(IContextMenu *menu, BOOL background) @@ -4418,7 +4418,7 @@ static void test_contextmenu(IContextMenu *menu, BOOL background) /* Attempt to execute a nonexistent command */ cmi.lpVerb = MAKEINTRESOURCEA(9999); hr = IContextMenu_InvokeCommand(menu, &cmi); - todo_wine_if(background) + todo_wine_if(background) ok(hr == E_INVALIDARG, "Got 0x%08x\n", hr); cmi.lpVerb = "foobar_wine_test"; @@ -5290,18 +5290,18 @@ static void test_SHLimitInputEdit(void) ok(hr == S_OK, "Failed to get desktop folder, hr %#x.\n", hr); hr = SHLimitInputEdit(NULL, desktop); -todo_wine + todo_wine ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); hwnd = CreateWindowA("EDIT", NULL, WS_VISIBLE, 0, 0, 100, 30, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "Failed to create Edit control.\n"); hr = SHLimitInputEdit(hwnd, desktop); -todo_wine + todo_wine ok(hr == S_OK, "Failed to set input limits, hr %#x.\n", hr); hr = SHLimitInputEdit(hwnd, desktop); -todo_wine + todo_wine ok(hr == S_OK, "Failed to set input limits, hr %#x.\n", hr); DestroyWindow(hwnd); diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index f5d96c8d441..48ba72a4c0e 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1479,7 +1479,7 @@ static void test_newmenu(void) HRESULT hr; hr = CoCreateInstance(&CLSID_NewMenu, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); -todo_wine + todo_wine ok(hr == S_OK, "Failed to create NewMenu object, hr %#x.\n", hr); if (hr != S_OK) {

1 0

Fabian Maurer : shlwapi/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 9f2fab6cd66c1a052abeb82a1eb23c1f6e4904ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f2fab6cd66c1a052abeb82a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:50 2022 +0100 shlwapi/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/istream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 84957ac8cd1..4894eabdf50 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -810,7 +810,7 @@ static void test_SHCreateMemStream(void) ok(num == 0, "expected 0, got 0x%08x\n", num); hr = IStream_Clone(stream, &stream2); -todo_wine + todo_wine ok(hr == S_OK || broken(hr == E_NOTIMPL) /* < Win8 */, "Failed to clone a stream, hr %#x.\n", hr); if (hr == S_OK) IStream_Release(stream2);

1 0

Fabian Maurer : taskschd/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 9c3d06e54c1675d843835b5e6827c671896aceaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c3d06e54c1675d843835b5e… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:56 2022 +0100 taskschd/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/tests/scheduler.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index c03ecd35b97..e7b39e5fdaf 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -151,11 +151,11 @@ static void test_GetFolder(void) ok(hr == S_OK, "Connect error %#x\n", hr); hr = ITaskService_GetFolder(service, slash, &folder); -todo_wine + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskService_GetFolder(service, dot, &folder); -todo_wine + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* win7 */, "expected ERROR_INVALID_NAME, got %#x\n", hr); @@ -198,7 +198,7 @@ todo_wine ITaskFolder_DeleteFolder(folder, Wine, 0); hr = ITaskFolder_CreateFolder(folder, slash, v_null, &subfolder); -todo_wine + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskService_GetFolder(service, Wine_Folder1_Folder2, &subfolder); @@ -206,7 +206,7 @@ todo_wine "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, bslash, v_null, &subfolder); -todo_wine + todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, Wine_Folder1_Folder2, v_null, &subfolder); @@ -360,7 +360,7 @@ todo_wine ok(hr == E_ACCESSDENIED || hr == E_INVALIDARG /* Vista */, "expected E_ACCESSDENIED, got %#x\n", hr); hr = ITaskFolder_DeleteFolder(folder, slash, 0); -todo_wine + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); ITaskFolder_Release(folder); @@ -799,7 +799,7 @@ static void test_GetTask(void) ok(hr == S_OK, "RegisterTask error %#x\n", hr); hr = ITaskFolder_RegisterTask(root, Wine, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); -todo_wine + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || broken(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS)) /* Vista */, "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); @@ -860,11 +860,11 @@ todo_wine SysFreeString(bstr); hr = IRegisteredTask_get_State(task2, &state); ok(hr == S_OK, "get_State error %#x\n", hr); -todo_wine + todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task2, &vbool); ok(hr == S_OK, "get_Enabled error %#x\n", hr); -todo_wine + todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); IRegisteredTask_Release(task2); @@ -897,11 +897,11 @@ todo_wine ok(hr == S_OK, "put_Enabled error %#x\n", hr); hr = IRegisteredTask_get_State(task1, &state); ok(hr == S_OK, "get_State error %#x\n", hr); -todo_wine + todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task1, &vbool); ok(hr == S_OK, "get_Enabled error %#x\n", hr); -todo_wine + todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); IRegisteredTask_Release(task1); @@ -919,11 +919,11 @@ todo_wine SysFreeString(bstr); hr = IRegisteredTask_get_State(task2, &state); ok(hr == S_OK, "get_State error %#x\n", hr); -todo_wine + todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %d\n", state); hr = IRegisteredTask_get_Enabled(task2, &vbool); ok(hr == S_OK, "get_Enabled error %#x\n", hr); -todo_wine + todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); hr = IRegisteredTask_get_State(task2, NULL); @@ -934,7 +934,7 @@ todo_wine IRegisteredTask_Release(task2); hr = ITaskFolder_DeleteTask(folder, NULL, 0); -todo_wine + todo_wine 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); @@ -1592,7 +1592,7 @@ static void test_TaskDefinition(void) MultiByteToWideChar(CP_ACP, 0, xml3, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); -todo_wine + todo_wine ok(hr == SCHED_E_UNEXPECTEDNODE, "expected SCHED_E_UNEXPECTEDNODE, got %#x\n", hr); MultiByteToWideChar(CP_ACP, 0, xml4, -1, xmlW, ARRAY_SIZE(xmlW)); @@ -1601,7 +1601,7 @@ todo_wine MultiByteToWideChar(CP_ACP, 0, xml5, -1, xmlW, ARRAY_SIZE(xmlW)); hr = ITaskDefinition_put_XmlText(taskdef, xmlW); -todo_wine + todo_wine ok(hr == SCHED_E_MISSINGNODE, "expected SCHED_E_MISSINGNODE, got %#x\n", hr); MultiByteToWideChar(CP_ACP, 0, xml6, -1, xmlW, ARRAY_SIZE(xmlW)); @@ -1703,10 +1703,10 @@ todo_wine V_VT(&var) = VT_BSTR; V_BSTR(&var) = NULL; hr = IRegistrationInfo_get_SecurityDescriptor(reginfo, &var); -todo_wine + todo_wine ok(hr == S_OK, "get_SecurityDescriptor error %#x\n", hr); -if (hr == S_OK) - ok(V_VT(&var) == VT_EMPTY, "expected VT_EMPTY, got %u\n", V_VT(&var)); + if (hr == S_OK) + ok(V_VT(&var) == VT_EMPTY, "expected VT_EMPTY, got %u\n", V_VT(&var)); IRegistrationInfo_Release(reginfo);

1 0

Fabian Maurer : user32/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: c02787443960921e5b680aeb126015746d13c822 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c02787443960921e5b680aeb… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:57 2022 +0100 user32/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/combo.c | 2 +- dlls/user32/tests/dde.c | 4 +- dlls/user32/tests/dialog.c | 16 +-- dlls/user32/tests/listbox.c | 2 +- dlls/user32/tests/msg.c | 20 ++-- dlls/user32/tests/win.c | 232 ++++++++++++++++++++--------------------- dlls/user32/tests/winstation.c | 12 +-- 7 files changed, 144 insertions(+), 144 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c02787443960921e5b68…

1 0

Fabian Maurer : uxtheme/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 0e655043a2439e93a424c65710cc0d9e4661d3d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e655043a2439e93a424c657… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 29 00:36:58 2022 +0100 uxtheme/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index afc05b8549f..980676f9e57 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -885,11 +885,11 @@ static void test_buffered_paint(void) /* clearing */ hr = pBufferedPaintClear(NULL, NULL); -todo_wine + todo_wine ok(hr == E_FAIL, "Unexpected return code %#x\n", hr); hr = pBufferedPaintClear(buffer, NULL); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected return code %#x\n", hr); /* access buffer attributes */

1 0

Alexandre Julliard : vkd3d-shader: Consistently use uint32_t for pointers to shader data.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: vkd3d Branch: master Commit: e21928f6ee026b2ec12ce70f37c220bf774b1c83 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e21928f6ee026b2ec12ce70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 31 11:51:03 2022 +0100 vkd3d-shader: Consistently use uint32_t for pointers to shader data. Mixing uint32_t and DWORD pointers causes warnings on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 50 ++++++++++++++++---------------- libs/vkd3d-shader/vkd3d_shader_private.h | 4 +-- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 4d37731..d28c303 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -87,7 +87,7 @@ struct vkd3d_shader_src_param_entry struct vkd3d_shader_sm4_parser { - const DWORD *start, *end; + const uint32_t *start, *end; unsigned int output_map[MAX_REG_OUTPUT]; @@ -252,7 +252,7 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, u { struct vkd3d_shader_semantic *semantic = &ins->declaration.semantic; enum vkd3d_sm4_resource_type resource_type; - const DWORD *end = &tokens[token_count]; + const uint32_t *end = &tokens[token_count]; enum vkd3d_sm4_data_type data_type; enum vkd3d_data_type reg_data_type; DWORD components; @@ -297,7 +297,7 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, u static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction *ins, uint32_t opcode, uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { - const DWORD *end = &tokens[token_count]; + const uint32_t *end = &tokens[token_count]; shader_sm4_read_src_param(priv, &tokens, end, VKD3D_DATA_FLOAT, &ins->declaration.cb.src); shader_sm4_set_descriptor_register_range(priv, &ins->declaration.cb.src.reg, &ins->declaration.cb.range); @@ -323,7 +323,7 @@ static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction static void shader_sm4_read_dcl_sampler(struct vkd3d_shader_instruction *ins, uint32_t opcode, uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { - const DWORD *end = &tokens[token_count]; + const uint32_t *end = &tokens[token_count]; ins->flags = (opcode_token & VKD3D_SM4_SAMPLER_MODE_MASK) >> VKD3D_SM4_SAMPLER_MODE_SHIFT; if (ins->flags & ~VKD3D_SM4_SAMPLER_COMPARISON) @@ -342,7 +342,7 @@ static void shader_sm4_read_dcl_index_range(struct vkd3d_shader_instruction *ins } static void shader_sm4_read_dcl_output_topology(struct vkd3d_shader_instruction *ins, uint32_t opcode, - uint32_t opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { enum vkd3d_sm4_output_primitive_type primitive_type; @@ -495,7 +495,7 @@ static void shader_sm5_read_dcl_hs_max_tessfactor(struct vkd3d_shader_instructio } static void shader_sm5_read_dcl_thread_group(struct vkd3d_shader_instruction *ins, uint32_t opcode, - uint32_t opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { ins->declaration.thread_group_size.x = *tokens++; ins->declaration.thread_group_size.y = *tokens++; @@ -506,7 +506,7 @@ static void shader_sm5_read_dcl_uav_raw(struct vkd3d_shader_instruction *ins, ui const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { struct vkd3d_shader_raw_resource *resource = &ins->declaration.raw_resource; - const DWORD *end = &tokens[token_count]; + const uint32_t *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &resource->resource.reg); shader_sm4_set_descriptor_register_range(priv, &resource->resource.reg.reg, &resource->resource.range); @@ -518,7 +518,7 @@ static void shader_sm5_read_dcl_uav_structured(struct vkd3d_shader_instruction * uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { struct vkd3d_shader_structured_resource *resource = &ins->declaration.structured_resource; - const DWORD *end = &tokens[token_count]; + const uint32_t *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &resource->resource.reg); shader_sm4_set_descriptor_register_range(priv, &resource->resource.reg.reg, &resource->resource.range); @@ -553,7 +553,7 @@ static void shader_sm5_read_dcl_resource_structured(struct vkd3d_shader_instruct uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { struct vkd3d_shader_structured_resource *resource = &ins->declaration.structured_resource; - const DWORD *end = &tokens[token_count]; + const uint32_t *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &resource->resource.reg); shader_sm4_set_descriptor_register_range(priv, &resource->resource.reg.reg, &resource->resource.range); @@ -567,7 +567,7 @@ static void shader_sm5_read_dcl_resource_raw(struct vkd3d_shader_instruction *in uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { struct vkd3d_shader_raw_resource *resource = &ins->declaration.raw_resource; - const DWORD *end = &tokens[token_count]; + const uint32_t *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &resource->resource.reg); shader_sm4_set_descriptor_register_range(priv, &resource->resource.reg.reg, &resource->resource.range); @@ -1465,7 +1465,7 @@ static void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, stru const uint32_t **ptr = &parser->ptr; unsigned int i, len; size_t remaining; - const DWORD *p; + const uint32_t *p; DWORD precise; list_move_head(&sm4->src_free, &sm4->src); @@ -1692,7 +1692,7 @@ static bool require_space(size_t offset, size_t count, size_t size, size_t data_ return !count || (data_size - offset) / count >= size; } -static void read_dword(const char **ptr, DWORD *d) +static void read_dword(const char **ptr, uint32_t *d) { memcpy(d, *ptr, sizeof(*d)); *ptr += sizeof(*d); @@ -1700,14 +1700,14 @@ static void read_dword(const char **ptr, DWORD *d) static void read_float(const char **ptr, float *f) { - STATIC_ASSERT(sizeof(float) == sizeof(DWORD)); - read_dword(ptr, (DWORD *)f); + STATIC_ASSERT(sizeof(float) == sizeof(uint32_t)); + read_dword(ptr, (uint32_t *)f); } static void skip_dword_unknown(const char **ptr, unsigned int count) { unsigned int i; - DWORD d; + uint32_t d; WARN("Skipping %u unknown DWORDs:\n", count); for (i = 0; i < count; ++i) @@ -1744,11 +1744,11 @@ static int parse_dxbc(const char *data, size_t data_size, uint32_t checksum[4], calculated_checksum[4]; const char *ptr = data; int ret = VKD3D_OK; - DWORD chunk_count; - DWORD total_size; + uint32_t chunk_count; + uint32_t total_size; unsigned int i; - DWORD version; - DWORD tag; + uint32_t version; + uint32_t tag; if (data_size < VKD3D_DXBC_HEADER_SIZE) { @@ -1803,9 +1803,9 @@ static int parse_dxbc(const char *data, size_t data_size, for (i = 0; i < chunk_count; ++i) { - DWORD chunk_tag, chunk_size; + uint32_t chunk_tag, chunk_size; const char *chunk_ptr; - DWORD chunk_offset; + uint32_t chunk_offset; read_dword(&ptr, &chunk_offset); TRACE("chunk %u at offset %#x\n", i, chunk_offset); @@ -1847,7 +1847,7 @@ static int shader_parse_signature(DWORD tag, const char *data, DWORD data_size, struct vkd3d_shader_signature_element *e; const char *ptr = data; unsigned int i; - DWORD count; + uint32_t count; if (!require_space(0, 2, sizeof(DWORD), data_size)) { @@ -1877,7 +1877,7 @@ static int shader_parse_signature(DWORD tag, const char *data, DWORD data_size, for (i = 0; i < count; ++i) { - DWORD name_offset, mask; + uint32_t name_offset, mask; if (has_stream_index) read_dword(&ptr, &e[i].stream_index); @@ -1998,7 +1998,7 @@ static int shdr_handler(const char *data, DWORD data_size, DWORD tag, void *cont case TAG_SHEX: if (desc->byte_code) FIXME("Multiple shader code chunks.\n"); - desc->byte_code = (const DWORD *)data; + desc->byte_code = (const uint32_t *)data; desc->byte_code_size = data_size; break; @@ -2355,7 +2355,7 @@ static int shader_parse_root_parameters(struct root_signature_parser_context *co } static int shader_parse_root_parameters1(struct root_signature_parser_context *context, - DWORD offset, DWORD count, struct vkd3d_shader_root_parameter1 *parameters) + uint32_t offset, DWORD count, struct vkd3d_shader_root_parameter1 *parameters) { const char *ptr; unsigned int i; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 9cd26d7..1de67f4 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -638,7 +638,7 @@ struct vkd3d_shader_version struct vkd3d_shader_immediate_constant_buffer { unsigned int vec4_count; - DWORD data[MAX_IMMEDIATE_CONSTANT_BUFFER_SIZE]; + uint32_t data[MAX_IMMEDIATE_CONSTANT_BUFFER_SIZE]; }; struct vkd3d_shader_indexable_temp @@ -762,7 +762,7 @@ enum vkd3d_shader_input_sysval_semantic struct vkd3d_shader_desc { - const DWORD *byte_code; + const uint32_t *byte_code; size_t byte_code_size; struct vkd3d_shader_signature input_signature; struct vkd3d_shader_signature output_signature;

1 0