February 2022 - Wine-Devel - list.winehq.org

[PATCH] dmstyle/tests: Build without -DWINE_NO_LONG_TYPES
by Michael Stefaniuc Feb. 10, 2022

Feb. 10, 2022

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/tests/Makefile.in | 1 - dlls/dmstyle/tests/dmstyle.c | 152 ++++++++++++++++----------------- 2 files changed, 76 insertions(+), 77 deletions(-) diff --git a/dlls/dmstyle/tests/Makefile.in b/dlls/dmstyle/tests/Makefile.in index a98f5dd6c27..ec8b0636014 100644 --- a/dlls/dmstyle/tests/Makefile.in +++ b/dlls/dmstyle/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dmstyle.dll IMPORTS = ole32 diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 69c33ad73cf..4b16cdad1a1 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -55,13 +55,13 @@ static void test_COM(void) hr = CoCreateInstance(&CLSID_DirectMusicStyle, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dms8); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicStyle8 create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicStyle8 create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dms8, "dms8 = %p\n", dms8); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, (void**)&dms8); - ok(hr == E_NOINTERFACE, "DirectMusicStyle8 create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicStyle8 create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicStyle8 interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, @@ -70,26 +70,26 @@ static void test_COM(void) win_skip("Old version without IDirectMusicStyle8\n"); return; } - ok(hr == S_OK, "DirectMusicStyle8 create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicStyle8 create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicStyle8_AddRef(dms8); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicStyle8_QueryInterface(dms8, &IID_IDirectMusicObject, (void**)&dmo); - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %#lx\n", hr); refcount = IDirectMusicObject_AddRef(dmo); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IDirectMusicObject_Release(dmo); hr = IDirectMusicStyle8_QueryInterface(dms8, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); refcount = IPersistStream_AddRef(ps); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IPersistStream_Release(ps); hr = IDirectMusicStyle8_QueryInterface(dms8, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount); refcount = IUnknown_Release(unk); while (IDirectMusicStyle8_Release(dms8)); @@ -107,36 +107,36 @@ static void test_COM_section(void) hr = CoCreateInstance(&CLSID_DirectMusicSection, (IUnknown *)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dmo); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicSection create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicSection create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!dmo, "dmo = %p\n", dmo); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicSection, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, (void**)&dmo); todo_wine ok(hr == E_NOINTERFACE, - "DirectMusicSection create failed: %08x, expected E_NOINTERFACE\n", hr); + "DirectMusicSection create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicObject interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicSection, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmo); - todo_wine ok(hr == S_OK, "DirectMusicSection create failed: %08x, expected S_OK\n", hr); + todo_wine ok(hr == S_OK, "DirectMusicSection create failed: %#lx, expected S_OK\n", hr); if (hr != S_OK) { skip("DirectMusicSection not implemented\n"); return; } refcount = IDirectMusicObject_AddRef(dmo); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicObject_QueryInterface(dmo, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); refcount = IPersistStream_AddRef(ps); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); IPersistStream_Release(ps); hr = IDirectMusicObject_QueryInterface(dmo, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IUnknown_Release(unk); while (IDirectMusicObject_Release(dmo)); @@ -174,32 +174,32 @@ static void test_COM_track(void) continue; } ok(hr == CLASS_E_NOAGGREGATION, - "%s create failed: %08x, expected CLASS_E_NOAGGREGATION\n", class[i].name, hr); + "%s create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", class[i].name, hr); ok(!dmt8, "dmt8 = %p\n", dmt8); /* Invalid RIID */ hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmt8); - ok(hr == E_NOINTERFACE, "%s create failed: %08x, expected E_NOINTERFACE\n", + ok(hr == E_NOINTERFACE, "%s create failed: %#lx, expected E_NOINTERFACE\n", class[i].name, hr); /* Same refcount for all DirectMusicTrack interfaces */ hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, (void**)&dmt8); - ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); + ok(hr == S_OK, "%s create failed: %#lx, expected S_OK\n", class[i].name, hr); refcount = IDirectMusicTrack8_AddRef(dmt8); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); refcount = IPersistStream_AddRef(ps); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); IPersistStream_Release(ps); hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IUnknown_Release(unk); while (IDirectMusicTrack8_Release(dmt8)); @@ -216,23 +216,23 @@ static void test_dmstyle(void) hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicStyle, (void**)&dms); - ok(hr == S_OK, "DirectMusicStyle create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicStyle create failed: %#lx, expected S_OK\n", hr); /* IPersistStream */ hr = IDirectMusicStyle_QueryInterface(dms, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %#lx\n", hr); ok(IsEqualGUID(&class, &CLSID_DirectMusicStyle), "Expected class CLSID_DirectMusicStyle got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods*/ hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %#lx\n", hr); hr = IPersistStream_GetSizeMax(ps, &size); - ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %#lx\n", hr); hr = IPersistStream_Save(ps, NULL, TRUE); - ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %#lx\n", hr); while (IDirectMusicStyle_Release(dms)); } @@ -244,7 +244,7 @@ static void expect_getparam(IDirectMusicTrack8 *track, REFGUID type, const char char buf[64] = { 0 }; hr = IDirectMusicTrack8_GetParam(track, type, 0, NULL, buf); - ok(hr == expect, "GetParam(%s) failed: %08x, expected %08x\n", name, hr, expect); + ok(hr == expect, "GetParam(%s) failed: %#lx, expected %#lx\n", name, hr, expect); } static void expect_setparam(IDirectMusicTrack8 *track, REFGUID type, const char *name, @@ -253,7 +253,7 @@ static void expect_setparam(IDirectMusicTrack8 *track, REFGUID type, const char HRESULT hr; hr = IDirectMusicTrack8_SetParam(track, type, 0, track); - ok(hr == expect, "SetParam(%s) failed: %08x, expected %08x\n", name, hr, expect); + ok(hr == expect, "SetParam(%s) failed: %#lx, expected %#lx\n", name, hr, expect); } static void test_track(void) @@ -322,36 +322,36 @@ static void test_track(void) trace("Testing %s\n", class[i].name); hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, (void**)&dmt8); - ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); + ok(hr == S_OK, "%s create failed: %#lx, expected S_OK\n", class[i].name, hr); /* IDirectMusicTrack8 */ hr = IDirectMusicTrack8_Init(dmt8, NULL); - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %#lx\n", hr); if (class[i].clsid != &CLSID_DirectMusicChordTrack && class[i].clsid != &CLSID_DirectMusicCommandTrack) { /* Crashes on native */ hr = IDirectMusicTrack8_InitPlay(dmt8, NULL, NULL, NULL, 0, 0); if (class[i].clsid == &CLSID_DirectMusicMuteTrack) - ok(hr == S_OK, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + ok(hr == S_OK, "IDirectMusicTrack8_InitPlay failed: %#lx\n", hr); else - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %#lx\n", hr); } hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %#lx\n", hr); hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %#lx\n", hr); hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %#lx\n", hr); for (j = 0; j < ARRAY_SIZE(param_types); j++) { hr = IDirectMusicTrack8_IsParamSupported(dmt8, param_types[j].type); if (class[i].has_params & (1 << j)) - ok(hr == S_OK, "IsParamSupported(%s) failed: %08x, expected S_OK\n", + ok(hr == S_OK, "IsParamSupported(%s) failed: %#lx, expected S_OK\n", param_types[j].name, hr); else { ok(hr == DMUS_E_TYPE_UNSUPPORTED, - "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + "IsParamSupported(%s) failed: %#lx, expected DMUS_E_TYPE_UNSUPPORTED\n", param_types[j].name, hr); if (class[i].clsid == &CLSID_DirectMusicChordTrack) { expect_setparam(dmt8, param_types[j].type, param_types[j].name, @@ -410,53 +410,53 @@ static void test_track(void) if (class[i].clsid == &CLSID_DirectMusicMuteTrack) { hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %#lx\n", hr); hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %#lx\n", hr); } else todo_wine { hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_AddNotificationType failed: %#lx\n", hr); hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_RemoveNotificationType failed: %#lx\n", hr); } todo_wine { hr = IDirectMusicTrack8_Clone(dmt8, 0, 0, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %#lx\n", hr); hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %#lx\n", hr); hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParamEx failed: %#lx\n", hr); hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParamEx failed: %#lx\n", hr); } hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %#lx\n", hr); if (class[i].has_join) { hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %#lx\n", hr); } else { hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %#lx\n", hr); } /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); hr = IPersistStream_GetClassID(ps, &classid); - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %#lx\n", hr); ok(IsEqualGUID(&classid, class[i].clsid), "Expected class %s got %s\n", class[i].name, wine_dbgstr_guid(&classid)); hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %#lx\n", hr); hr = IPersistStream_GetSizeMax(ps, &size); - ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %#lx\n", hr); hr = IPersistStream_Save(ps, NULL, TRUE); if (class[i].has_save) - ok(hr == E_POINTER, "IPersistStream_Save failed: %08x\n", hr); + ok(hr == E_POINTER, "IPersistStream_Save failed: %#lx\n", hr); else - ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %#lx\n", hr); while (IDirectMusicTrack8_Release(dmt8)); } @@ -570,12 +570,12 @@ static void test_parsedescriptor(void) hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void **)&dmo); - ok(hr == S_OK, "DirectMusicStyle create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicStyle create failed: %#lx, expected S_OK\n", hr); /* Nothing loaded */ hr = IDirectMusicObject_GetDescriptor(dmo, &desc); - ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData & DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "GetDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData & DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle), "Got class guid %s, expected CLSID_DirectMusicStyle\n", @@ -585,8 +585,8 @@ static void test_parsedescriptor(void) stream = gen_riff_stream(empty); memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle), "Got class guid %s, expected CLSID_DirectMusicStyle\n", @@ -596,25 +596,25 @@ static void test_parsedescriptor(void) /* NULL pointers */ memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, NULL, &desc); - ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "ParseDescriptor failed: %#lx, expected E_POINTER\n", hr); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, NULL); - ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "ParseDescriptor failed: %#lx, expected E_POINTER\n", hr); /* Wrong form */ empty[1] = DMUS_FOURCC_CONTAINER_FORM; stream = gen_riff_stream(empty); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == DMUS_E_CHUNKNOTFOUND, - "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr); + "ParseDescriptor failed: %#lx, expected DMUS_E_CHUNKNOTFOUND\n", hr); IStream_Release(stream); /* All desc chunks, DMUS_OBJ_CATEGORY not supported */ stream = gen_riff_stream(alldesc); memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_VERSION; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle), "Got class guid %s, expected CLSID_DirectMusicStyle\n", wine_dbgstr_guid(&desc.guidClass)); @@ -629,9 +629,9 @@ static void test_parsedescriptor(void) stream = gen_riff_stream(inam); memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME), - "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); + "Got valid data %#lx, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -641,8 +641,8 @@ static void test_parsedescriptor(void) stream = gen_riff_stream(inam); memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); IStream_Release(stream); @@ -650,9 +650,9 @@ static void test_parsedescriptor(void) stream = gen_riff_stream(dupes); memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_VERSION; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); -- 2.34.1

1 0

[PATCH] dmscript/tests: Build without -DWINE_NO_LONG_TYPES
by Michael Stefaniuc Feb. 10, 2022

Feb. 10, 2022

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmscript/tests/Makefile.in | 1 - dlls/dmscript/tests/dmscript.c | 109 ++++++++++++++++---------------- 2 files changed, 54 insertions(+), 56 deletions(-) diff --git a/dlls/dmscript/tests/Makefile.in b/dlls/dmscript/tests/Makefile.in index 5cc5553e2ca..a4b246d0931 100644 --- a/dlls/dmscript/tests/Makefile.in +++ b/dlls/dmscript/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dmscript.dll IMPORTS = ole32 diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index 30b64d5788d..f3ae2c940d2 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -94,37 +94,37 @@ static void test_COM(void) hr = CoCreateInstance(&CLSID_DirectMusicScript, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unk_obj.inner_unk); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicScript create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicScript create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!unk_obj.inner_unk, "unk_obj.inner_unk = %p\n", unk_obj.inner_unk); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicScript, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, (void**)&dms); - ok(hr == E_NOINTERFACE, "DirectMusicScript create failed: %08x, expected E_NOINTERFACE\n", hr); + ok(hr == E_NOINTERFACE, "DirectMusicScript create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicScript interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicScript, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicScript, (void**)&dms); - ok(hr == S_OK, "DirectMusicScript create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicScript create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicScript_AddRef(dms); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicScript_QueryInterface(dms, &IID_IDirectMusicObject, (void**)&dmo); - ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %#lx\n", hr); refcount = IDirectMusicObject_AddRef(dmo); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IDirectMusicObject_Release(dmo); hr = IDirectMusicScript_QueryInterface(dms, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); refcount = IPersistStream_AddRef(ps); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IPersistStream_Release(ps); hr = IDirectMusicScript_QueryInterface(dms, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount); refcount = IUnknown_Release(unk); while (IDirectMusicScript_Release(dms)); @@ -143,32 +143,31 @@ static void test_COM_scripttrack(void) hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unk_obj.inner_unk); ok(hr == CLASS_E_NOAGGREGATION, - "DirectMusicScriptTrack create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + "DirectMusicScriptTrack create failed: %#lx, expected CLASS_E_NOAGGREGATION\n", hr); ok(!unk_obj.inner_unk, "unk_obj.inner_unk = %p\n", unk_obj.inner_unk); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmt); - ok(hr == E_NOINTERFACE, "DirectMusicScriptTrack create failed: %08x, expected E_NOINTERFACE\n", - hr); + ok(hr == E_NOINTERFACE, "DirectMusicScriptTrack create failed: %#lx, expected E_NOINTERFACE\n", hr); /* Same refcount for all DirectMusicScriptTrack interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, (void**)&dmt); - ok(hr == S_OK, "DirectMusicScriptTrack create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicScriptTrack create failed: %#lx, expected S_OK\n", hr); refcount = IDirectMusicTrack_AddRef(dmt); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); refcount = IPersistStream_AddRef(ps); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); IPersistStream_Release(ps); hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IUnknown_Release(unk); while (IDirectMusicTrack_Release(dmt)); @@ -184,19 +183,19 @@ static void test_dmscript(void) hr = CoCreateInstance(&CLSID_DirectMusicScript, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicScript, (void**)&dms); - ok(hr == S_OK, "DirectMusicScript create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicScript create failed: %#lx, expected S_OK\n", hr); /* Unimplemented IPersistStream methods */ hr = IDirectMusicScript_QueryInterface(dms, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == E_NOTIMPL, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_GetClassID failed: %#lx\n", hr); hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %#lx\n", hr); hr = IPersistStream_GetSizeMax(ps, &size); - ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %#lx\n", hr); hr = IPersistStream_Save(ps, NULL, TRUE); - ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %#lx\n", hr); while (IDirectMusicScript_Release(dms)); } @@ -249,67 +248,67 @@ static void test_scripttrack(void) hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, (void**)&dmt); - ok(hr == S_OK, "DirectMusicScriptTrack create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicScriptTrack create failed: %#lx, expected S_OK\n", hr); /* IDirectMusicTrack8 */ todo_wine { hr = IDirectMusicTrack8_Init(dmt, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %#lx\n", hr); hr = IDirectMusicTrack8_InitPlay(dmt, NULL, NULL, NULL, 0, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %#lx\n", hr); hr = IDirectMusicTrack8_EndPlay(dmt, NULL); - ok(hr == E_POINTER, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_EndPlay failed: %#lx\n", hr); hr = IDirectMusicTrack8_Play(dmt, NULL, 0, 0, 0, 0, NULL, NULL, 0); - ok(hr == E_POINTER, "IDirectMusicTrack8_Play failed: %08x\n", hr); + ok(hr == E_POINTER, "IDirectMusicTrack8_Play failed: %#lx\n", hr); } hr = IDirectMusicTrack8_GetParam(dmt, NULL, 0, NULL, NULL); - ok(hr == DMUS_E_GET_UNSUPPORTED, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + ok(hr == DMUS_E_GET_UNSUPPORTED, "IDirectMusicTrack8_GetParam failed: %#lx\n", hr); for (i = 0; i < ARRAY_SIZE(unsupported); i++) { hr = IDirectMusicTrack8_IsParamSupported(dmt, unsupported[i].type); ok(hr == DMUS_E_TYPE_UNSUPPORTED, - "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + "IsParamSupported(%s) failed: %#lx, expected DMUS_E_TYPE_UNSUPPORTED\n", unsupported[i].name, hr); hr = IDirectMusicTrack8_GetParam(dmt, unsupported[i].type, 0, NULL, buf); ok(hr == DMUS_E_GET_UNSUPPORTED, - "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + "GetParam(%s) failed: %#lx, expected DMUS_E_GET_UNSUPPORTED\n", unsupported[i].name, hr); hr = IDirectMusicTrack8_SetParam(dmt, unsupported[i].type, 0, buf); ok(hr == DMUS_E_SET_UNSUPPORTED, - "SetParam(%s) failed: %08x, expected DMUS_E_SET_UNSUPPORTED\n", + "SetParam(%s) failed: %#lx, expected DMUS_E_SET_UNSUPPORTED\n", unsupported[i].name, hr); } hr = IDirectMusicTrack8_AddNotificationType(dmt, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %#lx\n", hr); hr = IDirectMusicTrack8_RemoveNotificationType(dmt, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %#lx\n", hr); hr = IDirectMusicTrack8_Clone(dmt, 0, 0, NULL); - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %#lx\n", hr); hr = IDirectMusicTrack8_PlayEx(dmt, NULL, 0, 0, 0, 0, NULL, NULL, 0); - todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %#lx\n", hr); hr = IDirectMusicTrack8_Compose(dmt, NULL, 0, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %#lx\n", hr); hr = IDirectMusicTrack8_Join(dmt, NULL, 0, NULL, 0, NULL); - ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %#lx\n", hr); /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); hr = IPersistStream_GetClassID(ps, NULL); - ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "got %#lx\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %#lx\n", hr); ok(IsEqualGUID(&class, &CLSID_DirectMusicScriptTrack), "Expected class CLSID_DirectMusicScriptTrack got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %#lx\n", hr); hr = IPersistStream_GetSizeMax(ps, &size); - ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %#lx\n", hr); hr = IPersistStream_Save(ps, NULL, TRUE); - ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %#lx\n", hr); while (IDirectMusicTrack8_Release(dmt)); } @@ -370,41 +369,41 @@ static void test_parsedescriptor(void) hr = CoCreateInstance(&CLSID_DirectMusicScript, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void **)&dmo); - ok(hr == S_OK, "DirectMusicScript create failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "DirectMusicScript create failed: %#lx, expected S_OK\n", hr); /* Nothing loaded */ hr = IDirectMusicObject_GetDescriptor(dmo, &desc); - ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "GetDescriptor failed: %#lx, expected S_OK\n", hr); todo_wine ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_VERSION), - "Got valid data %#x, expected DMUS_OBJ_OBJECT | DMUS_OBJ_VERSION\n", desc.dwValidData); + "Got valid data %#lx, expected DMUS_OBJ_OBJECT | DMUS_OBJ_VERSION\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicScript), "Got class guid %s, expected CLSID_DirectMusicScript\n", wine_dbgstr_guid(&desc.guidClass)); ok(!desc.vVersion.dwVersionMS && !desc.vVersion.dwVersionLS, - "Got DMUS_VERSION %u.%u, expected 0.0\n", desc.vVersion.dwVersionMS, + "Got DMUS_VERSION %lu.%lu, expected 0.0\n", desc.vVersion.dwVersionMS, desc.vVersion.dwVersionLS); /* Empty RIFF stream */ stream = gen_riff_stream(empty); memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); + ok(hr == S_OK, "ParseDescriptor failed: %#lx, expected S_OK\n", hr); + ok(!desc.dwValidData, "Got valid data %#lx, expected 0\n", desc.dwValidData); IStream_Release(stream); /* NULL pointers */ memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, NULL, &desc); - ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "ParseDescriptor failed: %#lx, expected E_POINTER\n", hr); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, NULL); - ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + ok(hr == E_POINTER, "ParseDescriptor failed: %#lx, expected E_POINTER\n", hr); /* Wrong form */ empty[1] = DMUS_FOURCC_CONTAINER_FORM; stream = gen_riff_stream(empty); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == DMUS_E_SCRIPT_INVALID_FILE, - "ParseDescriptor failed: %08x, expected DMUS_E_SCRIPT_INVALID_FILE\n", hr); + "ParseDescriptor failed: %#lx, expected DMUS_E_SCRIPT_INVALID_FILE\n", hr); IStream_Release(stream); IDirectMusicObject_Release(dmo); -- 2.34.1

1 0

[PATCH] dmloader/tests: Build without -DWINE_NO_LONG_TYPES
by Michael Stefaniuc Feb. 10, 2022

Feb. 10, 2022

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmloader/tests/Makefile.in | 1 - dlls/dmloader/tests/loader.c | 28 ++++++++++++++-------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/dmloader/tests/Makefile.in b/dlls/dmloader/tests/Makefile.in index 8eef83551d4..d8be1bce3e4 100644 --- a/dlls/dmloader/tests/Makefile.in +++ b/dlls/dmloader/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dmloader.dll IMPORTS = ole32 diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 418a4ebb7a5..01f9fb435fd 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -266,12 +266,12 @@ static void test_COM(void) &IID_IDirectMusicLoader8, (void**)&dml8); ok(hr == S_OK, "DirectMusicLoader create failed: %08x, expected S_OK\n", hr); refcount = IDirectMusicLoader8_AddRef(dml8); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicLoader8_QueryInterface(dml8, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IUnknown_Release(unk); while (IDirectMusicLoader8_Release(dml8)); @@ -303,24 +303,24 @@ static void test_COM_container(void) &IID_IDirectMusicContainer, (void**)&dmc); ok(hr == S_OK, "DirectMusicContainer create failed: %08x, expected S_OK\n", hr); refcount = IDirectMusicContainer_AddRef(dmc); - ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); hr = IDirectMusicContainer_QueryInterface(dmc, &IID_IDirectMusicObject, (void**)&dmo); ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); refcount = IDirectMusicObject_AddRef(dmo); - ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); refcount = IDirectMusicObject_Release(dmo); hr = IDirectMusicContainer_QueryInterface(dmc, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); refcount = IPersistStream_AddRef(ps); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); refcount = IPersistStream_Release(ps); hr = IDirectMusicContainer_QueryInterface(dmc, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); refcount = IUnknown_AddRef(unk); - ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %lu, expected 6\n", refcount); refcount = IUnknown_Release(unk); while (IDirectMusicContainer_Release(dmc)); @@ -355,13 +355,13 @@ static void test_container(void) hr = IDirectMusicObject_GetDescriptor(dmo, &desc); ok(hr == S_OK, "IDirectMusicObject_GetDescriptor failed: %08x\n", hr); ok(desc.dwValidData == DMUS_OBJ_CLASS, - "Fresh object has more valid data (%08x) than DMUS_OBJ_CLASS\n", desc.dwValidData); + "Fresh object has more valid data (%#lx) than DMUS_OBJ_CLASS\n", desc.dwValidData); /* DMUS_OBJ_CLASS is immutable */ desc.dwValidData = DMUS_OBJ_CLASS; desc.dwSize = 1; /* size is ignored */ hr = IDirectMusicObject_SetDescriptor(dmo, &desc); ok(hr == S_FALSE , "IDirectMusicObject_SetDescriptor failed: %08x\n", hr); - ok(!desc.dwValidData, "dwValidData wasn't cleared: %08x\n", desc.dwValidData); + ok(!desc.dwValidData, "dwValidData wasn't cleared: %#lx\n", desc.dwValidData); desc.dwValidData = DMUS_OBJ_CLASS; desc.guidClass = CLSID_DirectMusicSegment; hr = IDirectMusicObject_SetDescriptor(dmo, &desc); @@ -509,7 +509,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); ok(desc.dwValidData == DMUS_OBJ_CLASS /* XP */ || broken(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS)), /* Vista and above */ - "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", desc.dwValidData); + "Got valid data %#lx, expected DMUS_OBJ_OBJECT\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicContainer), "Got class guid %s, expected CLSID_DirectMusicContainer\n", wine_dbgstr_guid(&desc.guidClass)); @@ -522,7 +522,7 @@ static void test_parsedescriptor(void) desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicContainer), "Got class guid %s, expected CLSID_DirectMusicContainer\n", @@ -555,7 +555,7 @@ static void test_parsedescriptor(void) hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicContainer), "Got class guid %s, expected CLSID_DirectMusicContainer\n", wine_dbgstr_guid(&desc.guidClass)); @@ -572,7 +572,7 @@ static void test_parsedescriptor(void) desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); IStream_Release(stream); @@ -583,7 +583,7 @@ static void test_parsedescriptor(void) desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#lx, expected DMUS_OBJ_CLASS\n", desc.dwValidData); IStream_Release(stream); @@ -594,7 +594,7 @@ static void test_parsedescriptor(void) hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION; - ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(desc.dwValidData == valid, "Got valid data %#lx, expected %#lx\n", desc.dwValidData, valid); ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); -- 2.34.1

1 0

[PATCH 1/2] server: Always place compiler barrier before atomic memory stores.
by Jinoh Kang Feb. 10, 2022

Feb. 10, 2022

GCC, clang, and other compilers do not actually provide acquire/release semantics on volatile memory accesses. This is also true on MSVC with the /volatile:iso (use strict ISO C semantics for volatile accesses) flag. Consider the following test program: void func(int *foo, volatile int *bar) { *foo = 1; *bar = 2; /* NOTE: *not* immune to reordering! */ *foo = 3; } After store reordering and dead code removal, the function above compiles into the following x86-64 assembly on GCC 11.2 (gcc -O2): movl $2, (%rsi) movl $3, (%rdi) ret Note that the first write to "*foo" has been ellided; the compiler decided that it is safe to reorder writes to "*foo" around writes to the volatile variable "*bar", so it simply merged the first "*foo" write into the second one. Fix this by explicitly specifying a compiler memory barrier before the atomic store. As a workaround for GCC bug #81316, we do this even for other architectures where we explicitly use the atomic memory access builtin. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- server/fd.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/server/fd.c b/server/fd.c index 1b4b98b0e76..5865db89c33 100644 --- a/server/fd.c +++ b/server/fd.c @@ -381,10 +381,15 @@ static const int user_shared_data_timeout = 16; static void atomic_store_ulong(volatile ULONG *ptr, ULONG value) { - /* on x86 there should be total store order guarantees, so volatile is - * enough to ensure the stores aren't reordered by the compiler, and then - * they will always be seen in-order from other CPUs. On other archs, we - * need atomic intrinsics to guarantee that. */ + /* on x86 there should be total store order guarantees, so a compiler + * barrier is enough to ensure the stores aren't reordered by the compiler; + * then, they will always be seen in-order from other CPUs. On other archs, + * we need atomic intrinsics to guarantee that. + * + * even when using atomic intrinsics, we explicitly place a memory barrier + * to work around GCC bug #81316 (affects all GCC versions prior to 7.x). + */ + __asm__ __volatile__("" ::: "memory"); #if defined(__i386__) || defined(__x86_64__) *ptr = value; #else @@ -394,6 +399,10 @@ static void atomic_store_ulong(volatile ULONG *ptr, ULONG value) static void atomic_store_long(volatile LONG *ptr, LONG value) { + /* even when using atomic intrinsics, we explicitly place a memory barrier + * to work around GCC bug #81316 (affects all GCC versions prior to 7.x). + */ + __asm__ __volatile__("" ::: "memory"); #if defined(__i386__) || defined(__x86_64__) *ptr = value; #else -- 2.34.1

4 9

[PATCH] winemac.drv: fix compile with pre macOS 10.12 SDKs
by Dean Greer Feb. 10, 2022

Feb. 10, 2022

>From 10392f7f4f469f266016542b1d3c0b7d39d59bbc Mon Sep 17 00:00:00 2001 From: Dean M Greer <gcenx83(a)gmail.com> Date: Sun, 23 Jan 2022 13:58:38 -0500 Subject: [PATCH] winemac.drv: fix compile with pre macOS 10.12 SDKs Fixes a regression introduced by https://source.winehq.org/git/wine.git/commit/e58b1a2b395b56859157e7dd8d08c… Signed-off-by: Dean M Greer <gcenx83(a)gmail.com> --- dlls/winemac.drv/cocoa_app.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index e5caad00a870..52c91c0621f1 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -56,6 +56,7 @@ #define NSWindowStyleMaskResizable NSResizableWindowMask #define NSWindowStyleMaskTitled NSTitledWindowMask #define NSWindowStyleMaskUtilityWindow NSUtilityWindowMask +#define NSWindowStyleMaskNonactivatingPanel NSNonactivatingPanelMask #endif #define ERR(...) do { if (macdrv_err_on) LogError(__func__, __VA_ARGS__); } while (false) --

4 5

[tools 1/3] testbot/LibvirtTool: Do not require '-off' to be at the end of the snapshot name.
by Francois Gouget Feb. 10, 2022

Feb. 10, 2022

One could certainly reorder the elements of the snapshot name so '-off' is the last part but it's not always natural. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- For now this is just for the TestBot administrator convenience but a later patch will make the snapshot name parsing more modular and the flags (including -off) will be position independent. So ShutDown() will be ready when then. --- testbot/bin/LibvirtTool.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 681223f11c..f14d54cd3b 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -284,7 +284,7 @@ sub ShutDown() { my $Domain = $VM->GetDomain(); my $CurrentSnapshot = $Domain->GetSnapshotName(); - if (!defined $CurrentSnapshot or $CurrentSnapshot !~ /-off$/ or + if (!defined $CurrentSnapshot or $CurrentSnapshot !~ /-off\b/ or !$Domain->IsPoweredOn()) { return 1; -- 2.30.2

1 2

[PATCH 1/4] d3dx9: Do not use d3dx_effect_cleanup() in D3DXCreateEffectEx().
by Zebediah Figura Feb. 10, 2022

Feb. 10, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dx9_36/effect.c | 57 +++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 310e5c0bf17..6ea138e632f 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -6422,15 +6422,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev effect->ID3DXEffect_iface.lpVtbl = &ID3DXEffect_Vtbl; effect->ref = 1; - if (pool) - { - effect->pool = unsafe_impl_from_ID3DXEffectPool(pool); - pool->lpVtbl->AddRef(pool); - } - - IDirect3DDevice9_AddRef(device); - effect->device = device; - effect->flags = flags; list_init(&effect->parameter_block_list); @@ -6487,6 +6478,15 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev TRACE("Tag: %x\n", tag); } + if (pool) + { + effect->pool = unsafe_impl_from_ID3DXEffectPool(pool); + pool->lpVtbl->AddRef(pool); + } + + IDirect3DDevice9_AddRef(device); + effect->device = device; + if (skip_constants_string) { skip_constants_buffer = HeapAlloc(GetProcessHeap(), 0, @@ -6495,7 +6495,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev { if (bytecode) ID3D10Blob_Release(bytecode); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto fail; } strcpy(skip_constants_buffer, skip_constants_string); @@ -6504,7 +6505,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev HeapFree(GetProcessHeap(), 0, skip_constants_buffer); if (bytecode) ID3D10Blob_Release(bytecode); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto fail; } } read_dword(&ptr, &offset); @@ -6518,7 +6520,7 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev FIXME("Failed to parse effect.\n"); HeapFree(GetProcessHeap(), 0, skip_constants_buffer); HeapFree(GetProcessHeap(), 0, skip_constants); - return hr; + goto fail; } for (i = 0; i < skip_constants_count; ++i) @@ -6535,7 +6537,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev debugstr_a(skip_constants[i]), j); HeapFree(GetProcessHeap(), 0, skip_constants_buffer); HeapFree(GetProcessHeap(), 0, skip_constants); - return D3DERR_INVALIDCALL; + hr = D3DERR_INVALIDCALL; + goto fail; } } } @@ -6557,6 +6560,33 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev } return D3D_OK; + +fail: + if (effect->techniques) + { + for (i = 0; i < effect->technique_count; ++i) + free_technique(&effect->techniques[i]); + heap_free(effect->techniques); + } + + if (effect->parameters) + { + for (i = 0; i < effect->parameter_count; ++i) + free_top_level_parameter(&effect->parameters[i]); + heap_free(effect->parameters); + } + + if (effect->objects) + { + for (i = 0; i < effect->object_count; ++i) + free_object(&effect->objects[i]); + heap_free(effect->objects); + } + + IDirect3DDevice9_Release(effect->device); + if (pool) + pool->lpVtbl->Release(pool); + return hr; } HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatalen, @@ -6593,7 +6623,6 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s if (FAILED(hr)) { WARN("Failed to create effect object, hr %#x.\n", hr); - d3dx_effect_cleanup(object); return hr; } -- 2.34.1

2 4

[PATCH 8/8] msvcp60: Remove basic_istream<wchar> code.
by Piotr Caban Feb. 10, 2022

Feb. 10, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 944 ++++++++++++-------------------------- dlls/msvcp60/msvcp60.spec | 144 +++--- 2 files changed, 369 insertions(+), 719 deletions(-)

1 0

[PATCH 7/8] msvcp60: Remove basic_iostream<wchar> code.
by Piotr Caban Feb. 10, 2022

Feb. 10, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 92 +++++++++++++-------------------------- dlls/msvcp60/msvcp60.spec | 12 ++--- 2 files changed, 37 insertions(+), 67 deletions(-)

1 0

[PATCH 6/8] msvcp60: Remove basic_ofstream<wchar> code.
by Piotr Caban Feb. 10, 2022

Feb. 10, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 121 ++++++++++++-------------------------- dlls/msvcp60/msvcp60.spec | 28 ++++----- 2 files changed, 53 insertions(+), 96 deletions(-)

1 0

[PATCH 5/8] msvcp60: Remove basic_ifstream<wchar> code.
by Piotr Caban Feb. 10, 2022

Feb. 10, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 121 ++++++++++++-------------------------- dlls/msvcp60/msvcp60.spec | 28 ++++----- 2 files changed, 53 insertions(+), 96 deletions(-)

1 0

[PATCH 4/8] msvcp60: Remove basic_fstream<wchar> code.
by Piotr Caban Feb. 10, 2022

Feb. 10, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 134 +++++++++++++------------------------- dlls/msvcp60/msvcp60.spec | 32 ++++----- 2 files changed, 61 insertions(+), 105 deletions(-)

1 0

[PATCH 3/8] msvcp60: Remove basic_ostringstream<wchar> code.
by Piotr Caban Feb. 10, 2022

Feb. 10, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 121 +++++++++++--------------------------- dlls/msvcp60/msvcp60.spec | 20 +++---- 2 files changed, 44 insertions(+), 97 deletions(-)

1 0

[PATCH 2/8] msvcp60: Remove basic_istringstream<wchar> code.
by Piotr Caban Feb. 10, 2022

Feb. 10, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 121 +++++++++++--------------------------- dlls/msvcp60/msvcp60.spec | 20 +++---- 2 files changed, 44 insertions(+), 97 deletions(-)

1 0

[PATCH 1/8] msvcp60: Remove basic_stringstream<wchar> code.
by Piotr Caban Feb. 10, 2022

Feb. 10, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- basic_stringstream<wchar> is not exported in msvcp60. There are already tons of differences between msvcp60 ios.c and msvcp90 so there's no reason to keep the files as similar as possible. dlls/msvcp60/ios.c | 142 +++++++++++--------------------------- dlls/msvcp60/msvcp60.spec | 20 +++--- 2 files changed, 52 insertions(+), 110 deletions(-)

1 0

[PATCH v2 1/5] shlwapi/tests: Remove workarounds from url.c for no longer supported Windows versions.
by Zebediah Figura Feb. 10, 2022

Feb. 10, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/shlwapi/tests/url.c | 66 ++++++++++++---------------------------- 1 file changed, 19 insertions(+), 47 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 703bdcd0a55..65fc2cfedd1 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -295,7 +295,6 @@ typedef struct _TEST_URL_ESCAPEW { DWORD flags; const WCHAR expecturl[INTERNET_MAX_URL_LENGTH]; const WCHAR win7url[INTERNET_MAX_URL_LENGTH]; /* <= Win7 */ - const WCHAR vistaurl[INTERNET_MAX_URL_LENGTH]; /* <= Vista/2k8 */ } TEST_URL_ESCAPEW; static const TEST_URL_ESCAPEW TEST_ESCAPEW[] = { @@ -311,12 +310,10 @@ static const TEST_URL_ESCAPEW TEST_ESCAPEW[] = { {'M','a','%','D','F',0}}, /* 0x2070E */ {{0xd841,0xdf0e,0}, URL_ESCAPE_AS_UTF8, {'%','F','0','%','A','0','%','9','C','%','8','E',0}, - {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}, - {0xd841,0xdf0e,0}}, + {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}}, /* 0x27A3E */ {{0xd85e,0xde3e,0}, URL_ESCAPE_AS_UTF8, {'%','F','0','%','A','7','%','A','8','%','B','E',0}, - {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}, - {0xd85e,0xde3e,0}}, + {'%','E','F','%','B','F','%','B','D','%','E','F','%','B','F','%','B','D',0}}, {{0xd85e,0}, URL_ESCAPE_AS_UTF8, {'%','E','F','%','B','F','%','B','D',0}, {0xd85e,0}}, @@ -414,12 +411,7 @@ static const struct { {"c:\\foo/b a%r", "file:///c:/foo/b%20a%25r", S_OK}, {"c:\\foo\\foo bar", "file:///c:/foo/foo%20bar", S_OK}, {"file:///c:/foo/bar", "file:///c:/foo/bar", S_FALSE}, -#if 0 - /* The following test fails on native shlwapi as distributed with Win95/98. - * Wine matches the behaviour of later versions. - */ {"xx:c:\\foo\\bar", "xx:c:\\foo\\bar", S_FALSE} -#endif }; /* ################ */ @@ -614,8 +606,8 @@ static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, const dwSize = 1; res = UrlGetPartA(szUrl, szPart, &dwSize, dwPart, dwFlags); ok(res == E_POINTER, "UrlGetPart for \"%s\" gave: 0x%08x\n", szUrl, res); - ok(dwSize == strlen(szExpected)+1 || - (*szExpected == '?' && dwSize == strlen(szExpected)), + todo_wine_if (dwPart == URL_PART_QUERY) + ok(dwSize == strlen(szExpected) + 1, "UrlGetPart for \"%s\" gave size: %u\n", szUrl, dwSize); dwSize = INTERNET_MAX_URL_LENGTH; @@ -638,9 +630,8 @@ static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, const FreeWideString(wszConvertedPart); FreeWideString(wszUrl); - /* Note that v6.0 and later don't return '?' with the query */ - ok(strcmp(szPart,szExpected)==0 || - (*szExpected=='?' && !strcmp(szPart,szExpected+1)), + todo_wine_if (dwPart == URL_PART_QUERY) + ok(!strcmp(szPart,szExpected), "Expected %s, but got %s\n", szExpected, szPart); } @@ -707,7 +698,7 @@ static void test_UrlGetPart(void) test_url_part(TEST_URL_3, URL_PART_USERNAME, 0, "foo"); test_url_part(TEST_URL_3, URL_PART_PASSWORD, 0, "bar"); test_url_part(TEST_URL_3, URL_PART_SCHEME, 0, "http"); - test_url_part(TEST_URL_3, URL_PART_QUERY, 0, "?query=x&return=y"); + test_url_part(TEST_URL_3, URL_PART_QUERY, 0, "query=x&return=y"); test_url_part(TEST_URL_4, URL_PART_HOSTNAME, 0, "google.*.com"); @@ -855,10 +846,8 @@ static void test_UrlEscapeA(void) size = 1; empty_string[0] = 127; ret = UrlEscapeA("/woningplan/woonkamer basis.swf", empty_string, &size, URL_ESCAPE_AS_UTF8); - ok(ret == E_NOTIMPL || broken(ret == E_POINTER), /* < Win7/Win2k8 */ - "got %x, expected %x\n", ret, E_NOTIMPL); - ok(size == 1 || broken(size == 34), /* < Win7/Win2k8 */ - "got %d, expected %d\n", size, 1); + ok(ret == E_NOTIMPL, "Got unexpected hr %#x.\n", ret); + ok(size == 1, "Got unexpected size %u.\n", size); ok(empty_string[0] == 127, "String has changed, empty_string[0] = %d\n", empty_string[0]); for (i = 0; i < ARRAY_SIZE(TEST_ESCAPE); i++) { @@ -962,12 +951,10 @@ static void test_UrlEscapeW(void) size = INTERNET_MAX_URL_LENGTH; ret = UrlEscapeW(TEST_ESCAPEW[i].url, ret_url, &size, TEST_ESCAPEW[i].flags); ok(ret == S_OK, "Got unexpected hr %#x for %s.\n", ret, debugstr_w(TEST_ESCAPEW[i].url)); - ok(!lstrcmpW(ret_url, TEST_ESCAPEW[i].expecturl) || - broken(!lstrcmpW(ret_url, TEST_ESCAPEW[i].vistaurl)) || - broken(!lstrcmpW(ret_url, TEST_ESCAPEW[i].win7url)), - "Expected \"%s\" or \"%s\" or \"%s\", but got \"%s\" for \"%s\"\n", - wine_dbgstr_w(TEST_ESCAPEW[i].expecturl), wine_dbgstr_w(TEST_ESCAPEW[i].vistaurl), - wine_dbgstr_w(TEST_ESCAPEW[i].win7url), wine_dbgstr_w(ret_url), wine_dbgstr_w(TEST_ESCAPEW[i].url)); + ok(!wcscmp(ret_url, TEST_ESCAPEW[i].expecturl) + || broken(!wcscmp(ret_url, TEST_ESCAPEW[i].win7url)), + "Expected %s, but got %s for %s.\n", debugstr_w(TEST_ESCAPEW[i].expecturl), + debugstr_w(ret_url), debugstr_w(TEST_ESCAPEW[i].url)); } } @@ -1484,36 +1471,27 @@ static void test_HashData(void) /* Test hashing with identically sized input/output buffers. */ res = HashData(input, 16, output, 16); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); - if(res == S_OK) - ok(!memcmp(output, expected, sizeof(expected)), - "Output buffer did not match expected contents\n"); + ok(!memcmp(output, expected, sizeof(expected)), "data didn't match\n"); /* Test hashing with larger output buffer. */ res = HashData(input, 16, output, 32); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); - if(res == S_OK) - ok(!memcmp(output, expected2, sizeof(expected2)), - "Output buffer did not match expected contents\n"); + ok(!memcmp(output, expected2, sizeof(expected2)), "data didn't match\n"); /* Test hashing with smaller input buffer. */ res = HashData(input, 8, output, 16); ok(res == S_OK, "Expected HashData to return S_OK, got 0x%08x\n", res); - if(res == S_OK) - ok(!memcmp(output, expected3, sizeof(expected3)), - "Output buffer did not match expected contents\n"); + ok(!memcmp(output, expected3, sizeof(expected3)), "data didn't match\n"); /* Test passing NULL pointers for input/output parameters. */ res = HashData(NULL, 0, NULL, 0); - ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ - "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); + ok(res == E_INVALIDARG, "Got unexpected hr %#x.\n", res); res = HashData(input, 0, NULL, 0); - ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ - "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); + ok(res == E_INVALIDARG, "Got unexpected hr %#x.\n", res); res = HashData(NULL, 0, output, 0); - ok(res == E_INVALIDARG || broken(res == S_OK), /* Windows 2000 */ - "Expected HashData to return E_INVALIDARG, got 0x%08x\n", res); + ok(res == E_INVALIDARG, "Got unexpected hr %#x.\n", res); /* Test passing valid pointers with sizes of zero. */ for (i = 0; i < ARRAY_SIZE(input); i++) @@ -1527,16 +1505,10 @@ static void test_HashData(void) /* The buffers should be unchanged. */ for (i = 0; i < ARRAY_SIZE(input); i++) - { ok(input[i] == 0x00, "Expected the input buffer to be unchanged\n"); - if(input[i] != 0x00) break; - } for (i = 0; i < ARRAY_SIZE(output); i++) - { ok(output[i] == 0xFF, "Expected the output buffer to be unchanged\n"); - if(output[i] != 0xFF) break; - } /* Input/output parameters are not validated. */ res = HashData((BYTE *)0xdeadbeef, 0, (BYTE *)0xdeadbeef, 0); -- 2.34.1

2 6

[PATCH 1/2] ntdll: Guard against syscall stack overrun.
by Paul Gofman Feb. 10, 2022

Feb. 10, 2022

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- So when the overrun happens we get a syscall error instead of smashing user stack. dlls/ntdll/unix/signal_arm.c | 4 ++++ dlls/ntdll/unix/signal_arm64.c | 4 ++++ dlls/ntdll/unix/signal_i386.c | 4 ++++ dlls/ntdll/unix/signal_x86_64.c | 4 ++++ dlls/ntdll/unix/unix_private.h | 10 +++++++++- dlls/ntdll/unix/virtual.c | 5 +++++ 6 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index a1bcb0ddd32..02267e1c285 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -780,6 +780,10 @@ static BOOL handle_syscall_fault( ucontext_t *context, EXCEPTION_RECORD *rec ) (DWORD)IP_sig(context), (DWORD)SP_sig(context), (DWORD)LR_sig(context), (DWORD)PC_sig(context), (DWORD)CPSR_sig(context) ); + if (rec->ExceptionCode == STATUS_ACCESS_VIOLATION + && is_inside_syscall_stack_guard( (char *)rec->ExceptionInformation[1] )) + ERR_(seh)( "Syscall stack overrun.\n "); + if (ntdll_get_thread_data()->jmp_buf) { TRACE( "returning to handler\n" ); diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 94f280e218a..7056adca171 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -834,6 +834,10 @@ static BOOL handle_syscall_fault( ucontext_t *context, EXCEPTION_RECORD *rec ) (DWORD64)REGn_sig(28, context), (DWORD64)FP_sig(context), (DWORD64)LR_sig(context), (DWORD64)SP_sig(context) ); + if (rec->ExceptionCode == STATUS_ACCESS_VIOLATION + && is_inside_syscall_stack_guard( (char *)rec->ExceptionInformation[1] )) + ERR_(seh)( "Syscall stack overrun.\n "); + if (ntdll_get_thread_data()->jmp_buf) { TRACE( "returning to handler\n" ); diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 6bb5649e2b5..4bc4bd321ac 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1716,6 +1716,10 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, void *stack_ptr, context->Ebp, context->Esp, context->SegCs, context->SegDs, context->SegEs, context->SegFs, context->SegGs, context->EFlags ); + if (rec->ExceptionCode == STATUS_ACCESS_VIOLATION + && is_inside_syscall_stack_guard( (char *)rec->ExceptionInformation[1] )) + ERR_(seh)( "Syscall stack overrun.\n "); + if (ntdll_get_thread_data()->jmp_buf) { TRACE( "returning to handler\n" ); diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 68855dccacf..7c39fe5f9bc 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2525,6 +2525,10 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, TRACE_(seh)( " r12=%016lx r13=%016lx r14=%016lx r15=%016lx\n", context->R12, context->R13, context->R14, context->R15 ); + if (rec->ExceptionCode == STATUS_ACCESS_VIOLATION + && is_inside_syscall_stack_guard( (char *)rec->ExceptionInformation[1] )) + ERR_(seh)( "Syscall stack overrun.\n "); + if (ntdll_get_thread_data()->jmp_buf) { TRACE_(seh)( "returning to handler\n" ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index a79edabc37c..07c7bebba4d 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -85,7 +85,8 @@ static const SIZE_T teb_size = 0x3800; /* TEB64 + TEB32 + debug info */ static const SIZE_T signal_stack_mask = 0xffff; static const SIZE_T signal_stack_size = 0x10000 - 0x3800; static const SIZE_T kernel_stack_size = 0x20000; -static const SIZE_T min_kernel_stack = 0x2000; +static const SIZE_T kernel_stack_guard_size = 0x1000; +static const SIZE_T min_kernel_stack = 0x3000; static const LONG teb_offset = 0x2000; #define FILE_WRITE_TO_END_OF_FILE ((LONGLONG)-1) @@ -318,6 +319,13 @@ static inline BOOL is_inside_signal_stack( void *ptr ) (char *)ptr < (char *)get_signal_stack() + signal_stack_size); } +static inline BOOL is_inside_syscall_stack_guard( const char *stack_ptr ) +{ + const char *kernel_stack = ntdll_get_thread_data()->kernel_stack; + + return (stack_ptr >= kernel_stack && stack_ptr < kernel_stack + kernel_stack_guard_size); +} + static inline void mutex_lock( pthread_mutex_t *mutex ) { if (!process_exiting) pthread_mutex_lock( mutex ); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 94b300c5057..621e7be996d 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3100,6 +3100,7 @@ NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, ULONG_PTR zero_bits, SI SIZE_T commit_size, SIZE_T extra_size ) { struct file_view *view; + char *kernel_stack; NTSTATUS status; sigset_t sigset; SIZE_T size; @@ -3143,6 +3144,10 @@ NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, ULONG_PTR zero_bits, SI delete_view( view ); goto done; } + /* setup kernel stack no access guard page */ + kernel_stack = (char *)view->base + view->size; + set_page_vprot( kernel_stack, kernel_stack_guard_size, VPROT_COMMITTED ); + mprotect_range( kernel_stack, kernel_stack_guard_size, 0, 0 ); } /* note: limit is lower than base since the stack grows down */ -- 2.34.1

1 1

[PATCH 3/3] server: Store all 64 bits of window id.
by Jacek Caban Feb. 10, 2022

Feb. 10, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- We already store it as UINT_PTR in WND struct and have a test for that, but it's not the case on server side (so inter-process queries do not work right). This patch reuses extra_value field of the request struct. Changing id type would make the request too large and we don't set extra bytes and window id in the same time anyway. dlls/user32/win.c | 2 +- server/protocol.def | 3 +-- server/window.c | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-)

1 0

[PATCH 2/3] user32: Destroy window server objects from destroy_thread_windows.
by Jacek Caban Feb. 10, 2022

Feb. 10, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This ensures that handle validity is consistent between user32 and server. Without this patch, during the time between destroy_thread_windows() and server noticing that the thread is actually destroyed, the state is inconsistent. dlls/user32/win.c | 9 +++++++++ server/window.c | 9 +++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[PATCH v5 3/3] user32: DefWindowProc(WM_NCCALCSIZE) should return 0.
by Dmitry Timoshkov Feb. 10, 2022

Feb. 10, 2022

v3: As suggested by Alexandre changed NC_HandleNCCalcSize to not return a value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37609 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/controls.h | 2 +- dlls/user32/defwnd.c | 3 ++- dlls/user32/nonclient.c | 9 ++------- dlls/user32/tests/win.c | 6 ------ 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index ce14d13171f..52584748768 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -168,7 +168,7 @@ extern void MENU_EndMenu(HWND) DECLSPEC_HIDDEN; /* nonclient area */ extern LRESULT NC_HandleNCPaint( HWND hwnd , HRGN clip) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; -extern LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wParam, RECT *winRect ) DECLSPEC_HIDDEN; +extern void NC_HandleNCCalcSize( HWND hwnd, WPARAM wParam, RECT *winRect ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCLButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCMouseMove( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index abb73e73ca8..a8978c2d847 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -260,7 +260,8 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } case WM_NCCALCSIZE: - return NC_HandleNCCalcSize( hwnd, wParam, (RECT *)lParam ); + NC_HandleNCCalcSize( hwnd, wParam, (RECT *)lParam ); + break; case WM_WINDOWPOSCHANGING: return WINPOS_HandleWindowPosChanging( hwnd, (WINDOWPOS *)lParam ); diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 639cca707fb..f944ed568a4 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -346,19 +346,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH AdjustWindowRectExForDpi( LPRECT rect, DWORD style * * Handle a WM_NCCALCSIZE message. Called from DefWindowProc(). */ -LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wparam, RECT *winRect ) +void NC_HandleNCCalcSize( HWND hwnd, WPARAM wparam, RECT *winRect ) { RECT tmpRect = { 0, 0, 0, 0 }; - LRESULT result = 0; LONG cls_style = GetClassLongW(hwnd, GCL_STYLE); LONG style = GetWindowLongW( hwnd, GWL_STYLE ); LONG exStyle = GetWindowLongW( hwnd, GWL_EXSTYLE ); if (winRect == NULL) - return 0; - - if (cls_style & CS_VREDRAW) result |= WVR_VREDRAW; - if (cls_style & CS_HREDRAW) result |= WVR_HREDRAW; + return; if (!(style & WS_MINIMIZE)) { @@ -413,7 +409,6 @@ LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wparam, RECT *winRect ) winRect->right = winRect->left; winRect->bottom = winRect->top; } - return result; } diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 8c1e8079201..17511d6d142 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1475,7 +1475,6 @@ static void test_nonclient_area(HWND hwnd) rc = rc_window; ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); -todo_wine_if(ret != 0) ok(!ret, "got %08lx\n", ret); MapWindowPoints(0, hwnd, (LPPOINT)&rc, 2); ok(EqualRect(&rc, &rc_client), @@ -1494,7 +1493,6 @@ todo_wine_if(ret != 0) rc = rc_window; ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); -todo_wine_if(ret != 0) ok(!ret, "got %08lx\n", ret); MapWindowPoints(0, hwnd, (LPPOINT)&rc, 2); ok(EqualRect(&rc, &rc_client), @@ -12966,25 +12964,21 @@ static void test_WM_NCCALCSIZE(void) params.lppos = &winpos; ret = SendMessageW(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params); -todo_wine ok(!ret, "got %08lx\n", ret); ok(EqualRect(&params.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(&params.rgrc[0])); params.rgrc[0] = window_rect; ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params); -todo_wine ok(!ret, "got %08lx\n", ret); ok(EqualRect(&params.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(&params.rgrc[0])); GetWindowRect(hwnd, &window_rect); ret = SendMessageW(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect); -todo_wine ok(!ret, "got %08lx\n", ret); ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect)); GetWindowRect(hwnd, &window_rect); ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect); -todo_wine ok(!ret, "got %08lx\n", ret); ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect)); -- 2.34.1

2 1

[PATCH 1/3] user32: Use a single lock in destroy_thread_windows.
by Jacek Caban Feb. 10, 2022

Feb. 10, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-)

1 0

[PATCH v5 2/3] user32/tests: Add more tests for WM_NCCALCSIZE.
by Dmitry Timoshkov Feb. 10, 2022

Feb. 10, 2022

v4: Rebased to current git. v5: Fixed compiler warnings. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 164 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 154 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c01f43d65e9..8c1e8079201 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1003,6 +1003,7 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR } case WM_WINDOWPOSCHANGED: { + LRESULT ret; RECT rc1, rc2; WINDOWPOS *winpos = (WINDOWPOS *)lparam; ok(winpos->x >= -32768 && winpos->x <= 32767, "bad winpos->x %d\n", winpos->x); @@ -1023,7 +1024,8 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR wine_dbgstr_rect(&rc2)); GetClientRect(hwnd, &rc2); - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc1); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc1); + ok(!ret, "got %08lx\n", ret); MapWindowPoints(0, hwnd, (LPPOINT)&rc1, 2); ok(EqualRect(&rc1, &rc2), "rects do not match %s / %s\n", wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); @@ -1076,6 +1078,13 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR break; case WM_MOUSEACTIVATE: return MA_ACTIVATE; + + case WM_NCCALCSIZE: + { + LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam); + return ret; + } } return DefWindowProcA(hwnd, msg, wparam, lparam); @@ -1106,6 +1115,13 @@ static LRESULT WINAPI main_window_procW(HWND hwnd, UINT msg, WPARAM wparam, LPAR return 0; } break; + + case WM_NCCALCSIZE: + { + LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam); + return ret; + } } return DefWindowProcA(hwnd, msg, wparam, lparam); @@ -1131,6 +1147,13 @@ static LRESULT WINAPI tool_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR ok(!got_getminmaxinfo, "tool: WM_GETMINMAXINFO should NOT have been received before WM_NCCREATE\n"); break; } + + case WM_NCCALCSIZE: + { + LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam); + return ret; + } } return DefWindowProcA(hwnd, msg, wparam, lparam); @@ -1395,6 +1418,14 @@ static LRESULT CALLBACK test_standard_scrollbar_proc(HWND hwnd, UINT msg, WPARAM DeleteObject(region); return 0; } + + case WM_NCCALCSIZE: + { + LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wp, lp); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wp, lp); + return ret; + } + default: return DefWindowProcA(hwnd, msg, wp, lp); } @@ -1443,7 +1474,9 @@ static void test_nonclient_area(HWND hwnd) rc = rc_window; - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); +todo_wine_if(ret != 0) + ok(!ret, "got %08lx\n", ret); MapWindowPoints(0, hwnd, (LPPOINT)&rc, 2); ok(EqualRect(&rc, &rc_client), "client rect does not match: style:exstyle=0x%08x:0x%08x, menu=%d client=%s, calc=%s\n", @@ -1460,7 +1493,9 @@ static void test_nonclient_area(HWND hwnd) FixedAdjustWindowRectEx(&rc_window, style, menu, exstyle); rc = rc_window; - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); +todo_wine_if(ret != 0) + ok(!ret, "got %08lx\n", ret); MapWindowPoints(0, hwnd, (LPPOINT)&rc, 2); ok(EqualRect(&rc, &rc_client), "synthetic rect does not match: style:exstyle=0x%08x:0x%08x, menu=%d, client=%s, calc=%s\n", @@ -2353,6 +2388,7 @@ static LRESULT WINAPI mdi_child_wnd_proc_2(HWND hwnd, UINT msg, WPARAM wparam, L case WM_WINDOWPOSCHANGED: { + LRESULT ret; WINDOWPOS *winpos = (WINDOWPOS *)lparam; RECT rc1, rc2; @@ -2364,7 +2400,8 @@ static LRESULT WINAPI mdi_child_wnd_proc_2(HWND hwnd, UINT msg, WPARAM wparam, L wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); GetWindowRect(hwnd, &rc1); GetClientRect(hwnd, &rc2); - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc1); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc1); + ok(!ret, "got %08lx\n", ret); MapWindowPoints(0, hwnd, (LPPOINT)&rc1, 2); ok(EqualRect(&rc1, &rc2), "rects do not match, window=%s client=%s\n", wine_dbgstr_rect(&rc1), wine_dbgstr_rect(&rc2)); @@ -2390,7 +2427,15 @@ static LRESULT WINAPI mdi_child_wnd_proc_2(HWND hwnd, UINT msg, WPARAM wparam, L return 1; } + + case WM_NCCALCSIZE: + { + LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam); + return ret; + } } + return DefWindowProcA(hwnd, msg, wparam, lparam); } @@ -2446,6 +2491,13 @@ static LRESULT WINAPI mdi_main_wnd_procA(HWND hwnd, UINT msg, WPARAM wparam, LPA return 1; } + case WM_NCCALCSIZE: + { + LRESULT ret = DefFrameProcA(hwnd, mdi_client, WM_NCCALCSIZE, wparam, lparam); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam); + return ret; + } + case WM_CLOSE: PostQuitMessage(0); break; @@ -4657,11 +4709,13 @@ static void test_validatergn(HWND hwnd) static void nccalchelper(HWND hwnd, INT x, INT y, RECT *prc) { + LRESULT ret; RECT rc; MoveWindow( hwnd, 0, 0, x, y, 0); GetWindowRect( hwnd, prc); rc = *prc; - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)prc); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)prc); + ok(!ret, "got %08lx\n", ret); if (winetest_debug > 1) trace("window rect is %s, nccalc rect is %s\n", wine_dbgstr_rect(&rc), wine_dbgstr_rect(prc)); } @@ -6553,11 +6607,14 @@ static LRESULT CALLBACK winsizes_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM } case WM_NCCALCSIZE: { + LRESULT ret; RECT rect, *r = (RECT *)lp; GetWindowRect( hwnd, &rect ); ok( EqualRect( &rect, r ), "passed rect %s doesn't match window rect %s\n", wine_dbgstr_rect( r ), wine_dbgstr_rect( &rect )); - return DefWindowProcA(hwnd, msg, wp, lp); + ret = DefWindowProcA(hwnd, msg, wp, lp); + ok(!ret, "got %08lx\n", ret); + return ret; } default: return DefWindowProcA(hwnd, msg, wp, lp); @@ -7467,7 +7524,8 @@ static void test_ShowWindow(void) /* test NC area */ GetWindowRect(hwnd, &rc); SetRect(&rcNonClient, rc.left, rc.top, rc.left, rc.top); - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc); + ok(!ret, "got %08lx\n", ret); ok(EqualRect(&rc, &rcNonClient), "expected %s, got %s\n", wine_dbgstr_rect(&rcNonClient), wine_dbgstr_rect(&rc)); @@ -7755,7 +7813,8 @@ static void test_ShowWindow_owned(HWND hwndMain) /* test NC area */ GetWindowRect(hwnd, &rect); SetRect(&nc, rect.left, rect.top, rect.left, rect.top); - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ok(!ret, "got %08lx\n", ret); ok(EqualRect(&rect, &nc), "expected %s, got %s\n", wine_dbgstr_rect(&nc), wine_dbgstr_rect(&rect)); @@ -7887,7 +7946,8 @@ static void test_ShowWindow_child(HWND hwndMain) /* test NC area */ GetWindowRect(hwnd, &rect); SetRect(&nc, rect.left, rect.top, rect.left, rect.top); - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ok(!ret, "got %08lx\n", ret); ok(EqualRect(&rect, &nc), "expected %s, got %s\n", wine_dbgstr_rect(&nc), wine_dbgstr_rect(&rect)); @@ -8015,7 +8075,8 @@ static void test_ShowWindow_mdichild(HWND hwndMain) /* test NC area */ GetWindowRect(hwnd, &rect); SetRect(&nc, rect.left, rect.top, rect.left, rect.top); - DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ok(!ret, "got %08lx\n", ret); ok(EqualRect(&rect, &nc), "expected %s, got %s\n", wine_dbgstr_rect(&nc), wine_dbgstr_rect(&rect)); @@ -9049,6 +9110,12 @@ static LRESULT CALLBACK fullscreen_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPAR ok(minmax->ptMaxSize.y >= mi.rcMonitor.bottom, "%d >= %d\n", minmax->ptMaxSize.y, mi.rcMonitor.bottom); break; } + case WM_NCCALCSIZE: + { + LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wp, lp); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wp, lp); + return ret; + } } return DefWindowProcA(hwnd, msg, wp, lp); } @@ -9308,6 +9375,13 @@ static LRESULT WINAPI test_thick_child_size_winproc(HWND hwnd, UINT msg, WPARAM break; } + + case WM_NCCALCSIZE: + { + LRESULT ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, wparam, lparam); + ok(!ret, "got %08lx (%08lx %08lx)\n", ret, wparam, lparam); + return ret; + } } return DefWindowProcA(hwnd, msg, wparam, lparam); @@ -12848,6 +12922,75 @@ static void test_ncdestroy(void) DestroyWindow(hwnd); } +static void test_WM_NCCALCSIZE(void) +{ + WNDCLASSA cls; + HWND hwnd; + NCCALCSIZE_PARAMS params; + WINDOWPOS winpos; + RECT client_rect, window_rect; + LRESULT ret; + + cls.style = CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW; + cls.lpfnWndProc = DefWindowProcA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "dummy_window_class"; + ret = RegisterClassA(&cls); + ok(ret, "RegisterClass error %u\n", GetLastError()); + + hwnd = CreateWindowExA(0, "dummy_window_class", NULL, + WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP, + 100, 100, 200, 200, 0, 0, GetModuleHandleA(NULL), NULL); + ok(hwnd != 0, "CreateWindowEx error %u\n", GetLastError()); + + GetWindowRect(hwnd, &window_rect); + params.rgrc[0] = window_rect; + params.rgrc[1] = window_rect; + GetClientRect(hwnd, &client_rect); + MapWindowPoints(hwnd, 0, (POINT *)&client_rect, 2); + params.rgrc[2] = client_rect; + + winpos.hwnd = hwnd; + winpos.hwndInsertAfter = HWND_TOP; + winpos.x = window_rect.left; + winpos.y = window_rect.top; + winpos.cx = window_rect.right - window_rect.left; + winpos.cy = window_rect.bottom - window_rect.top; + winpos.flags = SWP_NOMOVE; + params.lppos = &winpos; + + ret = SendMessageW(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params); +todo_wine + ok(!ret, "got %08lx\n", ret); + ok(EqualRect(&params.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(&params.rgrc[0])); + + params.rgrc[0] = window_rect; + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params); +todo_wine + ok(!ret, "got %08lx\n", ret); + ok(EqualRect(&params.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(&params.rgrc[0])); + + GetWindowRect(hwnd, &window_rect); + ret = SendMessageW(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect); +todo_wine + ok(!ret, "got %08lx\n", ret); + ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect)); + + GetWindowRect(hwnd, &window_rect); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect); +todo_wine + ok(!ret, "got %08lx\n", ret); + ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect)); + + DestroyWindow(hwnd); +} + START_TEST(win) { char **argv; @@ -13029,6 +13172,7 @@ START_TEST(win) test_SC_SIZE(); test_cancel_mode(); test_DragDetect(); + test_WM_NCCALCSIZE(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); -- 2.34.1

2 1

[PATCH] mfreadwrite: Introduce an internal source reader refcount.
by Rémi Bernon Feb. 10, 2022

Feb. 10, 2022

To decide when to shutdown the media source. Otherwise the references hold by the callbacks from BeginGetEvent and others are keeping the source reader alive and the IMFMediaSource_Shutdown is never called. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mfreadwrite/reader.c | 41 +++++++++++++++++++++++++-------- dlls/mfreadwrite/tests/mfplat.c | 8 +++++-- 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index be77e1c5b1d..18509e067b3 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -153,6 +153,7 @@ struct source_reader IMFAsyncCallback source_events_callback; IMFAsyncCallback stream_events_callback; IMFAsyncCallback async_commands_callback; + LONG internal_refcount; LONG refcount; IMFMediaSource *source; IMFPresentationDescriptor *descriptor; @@ -203,6 +204,9 @@ static struct media_stream *impl_stream_from_IMFVideoSampleAllocatorNotify(IMFVi return CONTAINING_RECORD(iface, struct media_stream, notify_cb); } +static ULONG WINAPI src_reader_internal_addref(struct source_reader *reader); +static ULONG WINAPI src_reader_internal_release(struct source_reader *reader); + static HRESULT WINAPI source_reader_async_command_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -325,13 +329,13 @@ static HRESULT WINAPI source_reader_callback_QueryInterface(IMFAsyncCallback *if static ULONG WINAPI source_reader_source_events_callback_AddRef(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); - return IMFSourceReader_AddRef(&reader->IMFSourceReader_iface); + return src_reader_internal_addref(reader); } static ULONG WINAPI source_reader_source_events_callback_Release(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); - return IMFSourceReader_Release(&reader->IMFSourceReader_iface); + return src_reader_internal_release(reader); } static HRESULT WINAPI source_reader_callback_GetParameters(IMFAsyncCallback *iface, @@ -611,13 +615,13 @@ static const IMFAsyncCallbackVtbl source_events_callback_vtbl = static ULONG WINAPI source_reader_stream_events_callback_AddRef(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_stream_callback_IMFAsyncCallback(iface); - return IMFSourceReader_AddRef(&reader->IMFSourceReader_iface); + return src_reader_internal_addref(reader); } static ULONG WINAPI source_reader_stream_events_callback_Release(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_stream_callback_IMFAsyncCallback(iface); - return IMFSourceReader_Release(&reader->IMFSourceReader_iface); + return src_reader_internal_release(reader); } static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, struct media_stream *stream) @@ -888,13 +892,13 @@ static const IMFAsyncCallbackVtbl stream_events_callback_vtbl = static ULONG WINAPI source_reader_async_commands_callback_AddRef(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_async_commands_callback_IMFAsyncCallback(iface); - return IMFSourceReader_AddRef(&reader->IMFSourceReader_iface); + return src_reader_internal_addref(reader); } static ULONG WINAPI source_reader_async_commands_callback_Release(IMFAsyncCallback *iface) { struct source_reader *reader = impl_from_async_commands_callback_IMFAsyncCallback(iface); - return IMFSourceReader_Release(&reader->IMFSourceReader_iface); + return src_reader_internal_release(reader); } static struct stream_response * media_stream_detach_response(struct source_reader *reader, struct stream_response *response) @@ -1337,16 +1341,34 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) { struct source_reader *reader = impl_from_IMFSourceReader(iface); ULONG refcount = InterlockedDecrement(&reader->refcount); - unsigned int i; TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) { - if (reader->async_callback) - IMFSourceReaderCallback_Release(reader->async_callback); if (reader->flags & SOURCE_READER_SHUTDOWN_ON_RELEASE) IMFMediaSource_Shutdown(reader->source); + src_reader_internal_release(reader); + } + + return refcount; +} + +static ULONG WINAPI src_reader_internal_addref(struct source_reader *reader) +{ + ULONG refcount = InterlockedIncrement(&reader->internal_refcount); + return refcount; +} + +static ULONG WINAPI src_reader_internal_release(struct source_reader *reader) +{ + ULONG refcount = InterlockedDecrement(&reader->internal_refcount); + unsigned int i; + + if (!refcount) + { + if (reader->async_callback) + IMFSourceReaderCallback_Release(reader->async_callback); if (reader->descriptor) IMFPresentationDescriptor_Release(reader->descriptor); if (reader->attributes) @@ -2267,6 +2289,7 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri object->source_events_callback.lpVtbl = &source_events_callback_vtbl; object->stream_events_callback.lpVtbl = &stream_events_callback_vtbl; object->async_commands_callback.lpVtbl = &async_commands_callback_vtbl; + object->internal_refcount = 1; object->refcount = 1; list_init(&object->responses); if (shutdown_on_release) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 7e724344168..0791f51fa37 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -862,7 +862,8 @@ skip_read_sample: hr = IMFSourceReader_Flush(reader, MF_SOURCE_READER_ALL_STREAMS); ok(hr == S_OK, "Failed to flush all streams, hr %#x.\n", hr); - IMFSourceReader_Release(reader); + refcount = IMFSourceReader_Release(reader); + ok(refcount == 0, "Release returned %u.\n", refcount); /* Async mode. */ callback = create_async_callback(); @@ -883,7 +884,10 @@ todo_wine { } IMFAttributes_Release(attributes); if (hr == S_OK) - IMFSourceReader_Release(reader); + { + refcount = IMFSourceReader_Release(reader); + ok(refcount == 0, "Release returned %u.\n", refcount); + } IMFByteStream_Release(stream); } -- 2.34.1

3 5

[PATCH 1/3] wined3d: Initialize map_ptr to NULL in wined3d_context_vk_create_slab_bo().
by Zebediah Figura Feb. 10, 2022

Feb. 10, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 97c60719489..f3ec5c03c85 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -456,6 +456,7 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context *bo = slab->bo; bo->memory = NULL; bo->slab = slab; + bo->b.map_ptr = NULL; bo->b.buffer_offset = idx * object_size; bo->b.memory_offset = slab->bo.b.memory_offset + bo->b.buffer_offset; bo->size = size; -- 2.34.1

2 5

[PATCH v5 1/3] user32/tests: Add more missing ShowWindow() return value checks.
by Dmitry Timoshkov Feb. 10, 2022

Feb. 10, 2022

Also change 'BOOL ret' to 'LRESULT ret' to avoid introducing new variable for DefWindowProc() return value checks in the next patch. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 58 ++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 3ace25056de..c01f43d65e9 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7695,7 +7695,7 @@ static void test_ShowWindow_owned(HWND hwndMain) { MONITORINFO mon_info = {sizeof(mon_info)}; RECT rect, orig, expect, nc; - BOOL ret; + LPARAM ret; HWND hwnd, hwnd2; LONG style; @@ -7722,7 +7722,7 @@ static void test_ShowWindow_owned(HWND hwndMain) wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect)); ret = ShowWindow(hwnd, SW_SHOW); - ok(!ret, "wrong ret %d\n", ret); + ok(!ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7733,7 +7733,7 @@ static void test_ShowWindow_owned(HWND hwndMain) wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect)); ret = ShowWindow(hwnd, SW_MINIMIZE); - ok(ret, "wrong ret %d\n", ret); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7763,7 +7763,7 @@ static void test_ShowWindow_owned(HWND hwndMain) * on top of each other) */ OffsetRect(&expect, GetSystemMetrics(SM_CXMINIMIZED), 0); ret = ShowWindow(hwnd2, SW_MINIMIZE); - ok(ret, "wrong ret %d\n", ret); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd2, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7774,8 +7774,8 @@ static void test_ShowWindow_owned(HWND hwndMain) ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); - ShowWindow(hwnd, SW_RESTORE); - ok(ret, "wrong ret %d\n", ret); + ret = ShowWindow(hwnd, SW_RESTORE); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7785,8 +7785,8 @@ static void test_ShowWindow_owned(HWND hwndMain) ok(EqualRect(&orig, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect)); - ShowWindow(hwnd, SW_MAXIMIZE); - ok(ret, "wrong ret %d\n", ret); + ret = ShowWindow(hwnd, SW_MAXIMIZE); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7806,8 +7806,8 @@ static void test_ShowWindow_owned(HWND hwndMain) ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); - ShowWindow(hwnd, SW_RESTORE); - ok(ret, "wrong ret %d\n", ret); + ret = ShowWindow(hwnd, SW_RESTORE); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7824,7 +7824,7 @@ static void test_ShowWindow_owned(HWND hwndMain) static void test_ShowWindow_child(HWND hwndMain) { RECT rect, orig, expect, nc; - BOOL ret; + LPARAM ret; HWND hwnd, hwnd2; LONG style; POINT pt = {0}; @@ -7854,7 +7854,7 @@ static void test_ShowWindow_child(HWND hwndMain) wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect)); ret = ShowWindow(hwnd, SW_SHOW); - ok(!ret, "wrong ret %d\n", ret); + ok(!ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7865,7 +7865,7 @@ static void test_ShowWindow_child(HWND hwndMain) wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect)); ret = ShowWindow(hwnd, SW_MINIMIZE); - ok(ret, "wrong ret %d\n", ret); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7895,7 +7895,7 @@ static void test_ShowWindow_child(HWND hwndMain) * fit more than one per row */ OffsetRect(&expect, 0, -GetSystemMetrics(SM_CYMINIMIZED)); ret = ShowWindow(hwnd2, SW_MINIMIZE); - ok(ret, "wrong ret %d\n", ret); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd2, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7905,8 +7905,8 @@ static void test_ShowWindow_child(HWND hwndMain) ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); - ShowWindow(hwnd, SW_RESTORE); - ok(ret, "wrong ret %d\n", ret); + ret = ShowWindow(hwnd, SW_RESTORE); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7916,8 +7916,8 @@ static void test_ShowWindow_child(HWND hwndMain) ok(EqualRect(&orig, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect)); - ShowWindow(hwnd, SW_MAXIMIZE); - ok(ret, "wrong ret %d\n", ret); + ret = ShowWindow(hwnd, SW_MAXIMIZE); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7939,8 +7939,8 @@ static void test_ShowWindow_child(HWND hwndMain) ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); - ShowWindow(hwnd, SW_RESTORE); - ok(ret, "wrong ret %d\n", ret); + ret = ShowWindow(hwnd, SW_RESTORE); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -7957,7 +7957,7 @@ static void test_ShowWindow_child(HWND hwndMain) static void test_ShowWindow_mdichild(HWND hwndMain) { RECT rect, orig, expect, nc; - BOOL ret; + LPARAM ret; HWND mdiclient, hwnd, hwnd2; LONG style; POINT pt = {0}; @@ -7993,7 +7993,7 @@ static void test_ShowWindow_mdichild(HWND hwndMain) wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect)); ret = ShowWindow(hwnd, SW_MINIMIZE); - ok(ret, "wrong ret %d\n", ret); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -8023,7 +8023,7 @@ static void test_ShowWindow_mdichild(HWND hwndMain) * fit more than one per row */ OffsetRect(&expect, 0, -GetSystemMetrics(SM_CYMINIMIZED)); ret = ShowWindow(hwnd2, SW_MINIMIZE); - ok(ret, "wrong ret %d\n", ret); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd2, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -8033,8 +8033,8 @@ static void test_ShowWindow_mdichild(HWND hwndMain) ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); - ShowWindow(hwnd, SW_RESTORE); - ok(ret, "wrong ret %d\n", ret); + ret = ShowWindow(hwnd, SW_RESTORE); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -8044,8 +8044,8 @@ static void test_ShowWindow_mdichild(HWND hwndMain) ok(EqualRect(&orig, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&orig), wine_dbgstr_rect(&rect)); - ShowWindow(hwnd, SW_MAXIMIZE); - ok(ret, "wrong ret %d\n", ret); + ret = ShowWindow(hwnd, SW_MAXIMIZE); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); @@ -8067,8 +8067,8 @@ static void test_ShowWindow_mdichild(HWND hwndMain) ok(EqualRect(&expect, &rect), "expected %s, got %s\n", wine_dbgstr_rect(&expect), wine_dbgstr_rect(&rect)); - ShowWindow(hwnd, SW_RESTORE); - ok(ret, "wrong ret %d\n", ret); + ret = ShowWindow(hwnd, SW_RESTORE); + ok(ret, "wrong ret %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); ok(style & WS_VISIBLE, "window should be visible\n"); -- 2.34.1

1 0