June 2022 - Wine-Commits - list.winehq.org

Zebediah Figura : user32: Use HID ioctls directly.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: 879ef36148b489f82a3d99d2113b01eb7eb985a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=879ef36148b489f82a3d99d2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 2 14:37:01 2022 -0500 user32: Use HID ioctls directly. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/Makefile.in | 2 +- dlls/user32/rawinput.c | 53 +++++++++++++++++++++++++++++-------------------- 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 3f4115c5679..79821929390 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -3,7 +3,7 @@ MODULE = user32.dll IMPORTLIB = user32 IMPORTS = $(PNG_PE_LIBS) gdi32 version sechost advapi32 kernelbase win32u EXTRAINCL = $(PNG_PE_CFLAGS) -DELAYIMPORTS = hid setupapi imm32 +DELAYIMPORTS = setupapi imm32 C_SRCS = \ button.c \ diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index c9afc18ea53..5f5c898be0e 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -26,11 +26,11 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winioctl.h" #include "winnls.h" #include "winreg.h" #include "winuser.h" #include "setupapi.h" -#include "ddk/hidsdi.h" #include "wine/debug.h" #include "wine/server.h" #include "wine/hid.h" @@ -53,7 +53,7 @@ struct device HANDLE file; HANDLE handle; RID_DEVICE_INFO info; - PHIDP_PREPARSED_DATA data; + struct hid_preparsed_data *data; }; static struct device *rawinput_devices; @@ -100,12 +100,13 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, static const RID_DEVICE_INFO_KEYBOARD keyboard_info = {0, 0, 1, 12, 3, 101}; static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - PHIDP_PREPARSED_DATA preparsed_data = NULL; + struct hid_preparsed_data *preparsed = NULL; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; - struct hid_preparsed_data *preparsed; + HID_COLLECTION_INFORMATION hid_info; struct device *device = NULL; RID_DEVICE_INFO info; - HIDD_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + NTSTATUS status; UINT32 handle; DWORD i, size; HANDLE file; @@ -152,23 +153,33 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, switch (type) { case RIM_TYPEHID: - attr.Size = sizeof(HIDD_ATTRIBUTES); - if (!HidD_GetAttributes( device->file, &attr )) + status = NtDeviceIoControlFile( device->file, NULL, NULL, NULL, &io, + IOCTL_HID_GET_COLLECTION_INFORMATION, + NULL, 0, &hid_info, sizeof(hid_info) ); + if (status) { - ERR( "Failed to get attributes.\n" ); + ERR( "Failed to get collection information, status %#lx.\n", status ); goto fail; } - info.hid.dwVendorId = attr.VendorID; - info.hid.dwProductId = attr.ProductID; - info.hid.dwVersionNumber = attr.VersionNumber; + info.hid.dwVendorId = hid_info.VendorID; + info.hid.dwProductId = hid_info.ProductID; + info.hid.dwVersionNumber = hid_info.VersionNumber; + + if (!(preparsed = malloc( hid_info.DescriptorSize ))) + { + ERR( "Failed to allocate memory.\n" ); + goto fail; + } - if (!HidD_GetPreparsedData( file, &preparsed_data )) + status = NtDeviceIoControlFile( device->file, NULL, NULL, NULL, &io, + IOCTL_HID_GET_COLLECTION_DESCRIPTOR, + NULL, 0, preparsed, hid_info.DescriptorSize ); + if (status) { - ERR( "Failed to get preparsed data.\n" ); + ERR( "Failed to get collection descriptor, status %#lx.\n", status ); goto fail; } - preparsed = (struct hid_preparsed_data *)preparsed_data; info.hid.usUsagePage = preparsed->usage_page; info.hid.usUsage = preparsed->usage; @@ -190,7 +201,7 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, if (device) { TRACE("Updating device %x / %s.\n", handle, debugstr_w(detail->DevicePath)); - HidD_FreePreparsedData(device->data); + free(device->data); CloseHandle(device->file); free(device->detail); } @@ -210,12 +221,12 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, device->file = file; device->handle = ULongToHandle(handle); device->info = info; - device->data = preparsed_data; + device->data = preparsed; return device; fail: - free( preparsed_data ); + free( preparsed ); CloseHandle( file ); free( detail ); return NULL; @@ -235,7 +246,7 @@ void rawinput_update_device_list(void) /* destroy previous list */ for (idx = 0; idx < rawinput_devices_count; ++idx) { - HidD_FreePreparsedData(rawinput_devices[idx].data); + free(rawinput_devices[idx].data); CloseHandle(rawinput_devices[idx].file); free(rawinput_devices[idx].detail); } @@ -779,12 +790,12 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT break; case RIDI_PREPARSEDDATA: - if (!(preparsed = (struct hid_preparsed_data *)device->data)) len = 0; + if (!(preparsed = device->data)) len = 0; else len = preparsed->caps_size + FIELD_OFFSET(struct hid_preparsed_data, value_caps[0]) + preparsed->number_link_collection_nodes * sizeof(struct hid_collection_node); - if (device->data && len <= data_len && data) - memcpy(data, device->data, len); + if (preparsed && len <= data_len && data) + memcpy(data, preparsed, len); *data_size = len; break;

1 0

Ziqing Hui : xmllite: Increase depth in reader_set_current_attribute().
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: e2ae7ccb794beb8043a3eaaffc2fe0840085d1ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2ae7ccb794beb8043a3eaaf… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jun 2 15:10:00 2022 +0800 xmllite: Increase depth in reader_set_current_attribute(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 5 ++--- dlls/xmllite/tests/reader.c | 14 +++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 03bb6c409b7..4045b4dfcca 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2931,6 +2931,8 @@ static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node static void reader_set_current_attribute(xmlreader *reader, struct attribute *attr) { + if (!reader->attr) + reader_inc_depth(reader); reader->attr = attr; reader->chunk_read_off = 0; reader_set_strvalue(reader, StringValue_Prefix, &attr->prefix); @@ -2943,9 +2945,6 @@ static HRESULT reader_move_to_first_attribute(xmlreader *reader) if (!reader->attr_count) return S_FALSE; - if (!reader->attr) - reader_inc_depth(reader); - reader_set_current_attribute(reader, LIST_ENTRY(list_head(&reader->attrs), struct attribute, entry)); return S_OK; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 7b68365ac48..2ea781ce992 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2592,17 +2592,17 @@ static void test_attribute_by_name(void) hr = IXmlReader_MoveToAttributeByName(reader, L"xmlns", xmlns_uriW); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine TEST_DEPTH(reader, 2); + TEST_DEPTH(reader, 2); reader_value(reader, L"myns"); hr = IXmlReader_MoveToAttributeByName(reader, L"a", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine TEST_DEPTH(reader, 2); + TEST_DEPTH(reader, 2); reader_value(reader, L"value a"); hr = IXmlReader_MoveToAttributeByName(reader, L"b", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine TEST_DEPTH(reader, 2); + TEST_DEPTH(reader, 2); reader_value(reader, L"value b"); hr = IXmlReader_MoveToAttributeByName(reader, L"a", L"myns"); @@ -2613,22 +2613,22 @@ static void test_attribute_by_name(void) hr = IXmlReader_MoveToAttributeByName(reader, L"ns", xmlns_uriW); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine TEST_DEPTH(reader, 2); + TEST_DEPTH(reader, 2); reader_value(reader, L"ns uri"); hr = IXmlReader_MoveToAttributeByName(reader, L"b", L""); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine TEST_DEPTH(reader, 2); + TEST_DEPTH(reader, 2); reader_value(reader, L"value b"); hr = IXmlReader_MoveToAttributeByName(reader, L"c", NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine TEST_DEPTH(reader, 2); + TEST_DEPTH(reader, 2); reader_value(reader, L"value c2"); hr = IXmlReader_MoveToAttributeByName(reader, L"c", L"ns uri"); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine TEST_DEPTH(reader, 2); + TEST_DEPTH(reader, 2); reader_value(reader, L"value c"); IXmlReader_Release(reader);

1 0

Jacek Caban : winemac: Move macdrv_sent_text_input to event.c.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: fa670ef001faa850177e5ea4dd87174d4098f276 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa670ef001faa850177e5ea4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 31 20:09:45 2022 +0200 winemac: Move macdrv_sent_text_input to event.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/event.c | 11 +++++++++++ dlls/winemac.drv/ime.c | 10 ---------- dlls/winemac.drv/macdrv.h | 1 - 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 45ceb09c094..9e53bef981a 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -26,6 +26,7 @@ #include "winuser.h" WINE_DEFAULT_DEBUG_CHANNEL(event); +WINE_DECLARE_DEBUG_CHANNEL(imm); /* return the name of an Mac event */ @@ -140,6 +141,16 @@ static macdrv_event_mask get_event_mask(DWORD mask) } +/*********************************************************************** + * macdrv_sent_text_input + */ +static void macdrv_sent_text_input(const macdrv_event *event) +{ + TRACE_(imm)("handled: %s\n", event->sent_text_input.handled ? "TRUE" : "FALSE"); + *event->sent_text_input.done = event->sent_text_input.handled ? 1 : -1; +} + + /*********************************************************************** * macdrv_query_event * diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index d1d2002fc47..00d4d9f1852 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -1451,16 +1451,6 @@ void macdrv_im_set_text(const macdrv_event *event) IME_NotifyComplete(himc); } -/*********************************************************************** - * macdrv_sent_text_input - */ -void macdrv_sent_text_input(const macdrv_event *event) -{ - TRACE("handled: %s\n", event->sent_text_input.handled ? "TRUE" : "FALSE"); - *event->sent_text_input.done = event->sent_text_input.handled ? 1 : -1; -} - - /************************************************************************** * query_ime_char_rect */ diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 2ea6cd638c3..95ed36ff7e0 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -290,7 +290,6 @@ extern NTSTATUS macdrv_init(void *arg) DECLSPEC_HIDDEN; extern NTSTATUS macdrv_ime_process_text_input(void *arg) DECLSPEC_HIDDEN; extern void macdrv_im_set_text(const macdrv_event *event) DECLSPEC_HIDDEN; -extern void macdrv_sent_text_input(const macdrv_event *event) DECLSPEC_HIDDEN; extern BOOL query_ime_char_rect(macdrv_query* query) DECLSPEC_HIDDEN; /* unixlib interface */

1 0

Andrew Eikum : d3d9/tests: Add desktop window tests for IDirect3DDevice9Ex.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: de61c58308acae5a5c71e3935d3536bd942d2dcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=de61c58308acae5a5c71e393… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 1 13:05:15 2022 -0500 d3d9/tests: Add desktop window tests for IDirect3DDevice9Ex. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 2afe73088c7..fc148aca4a8 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4923,6 +4923,39 @@ static void test_pinned_buffers(void) DestroyWindow(window); } +static void test_desktop_window(void) +{ + IDirect3DDevice9Ex *device; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, NULL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(window); + return; + } + IDirect3DDevice9Ex_Release(device); + DestroyWindow(window); + + device = create_device(GetDesktopWindow(), NULL); + ok(!!device, "Failed to create a D3D device.\n"); + + hr = IDirect3DDevice9Ex_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + color = get_pixel_color(device, 1, 1); + ok(color == 0x00ff0000, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9Ex_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + refcount = IDirect3DDevice9Ex_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d9ex) { DEVMODEW current_mode; @@ -4982,6 +5015,7 @@ START_TEST(d3d9ex) test_resource_access(); test_sysmem_draw(); test_pinned_buffers(); + test_desktop_window(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Zebediah Figura : user32: Retrieve the usage page and usage directly from the hid_preparsed_data structure.
by Alexandre Julliard June 2, 2022

June 2, 2022

Module: wine Branch: master Commit: c55980a47cf17079597e11291d97611355bab244 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c55980a47cf17079597e1129… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 2 14:18:37 2022 -0500 user32: Retrieve the usage page and usage directly from the hid_preparsed_data structure. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/rawinput.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index a103751a109..e9ac5e9aff2 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -101,10 +101,10 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, SP_DEVINFO_DATA device_data = {sizeof(device_data)}; PHIDP_PREPARSED_DATA preparsed_data = NULL; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; + struct hid_preparsed_data *preparsed; struct device *device = NULL; RID_DEVICE_INFO info; HIDD_ATTRIBUTES attr; - HIDP_CAPS caps; UINT32 handle; DWORD i, size; HANDLE file; @@ -167,15 +167,10 @@ static struct device *add_device( HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface, ERR( "Failed to get preparsed data.\n" ); goto fail; } + preparsed = (struct hid_preparsed_data *)preparsed_data; - if (!HidP_GetCaps( preparsed_data, &caps )) - { - ERR( "Failed to get caps.\n" ); - goto fail; - } - - info.hid.usUsagePage = caps.UsagePage; - info.hid.usUsage = caps.Usage; + info.hid.usUsagePage = preparsed->usage_page; + info.hid.usUsage = preparsed->usage; break; case RIM_TYPEMOUSE:

1 0

Andrew Eikum : xaudio2/tests: Remove failing legacy CLSID tests.
by Alexandre Julliard June 1, 2022

June 1, 2022

Module: wine Branch: master Commit: c1e793f1119de0c0ef7d4bd6d9fefbafdb5dbbe5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1e793f1119de0c0ef7d4bd6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 1 13:06:28 2022 -0500 xaudio2/tests: Remove failing legacy CLSID tests. Modern Windows fails these tests, and no application is known to need this behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52998 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/tests/xaudio2.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 9d50944b8d3..f4f808c2656 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -1067,10 +1067,6 @@ static void test_xapo_creation_modern(const char *module) /* CLSIDs are the same across all versions */ static const GUID *const_clsids[] = { - &CLSID_FXEQ27, - &CLSID_FXMasteringLimiter27, - &CLSID_FXReverb27, - &CLSID_FXEcho27, &CLSID_FXEQ, &CLSID_FXMasteringLimiter, &CLSID_FXReverb, @@ -1111,19 +1107,6 @@ static void test_xapo_creation_modern(const char *module) IUnknown_Release(fx_unk); } - /* test legacy CLSID */ - hr = pCreateFX(&CLSID_AudioVolumeMeter27, &fx_unk, NULL, 0); - ok(hr == S_OK, "%s: CreateFX(CLSID_AudioVolumeMeter) failed: %08lx\n", module, hr); - if(SUCCEEDED(hr)){ - IXAPO *xapo; - hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO interface: %08lx\n", hr); - if(SUCCEEDED(hr)) - IXAPO_Release(xapo); - rc = IUnknown_Release(fx_unk); - ok(rc == 0, "XAPO via legacy CreateFX should have been released, got refcount: %lu\n", rc); - } - pCAVM = (void*)GetProcAddress(xaudio2dll, "CreateAudioVolumeMeter"); ok(pCAVM != NULL, "%s did not have CreateAudioVolumeMeter?\n", module);

1 0

Piotr Caban : d3dx10: Try loading the resource as bitmap in D3DX10CreateAsyncResourceLoader.
by Alexandre Julliard June 1, 2022

June 1, 2022

Module: wine Branch: master Commit: d3f5b69bdc8513dd4720724695200b113601eb25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3f5b69bdc8513dd47207246… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 26 18:34:15 2022 +0200 d3dx10: Try loading the resource as bitmap in D3DX10CreateAsyncResourceLoader. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/async.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index db46a9353f6..89165a55af2 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -345,6 +345,8 @@ HRESULT WINAPI D3DX10CreateAsyncResourceLoaderA(HMODULE module, const char *reso return E_OUTOFMEMORY; if (!(rsrc = FindResourceA(module, resource, (const char *)RT_RCDATA))) + rsrc = FindResourceA(module, resource, (const char *)RT_BITMAP); + if (!rsrc) { WARN("Failed to find resource.\n"); HeapFree(GetProcessHeap(), 0, object); @@ -377,6 +379,8 @@ HRESULT WINAPI D3DX10CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *res return E_OUTOFMEMORY; if (!(rsrc = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA))) + rsrc = FindResourceW(module, resource, (const WCHAR *)RT_BITMAP); + if (!rsrc) { WARN("Failed to find resource.\n"); HeapFree(GetProcessHeap(), 0, object);

1 0

Zebediah Figura : wined3d: Always unmap buffer objects if ARB_buffer_storage is not supported.
by Alexandre Julliard June 1, 2022

June 1, 2022

Module: wine Branch: master Commit: d67a9b5faa7ac9e67234eff93f4e4748b0dc19d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d67a9b5faa7ac9e67234eff9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 30 20:10:08 2022 -0500 wined3d: Always unmap buffer objects if ARB_buffer_storage is not supported. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52663 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 8da17c9aa94..5ae237db54b 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2937,7 +2937,8 @@ static void wined3d_bo_gl_unmap(struct wined3d_bo_gl *bo, struct wined3d_context { const struct wined3d_gl_info *gl_info = context_gl->gl_info; - if (context_gl->c.device->adapter->mapped_size <= MAX_PERSISTENT_MAPPED_BYTES) + if (context_gl->c.d3d_info->persistent_map + && context_gl->c.device->adapter->mapped_size <= MAX_PERSISTENT_MAPPED_BYTES) { TRACE("Not unmapping BO %p.\n", bo); return; @@ -2960,6 +2961,7 @@ static void wined3d_bo_gl_unmap(struct wined3d_bo_gl *bo, struct wined3d_context if (bo->b.client_map_count) { wined3d_device_bo_map_unlock(context_gl->c.device); + assert(context_gl->c.d3d_info->persistent_map); TRACE("BO %p is still in use by a client thread; not unmapping.\n", bo); return; }

1 0

Piotr Caban : d3dx10: Add D3DX10CreateAsyncTextureInfoProcessor stub.
by Alexandre Julliard June 1, 2022

June 1, 2022

Module: wine Branch: master Commit: 1c66d05a9c5b634f0e141113536bd9431c5e371e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c66d05a9c5b634f0e141113… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 26 18:34:34 2022 +0200 d3dx10: Add D3DX10CreateAsyncTextureInfoProcessor stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/async.c | 6 ++++++ dlls/d3dx10_43/d3dx10_43.spec | 2 +- include/d3dx10.h | 2 +- include/d3dx10async.h | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index 89165a55af2..716eb7f44fb 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -398,6 +398,12 @@ HRESULT WINAPI D3DX10CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *res return S_OK; } +HRESULT WINAPI D3DX10CreateAsyncTextureInfoProcessor(D3DX10_IMAGE_INFO *info, ID3DX10DataProcessor **processor) +{ + FIXME("info %p, processor %p stub!\n", info, processor); + return E_NOTIMPL; +} + HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_size, const char *filename, const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, ID3D10Blob **errors, HRESULT *hresult) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 82b71b5fa5c..c0a2c9fa56c 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -16,7 +16,7 @@ @ stdcall D3DX10CreateAsyncResourceLoaderW(long wstr ptr) @ stub D3DX10CreateAsyncShaderPreprocessProcessor(str ptr ptr ptr ptr ptr) @ stub D3DX10CreateAsyncShaderResourceViewProcessor(ptr ptr ptr) -@ stub D3DX10CreateAsyncTextureInfoProcessor(ptr ptr) +@ stdcall D3DX10CreateAsyncTextureInfoProcessor(ptr ptr) @ stub D3DX10CreateAsyncTextureProcessor(ptr ptr ptr) @ stdcall D3DX10CreateDevice(ptr long long long ptr) @ stdcall D3DX10CreateDeviceAndSwapChain(ptr long long long ptr ptr ptr) diff --git a/include/d3dx10.h b/include/d3dx10.h index cb7b65c53cc..004342411b6 100644 --- a/include/d3dx10.h +++ b/include/d3dx10.h @@ -29,9 +29,9 @@ #include "d3d10.h" #include "d3dx10math.h" #include "d3dx10core.h" -#include "d3dx10async.h" #include "d3dx10tex.h" #include "d3dx10mesh.h" +#include "d3dx10async.h" #define _FACDD 0x876 #define MAKE_DDHRESULT(code) MAKE_HRESULT(1, _FACDD, code) diff --git a/include/d3dx10async.h b/include/d3dx10async.h index 0b7aca9c023..c932be91b01 100644 --- a/include/d3dx10async.h +++ b/include/d3dx10async.h @@ -76,4 +76,6 @@ HRESULT WINAPI D3DX10CreateAsyncMemoryLoader(const void *data, SIZE_T datasize, HRESULT WINAPI D3DX10CreateAsyncResourceLoaderA(HMODULE module, const char *resource, ID3DX10DataLoader **loader); HRESULT WINAPI D3DX10CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *resource, ID3DX10DataLoader **loader); +HRESULT WINAPI D3DX10CreateAsyncTextureInfoProcessor(D3DX10_IMAGE_INFO *info, ID3DX10DataProcessor **processor); + #endif

1 0

Jacek Caban : winemac: Avoid PE calls in systray.c.
by Alexandre Julliard June 1, 2022

June 1, 2022

Module: wine Branch: master Commit: 58e4adf0b90946ae5f19299bf91ef1b2a0b22f77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58e4adf0b90946ae5f19299b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 31 19:02:29 2022 +0200 winemac: Avoid PE calls in systray.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/systray.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index dbddbddff9a..a5ea7e55d79 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -135,8 +135,8 @@ static BOOL modify_icon(struct tray_icon *icon, NOTIFYICONDATAW *nid) if (nid->uFlags & NIF_ICON) { - if (icon->image) DestroyIcon(icon->image); - icon->image = CopyIcon(nid->hIcon); + if (icon->image) NtUserDestroyCursor(icon->image, 0); + icon->image = CopyImage(nid->hIcon, IMAGE_ICON, 0, 0, 0); if (icon->status_item) update_image = TRUE; } @@ -195,7 +195,7 @@ static BOOL add_icon(NOTIFYICONDATAW *nid) return FALSE; } - if (!(icon = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*icon)))) + if (!(icon = calloc(1, sizeof(*icon)))) { ERR("out of memory\n"); return FALSE; @@ -234,8 +234,8 @@ static BOOL delete_icon(struct tray_icon *icon) macdrv_destroy_status_item(icon->status_item); } list_remove(&icon->entry); - DestroyIcon(icon->image); - HeapFree(GetProcessHeap(), 0, icon); + NtUserDestroyCursor(icon->image, 0); + free(icon); return TRUE; } @@ -290,7 +290,8 @@ static BOOL notify_owner(struct tray_icon *icon, UINT msg, int x, int y) } TRACE("posting msg 0x%04x to hwnd %p id 0x%x\n", msg, icon->owner, icon->id); - if (!SendNotifyMessageW(icon->owner, icon->callback_message, wp, lp) && + if (!NtUserMessageCall(icon->owner, icon->callback_message, wp, lp, + 0, NtUserSendNotifyMessage, FALSE) && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) { WARN("window %p was destroyed, removing icon 0x%x\n", icon->owner, icon->id); @@ -335,7 +336,7 @@ void macdrv_status_item_mouse_button(const macdrv_event *event) else if (event->status_item_mouse_button.count % 2 == 0) msg += WM_LBUTTONDBLCLK - WM_LBUTTONDOWN; - if (!SendMessageW(icon->owner, WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS, 0, 0) && + if (!send_message(icon->owner, WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS, 0, 0) && GetLastError() == ERROR_INVALID_WINDOW_HANDLE) { WARN("window %p was destroyed, removing icon 0x%x\n", icon->owner, icon->id);

1 0