- Wine-devel - list.winehq.org

[PATCH v3 2/5] comctl32/tests: Add iItem and uChanged to LVN_ITEMCHANGING/LVN_ITEMCHANGED context.
by Dmitry Timoshkov 20 Feb '22

20 Feb '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/listview.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 5485cd4b4e2..bc89e8938be 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -472,7 +472,17 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; - if (message == WM_NOTIFY && lParam) msg.id = ((NMHDR*)lParam)->code; + if (message == WM_NOTIFY && lParam) + { + NMLISTVIEW *nmlv = (NMLISTVIEW *)lParam; + + msg.id = nmlv->hdr.code; + if (msg.id == LVN_ITEMCHANGING || msg.id == LVN_ITEMCHANGED) + { + msg.wParam = nmlv->iItem; + msg.lParam = nmlv->uChanged; + } + } if (message == WM_COMMAND) msg.id = HIWORD(wParam); /* log system messages, except for painting */ -- 2.35.1

2 1

[PATCH v3 1/5] comctl32/tests: Print id value as decimal.
by Dmitry Timoshkov 20 Feb '22

20 Feb '22

All the notification codes (printed as an id) have negative base value (SBN_, UDN_, HDN_, BCN_, TBN_, TTN_, RBN_, TRBN_, PGN_, TVN_, LVN_, TCN_, CBEN_, IPN_, MCN_, DTN_), and printing them as decimal helps to quickly identify the corresponding notification value in cases when an id in the message sequence doesn't match. Custom ids in the message sequences have small numbers (0, 1, 2, ...), so they also get printed correctly. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/msg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/msg.h b/dlls/comctl32/tests/msg.h index 7337c724a5c..8ba2efddb0a 100644 --- a/dlls/comctl32/tests/msg.h +++ b/dlls/comctl32/tests/msg.h @@ -261,14 +261,14 @@ static void ok_sequence_(struct msg_sequence **seq, int sequence_index, failcount++; dump++; ok_(file, line) (FALSE, - "%s: in msg 0x%04x expecting id 0x%x got 0x%x\n", + "%s: in msg 0x%04x expecting id %d got %d\n", context, expected->message, expected->id, actual->id); } } else { ok_(file, line) (expected->id == actual->id, - "%s: in msg 0x%04x expecting id 0x%x got 0x%x\n", + "%s: in msg 0x%04x expecting id %d got %d\n", context, expected->message, expected->id, actual->id); if (expected->id != actual->id) dump++; } -- 2.35.1

3 2

[v2 PATCH] t2embed/tests: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 20 Feb '22

20 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/t2embed/tests/Makefile.in | 1 - dlls/t2embed/tests/t2embed.c | 54 ++++++++++++++++++---------------- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/dlls/t2embed/tests/Makefile.in b/dlls/t2embed/tests/Makefile.in index 69d91384869..c4f49a3f6ca 100644 --- a/dlls/t2embed/tests/Makefile.in +++ b/dlls/t2embed/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = t2embed.dll IMPORTS = user32 gdi32 t2embed diff --git a/dlls/t2embed/tests/t2embed.c b/dlls/t2embed/tests/t2embed.c index 4ffc3daed12..004ba5492ae 100644 --- a/dlls/t2embed/tests/t2embed.c +++ b/dlls/t2embed/tests/t2embed.c @@ -43,7 +43,7 @@ static int CALLBACK enum_font_proc(ENUMLOGFONTEXA *enumlf, NEWTEXTMETRICEXA *ntm UINT fsType = otm.otmfsType & 0xf; ret = TTGetEmbeddingType(hdc, &status); - ok(ret == E_NONE || ret == E_NOTATRUETYPEFONT, "Unexpected return value %#x.\n", ret); + ok(ret == E_NONE || ret == E_NOTATRUETYPEFONT, "Unexpected return value %#lx.\n", ret); if (ret == E_NONE) { @@ -56,7 +56,7 @@ static int CALLBACK enum_font_proc(ENUMLOGFONTEXA *enumlf, NEWTEXTMETRICEXA *ntm else if (fsType & LICENSE_NOEMBEDDING) expected = EMBED_NOEMBEDDING; - ok(expected == status, "%s: status %d, expected %d, fsType %#x\n", enumlf->elfLogFont.lfFaceName, status, + ok(expected == status, "%s: status %ld, expected %ld, fsType %#x\n", enumlf->elfLogFont.lfFaceName, status, expected, otm.otmfsType); } } @@ -64,8 +64,8 @@ static int CALLBACK enum_font_proc(ENUMLOGFONTEXA *enumlf, NEWTEXTMETRICEXA *ntm { status = 0xdeadbeef; ret = TTGetEmbeddingType(hdc, &status); - ok(ret == E_NOTATRUETYPEFONT, "%s: got %d\n", enumlf->elfLogFont.lfFaceName, ret); - ok(status == 0xdeadbeef, "%s: got status %d\n", enumlf->elfLogFont.lfFaceName, status); + ok(ret == E_NOTATRUETYPEFONT, "%s: got %ld.\n", enumlf->elfLogFont.lfFaceName, ret); + ok(status == 0xdeadbeef, "%s: got status %#lx.\n", enumlf->elfLogFont.lfFaceName, status); } SelectObject(hdc, old_font); @@ -84,27 +84,28 @@ static void test_TTGetEmbeddingType(void) HDC hdc; ret = TTGetEmbeddingType(NULL, NULL); - ok(ret == E_HDCINVALID, "got %d\n", ret); + ok(ret == E_HDCINVALID, "Unexpected retval %#lx.\n", ret); status = 0xdeadbeef; ret = TTGetEmbeddingType(NULL, &status); - ok(ret == E_HDCINVALID, "got %#x\n", ret); - ok(status == 0xdeadbeef, "got %u\n", status); + ok(ret == E_HDCINVALID, "Unexpected retval %#lx.\n", ret); + ok(status == 0xdeadbeef, "Unexpected status %#lx.\n", status); status = 0xdeadbeef; ret = TTGetEmbeddingType((HDC)0xdeadbeef, &status); - ok(ret == E_NOTATRUETYPEFONT || broken(ret == E_ERRORACCESSINGFONTDATA) /* xp, vista */, "got %#x\n", ret); - ok(status == 0xdeadbeef, "got %u\n", status); + ok(ret == E_NOTATRUETYPEFONT || broken(ret == E_ERRORACCESSINGFONTDATA) /* xp, vista */, + "Unexpected retval %#lx.\n", ret); + ok(status == 0xdeadbeef, "Unexpected status %#lx.\n", status); hdc = CreateCompatibleDC(0); ret = TTGetEmbeddingType(hdc, NULL); - ok(ret == E_NOTATRUETYPEFONT, "got %#x\n", ret); + ok(ret == E_NOTATRUETYPEFONT, "Unexpected retval %#lx.\n", ret); status = 0xdeadbeef; ret = TTGetEmbeddingType(hdc, &status); - ok(ret == E_NOTATRUETYPEFONT, "got %#x\n", ret); - ok(status == 0xdeadbeef, "got %u\n", status); + ok(ret == E_NOTATRUETYPEFONT, "Unexpected retval %#lx.\n", ret); + ok(status == 0xdeadbeef, "Unexpected status %#lx.\n", status); memset(&logfont, 0, sizeof(logfont)); logfont.lfHeight = 12; @@ -117,11 +118,11 @@ static void test_TTGetEmbeddingType(void) status = 0; ret = TTGetEmbeddingType(hdc, &status); - ok(ret == E_NONE, "got %#x\n", ret); - ok(status != 0, "got %u\n", status); + ok(ret == E_NONE, "Unexpected retval %#lx.\n", ret); + ok(status != 0, "Unexpected status %lu.\n", status); ret = TTGetEmbeddingType(hdc, NULL); - ok(ret == E_PERMISSIONSINVALID, "got %#x\n", ret); + ok(ret == E_PERMISSIONSINVALID, "Unexpected retval %#lx.\n", ret); SelectObject(hdc, old_font); DeleteObject(hfont); @@ -140,36 +141,37 @@ static void test_TTIsEmbeddingEnabledForFacename(void) LONG ret; ret = TTIsEmbeddingEnabledForFacename(NULL, NULL); - ok(ret == E_FACENAMEINVALID, "got %#x\n", ret); + ok(ret == E_FACENAMEINVALID, "Unexpected retval %#lx.\n", ret); status = 123; ret = TTIsEmbeddingEnabledForFacename(NULL, &status); - ok(ret == E_FACENAMEINVALID, "got %#x\n", ret); + ok(ret == E_FACENAMEINVALID, "Unexpected retval %#lx.\n", ret); ok(status == 123, "got %d\n", status); ret = TTIsEmbeddingEnabledForFacename("Arial", NULL); - ok(ret == E_PBENABLEDINVALID, "got %#x\n", ret); + ok(ret == E_PBENABLEDINVALID, "Unexpected retval %#lx.\n", ret); status = 123; ret = TTIsEmbeddingEnabledForFacename("Arial", &status); - ok(ret == E_NONE, "got %#x\n", ret); + ok(ret == E_NONE, "Unexpected retval %#lx.\n", ret); ok(status != 123, "got %d\n", status); } static void test_TTIsEmbeddingEnabled(void) { HFONT old_font, hfont; - LONG ret, status; LOGFONTA logfont; + BOOL status; + LONG ret; HDC hdc; ret = TTIsEmbeddingEnabled(NULL, NULL); - ok(ret == E_HDCINVALID, "got %#x\n", ret); + ok(ret == E_HDCINVALID, "Unexpected retval %#lx.\n", ret); status = 123; ret = TTIsEmbeddingEnabled(NULL, &status); - ok(ret == E_HDCINVALID, "got %#x\n", ret); - ok(status == 123, "got %d\n", status); + ok(ret == E_HDCINVALID, "Unexpected retval %#lx.\n", ret); + ok(status == 123, "Unexpected status %d.\n", status); hdc = CreateCompatibleDC(0); @@ -183,12 +185,12 @@ static void test_TTIsEmbeddingEnabled(void) old_font = SelectObject(hdc, hfont); ret = TTIsEmbeddingEnabled(hdc, NULL); - ok(ret == E_PBENABLEDINVALID, "Unexpected return value %#x.\n", ret); + ok(ret == E_PBENABLEDINVALID, "Unexpected retval %#lx.\n", ret); status = 123; ret = TTIsEmbeddingEnabled(hdc, &status); - ok(ret == E_NONE, "got %#x\n", ret); - ok(status != 123, "got %u\n", status); + ok(ret == E_NONE, "Unexpected retval %#lx.\n", ret); + ok(status != 123, "Unexpected status %d.\n", status); SelectObject(hdc, old_font); DeleteObject(hfont); -- 2.34.1

2 1

[PATCH] t2embed/tests: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 20 Feb '22

20 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/t2embed/tests/Makefile.in | 1 - dlls/t2embed/tests/t2embed.c | 54 ++++++++++++++++++---------------- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/dlls/t2embed/tests/Makefile.in b/dlls/t2embed/tests/Makefile.in index 69d91384869..c4f49a3f6ca 100644 --- a/dlls/t2embed/tests/Makefile.in +++ b/dlls/t2embed/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = t2embed.dll IMPORTS = user32 gdi32 t2embed diff --git a/dlls/t2embed/tests/t2embed.c b/dlls/t2embed/tests/t2embed.c index 4ffc3daed12..130b17cd2c3 100644 --- a/dlls/t2embed/tests/t2embed.c +++ b/dlls/t2embed/tests/t2embed.c @@ -43,7 +43,7 @@ static int CALLBACK enum_font_proc(ENUMLOGFONTEXA *enumlf, NEWTEXTMETRICEXA *ntm UINT fsType = otm.otmfsType & 0xf; ret = TTGetEmbeddingType(hdc, &status); - ok(ret == E_NONE || ret == E_NOTATRUETYPEFONT, "Unexpected return value %#x.\n", ret); + ok(ret == E_NONE || ret == E_NOTATRUETYPEFONT, "Unexpected return value %#lx.\n", ret); if (ret == E_NONE) { @@ -56,7 +56,7 @@ static int CALLBACK enum_font_proc(ENUMLOGFONTEXA *enumlf, NEWTEXTMETRICEXA *ntm else if (fsType & LICENSE_NOEMBEDDING) expected = EMBED_NOEMBEDDING; - ok(expected == status, "%s: status %d, expected %d, fsType %#x\n", enumlf->elfLogFont.lfFaceName, status, + ok(expected == status, "%s: status %ld, expected %ld, fsType %#x\n", enumlf->elfLogFont.lfFaceName, status, expected, otm.otmfsType); } } @@ -64,8 +64,8 @@ static int CALLBACK enum_font_proc(ENUMLOGFONTEXA *enumlf, NEWTEXTMETRICEXA *ntm { status = 0xdeadbeef; ret = TTGetEmbeddingType(hdc, &status); - ok(ret == E_NOTATRUETYPEFONT, "%s: got %d\n", enumlf->elfLogFont.lfFaceName, ret); - ok(status == 0xdeadbeef, "%s: got status %d\n", enumlf->elfLogFont.lfFaceName, status); + ok(ret == E_NOTATRUETYPEFONT, "%s: got %ld.\n", enumlf->elfLogFont.lfFaceName, ret); + ok(status == 0xdeadbeef, "%s: got status %#lx.\n", enumlf->elfLogFont.lfFaceName, status); } SelectObject(hdc, old_font); @@ -84,27 +84,28 @@ static void test_TTGetEmbeddingType(void) HDC hdc; ret = TTGetEmbeddingType(NULL, NULL); - ok(ret == E_HDCINVALID, "got %d\n", ret); + ok(ret == E_HDCINVALID, "Unexpected retval %#lx.\n", ret); status = 0xdeadbeef; ret = TTGetEmbeddingType(NULL, &status); - ok(ret == E_HDCINVALID, "got %#x\n", ret); - ok(status == 0xdeadbeef, "got %u\n", status); + ok(ret == E_HDCINVALID, "Unexpected retval %#lx.\n", ret); + ok(status == 0xdeadbeef, "Unexpected status %#lx.\n", status); status = 0xdeadbeef; ret = TTGetEmbeddingType((HDC)0xdeadbeef, &status); - ok(ret == E_NOTATRUETYPEFONT || broken(ret == E_ERRORACCESSINGFONTDATA) /* xp, vista */, "got %#x\n", ret); - ok(status == 0xdeadbeef, "got %u\n", status); + ok(ret == E_NOTATRUETYPEFONT || broken(ret == E_ERRORACCESSINGFONTDATA) /* xp, vista */, + "Unexpected retval %#lx.\n", ret); + ok(status == 0xdeadbeef, "Unexpected status %#lx.\n", status); hdc = CreateCompatibleDC(0); ret = TTGetEmbeddingType(hdc, NULL); - ok(ret == E_NOTATRUETYPEFONT, "got %#x\n", ret); + ok(ret == E_NOTATRUETYPEFONT, "Unexpected retval %#lx.\n", ret); status = 0xdeadbeef; ret = TTGetEmbeddingType(hdc, &status); - ok(ret == E_NOTATRUETYPEFONT, "got %#x\n", ret); - ok(status == 0xdeadbeef, "got %u\n", status); + ok(ret == E_NOTATRUETYPEFONT, "Unexpected retval %#lx.\n", ret); + ok(status == 0xdeadbeef, "Unexpected status %#lx.\n", status); memset(&logfont, 0, sizeof(logfont)); logfont.lfHeight = 12; @@ -117,11 +118,11 @@ static void test_TTGetEmbeddingType(void) status = 0; ret = TTGetEmbeddingType(hdc, &status); - ok(ret == E_NONE, "got %#x\n", ret); - ok(status != 0, "got %u\n", status); + ok(ret == E_NONE, "Unexpected retval %#lx.\n", ret); + ok(status != 0, "Unexpected status %lu.\n", status); ret = TTGetEmbeddingType(hdc, NULL); - ok(ret == E_PERMISSIONSINVALID, "got %#x\n", ret); + ok(ret == E_PERMISSIONSINVALID, "Unexpected retval %#lx.\n", ret); SelectObject(hdc, old_font); DeleteObject(hfont); @@ -140,36 +141,37 @@ static void test_TTIsEmbeddingEnabledForFacename(void) LONG ret; ret = TTIsEmbeddingEnabledForFacename(NULL, NULL); - ok(ret == E_FACENAMEINVALID, "got %#x\n", ret); + ok(ret == E_FACENAMEINVALID, "Unexpected retval %#lx.\n", ret); status = 123; ret = TTIsEmbeddingEnabledForFacename(NULL, &status); - ok(ret == E_FACENAMEINVALID, "got %#x\n", ret); + ok(ret == E_FACENAMEINVALID, "Unexpected retval %#lx.\n", ret); ok(status == 123, "got %d\n", status); ret = TTIsEmbeddingEnabledForFacename("Arial", NULL); - ok(ret == E_PBENABLEDINVALID, "got %#x\n", ret); + ok(ret == E_PBENABLEDINVALID, "Unexpected retval %#lx.\n", ret); status = 123; ret = TTIsEmbeddingEnabledForFacename("Arial", &status); - ok(ret == E_NONE, "got %#x\n", ret); + ok(ret == E_NONE, "Unexpected retval %#lx.\n", ret); ok(status != 123, "got %d\n", status); } static void test_TTIsEmbeddingEnabled(void) { HFONT old_font, hfont; - LONG ret, status; LOGFONTA logfont; + BOOL status; + LONG ret; HDC hdc; ret = TTIsEmbeddingEnabled(NULL, NULL); - ok(ret == E_HDCINVALID, "got %#x\n", ret); + ok(ret == E_HDCINVALID, "Unexpected retval %#lx.\n", ret); status = 123; ret = TTIsEmbeddingEnabled(NULL, &status); - ok(ret == E_HDCINVALID, "got %#x\n", ret); - ok(status == 123, "got %d\n", status); + ok(ret == E_HDCINVALID, "Unexpected retval %#lx.\n", ret); + ok(status != 123, "Unexpected status %d.\n", status); hdc = CreateCompatibleDC(0); @@ -183,12 +185,12 @@ static void test_TTIsEmbeddingEnabled(void) old_font = SelectObject(hdc, hfont); ret = TTIsEmbeddingEnabled(hdc, NULL); - ok(ret == E_PBENABLEDINVALID, "Unexpected return value %#x.\n", ret); + ok(ret == E_PBENABLEDINVALID, "Unexpected retval %#lx.\n", ret); status = 123; ret = TTIsEmbeddingEnabled(hdc, &status); - ok(ret == E_NONE, "got %#x\n", ret); - ok(status != 123, "got %u\n", status); + ok(ret == E_NONE, "Unexpected retval %#lx.\n", ret); + ok(status != 123, "Unexpected status %d.\n", status); SelectObject(hdc, old_font); DeleteObject(hfont); -- 2.34.1

2 1

[PATCH] dxva2/tests: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 20 Feb '22

20 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/tests/Makefile.in | 1 - dlls/dxva2/tests/dxva2.c | 182 +++++++++++++++++------------------ 2 files changed, 91 insertions(+), 92 deletions(-) diff --git a/dlls/dxva2/tests/Makefile.in b/dlls/dxva2/tests/Makefile.in index 03e8afa3191..ccd03940a24 100644 --- a/dlls/dxva2/tests/Makefile.in +++ b/dlls/dxva2/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = dxva2.dll IMPORTS = dxva2 user32 d3d9 ole32 diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index d94299f0c78..cc5bc3cd76f 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -66,14 +66,14 @@ static void test_surface_desc(IDirect3DSurface9 *surface) HRESULT hr; hr = IDirect3DSurface9_GetDesc(surface, &desc); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(desc.Format == D3DFMT_X8R8G8B8, "Unexpected format %d.\n", desc.Format); ok(desc.Type == D3DRTYPE_SURFACE, "Unexpected type %d.\n", desc.Type); - ok(desc.Usage == 0, "Unexpected usage %d.\n", desc.Usage); + ok(!desc.Usage, "Unexpected usage %ld.\n", desc.Usage); ok(desc.Pool == D3DPOOL_DEFAULT, "Unexpected pool %d.\n", desc.Pool); ok(desc.MultiSampleType == D3DMULTISAMPLE_NONE, "Unexpected multisample type %d.\n", desc.MultiSampleType); - ok(desc.MultiSampleQuality == 0, "Unexpected multisample quality %d.\n", desc.MultiSampleQuality); + ok(!desc.MultiSampleQuality, "Unexpected multisample quality %ld.\n", desc.MultiSampleQuality); ok(desc.Width == 64, "Unexpected width %u.\n", desc.Width); ok(desc.Height == 64, "Unexpected height %u.\n", desc.Height); } @@ -134,31 +134,31 @@ static void test_device_manager(void) } hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); - ok(hr == DXVA2_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + ok(hr == DXVA2_E_NOT_INITIALIZED, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_LockDevice(manager, 0, &device2, FALSE); - ok(hr == DXVA2_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + ok(hr == DXVA2_E_NOT_INITIALIZED, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, 0); - ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + ok(hr == E_HANDLE, "Unexpected hr %#lx.\n", hr); /* Invalid token. */ hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token + 1); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); refcount = get_refcount(device); hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, 0); - ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + ok(hr == E_HANDLE, "Unexpected hr %#lx.\n", hr); handle1 = NULL; hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!handle1, "Unexpected handle value.\n"); refcount2 = get_refcount(device); @@ -166,172 +166,172 @@ static void test_device_manager(void) handle = NULL; hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(handle != handle1, "Unexpected handle.\n"); hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Already closed. */ hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); - ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + ok(hr == E_HANDLE, "Unexpected hr %#lx.\n", hr); handle = NULL; hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_TestDevice(manager, handle1); - ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + ok(hr == E_HANDLE, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_TestDevice(manager, 0); - ok(hr == E_HANDLE, "Unexpected hr %#x.\n", hr); + ok(hr == E_HANDLE, "Unexpected hr %#lx.\n", hr); handle = NULL; hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); handle1 = NULL; hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoProcessorService, (void **)&processor_service); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IDirectXVideoProcessorService_Release(processor_service); device2 = create_device(d3d, window); hr = IDirect3DDeviceManager9_ResetDevice(manager, device2, token); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoProcessorService, (void **)&processor_service); - ok(hr == DXVA2_E_NEW_VIDEO_DEVICE, "Unexpected hr %#x.\n", hr); + ok(hr == DXVA2_E_NEW_VIDEO_DEVICE, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_TestDevice(manager, handle); - ok(hr == DXVA2_E_NEW_VIDEO_DEVICE, "Unexpected hr %#x.\n", hr); + ok(hr == DXVA2_E_NEW_VIDEO_DEVICE, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Lock/Unlock. */ hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_LockDevice(manager, handle, &device3, FALSE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(device2 == device3, "Unexpected device pointer.\n"); IDirect3DDevice9_Release(device3); hr = IDirect3DDeviceManager9_UnlockDevice(manager, handle, FALSE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_UnlockDevice(manager, handle, FALSE); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_UnlockDevice(manager, (HANDLE)((ULONG_PTR)handle + 100), FALSE); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* Locked with one handle, unlock with another. */ hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_LockDevice(manager, handle, &device3, FALSE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(device2 == device3, "Unexpected device pointer.\n"); IDirect3DDevice9_Release(device3); hr = IDirect3DDeviceManager9_UnlockDevice(manager, handle1, FALSE); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); /* Closing unlocks the device. */ hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_LockDevice(manager, handle1, &device3, FALSE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(device2 == device3, "Unexpected device pointer.\n"); IDirect3DDevice9_Release(device3); hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Open two handles. */ hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_LockDevice(manager, handle, &device3, FALSE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(device2 == device3, "Unexpected device pointer.\n"); IDirect3DDevice9_Release(device3); hr = IDirect3DDeviceManager9_LockDevice(manager, handle1, &device3, FALSE); - ok(hr == DXVA2_E_VIDEO_DEVICE_LOCKED, "Unexpected hr %#x.\n", hr); + ok(hr == DXVA2_E_VIDEO_DEVICE_LOCKED, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* State saving function. */ hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_LockDevice(manager, handle, &device3, FALSE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(device2 == device3, "Unexpected device pointer.\n"); SetRect(&rect, 50, 60, 70, 80); hr = IDirect3DDevice9_SetScissorRect(device3, &rect); - ok(SUCCEEDED(hr), "Failed to set scissor rect, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_UnlockDevice(manager, handle, TRUE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); SetRect(&rect, 30, 60, 70, 80); hr = IDirect3DDevice9_SetScissorRect(device3, &rect); - ok(SUCCEEDED(hr), "Failed to set scissor rect, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IDirect3DDevice9_Release(device3); hr = IDirect3DDeviceManager9_LockDevice(manager, handle, &device3, FALSE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(device2 == device3, "Unexpected device pointer.\n"); hr = IDirect3DDevice9_GetScissorRect(device3, &rect); - ok(SUCCEEDED(hr), "Failed to get scissor rect, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(rect.left == 50 && rect.top == 60 && rect.right == 70 && rect.bottom == 80, "Got unexpected scissor rect %s.\n", wine_dbgstr_rect(&rect)); IDirect3DDevice9_Release(device3); hr = IDirect3DDeviceManager9_UnlockDevice(manager, handle, TRUE); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); /* Acceleration service. */ hr = DXVA2CreateVideoService(device, &IID_IDirectXVideoAccelerationService, (void **)&accel_service); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); surfaces[0] = surfaces[1] = NULL; hr = IDirectXVideoAccelerationService_CreateSurface(accel_service, 64, 64, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, surfaces, NULL); - ok(hr == S_OK, "Failed to create a surface, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!surfaces[0] && !surfaces[1], "Unexpected surfaces.\n"); IDirect3DSurface9_Release(surfaces[0]); hr = IDirectXVideoAccelerationService_CreateSurface(accel_service, 64, 64, 1, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, surfaces, NULL); - ok(hr == S_OK, "Failed to create a surface, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!surfaces[0] && !!surfaces[1], "Unexpected surfaces.\n"); test_surface_desc(surfaces[0]); IDirect3DSurface9_Release(surfaces[0]); @@ -341,12 +341,12 @@ static void test_device_manager(void) /* RT formats. */ hr = DXVA2CreateVideoService(device, &IID_IDirectXVideoProcessorService, (void **)&proc_service); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); init_video_desc(&video_desc, D3DFMT_A8R8G8B8); hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count, "Unexpected format count %u.\n", count); CoTaskMemFree(guids); @@ -357,7 +357,7 @@ static void test_device_manager(void) count = 0; hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); todo_wine_if(rt_formats[i] == MAKEFOURCC('A','Y','U','V')) - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); if (FAILED(hr)) continue; ok(count > 0, "Unexpected device count.\n"); CoTaskMemFree(guids); @@ -365,7 +365,7 @@ static void test_device_manager(void) count = 0; hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, &video_desc, &count, &formats); - ok(hr == S_OK, "Unexpected hr %#x, format %d.\n", hr, rt_formats[i]); + ok(hr == S_OK, "Unexpected hr %#lx, format %d.\n", hr, rt_formats[i]); ok(count == 2, "Unexpected format count %u.\n", count); if (count == 2) ok(formats[0] == D3DFMT_X8R8G8B8 && formats[1] == D3DFMT_A8R8G8B8, "Unexpected formats %d,%d.\n", @@ -379,27 +379,27 @@ static void test_device_manager(void) hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, &video_desc, &count, &formats); - ok(hr == E_FAIL, "Unexpected hr %#x, format %d.\n", hr, rt_unsupported_formats[i]); + ok(hr == E_FAIL, "Unexpected hr %#lx, format %d.\n", hr, rt_unsupported_formats[i]); } IDirectXVideoProcessorService_Release(proc_service); hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoAccelerationService, (void **)&accel_service); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXVideoAccelerationService_CreateSurface(accel_service, 64, 64, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, surfaces, NULL); - ok(hr == S_OK, "Failed to create a surface, hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DSurface9_GetDevice(surfaces[0], &device3); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(device2 == device3, "Unexpected device.\n"); IDirect3DDevice9_Release(device3); @@ -443,24 +443,24 @@ static void test_video_processor(void) } hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); handle = NULL; hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); handle1 = NULL; hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(get_refcount(manager) == 1, "Unexpected refcount %u.\n", get_refcount(manager)); hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoProcessorService, (void **)&service); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); memset(&video_desc, 0, sizeof(video_desc)); video_desc.SampleWidth = 64; @@ -470,24 +470,24 @@ static void test_video_processor(void) /* Number of substreams does not include reference stream. */ hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &DXVA2_VideoProcSoftwareDevice, &video_desc, D3DFMT_A8R8G8B8, 16, &processor); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &DXVA2_VideoProcSoftwareDevice, &video_desc, D3DFMT_A8R8G8B8, 15, &processor); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IDirectXVideoProcessor_Release(processor); hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &DXVA2_VideoProcSoftwareDevice, &video_desc, D3DFMT_A8R8G8B8, 0, &processor); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IDirectXVideoProcessor_Release(processor); hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &DXVA2_VideoProcSoftwareDevice, &video_desc, D3DFMT_A8R8G8B8, 1, &processor); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXVideoProcessor_GetVideoProcessorCaps(processor, &caps); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(caps.DeviceCaps == DXVA2_VPDev_SoftwareDevice, "Unexpected device type %#x.\n", caps.DeviceCaps); ok(caps.InputPool == D3DPOOL_SYSTEMMEM, "Unexpected input pool %#x.\n", caps.InputPool); ok(!caps.NumForwardRefSamples, "Unexpected sample count.\n"); @@ -507,18 +507,18 @@ static void test_video_processor(void) hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &DXVA2_VideoProcSoftwareDevice, &video_desc, D3DFMT_A8R8G8B8, 1, &processor2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(processor2 != processor, "Unexpected instance.\n"); hr = IDirectXVideoProcessor_GetCreationParameters(processor, NULL, NULL, NULL, NULL); - ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); hr = IDirectXVideoProcessor_GetCreationParameters(processor, &guid, NULL, NULL, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(IsEqualGUID(&guid, &DXVA2_VideoProcSoftwareDevice), "Unexpected device guid.\n"); hr = IDirectXVideoProcessor_GetCreationParameters(processor, NULL, NULL, &format, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(format == D3DFMT_A8R8G8B8, "Unexpected format %u.\n", format); IDirectXVideoProcessor_Release(processor); @@ -526,17 +526,17 @@ static void test_video_processor(void) hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoProcessorService, (void **)&service2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(service == service2, "Unexpected pointer.\n"); IDirectXVideoProcessorService_Release(service2); IDirectXVideoProcessorService_Release(service); hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IDirect3DDevice9_Release(device); IDirect3DDeviceManager9_Release(manager); @@ -597,18 +597,18 @@ static void test_progressive_device(void) } hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); handle = NULL; hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoProcessorService, (void **)&service); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); memset(&video_desc, 0, sizeof(video_desc)); video_desc.SampleWidth = 64; @@ -631,7 +631,7 @@ static void test_progressive_device(void) /* Check that progressive device is returned for given input format. */ count = 0; hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(service, &video_desc, &count, &guids); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(count > 0, "Unexpected device count.\n"); for (j = 0; j < count; ++j) { @@ -643,7 +643,7 @@ static void test_progressive_device(void) count = 0; hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(service, &DXVA2_VideoProcProgressiveDevice, &video_desc, &count, &rt_formats); - ok(hr == S_OK, "Unexpected hr %#x, format %d.\n", hr, input_formats[i]); + ok(hr == S_OK, "Unexpected hr %#lx, format %d.\n", hr, input_formats[i]); ok(count > 0, "Unexpected format count %u.\n", count); for (j = 0; j < count; ++j) { @@ -660,10 +660,10 @@ static void test_progressive_device(void) hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &DXVA2_VideoProcProgressiveDevice, &video_desc, D3DFMT_A8R8G8B8, 0, &processor); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IDirectXVideoProcessor_GetVideoProcessorCaps(processor, &caps); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(caps.DeviceCaps == DXVA2_VPDev_HardwareDevice, "Unexpected device type %#x.\n", caps.DeviceCaps); ok(!caps.NumForwardRefSamples, "Unexpected sample count.\n"); ok(!caps.NumBackwardRefSamples, "Unexpected sample count.\n"); @@ -672,7 +672,7 @@ static void test_progressive_device(void) caps.VideoProcessorOperations); hr = IDirectXVideoProcessor_GetCreationParameters(processor, &guid, NULL, &format, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(IsEqualGUID(&guid, &DXVA2_VideoProcProgressiveDevice), "Unexpected device guid.\n"); ok(format == D3DFMT_A8R8G8B8, "Unexpected format %u.\n", format); @@ -682,7 +682,7 @@ unsupported: IDirectXVideoProcessorService_Release(service); hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IDirect3DDevice9_Release(device); IDirect3DDeviceManager9_Release(manager); -- 2.34.1

1 0

[PATCH] shcore/tests: Build without -DWINE_NO_LONG_TYPES.
by Nikolay Sivov 20 Feb '22

20 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shcore/tests/Makefile.in | 1 - dlls/shcore/tests/shcore.c | 136 +++++++++++++++++----------------- 2 files changed, 68 insertions(+), 69 deletions(-) diff --git a/dlls/shcore/tests/Makefile.in b/dlls/shcore/tests/Makefile.in index f20c27aae2d..4f537fa3874 100644 --- a/dlls/shcore/tests/Makefile.in +++ b/dlls/shcore/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = shcore.dll IMPORTS = advapi32 diff --git a/dlls/shcore/tests/shcore.c b/dlls/shcore/tests/shcore.c index a75bfd899eb..af6b3b392f3 100644 --- a/dlls/shcore/tests/shcore.c +++ b/dlls/shcore/tests/shcore.c @@ -138,30 +138,30 @@ static void test_process_reference(void) obj = (void *)0xdeadbeef; hr = pGetProcessReference(&obj); - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); ok(obj == NULL, "Unexpected pointer.\n"); test_unk_init(&test_unk); test_unk_init(&test_unk2); pSetProcessReference(&test_unk.IUnknown_iface); - ok(test_unk.refcount == 1, "Unexpected refcount %u.\n", test_unk.refcount); + ok(test_unk.refcount == 1, "Unexpected refcount %lu.\n", test_unk.refcount); pSetProcessReference(&test_unk2.IUnknown_iface); - ok(test_unk.refcount == 1, "Unexpected refcount %u.\n", test_unk.refcount); - ok(test_unk2.refcount == 1, "Unexpected refcount %u.\n", test_unk2.refcount); + ok(test_unk.refcount == 1, "Unexpected refcount %lu.\n", test_unk.refcount); + ok(test_unk2.refcount == 1, "Unexpected refcount %lu.\n", test_unk2.refcount); hr = pGetProcessReference(&obj); - ok(hr == S_OK, "Failed to get reference, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get reference, hr %#lx.\n", hr); ok(obj == &test_unk2.IUnknown_iface, "Unexpected pointer.\n"); - ok(test_unk2.refcount == 2, "Unexpected refcount %u.\n", test_unk2.refcount); + ok(test_unk2.refcount == 2, "Unexpected refcount %lu.\n", test_unk2.refcount); hmod = LoadLibraryA("shell32.dll"); pSHGetInstanceExplorer = (void *)GetProcAddress(hmod, "SHGetInstanceExplorer"); hr = pSHGetInstanceExplorer(&obj); - ok(hr == S_OK, "Failed to get reference, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get reference, hr %#lx.\n", hr); ok(obj == &test_unk2.IUnknown_iface, "Unexpected pointer.\n"); - ok(test_unk2.refcount == 3, "Unexpected refcount %u.\n", test_unk2.refcount); + ok(test_unk2.refcount == 3, "Unexpected refcount %lu.\n", test_unk2.refcount); } static void test_SHUnicodeToAnsi(void) @@ -334,7 +334,7 @@ static void test_SHRegDuplicateHKey(void) DWORD ret; ret = RegCreateKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test", &hkey); - ok(!ret, "Failed to create test key, ret %d.\n", ret); + ok(!ret, "Failed to create test key, ret %ld.\n", ret); hkey2 = pSHRegDuplicateHKey(hkey); ok(hkey2 != NULL && hkey2 != hkey, "Unexpected duplicate key.\n"); @@ -351,20 +351,20 @@ static void test_SHDeleteKey(void) DWORD ret; ret = RegCreateKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test", &hkey); - ok(!ret, "Failed to create test key, %d.\n", ret); + ok(!ret, "Failed to create test key, %ld.\n", ret); ret = RegCreateKeyA(hkey, "delete_key", &hkey2); - ok(!ret, "Failed to create test key, %d.\n", ret); + ok(!ret, "Failed to create test key, %ld.\n", ret); RegCloseKey(hkey2); ret = RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test"); - ok(ret == ERROR_ACCESS_DENIED, "Unexpected return value %d.\n", ret); + ok(ret == ERROR_ACCESS_DENIED, "Unexpected return value %ld.\n", ret); ret = pSHDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test"); - ok(!ret, "Failed to delete a key, %d.\n", ret); + ok(!ret, "Unexpected retval %lu.\n", ret); ret = RegCloseKey(hkey); - ok(!ret, "Failed to delete a key, %d.\n", ret); + ok(!ret, "Unexpected retval %lu.\n", ret); } static HKEY create_test_entries(void) @@ -377,7 +377,7 @@ static HKEY create_test_entries(void) SetEnvironmentVariableA("FOO", test_envvar2); ret = RegCreateKeyA(HKEY_CURRENT_USER, REG_TEST_KEY, &hKey); - ok(!ret, "RegCreateKeyA failed, ret=%u\n", ret); + ok(!ret, "Unexpected retval %lu.\n", ret); if (hKey) { @@ -431,18 +431,18 @@ static void test_SHGetValue(void) size = MAX_PATH; type = -1; ret = pSHGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test1", &type, buf, &size); - ok(!ret, "Failed to get value, ret %u.\n", ret); + ok(!ret, "Failed to get value, ret %lu.\n", ret); ok(!strcmp(test_exp_path1, buf), "Unexpected value %s.\n", buf); - ok(type == REG_SZ, "Unexpected value type %d.\n", type); + ok(type == REG_SZ, "Unexpected type %ld.\n", type); strcpy(buf, initial_buffer); size = MAX_PATH; type = -1; ret = pSHGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test2", &type, buf, &size); - ok(!ret, "Failed to get value, ret %u.\n", ret); + ok(!ret, "Failed to get value, ret %lu.\n", ret); ok(!strcmp(test_path1, buf), "Unexpected value %s.\n", buf); - ok(type == REG_SZ, "Unexpected value type %d.\n", type); + ok(type == REG_SZ, "Unexpected type %ld.\n", type); delete_key(hkey, "Software\\Wine", "Test"); } @@ -457,31 +457,31 @@ static void test_SHRegGetValue(void) size = MAX_PATH; ret = pSHRegGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test1", SRRF_RT_REG_EXPAND_SZ, &type, data, &size); - ok(ret == ERROR_INVALID_PARAMETER, "SHRegGetValue failed, ret=%u\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Unexpected retval %lu.\n", ret); size = MAX_PATH; ret = pSHRegGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test1", SRRF_RT_REG_SZ, &type, data, &size); - ok(ret == ERROR_SUCCESS, "SHRegGetValue failed, ret=%u\n", ret); + ok(!ret, "Unexpected retval %lu.\n", ret); ok(!strcmp(data, test_exp_path1), "data = %s, expected %s\n", data, test_exp_path1); - ok(type == REG_SZ, "type = %d, expected REG_SZ\n", type); + ok(type == REG_SZ, "Unexpected type %ld.\n", type); size = MAX_PATH; ret = pSHRegGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test1", SRRF_RT_REG_DWORD, &type, data, &size); - ok(ret == ERROR_UNSUPPORTED_TYPE, "SHRegGetValue failed, ret=%u\n", ret); + ok(ret == ERROR_UNSUPPORTED_TYPE, "Unexpected retval %lu.\n", ret); size = MAX_PATH; ret = pSHRegGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test2", SRRF_RT_REG_EXPAND_SZ, &type, data, &size); - ok(ret == ERROR_INVALID_PARAMETER, "SHRegGetValue failed, ret=%u\n", ret); + ok(ret == ERROR_INVALID_PARAMETER, "Unexpected retval %lu.\n", ret); size = MAX_PATH; ret = pSHRegGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test2", SRRF_RT_REG_SZ, &type, data, &size); - ok(ret == ERROR_SUCCESS, "SHRegGetValue failed, ret=%u\n", ret); + ok(!ret, "Unexpected retval %lu.\n", ret); ok(!strcmp(data, test_path1), "data = %s, expected %s\n", data, test_path1); - ok(type == REG_SZ, "type = %d, expected REG_SZ\n", type); + ok(type == REG_SZ, "Unexpected type %ld.\n", type); size = MAX_PATH; ret = pSHRegGetValueA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test2", SRRF_RT_REG_QWORD, &type, data, &size); - ok(ret == ERROR_UNSUPPORTED_TYPE, "SHRegGetValue failed, ret=%u\n", ret); + ok(ret == ERROR_UNSUPPORTED_TYPE, "Unexpected retval %lu.\n", ret); delete_key(hkey, "Software\\Wine", "Test"); } @@ -496,7 +496,7 @@ static void test_SHQueryValueEx(void) testkey = create_test_entries(); ret = RegOpenKeyExA(HKEY_CURRENT_USER, REG_TEST_KEY, 0, KEY_QUERY_VALUE, &hKey); - ok(!ret, "Failed to open a key, ret %u.\n", ret); + ok(!ret, "Failed to open a key, ret %lu.\n", ret); /****** SHQueryValueExA ******/ @@ -507,28 +507,28 @@ static void test_SHQueryValueEx(void) * Case 1.1 All arguments are NULL */ ret = pSHQueryValueExA( hKey, "Test1", NULL, NULL, NULL, NULL); - ok(!ret, "Failed to query value, ret %u.\n", ret); + ok(!ret, "Failed to query value, ret %lu.\n", ret); /* * Case 1.2 dwType is set */ type = -1; ret = pSHQueryValueExA( hKey, "Test1", NULL, &type, NULL, NULL); - ok(!ret, "Failed to query value, ret %u.\n", ret); - ok(type == REG_SZ, "Expected REG_SZ, got (%u)\n", type); + ok(!ret, "Failed to query value, ret %lu.\n", ret); + ok(type == REG_SZ, "Unexpected type %ld.\n", type); size = 6; ret = pSHQueryValueExA( hKey, "Test1", NULL, NULL, NULL, &size); - ok(!ret, "Failed to query value, ret %u.\n", ret); - ok(size == buffer_len1, "Buffer sizes (%u) and (%u) are not equal\n", size, buffer_len1); + ok(!ret, "Failed to query value, ret %lu.\n", ret); + ok(size == buffer_len1, "Buffer sizes %lu and %lu are not equal\n", size, buffer_len1); /* * Expanded > unexpanded */ size = 6; ret = pSHQueryValueExA( hKey, "Test3", NULL, NULL, NULL, &size); - ok(!ret, "Failed to query value, ret %u.\n", ret); - ok(size >= buffer_len2, "Buffer size (%u) should be >= (%u)\n", size, buffer_len2); + ok(!ret, "Failed to query value, ret %lu.\n", ret); + ok(size >= buffer_len2, "Buffer size %lu should be >= %lu.\n", size, buffer_len2); /* * Case 1 string shrinks during expanding @@ -537,10 +537,10 @@ static void test_SHQueryValueEx(void) size = 6; type = -1; ret = pSHQueryValueExA( hKey, "Test1", NULL, &type, buf, &size); - ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got (%u)\n", ret); + ok(ret == ERROR_MORE_DATA, "Unexpected retval %ld.\n", ret); ok(!strcmp(initial_buffer, buf), "Comparing (%s) with (%s) failed\n", buf, initial_buffer); - ok(size == buffer_len1, "Buffer sizes (%u) and (%u) are not equal\n", size, buffer_len1); - ok(type == REG_SZ, "Expected REG_SZ, got (%u)\n", type); + ok(size == buffer_len1, "Buffer sizes %lu and %lu are not equal\n", size, buffer_len1); + ok(type == REG_SZ, "Unexpected type %ld.\n", type); /* * string grows during expanding @@ -550,10 +550,10 @@ static void test_SHQueryValueEx(void) size = 6; type = -1; ret = pSHQueryValueExA( hKey, "Test3", NULL, &type, buf, &size); - ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got (%u)\n", ret); + ok(ret == ERROR_MORE_DATA, "Unexpected retval %ld.\n", ret); ok(!strcmp(initial_buffer, buf), "Comparing (%s) with (%s) failed\n", buf, initial_buffer); - ok(size >= buffer_len2, "Buffer size (%u) should be >= (%u)\n", size, buffer_len2); - ok(type == REG_SZ, "Expected REG_SZ, got (%u)\n", type); + ok(size >= buffer_len2, "Buffer size %lu should be >= %lu.\n", size, buffer_len2); + ok(type == REG_SZ, "Unexpected type %ld.\n", type); /* * string grows during expanding @@ -565,15 +565,15 @@ static void test_SHQueryValueEx(void) size = strlen(test_envvar2) - 2; type = -1; ret = pSHQueryValueExA(hKey, "Test3", NULL, &type, buf, &size); - ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got (%u)\n", ret); + ok(ret == ERROR_MORE_DATA, "Unexpected retval %ld.\n", ret); todo_wine { ok(!strcmp("", buf), "Unexpanded string %s.\n", buf); } - ok(size >= buffer_len2, "Buffer size (%u) should be >= (%u)\n", size, buffer_len2); - ok(type == REG_SZ, "Expected REG_SZ, got (%u)\n", type); + ok(size >= buffer_len2, "Buffer size %lu should be >= %lu.\n", size, buffer_len2); + ok(type == REG_SZ, "Unexpected type %ld.\n", type); /* * string grows during expanding @@ -585,7 +585,7 @@ static void test_SHQueryValueEx(void) size = exp_len2 - 4; type = -1; ret = pSHQueryValueExA( hKey, "Test3", NULL, &type, buf, &size); - ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got (%u)\n", ret); + ok(ret == ERROR_MORE_DATA, "Unexpected retval %ld.\n", ret); todo_wine { @@ -593,8 +593,8 @@ static void test_SHQueryValueEx(void) "Expected empty or first part of the string \"%s\", got \"%s\"\n", test_envvar2, buf); } - ok(size >= buffer_len2, "Buffer size (%u) should be >= (%u)\n", size, buffer_len2); - ok(type == REG_SZ, "Expected REG_SZ, got (%u)\n", type); + ok(size >= buffer_len2, "Buffer size %lu should be >= %lu.\n", size, buffer_len2); + ok(type == REG_SZ, "Unexpected type %ld.\n", type); /* * The buffer is NULL but the size is set @@ -603,9 +603,9 @@ static void test_SHQueryValueEx(void) size = 6; type = -1; ret = pSHQueryValueExA( hKey, "Test3", NULL, &type, NULL, &size); - ok(!ret, "Failed to query value, ret %u.\n", ret); - ok(size >= buffer_len2, "Buffer size (%u) should be >= (%u)\n", size, buffer_len2); - ok(type == REG_SZ, "Expected REG_SZ, got (%u)\n", type); + ok(!ret, "Failed to query value, ret %lu.\n", ret); + ok(size >= buffer_len2, "Buffer size %lu should be >= %lu.\n", size, buffer_len2); + ok(type == REG_SZ, "Unexpected type %ld.\n", type); RegCloseKey(hKey); @@ -622,7 +622,7 @@ static void test_SHRegGetPath(void) strcpy(buf, initial_buffer); ret = pSHRegGetPathA(HKEY_CURRENT_USER, REG_TEST_KEY, "Test1", buf, 0); - ok(!ret, "Failed to get path, ret %u.\n", ret); + ok(!ret, "Failed to get path, ret %lu.\n", ret); ok(!strcmp(test_exp_path1, buf), "Unexpected path %s.\n", buf); delete_key(hkey, "Software\\Wine", "Test"); @@ -645,14 +645,14 @@ static void test_SHCopyKey(void) hKeyDst = NULL; ret = RegCreateKeyA(HKEY_CURRENT_USER, REG_TEST_KEY "\\CopyDestination", &hKeyDst); - ok(!ret, "Failed to create a test key, ret %d.\n", ret); + ok(!ret, "Failed to create a test key, ret %ld.\n", ret); hKeySrc = NULL; ret = RegOpenKeyA(HKEY_LOCAL_MACHINE, REG_CURRENT_VERSION, &hKeySrc); - ok(!ret, "Failed to open a test key, ret %d.\n", ret); + ok(!ret, "Failed to open a test key, ret %ld.\n", ret); ret = pSHCopyKeyA(hKeySrc, NULL, hKeyDst, 0); - ok(!ret, "Copy failed, ret=(%u)\n", ret); + ok(!ret, "Copy failed, ret %lu.\n", ret); RegCloseKey(hKeySrc); RegCloseKey(hKeyDst); @@ -660,7 +660,7 @@ static void test_SHCopyKey(void) /* Check we copied the sub keys, i.e. something that's on every windows system (including Wine) */ hKeyDst = NULL; ret = RegOpenKeyA(HKEY_CURRENT_USER, REG_TEST_KEY "\\CopyDestination\\Shell Folders", &hKeyDst); - ok(!ret, "Failed to open a test key, ret %d.\n", ret); + ok(!ret, "Failed to open a test key, ret %ld.\n", ret); /* And the we copied the values too */ ok(!pSHQueryValueExA(hKeyDst, "Common AppData", NULL, NULL, NULL, NULL), "SHQueryValueExA failed\n"); @@ -676,7 +676,7 @@ static void _check_file_size(const CHAR *filename, LONG exp_size, int line) DWORD file_size = 0xdeadbeef; handle = CreateFileA(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); file_size = GetFileSize(handle, NULL); - ok_(__FILE__,line)(file_size == exp_size, "got wrong file size: %d.\n", file_size); + ok_(__FILE__,line)(file_size == exp_size, "got wrong file size: %ld.\n", file_size); CloseHandle(handle); } @@ -688,11 +688,11 @@ static void _check_stream_size(IStream *obj, LONG exp_size, int line) HRESULT hr; stream_size.QuadPart = 0xdeadbeef; hr = pIStream_Size(obj, &stream_size); - ok_(__FILE__,line)(hr == S_OK, "IStream_Size failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(hr == S_OK, "IStream_Size failed: hr %#lx.\n", hr); ok_(__FILE__,line)(stream_size.QuadPart == exp_size, "Size(): got wrong size of stream: %s.\n", wine_dbgstr_longlong(stream_size.QuadPart)); hr = IStream_Stat(obj, &stat, STATFLAG_NONAME); - ok_(__FILE__,line)(hr == S_OK, "IStream_Stat failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(hr == S_OK, "IStream_Stat failed: hr %#lx.\n", hr); ok_(__FILE__,line)(stat.cbSize.QuadPart == exp_size, "Stat(): got wrong size of stream: %s.\n", wine_dbgstr_longlong(stat.cbSize.QuadPart)); } @@ -706,7 +706,7 @@ static void _check_stream_pos(IStream *obj, LONG exp_pos, int line) move.QuadPart = 0; pos.QuadPart = 0xdeadbeef; hr = IStream_Seek(obj, move, STREAM_SEEK_CUR, &pos); - ok_(__FILE__,line)(hr == S_OK, "IStream_Seek failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(hr == S_OK, "IStream_Seek failed: hr %#lx.\n", hr); ok_(__FILE__,line)(pos.QuadPart == exp_pos, "got wrong position: %s.\n", wine_dbgstr_longlong(pos.QuadPart)); } @@ -722,32 +722,32 @@ static void test_stream_size(void) HRESULT hr; handle = CreateFileA(filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); - ok(handle != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError()); + ok(handle != INVALID_HANDLE_VALUE, "File creation failed: %lu.\n", GetLastError()); WriteFile(handle, test_data, sizeof(test_data), &written, NULL); ok(written == sizeof(test_data), "Failed to write data into file.\n"); CloseHandle(handle); /* in read-only mode, SetSize() will success but it has no effect on Size() and the file */ hr = pSHCreateStreamOnFileA(filename, STGM_FAILIFTHERE|STGM_READ, &stream); - ok(hr == S_OK, "SHCreateStreamOnFileA failed: 0x%08x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_STREAM_SIZE(stream, sizeof(test_data)); stream_size.QuadPart = 0; hr = IStream_SetSize(stream, stream_size); - ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_STREAM_SIZE(stream, sizeof(test_data)); CHECK_STREAM_POS(stream, 0); stream_size.QuadPart = 100; hr = IStream_SetSize(stream, stream_size); - ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_STREAM_SIZE(stream, sizeof(test_data)); CHECK_STREAM_POS(stream, 100); IStream_Release(stream); CHECK_FILE_SIZE(filename, sizeof(test_data)); hr = pSHCreateStreamOnFileA(filename, STGM_FAILIFTHERE|STGM_WRITE, &stream); - ok(hr == S_OK, "SHCreateStreamOnFileA failed: 0x%08x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = pSHCreateStreamOnFileA(filename, STGM_FAILIFTHERE|STGM_READ, &stream2); - ok(hr == S_OK, "SHCreateStreamOnFileA failed: 0x%08x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_STREAM_SIZE(stream, sizeof(test_data)); CHECK_STREAM_SIZE(stream2, sizeof(test_data)); CHECK_STREAM_POS(stream, 0); @@ -755,7 +755,7 @@ static void test_stream_size(void) stream_size.QuadPart = 0; hr = IStream_SetSize(stream, stream_size); - ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_STREAM_SIZE(stream, 0); CHECK_STREAM_SIZE(stream2, 0); CHECK_STREAM_POS(stream, 0); @@ -763,7 +763,7 @@ static void test_stream_size(void) stream_size.QuadPart = 100; hr = IStream_SetSize(stream, stream_size); - ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_STREAM_SIZE(stream, 100); CHECK_STREAM_SIZE(stream2, 100); CHECK_STREAM_POS(stream, 0); @@ -771,7 +771,7 @@ static void test_stream_size(void) stream_size.QuadPart = 90; hr = IStream_SetSize(stream2, stream_size); - ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); CHECK_STREAM_SIZE(stream, 100); CHECK_STREAM_SIZE(stream2, 100); CHECK_STREAM_POS(stream, 0); -- 2.34.1

1 0

[PATCH] user32: Add stubs for RegisterSuspendResumeNotification/UnregisterSuspendResumeNotification.
by Wen Wang 20 Feb '22

20 Feb '22

These functions are required for some Steam version of The Legend of Heroes games to launch. Signed-off-by: Wen Wang <v72807647(a)gmail.com> --- dlls/user32/misc.c | 19 +++++++++++++++++++ dlls/user32/user32.spec | 2 ++ include/winuser.h | 2 ++ 3 files changed, 23 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 25d0b676667..e8b63028460 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -443,6 +443,25 @@ BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY handle) return TRUE; } +/********************************************************************** + * RegisterSuspendResumeNotification [USER32.@] + */ +HPOWERNOTIFY WINAPI RegisterSuspendResumeNotification(HANDLE recipient, DWORD flags) +{ + FIXME("(%p,%x): stub\n", recipient, flags); + return (HPOWERNOTIFY)0xdeadbeef; +} + +/********************************************************************** + * UnregisterSuspendResumeNotification [USER32.@] + */ +BOOL WINAPI UnregisterSuspendResumeNotification(HPOWERNOTIFY handle) +{ + FIXME("(%p): stub\n", handle); + return TRUE; +} + + /***************************************************************************** * GetGestureConfig (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 3baa7594e84..432211efb7a 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -605,6 +605,7 @@ @ stub RegisterNetworkCapabilities @ stdcall RegisterPointerDeviceNotifications(long long) @ stdcall RegisterPowerSettingNotification(long ptr long) +@ stdcall RegisterSuspendResumeNotification(long long) @ stdcall RegisterRawInputDevices(ptr long long) @ stdcall RegisterServicesProcess(long) @ stdcall RegisterShellHookWindow (long) @@ -783,6 +784,7 @@ @ stdcall UnregisterHotKey(long long) NtUserUnregisterHotKey # @ stub UnregisterMessagePumpHook @ stdcall UnregisterPowerSettingNotification(ptr) +@ stdcall UnregisterSuspendResumeNotification(ptr) @ stdcall UnregisterTouchWindow(long) @ stdcall UnregisterUserApiHook() @ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) diff --git a/include/winuser.h b/include/winuser.h index 898c9034e33..0197c986033 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4126,6 +4126,7 @@ WINUSERAPI HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE,LPVOID,DWORD); WINUSERAPI BOOL WINAPI RegisterHotKey(HWND,INT,UINT,UINT); WINUSERAPI BOOL WINAPI RegisterPointerDeviceNotifications(HWND,BOOL); WINUSERAPI HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE,LPCGUID,DWORD); +WINUSERAPI HPOWERNOTIFY WINAPI RegisterSuspendResumeNotification(HANDLE,DWORD); WINUSERAPI BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE,UINT,UINT); WINUSERAPI BOOL WINAPI RegisterShellHookWindow(HWND); WINUSERAPI BOOL WINAPI RegisterTouchWindow(HWND,ULONG); @@ -4300,6 +4301,7 @@ WINUSERAPI BOOL WINAPI UnregisterClassW(LPCWSTR,HINSTANCE); WINUSERAPI BOOL WINAPI UnregisterDeviceNotification(HDEVNOTIFY); WINUSERAPI BOOL WINAPI UnregisterHotKey(HWND,INT); WINUSERAPI BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY); +WINUSERAPI BOOL WINAPI UnregisterSuspendResumeNotification(HPOWERNOTIFY); WINUSERAPI BOOL WINAPI UnregisterTouchWindow(HWND); WINUSERAPI BOOL WINAPI UpdateWindow(HWND); WINUSERAPI BOOL WINAPI UserHandleGrantAccess(HANDLE,HANDLE,BOOL); -- 2.32.0

1 0

[PATCH] mfplat: Add VT_R4 case for propvariant tracing.
by Nikolay Sivov 20 Feb '22

20 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mfplat_private.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index dc29545df73..8418c8eb2ef 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -133,6 +133,8 @@ static inline const char *debugstr_propvar(const PROPVARIANT *v) return wine_dbg_sprintf("%p {VT_UI8: %s}", v, wine_dbgstr_longlong(v->uhVal.QuadPart)); case VT_I8: return wine_dbg_sprintf("%p {VT_I8: %s}", v, wine_dbgstr_longlong(v->hVal.QuadPart)); + case VT_R4: + return wine_dbg_sprintf("%p {VT_R4: %.8e}", v, v->fltVal); case VT_R8: return wine_dbg_sprintf("%p {VT_R8: %lf}", v, v->dblVal); case VT_CLSID: -- 2.34.1

1 0

[PATCH 00/11] Several programs/cmd improvements
by Eric Pouech 20 Feb '22

20 Feb '22

The first 7 patches have already been sent to wine-devel, but felt into the void (adding interactive tests framework to cmd, and fixing a couple of bugs in interactive more handling, including tests). So, resubmitting. The rest (4) patches implement tab and shift tab completion for filenames in cmd (trying to mimic native behavior). NB: I intentionnaly left ioctl 23 unused (as it appears in Roman's patches about GetConsoleProcessList). Won't resolve the potential merge conflict though. A+ --- Eric Pouech (11): programs/cmd/tests: don't output more data than available programs/cmd/tests: added ability to run tests in interactive mode programs/cmd/tests: some interactive test about input echo programs/cmd/tests: added support for multi-line input programs/cmd: handle white space only lines within ( ) block programs/cmd: expand commandline before parsing it (interactive mode) programs/cmd: detect badly quoted operand in 'if' statement kernelbase/console, programs/conhost: support CONSOLE_READCONSOLE_CONTROL in ReadConsoleW dlls/kernelbase, programs/conhost: return key state in ReadConsoleW with completion programs/cmd: implement filename completion programs/conhost: handle csi escape sequence for shift tab dlls/kernelbase/console.c | 36 ++- include/wine/condrv.h | 1 + programs/cmd/batch.c | 252 +++++++++++++++++- programs/cmd/builtins.c | 10 + programs/cmd/tests/batch.c | 111 ++++++-- programs/cmd/tests/interactive_builtins.cmd | 42 +++ .../cmd/tests/interactive_builtins.cmd.exp | 67 +++++ programs/cmd/tests/rsrc.rc | 10 + programs/cmd/wcmdmain.c | 34 ++- programs/conhost/conhost.c | 114 ++++++-- programs/conhost/conhost.h | 2 + server/console.c | 1 + 12 files changed, 618 insertions(+), 62 deletions(-) create mode 100644 programs/cmd/tests/interactive_builtins.cmd create mode 100644 programs/cmd/tests/interactive_builtins.cmd.exp

3 14

[PATCH 1/4] scrrun: Move IO mode check to writing helper.
by Nikolay Sivov 20 Feb '22

20 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/scrrun/filesystem.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 4794437a71d..0e51929ea54 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -609,11 +609,14 @@ static HRESULT WINAPI textstream_ReadAll(ITextStream *iface, BSTR *text) return read_from_buffer(This, This->read_buf_size, text, 0) ? S_FALSE : E_OUTOFMEMORY; } -static HRESULT textstream_writestr(struct textstream *stream, BSTR text) +static HRESULT textstream_write(struct textstream *stream, BSTR text) { DWORD written = 0; BOOL ret; + if (textstream_check_iomode(stream, IOWrite)) + return CTL_E_BADFILEMODE; + if (stream->unicode) { ret = WriteFile(stream->file, text, SysStringByteLen(text), &written, NULL); return (ret && written == SysStringByteLen(text)) ? S_OK : create_error(GetLastError()); @@ -636,14 +639,11 @@ static HRESULT textstream_writestr(struct textstream *stream, BSTR text) static HRESULT WINAPI textstream_Write(ITextStream *iface, BSTR text) { - struct textstream *This = impl_from_ITextStream(iface); - - TRACE("(%p)->(%s)\n", This, debugstr_w(text)); + struct textstream *stream = impl_from_ITextStream(iface); - if (textstream_check_iomode(This, IOWrite)) - return CTL_E_BADFILEMODE; + TRACE("%p, %s.\n", iface, debugstr_w(text)); - return textstream_writestr(This, text); + return textstream_write(stream, text); } static HRESULT textstream_writecrlf(struct textstream *stream) @@ -669,17 +669,14 @@ static HRESULT textstream_writecrlf(struct textstream *stream) static HRESULT WINAPI textstream_WriteLine(ITextStream *iface, BSTR text) { - struct textstream *This = impl_from_ITextStream(iface); + struct textstream *stream = impl_from_ITextStream(iface); HRESULT hr; - TRACE("(%p)->(%s)\n", This, debugstr_w(text)); - - if (textstream_check_iomode(This, IOWrite)) - return CTL_E_BADFILEMODE; + TRACE("%p, %s.\n", iface, debugstr_w(text)); - hr = textstream_writestr(This, text); + hr = textstream_write(stream, text); if (SUCCEEDED(hr)) - hr = textstream_writecrlf(This); + hr = textstream_writecrlf(stream); return hr; } -- 2.34.1

1 3