wine-commits January 2022

wine-commits@winehq.org

2 participants
726 discussions

Henri Verbeet : wined3d: Introduce a wined3d_bo_gl_unmap() helper.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 01bd9a7028133c7cf9a4beb218d83a4eba5565cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=01bd9a7028133c7cf9a4beb2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 30 21:05:24 2022 -0600 wined3d: Introduce a wined3d_bo_gl_unmap() helper. Mirroring wined3d_bo_vk_unmap(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 9236d2db90f..3a83027522a 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2758,6 +2758,19 @@ map: return map_ptr; } +static void wined3d_bo_gl_unmap(struct wined3d_bo_gl *bo, struct wined3d_context_gl *context_gl) +{ + const struct wined3d_gl_info *gl_info = context_gl->gl_info; + + if (bo->b.map_ptr) + return; + + wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); + GL_EXTCALL(glUnmapBuffer(bo->binding)); + wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); + checkGLcall("Unmap buffer object"); +} + void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data, size_t size, uint32_t flags) { @@ -2817,7 +2830,6 @@ static void flush_bo_ranges(struct wined3d_context_gl *context_gl, const struct void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data, unsigned int range_count, const struct wined3d_range *ranges) { - const struct wined3d_gl_info *gl_info; struct wined3d_bo_gl *bo; if (!data->buffer_object) @@ -2825,15 +2837,7 @@ void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, bo = wined3d_bo_gl(data->buffer_object); flush_bo_ranges(context_gl, wined3d_const_bo_address(data), range_count, ranges); - - if (bo->b.map_ptr) - return; - - gl_info = context_gl->gl_info; - wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); - GL_EXTCALL(glUnmapBuffer(bo->binding)); - wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); - checkGLcall("Unmap buffer object"); + wined3d_bo_gl_unmap(bo, context_gl); } void wined3d_context_gl_flush_bo_address(struct wined3d_context_gl *context_gl,

1 0

Stefan Dösinger : d3d8/tests: Ignore random testbot failures in test_cursor.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 83285d54bd50ae0d02f2ac3f39510a49afcb8438 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83285d54bd50ae0d02f2ac3f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 29 15:00:26 2022 +0300 d3d8/tests: Ignore random testbot failures in test_cursor. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 68b7fd00e70..cb1e83b64b3 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1074,11 +1074,19 @@ static void test_cursor(void) IDirect3DSurface8_Release(cursor); + /* On the testbot the cursor handle does not behave as expected in rare situations, + * leading to random test failures. Either the cursor handle changes before we expect + * it to, or it doesn't change afterwards (or already changed before we read the + * initial handle?). I was not able to reproduce this on my own machines. Moving the + * mouse outside the window results in similar behavior. However, I tested various + * obvious failure causes: Was the mouse moved? Was the window hidden or moved? Is + * the window in the background? Neither of those applies. Making the window topmost + * or using a fullscreen device doesn't improve the test's reliability either. */ memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); - ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ + ok(info.hCursor == cur || broken(1), "The cursor handle is %p\n", info.hCursor); /* unchanged */ /* Still hidden */ ret = IDirect3DDevice8_ShowCursor(device, TRUE); @@ -1092,7 +1100,7 @@ static void test_cursor(void) info.cbSize = sizeof(info); ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); - ok(info.hCursor != cur, "The cursor handle is %p\n", info.hCursor); + ok(info.hCursor != cur || broken(1), "The cursor handle is %p\n", info.hCursor); /* Cursor dimensions must all be powers of two */ for (test_idx = 0; test_idx < ARRAY_SIZE(cursor_sizes); ++test_idx)

1 0

Stefan Dösinger : d3d9/tests: Ignore random testbot failures in test_cursor.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: ef2943d16682cb214a403d44f848181cc2fb04ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef2943d16682cb214a403d44… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 29 15:00:25 2022 +0300 d3d9/tests: Ignore random testbot failures in test_cursor. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 2c909176c8e..7abf9ea3df2 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1886,11 +1886,19 @@ static void test_cursor(void) IDirect3DSurface9_Release(cursor); + /* On the testbot the cursor handle does not behave as expected in rare situations, + * leading to random test failures. Either the cursor handle changes before we expect + * it to, or it doesn't change afterwards (or already changed before we read the + * initial handle?). I was not able to reproduce this on my own machines. Moving the + * mouse outside the window results in similar behavior. However, I tested various + * obvious failure causes: Was the mouse moved? Was the window hidden or moved? Is + * the window in the background? Neither of those applies. Making the window topmost + * or using a fullscreen device doesn't improve the test's reliability either. */ memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); - ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ + ok(info.hCursor == cur || broken(1), "The cursor handle is %p\n", info.hCursor); /* unchanged */ /* Still hidden */ ret = IDirect3DDevice9_ShowCursor(device, TRUE); @@ -1904,7 +1912,7 @@ static void test_cursor(void) info.cbSize = sizeof(info); ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); - ok(info.hCursor != cur, "The cursor handle is %p\n", info.hCursor); + ok(info.hCursor != cur || broken(1), "The cursor handle is %p\n", info.hCursor); /* Cursor dimensions must all be powers of two */ for (test_idx = 0; test_idx < ARRAY_SIZE(cursor_sizes); ++test_idx)

1 0

Stefan Dösinger : d3d8/tests: Skip test_cursor_pos if we can't move the cursor.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 414d225bc346646b81cca2d6d1870d7fb2708c5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=414d225bc346646b81cca2d6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 31 13:19:45 2022 +0300 d3d8/tests: Skip test_cursor_pos if we can't move the cursor. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 7fdb7909db2..68b7fd00e70 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1210,6 +1210,7 @@ static void test_cursor_pos(void) HWND window; HRESULT hr; BOOL ret; + POINT pt; /* Note that we don't check for movement we're not supposed to receive. * That's because it's hard to distinguish from the user accidentally @@ -1241,6 +1242,18 @@ static void test_cursor_pos(void) ok(ret, "Failed to set cursor position.\n"); flush_events(); + /* Check if we can move the cursor. If we're running in a virtual desktop + * that does not have focus or the mouse is outside the desktop window, some + * window managers (e.g. kwin) will refuse to let us steal the pointer. That + * is reasonable, but breaks the test. */ + ret = GetCursorPos(&pt); + ok(ret, "Failed to get cursor position.\n"); + if (pt.x != 99 || pt.y != 99) + { + skip("Could not warp the cursor (cur pos %ux%u), skipping test.\n", pt.x, pt.y); + return; + } + wc.lpfnWndProc = test_cursor_proc; wc.lpszClassName = "d3d8_test_cursor_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n");

1 0

Stefan Dösinger : d3d9/tests: Skip test_cursor_pos if we can't move the cursor.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: dfd645734bf44b3095d0aea7f1bd3373e73cc629 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfd645734bf44b3095d0aea7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 31 13:19:44 2022 +0300 d3d9/tests: Skip test_cursor_pos if we can't move the cursor. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index d4ff9d0e4ed..2c909176c8e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5180,6 +5180,7 @@ static void test_cursor_pos(void) HWND window; HRESULT hr; BOOL ret; + POINT pt; /* Note that we don't check for movement we're not supposed to receive. * That's because it's hard to distinguish from the user accidentally @@ -5211,6 +5212,18 @@ static void test_cursor_pos(void) ok(ret, "Failed to set cursor position.\n"); flush_events(); + /* Check if we can move the cursor. If we're running in a virtual desktop + * that does not have focus or the mouse is outside the desktop window, some + * window managers (e.g. kwin) will refuse to let us steal the pointer. That + * is reasonable, but breaks the test. */ + ret = GetCursorPos(&pt); + ok(ret, "Failed to get cursor position.\n"); + if (pt.x != 99 || pt.y != 99) + { + skip("Could not warp the cursor (cur pos %ux%u), skipping test.\n", pt.x, pt.y); + return; + } + wc.lpfnWndProc = test_cursor_proc; wc.lpszClassName = "d3d9_test_cursor_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n");

1 0

Stefan Dösinger : d3d8/tests: Try to make test_cursor_pos more reliable.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: b88633a741aa5e2f9b03b01babb49976236f8cb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b88633a741aa5e2f9b03b01b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 31 13:19:43 2022 +0300 d3d8/tests: Try to make test_cursor_pos more reliable. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index fc94dcaaad7..7fdb7909db2 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1227,6 +1227,20 @@ static void test_cursor_pos(void) {0, 0}, }; + /* Windows 10 1709 is unreliable. One or more of the cursor movements we + * expect don't show up. Moving the mouse to a defined position beforehand + * seems to get it into better shape - only the final 150x150 move we do + * below is missing - it looks as if this Windows version filters redundant + * SetCursorPos calls on the user32 level, although I am not entirely sure. + * + * The weird thing is that the previous test leaves the cursor position + * reliably at 512x384 on the testbot. So the 50x50 mouse move shouldn't + * be stripped away anyway, but it might be a difference between moving the + * cursor through SetCursorPos vs moving it by changing the display mode. */ + ret = SetCursorPos(99, 99); + ok(ret, "Failed to set cursor position.\n"); + flush_events(); + wc.lpfnWndProc = test_cursor_proc; wc.lpszClassName = "d3d8_test_cursor_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); @@ -1259,7 +1273,8 @@ static void test_cursor_pos(void) IDirect3DDevice8_SetCursorPosition(device, 75, 75, 0); flush_events(); - /* SetCursorPosition() eats duplicates. */ + /* SetCursorPosition() eats duplicates. FIXME: Since we accept unexpected + * mouse moves the test doesn't actually demonstrate that. */ IDirect3DDevice8_SetCursorPosition(device, 75, 75, 0); flush_events(); @@ -1280,13 +1295,14 @@ static void test_cursor_pos(void) IDirect3DDevice8_SetCursorPosition(device, 150, 150, 0); flush_events(); - /* SetCursorPos() doesn't. */ + /* SetCursorPos() doesn't. Except for Win10 1709. */ ret = SetCursorPos(150, 150); ok(ret, "Failed to set cursor position.\n"); flush_events(); - ok(!expect_pos->x && !expect_pos->y, "Didn't receive MOUSEMOVE %u (%d, %d).\n", - (unsigned)(expect_pos - points), expect_pos->x, expect_pos->y); + ok((!expect_pos->x && !expect_pos->y) || broken(expect_pos - points == 7), + "Didn't receive MOUSEMOVE %u (%d, %d).\n", + (unsigned)(expect_pos - points), expect_pos->x, expect_pos->y); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Stefan Dösinger : d3d9/tests: Try to make test_cursor_pos more reliable.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: ead1672c0ed36b91d6f0280084454f9a1010f757 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ead1672c0ed36b91d6f02800… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 31 13:19:42 2022 +0300 d3d9/tests: Try to make test_cursor_pos more reliable. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index c480a9d163e..d4ff9d0e4ed 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5197,6 +5197,20 @@ static void test_cursor_pos(void) {0, 0}, }; + /* Windows 10 1709 is unreliable. One or more of the cursor movements we + * expect don't show up. Moving the mouse to a defined position beforehand + * seems to get it into better shape - only the final 150x150 move we do + * below is missing - it looks as if this Windows version filters redundant + * SetCursorPos calls on the user32 level, although I am not entirely sure. + * + * The weird thing is that the previous test leaves the cursor position + * reliably at 512x384 on the testbot. So the 50x50 mouse move shouldn't + * be stripped away anyway, but it might be a difference between moving the + * cursor through SetCursorPos vs moving it by changing the display mode. */ + ret = SetCursorPos(99, 99); + ok(ret, "Failed to set cursor position.\n"); + flush_events(); + wc.lpfnWndProc = test_cursor_proc; wc.lpszClassName = "d3d9_test_cursor_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); @@ -5231,7 +5245,8 @@ static void test_cursor_pos(void) IDirect3DDevice9_SetCursorPosition(device, 75, 75, 0); flush_events(); - /* SetCursorPosition() eats duplicates. */ + /* SetCursorPosition() eats duplicates. FIXME: Since we accept unexpected + * mouse moves the test doesn't actually demonstrate that. */ IDirect3DDevice9_SetCursorPosition(device, 75, 75, 0); flush_events(); @@ -5252,13 +5267,14 @@ static void test_cursor_pos(void) IDirect3DDevice9_SetCursorPosition(device, 150, 150, 0); flush_events(); - /* SetCursorPos() doesn't. */ + /* SetCursorPos() doesn't. Except for Win10 1709. */ ret = SetCursorPos(150, 150); ok(ret, "Failed to set cursor position.\n"); flush_events(); - ok(!expect_pos->x && !expect_pos->y, "Didn't receive MOUSEMOVE %u (%d, %d).\n", - (unsigned)(expect_pos - points), expect_pos->x, expect_pos->y); + ok((!expect_pos->x && !expect_pos->y) || broken(expect_pos - points == 7), + "Didn't receive MOUSEMOVE %u (%d, %d).\n", + (unsigned)(expect_pos - points), expect_pos->x, expect_pos->y); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Daniel Lehman : msxml3: Make utf-8 the default encoding.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 5260ab30cda07b896eaf8704890f7797dadd85f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5260ab30cda07b896eaf8704… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Nov 24 08:33:06 2021 -0800 msxml3: Make utf-8 the default encoding. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domdoc.c | 3 +++ dlls/msxml3/tests/domdoc.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 4013f106cc6..082d7950f8d 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2603,6 +2603,9 @@ static char *xmldoc_encoding(IXMLDOMDocument3 *doc) IXMLDOMNode_Release(node); } + if (!encoding && (encoding = heap_alloc(sizeof("UTF-8")))) + strcpy(encoding, "UTF-8"); + return encoding; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 761688c187b..ad4d255abe7 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6636,7 +6636,7 @@ static void test_save(void) { ReadFile(hfile, buffer, sizeof(buffer), &read, NULL); ok(read != 0, "could not read file\n"); - todo_wine ok(!memcmp(buffer, cheA, sizeof(cheA)-1), "got: %s\n", buffer); + ok(!memcmp(buffer, cheA, sizeof(cheA)-1), "got: %s\n", buffer); CloseHandle(hfile); DeleteFileA("test.xml");

1 0

Daniel Lehman : msxml3/tests: Add test saving XML with non-english characters.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: ba4838b0e6f7727a9fcb26658cfd0f3432b712a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba4838b0e6f7727a9fcb2665… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Nov 24 08:32:29 2021 -0800 msxml3/tests: Add test saving XML with non-english characters. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 48 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e931c683fb8..761688c187b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6473,7 +6473,9 @@ static void test_put_dataType( void ) static void test_save(void) { + static const char cheA[] = "<Testing che=\"\xd0\xa7\"/>"; IXMLDOMDocument *doc, *doc2; + IXMLDOMAttribute *attr; IXMLDOMElement *root; BSTR sOrig, sNew, filename; char buffer[100]; @@ -6481,7 +6483,7 @@ static void test_save(void) HGLOBAL global; VARIANT_BOOL b; DWORD read = 0; - VARIANT dest; + VARIANT v, dest; HANDLE hfile; HRESULT hr; char *ptr; @@ -6600,6 +6602,50 @@ static void test_save(void) IStream_Release(stream); IXMLDOMDocument_Release(doc); + + /* test default encoding with non-english characters */ + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &root); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)root, NULL); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_createAttribute(doc, _bstr_("che"), &attr); + EXPECT_HR(hr, S_OK); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(L"\x0427"); + hr = IXMLDOMAttribute_put_value(attr, v); + EXPECT_HR(hr, S_OK); + VariantClear(&v); + + hr = IXMLDOMElement_setAttributeNode(root, attr, NULL); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_BSTR; + V_BSTR(&dest) = _bstr_("test.xml"); + + hr = IXMLDOMDocument_save(doc, dest); + EXPECT_HR(hr, S_OK); + + hfile = CreateFileA("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); + ok(hfile != INVALID_HANDLE_VALUE, "Could not open file: %u\n", GetLastError()); + if (hfile != INVALID_HANDLE_VALUE) + { + ReadFile(hfile, buffer, sizeof(buffer), &read, NULL); + ok(read != 0, "could not read file\n"); + todo_wine ok(!memcmp(buffer, cheA, sizeof(cheA)-1), "got: %s\n", buffer); + + CloseHandle(hfile); + DeleteFileA("test.xml"); + } + + IXMLDOMAttribute_Release(attr); + IXMLDOMElement_Release(root); + IXMLDOMDocument_Release(doc); + free_bstrs(); }

1 0

Rémi Bernon : hid: Use msvcrt allocation functions.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: wine Branch: master Commit: 232d10e754b58b07f847b1ecdac7c6f0dd10bd69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=232d10e754b58b07f847b1ec… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 31 10:11:01 2022 +0100 hid: Use msvcrt allocation functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index bf5874d05ab..a82ba8392a1 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -21,6 +21,7 @@ #include <stdarg.h> +#include <stdlib.h> #include "wine/debug.h" @@ -55,7 +56,7 @@ static BOOL sync_ioctl(HANDLE file, DWORD code, void *in_buf, DWORD in_len, void BOOLEAN WINAPI HidD_FreePreparsedData( PHIDP_PREPARSED_DATA preparsed_data ) { TRACE( "preparsed_data %p.\n", preparsed_data ); - HeapFree( GetProcessHeap(), 0, preparsed_data ); + free( preparsed_data ); return TRUE; } @@ -142,11 +143,11 @@ BOOLEAN WINAPI HidD_GetPreparsedData( HANDLE file, PHIDP_PREPARSED_DATA *prepars if (!sync_ioctl( file, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(info) )) return FALSE; - if (!(data = HeapAlloc(GetProcessHeap(), 0, info.DescriptorSize))) return FALSE; + if (!(data = malloc( info.DescriptorSize ))) return FALSE; if (!sync_ioctl( file, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, data, info.DescriptorSize )) { - HeapFree( GetProcessHeap(), 0, data ); + free( data ); return FALSE; } *preparsed_data = data;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2022