wine-devel October 2016

wine-devel@winehq.org

45 participants
122 discussions

Some code ambiguity in tab control code.
by John Found 05 Oct '16

05 Oct '16

Hi. Trying without success to show tooltips for a tabcontrol, I found the following problems in the source code. Notice, that my skills in C++ are poor, so it is very possible the following is a false alarm. I am quote https://github.com/wine-mirror/wine/blob/master/dlls/comctl32/tab.c (hope it is the proper source code) This seems to be a bug: WM_LBUTTONDOWN is relayed in the WM_MOUSEMOVE handler. But WM_LBUTTONDOWN will always hide the tooltip. WM_MOUSEMOVE instead will set the timer for showing the tooltip. > static LRESULT > TAB_MouseMove (TAB_INFO *infoPtr, WPARAM wParam, LPARAM lParam) > { > int redrawLeave; > int redrawEnter; > > if (infoPtr->hwndToolTip) > TAB_RelayEvent (infoPtr->hwndToolTip, infoPtr->hwnd, > WM_LBUTTONDOWN, wParam, lParam); > > /* Determine which tab to highlight. Redraw tabs which change highlight > ** status. */ > TAB_RecalcHotTrack(infoPtr, &lParam, &redrawLeave, &redrawEnter); > > hottrack_refresh (infoPtr, redrawLeave); > hottrack_refresh (infoPtr, redrawEnter); > > return 0; > } The WM_LBUTTONDOWN is relayed twice? Why? It is not exactly a bug, but sub-optimal. > static LRESULT > TAB_LButtonDown (TAB_INFO *infoPtr, WPARAM wParam, LPARAM lParam) > { > POINT pt; > INT newItem; > UINT dummy; > > if (infoPtr->hwndToolTip) > TAB_RelayEvent (infoPtr->hwndToolTip, infoPtr->hwnd, > WM_LBUTTONDOWN, wParam, lParam); > > if (!(infoPtr->dwStyle & TCS_FOCUSNEVER)) { > SetFocus (infoPtr->hwnd); > } > > if (infoPtr->hwndToolTip) > TAB_RelayEvent (infoPtr->hwndToolTip, infoPtr->hwnd, > WM_LBUTTONDOWN, wParam, lParam); > -- http://fresh.flatassembler.net http://asm32.info John Found <johnfound(a)asm32.info>

2 3

Re: [PATCH] msvcrt: Implement __std_type_info_hash
by Piotr Caban 05 Oct '16

05 Oct '16

Hi Alexandre, On 10/04/16 22:49, GOUJON Alexandre wrote: > - MSVCRT_size_t hash = 0x811c9dc5; > + MSVCRT_size_t hash; > + MSVCRT_size_t fnvPrime; > const char *p; > > + if(sizeof(void*) == sizeof(int)) > + { > + hash = 0x811c9dc5; > + fnvPrime = 0x1000193; > + } > + else > + { > + hash = 0xcbf29ce484222325; > + fnvPrime = 0x100000001b3; > + } > + Please change name of fnvPrime variable to something like fnv_prime. Also you will need to initialize it using #ifdef, something like this should work: #ifdef _WIN64 MSVCRT_size_t hash = ... #else MSVCRT_size_t hash = ... #endif > + return hash ^ (hash >> 32); This will also cause compilation warning during 32-bit compilation. > diff --git a/dlls/ucrtbase/tests/cpp.c b/dlls/ucrtbase/tests/cpp.c > index 1a01fea..659269c 100644 > --- a/dlls/ucrtbase/tests/cpp.c > +++ b/dlls/ucrtbase/tests/cpp.c > @@ -163,7 +163,7 @@ static void test___std_type_info(void) > ti1.mangled[2] = 0; > hash1 = p___std_type_info_hash(&ti1); > #ifdef _WIN64 > - todo_wine ok(hash1 == 0xcbf29ce44fd0bfc1, "hash = %p\n", (void*)hash1); > + ok(hash1 == 0xcbf29ce44fd0bfc1, "hash = %p\n", (void*)hash1); And this. Thanks, Piotr

3 3

Re: [PATCH 4/7] wined3d: Avoid using destroyed context.
by Henri Verbeet 05 Oct '16

05 Oct '16

On 3 October 2016 at 00:38, Józef Kucia <jkucia(a)codeweavers.com> wrote: > The swapchain can be destroyed by state_unbind_resources() > if the only reference to a swapchain is kept by a shader resource view. > This happens in d3d10core and d3d11 tests when a device is destroyed > in test_swapchain_flip(). > I think it may be harder to fix than this. If state_unbind_resources() can end up destroying the (primary) swapchain, it's not safe to call context_acquire() afterwards. Which means it's unsafe to unload resources or even unload a different SRV. The reason destroying the RTVs is currently safe, is that we unloaded resources earlier, so releasing the references to the resources for those views shouldn't acquire a context to destroy e.g. the GL texture again, but that's already more fragile than I'd like. Perhaps we should just delay destroying the context until leaving the last level.

2 3

Re: [PATCH] winebus.sys: Implement common IRP_MJ_POWER handling
by Sebastian Lackner 05 Oct '16

05 Oct '16

On 05.10.2016 02:23, Aric Stewart wrote: > +NTSTATUS WINAPI common_power_dispatch(DEVICE_OBJECT *device, IRP *irp) > +{ > + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); > + TRACE("Device entering power state %i\n", irpsp->Parameters.Power.State.DeviceState); You are ignoring the MinorFunction parameter here. DeviceState is only valid for IRP_MN_SET_POWER, but there are also other IRP_MJ_POWER requests. For those it would be better to keep irp->IoStatus.u.Status set the original value, similar to how its done in common_pnp_dispatch. I would also suggest to add a TRACE with device and irp here (and to common_pnp_dispatch), otherwise it is difficult to interpret the meaning of the logged values. The TRACE in handle_IRP_MN_QUERY_ID could be removed then. Regards, Sebastian > + irp->IoStatus.u.Status = STATUS_SUCCESS; > + IoCompleteRequest(irp, IO_NO_INCREMENT); > + return STATUS_SUCCESS; > +} > +

1 0

Re: [PATCH] msinfo32: Display an About dialog when the program is run.
by Hugh McMaster 04 Oct '16

04 Oct '16

On Monday, 3 October 2016 5:14 PM, Alex Henrie wrote: > msinfo32 does not take any command line arguments, so I changed > WINE_FIXME to WINE_TRACE. No. msinfo32 accepts many command line arguments. See, for example, https://support.microsoft.com/en-au/kb/300887. > +#include <shlwapi.h> > + > +#include "resource.h" > +#include "shellapi.h" > #include "wine/debug.h" resource.h should come after wine/debug.h. You might also like to put shellapi.h before shlwapi.h. > int wmain(int argc, WCHAR *argv[]) > { > + static const WCHAR wineSystemInfoW[] = > + {'W','i','n','e',' ','S','y','s','t','e','m',' ','I','n','f','o','r','m','a','t','i','o','n',0}; > + WCHAR systemInfo[64]; > int i; > > - WINE_FIXME("stub:"); > for (i = 0; i < argc; i++) > - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); > - WINE_FIXME("\n"); > + WINE_TRACE(" %s", wine_dbgstr_w(argv[i])); > + WINE_TRACE("\n"); > + > + LoadStringW(GetModuleHandleW(NULL), STRING_SYSTEM_INFO, systemInfo, sizeof(systemInfo)/sizeof(WCHAR)); > + ShellAboutW(NULL, systemInfo, wineSystemInfoW, NULL); The dialog box text should also be translatable. Add it to the string table as well. > +#include "resource.h" > + > +STRINGTABLE > +{ > + STRING_SYSTEM_INFO, "System Information" > +} > +#define STRING_SYSTEM_INFO 0x170 Why #define this as 0x170? We normally start string tables from, e.g., 100, 101, 1000 or 1001.

2 2

Re: [3/3] winebus.sys: Add implementation for device removal. (v9)
by Aric Stewart 04 Oct '16

04 Oct '16

On 10/3/16 6:29 AM, Sebastian Lackner wrote: > From: Aric Stewart <aric(a)codeweavers.com> > > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > > Second part of 126774. Besides splitting, I've also done the following changes: > > * Rename find_hid_device -> bus_find_hid_device, for consistency with other bus_*_hid_*() functions. > * Do not append timestamp to the device names. To make the code more robust, I've modified > bus_remove_hid_device() to defer the release of the pnp_device pointer. If there are more > problems I would prefer to fix them properly, adding the timestamp seems more like a hack to me. > * Some style improvements. > > @Aric: I'm not sure if you are aware of it, but there is currently still a bug somewhere which > causes a crash during RemovalRelations when trying to remove a driver which was never added properly. > I feel like the right place to fix that is somewhere in ntoskrnl. Are you aware of this issue? > Yes, that bug is fixed by patch 126650, which has not been reviewed or committed yet. -aric > dlls/winebus.sys/bus.h | 16 +++++++-- > dlls/winebus.sys/bus_udev.c | 38 ++++++++++++++++++++-- > dlls/winebus.sys/main.c | 74 ++++++++++++++++++++++++++++++++++++++------ > 3 files changed, 111 insertions(+), 17 deletions(-) > > diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h > index dcb50f2..099558b 100644 > --- a/dlls/winebus.sys/bus.h > +++ b/dlls/winebus.sys/bus.h > @@ -19,8 +19,18 @@ > /* Busses */ > NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) DECLSPEC_HIDDEN; > > +/* Native device function table */ > +typedef struct > +{ > + int (*compare_platform_device)(DEVICE_OBJECT *device, void *platform_dev); > +} platform_vtbl; > + > +void *get_platform_private(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; > + > /* HID Plug and Play Bus */ > NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; > -DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, void *native, WORD vid, > - WORD pid, DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, > - const GUID *class) DECLSPEC_HIDDEN; > +DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, WORD vid, WORD pid, > + DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, > + const GUID *class, const platform_vtbl *vtbl, DWORD platform_data_size) DECLSPEC_HIDDEN; > +DEVICE_OBJECT *bus_find_hid_device(const platform_vtbl *vtbl, void *platform_dev) DECLSPEC_HIDDEN; > +void bus_remove_hid_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; > diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c > index b1d6c3f..d798c53 100644 > --- a/dlls/winebus.sys/bus_udev.c > +++ b/dlls/winebus.sys/bus_udev.c > @@ -61,6 +61,16 @@ static const WCHAR hidraw_busidW[] = {'H','I','D','R','A','W',0}; > #include "initguid.h" > DEFINE_GUID(GUID_DEVCLASS_HIDRAW, 0x3def44ad,0x242e,0x46e5,0x82,0x6d,0x70,0x72,0x13,0xf3,0xaa,0x81); > > +struct platform_private > +{ > + struct udev_device *udev_device; > +}; > + > +static inline struct platform_private *impl_from_DEVICE_OBJECT(DEVICE_OBJECT *device) > +{ > + return (struct platform_private *)get_platform_private(device); > +} > + > static DWORD get_sysattr_dword(struct udev_device *dev, const char *sysattr, int base) > { > const char *attr = udev_device_get_sysattr_value(dev, sysattr); > @@ -88,6 +98,18 @@ static WCHAR *get_sysattr_string(struct udev_device *dev, const char *sysattr) > return dst; > } > > +static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev) > +{ > + struct udev_device *dev1 = impl_from_DEVICE_OBJECT(device)->udev_device; > + struct udev_device *dev2 = platform_dev; > + return strcmp(udev_device_get_syspath(dev1), udev_device_get_syspath(dev2)); > +} > + > +static const platform_vtbl hidraw_vtbl = > +{ > + compare_platform_device, > +}; > + > static void try_add_device(struct udev_device *dev) > { > DWORD vid = 0, pid = 0, version = 0; > @@ -123,12 +145,15 @@ static void try_add_device(struct udev_device *dev) > subsystem = udev_device_get_subsystem(dev); > if (strcmp(subsystem, "hidraw") == 0) > { > - device = bus_create_hid_device(udev_driver_obj, hidraw_busidW, dev, vid, pid, > - version, 0, serial, FALSE, &GUID_DEVCLASS_HIDRAW); > + device = bus_create_hid_device(udev_driver_obj, hidraw_busidW, vid, pid, version, 0, serial, FALSE, > + &GUID_DEVCLASS_HIDRAW, &hidraw_vtbl, sizeof(struct platform_private)); > } > > if (device) > - udev_device_ref(dev); > + { > + impl_from_DEVICE_OBJECT(device)->udev_device = udev_device_ref(dev); > + IoInvalidateDeviceRelations(device, BusRelations); > + } > else > WARN("Ignoring device %s with subsystem %s\n", debugstr_a(devnode), subsystem); > > @@ -137,7 +162,12 @@ static void try_add_device(struct udev_device *dev) > > static void try_remove_device(struct udev_device *dev) > { > - /* FIXME */ > + DEVICE_OBJECT *device = bus_find_hid_device(&hidraw_vtbl, dev); > + if (!device) return; > + > + dev = impl_from_DEVICE_OBJECT(device)->udev_device; > + bus_remove_hid_device(device); > + udev_device_unref(dev); > } > > static void build_initial_deviceset(void) > diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c > index 1364eab..09a59d6 100644 > --- a/dlls/winebus.sys/main.c > +++ b/dlls/winebus.sys/main.c > @@ -47,13 +47,16 @@ struct pnp_device > > struct device_extension > { > - void *native; /* Must be the first member of the structure */ > + struct pnp_device *pnp_device; > > WORD vid, pid; > DWORD uid, version, index; > BOOL is_gamepad; > WCHAR *serial; > const WCHAR *busid; /* Expected to be a static constant */ > + > + const platform_vtbl *vtbl; > + BYTE platform_private[1]; > }; > > static CRITICAL_SECTION device_list_cs; > @@ -80,6 +83,12 @@ static inline WCHAR *strdupW(const WCHAR *src) > return dst; > } > > +void *get_platform_private(DEVICE_OBJECT *device) > +{ > + struct device_extension *ext = (struct device_extension *)device->DeviceExtension; > + return ext->platform_private; > +} > + > static DWORD get_vidpid_index(WORD vid, WORD pid) > { > struct pnp_device *ptr; > @@ -157,9 +166,9 @@ static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) > return dst; > } > > -DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, void *native, WORD vid, > - WORD pid, DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, > - const GUID *class) > +DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, WORD vid, WORD pid, > + DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, > + const GUID *class, const platform_vtbl *vtbl, DWORD platform_data_size) > { > static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e','\\','%','s','#','%','p',0}; > struct device_extension *ext; > @@ -169,16 +178,18 @@ DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, > WCHAR dev_name[256]; > HDEVINFO devinfo; > NTSTATUS status; > + DWORD length; > > - TRACE("(%p, %s, %p, %04x, %04x, %u, %u, %s, %u, %s)\n", driver, debugstr_w(busidW), native, > - vid, pid, version, uid, debugstr_w(serialW), is_gamepad, debugstr_guid(class)); > + TRACE("(%p, %s, %04x, %04x, %u, %u, %s, %u, %s, %p, %u)\n", driver, debugstr_w(busidW), vid, pid, > + version, uid, debugstr_w(serialW), is_gamepad, debugstr_guid(class), vtbl, platform_data_size); > > if (!(pnp_dev = HeapAlloc(GetProcessHeap(), 0, sizeof(*pnp_dev)))) > return NULL; > > - sprintfW(dev_name, device_name_fmtW, busidW, native); > + sprintfW(dev_name, device_name_fmtW, busidW, pnp_dev); > RtlInitUnicodeString(&nameW, dev_name); > - status = IoCreateDevice(driver, sizeof(*ext), &nameW, 0, 0, FALSE, &device); > + length = FIELD_OFFSET(struct device_extension, platform_private[platform_data_size]); > + status = IoCreateDevice(driver, length, &nameW, 0, 0, FALSE, &device); > if (status) > { > FIXME("failed to create device error %x\n", status); > @@ -190,7 +201,7 @@ DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, > > /* fill out device_extension struct */ > ext = (struct device_extension *)device->DeviceExtension; > - ext->native = native; > + ext->pnp_device = pnp_dev; > ext->vid = vid; > ext->pid = pid; > ext->uid = uid; > @@ -199,6 +210,7 @@ DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, > ext->is_gamepad = is_gamepad; > ext->serial = strdupW(serialW); > ext->busid = busidW; > + ext->vtbl = vtbl; > > /* add to list of pnp devices */ > pnp_dev->device = device; > @@ -226,10 +238,52 @@ DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, > else > ERR("failed to get ClassDevs: %x\n", GetLastError()); > > - IoInvalidateDeviceRelations(device, BusRelations); > return device; > } > > +DEVICE_OBJECT *bus_find_hid_device(const platform_vtbl *vtbl, void *platform_dev) > +{ > + struct pnp_device *dev; > + DEVICE_OBJECT *ret = NULL; > + > + TRACE("(%p, %p)\n", vtbl, platform_dev); > + > + EnterCriticalSection(&device_list_cs); > + LIST_FOR_EACH_ENTRY(dev, &pnp_devset, struct pnp_device, entry) > + { > + struct device_extension *ext = (struct device_extension *)dev->device->DeviceExtension; > + if (ext->vtbl != vtbl) continue; > + if (ext->vtbl->compare_platform_device(dev->device, platform_dev) == 0) > + { > + ret = dev->device; > + break; > + } > + } > + LeaveCriticalSection(&device_list_cs); > + > + TRACE("returning %p\n", ret); > + return ret; > +} > + > +void bus_remove_hid_device(DEVICE_OBJECT *device) > +{ > + struct device_extension *ext = (struct device_extension *)device->DeviceExtension; > + struct pnp_device *pnp_device = ext->pnp_device; > + > + TRACE("(%p)\n", device); > + > + EnterCriticalSection(&device_list_cs); > + list_remove(&pnp_device->entry); > + LeaveCriticalSection(&device_list_cs); > + > + IoInvalidateDeviceRelations(device, RemovalRelations); > + HeapFree(GetProcessHeap(), 0, ext->serial); > + IoDeleteDevice(device); > + > + /* pnp_device must be released after the device is gone */ > + HeapFree(GetProcessHeap(), 0, pnp_device); > +} > + > static NTSTATUS handle_IRP_MN_QUERY_ID(DEVICE_OBJECT *device, IRP *irp) > { > NTSTATUS status = irp->IoStatus.u.Status; >

2 2

Re: [PATCH 3/7] wined3d: Bind dummy textures to all texture image units.
by Henri Verbeet 03 Oct '16

03 Oct '16

On 3 October 2016 at 00:38, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > dlls/wined3d/context.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > Not that there's anything wrong with this, but what's the idea behind it?

2 1

Beating the Wineconf drum
by Jeremy White 03 Oct '16

03 Oct '16

Hey folks, A reminder, it's now just 6 weeks until Wineconf. We still have funding available, so write to me privately if you'd like to come, but don't have the funds. We could also use topics for conversation; you can email the wineconf mailing list, or edit the wiki page directly; either way is fine. Cheers, Jeremy p.s. And this is going to be my point of pain: https://www.winehq.org/~jwhite/latest.html

1 0

Re: [PATCH] make_unicode: Change handling of Turkish i to match Windows
by Dmitry Timoshkov 03 Oct '16

03 Oct '16

Daniel Lehman <dlehman(a)esri.com> wrote: > Windows does not lowercase the Turkish dotted i (0x130) as 'i' (0x69) > It also does not uppercase the small dotless I (0x131) to 'I' (0x49) > > Wine does the conversion for both, but Windows leaves them as-is > > the change here is to make Wine mimic Windows for the Turkish i Since you are modifying the win32 side of the unicode tables please add the correponding tests for LCMapString() to dlls/kernel32/tests/locale.c. It's quite possible that msvcrt doesn't use a win32 backend and has its own locale support. -- Dmitry.

3 4

Re: [PATCH v2] d2d1: Initial implementation of HWND render target
by Henri Verbeet 03 Oct '16

03 Oct '16

On 1 October 2016 at 18:12, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > +void d2d_d3d_render_target_set_pixel_size(ID2D1RenderTarget *iface, UINT32 width, UINT32 height) > +{ > + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); > + render_target->pixel_size.width = width; > + render_target->pixel_size.height = height; > +} > + I think d2d_d3d_render_target_create_rtv() already does this.

2 1

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-devel October 2016