September 2016 - Wine-Devel

Error handling in RpcBindingVectorFree (dlls/rpcrt4/rpc_binding.c)
by Gerald Pfeifer Nov. 22, 2020

Nov. 22, 2020

Looking at RPC_STATUS WINAPI RpcBindingVectorFree( RPC_BINDING_VECTOR** BindingVector ) { RPC_STATUS status; ULONG c; TRACE("(%p)\n", BindingVector); for (c=0; c<(*BindingVector)->Count; c++) { status = RpcBindingFree(&(*BindingVector)->BindingH[c]); } HeapFree(GetProcessHeap(), 0, *BindingVector); *BindingVector = NULL; return RPC_S_OK; } we currently always ignore the outcome of RpcBindingFree and return RPC_S_OK. However, there is one case where RpcBindingFree returns something different (which is if *Binding is null when RPC_S_INVALID_BINDING is returned). What is the proper way of handling this? Just keeping the code as is and removing the unused status variable? Breaking the loop once RpcBindingFree returns something different from RPC_S_OK? Continuing and returning the first / the last status different from RPC_S_OK? Gerald

1 1

ntoskrnl.exe: unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces
by Qian Hong Sept. 28, 2018

Sept. 28, 2018

Dear all, While test another online bank with wine ActiveX, I got an unimplemented fuction of ntoskrnl: IoGetDeviceInterfaces, I found it listed in http://source.winehq.org/WineAPI/ntoskrnl.html as a stup, so I can't understand this log: wine: Unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces called at address 0x7b839552 (thread 0022), starting debugger... Grateful for any explain! env: wine1.3.12 on Ubuntu 10.04 Here are the steps: 1. install an ActiveX from https://e.bank.ecitic.com/perbank5/plugs/CNCBSecPkg_EN.exe $ rm -rf ~/.wine $ winetricks -q mfc42 $ wine CNCBSecPkg_EN.exe fixme:ole:DllRegisterServer stub fixme:win:DisableProcessWindowsGhosting : stub fixme:msg:ChangeWindowMessageFilter c057 00000001 fixme:msg:ChangeWindowMessageFilter c057 00000001 fixme:msg:ChangeWindowMessageFilter c057 00000001 fixme:ole:CoCreateInstance no instance created for interface {ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf} of class {56fdf344-fd6d-11d0-958a-006097c9a090}, hres is 0x80004002 fixme:sfc:SfcIsFileProtected ((nil), L"C:\\Program Files\\\4e2d\4fe1\94f6\884c\7f51\94f6\5b89\5168\63a7\4ef6\\unins000.exe") stub fixme:win:WINNLSEnableIME hUnknown1 0x1011a bUnknown2 0: stub! fixme:win:WINNLSEnableIME hUnknown1 0x1011a bUnknown2 -1: stub! fixme:win:WINNLSEnableIME hUnknown1 0x1011a bUnknown2 0: stub! wine: Call from 0x7b839552 to unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces, aborting wine: Unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces called at address 0x7b839552 (thread 002b), starting debugger... wine: Call from 0x7b839552 to unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces, aborting wine: Call from 0x7b839552 to unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces, aborting 2. open the online bank entry with wine builtin IE, then IE will crash: $ wine iexplore https://e.bank.ecitic.com/perbank5/signIn.do Please checkout the full log here: http://pastebin.com/rbAg7gwj Should I file a singel bug in ntoskrnl component , or separate bugs, one for ntoskrnl and one for the IE crashing? Generalliy what component should I switch while file a bug about IE crashing? Many thanks! -- Regards, Qian Hong - Sent from Ubuntu http://www.ubuntu.com/

5 6

ODBC Databases: Jet/Access success
by Barry Bird June 14, 2018

June 14, 2018

Good Afternoon. In section 3.3.6.2 of your User Guide you ask readers to report successes with databases other than MS SQL. Well here's one (I know Access 2000 can work with Wine, but this doesn't require Access): How to set up Wine to enable Windows programs that read and write to Jet (Access) databases using ODBC. I write such programs in C and use the API defined in ODBC API Reference http://msdn.microsoft.com/en-us/library/ms714562%28VS.85%29.aspx They work fine on Windows and only require Mingw to be installed to compile and link them, both for console programs and those using Windows SDK. You then can write interactive programs in C which use a full-featured SQL database which comes bundled with Windows. No need to purchase Access. With the set-up below they will also run on Linux (Kubuntu 9.04) and Wine 1.1.26. You need to update the registry to install the Access drivers. Under Windows, export from the Registry to *.reg files the registry entries - HKLM\Software\ODBC - HKLM\Software\Microsoft\Jet all subsidiary keys and values come with them. You can carefully edit these files to remove drivers and DSNs you don't need. Import these files using the registry editor in wine: wine regedit.exe. You need to bring across from Windows to Windows\System32 under wine: clbcatq.dll comres.dll expsrv.dll msjet40.dll mswstr10.dll msjter40.dll msjint40.dll msjtes40.dll msrd3x40.dll odbc32.dll odbccp32.dll odbcji32.dll odbcjt32.dll odbcad32.exe odbcint.dll odbctrac.dll vbajet32.dll Register this server in wine: wine regsvr32.exe msjtes40.dll No need to install MDAC. To use Windows ODBC drivers, you have to override Wine's odbccp32.dll and odbc32.dll with the native versions because the Wine versions are currently wired directly to Linux's unixodbc. This can be done by setting up the ODBC Data Source Administrator odbcad32.exe using winecfg: - Add the program to the Applications tab - then in the libraries tab, pick from 'New override for library' drop-down odbc32.dll and odbccp32.dll add them and edit them to be Native for Windows. Then if you do wine odbcad32.exe this brings up the ODBC Data Source Administrator window as in the Windows Control Panel If needed, set up (System) DSNs using this program. Bring across the programs and *.mdb database files from Windows. Using winecfg, you need to set up each program you want to run with overrides for odbc32.dll and odbccp32.dll (Applications and Libraries tabs) as above. The programs should then run as they did in Windows but perhaps a bit slower with: wine Odbc-prog.exe This has been tested twice on a clean .wine install. I cannot vouch for support of all API and SQL facilities however. I hope someone finds this useful. Barry Bird

5 4

Re: include: Avoid overflow (warning) in RGBA_MAKE.
by Dmitry Timoshkov Feb. 26, 2017

Feb. 26, 2017

Gerald Pfeifer <gerald(a)pfeifer.com> wrote: > --- a/include/d3dtypes.h > +++ b/include/d3dtypes.h > @@ -53,7 +53,7 @@ typedef LONG D3DFIXED; > #define RGBA_GETRED(rgb) (((rgb) >> 16) & 0xff) > #define RGBA_GETGREEN(rgb) (((rgb) >> 8) & 0xff) > #define RGBA_GETBLUE(rgb) ((rgb) & 0xff) > -#define RGBA_MAKE(r, g, b, a) ((D3DCOLOR) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b))) > +#define RGBA_MAKE(r, g, b, a) ((D3DCOLOR) (((unsigned)(a) << 24) | ((r) << 16) | ((g) << 8) | (b))) This is a public header, probably you need to fix the callers of this macro instead. -- Dmitry.

3 4

Re: [v2] preloader: Allow a debugger to find ld.so's rendezvous-struct
by Alexandre Julliard Dec. 11, 2016

Dec. 11, 2016

Keno Fischer <keno(a)juliacomputing.com> writes: > @@ -123,6 +123,18 @@ static struct wine_preload_info preload_info[] = > { 0, 0 } /* end of list */ > }; > > +/* A fake .dynamic section through which we can inform the debugger of the > + address of the chain-loaded dynamic linker's rendezvous struct */ > +__asm__( > +".section .dynamic,\"aw\"\n" > +".global _DYNAMIC\n" > +"_DYNAMIC: .quad 21\n" // DT_DEBUG > +".quad 0\n" > +".quad 0\n" > +".quad 0\n" > +".previous\n" > +); This is causing a warning here: gcc -m32 -c -o preloader.o preloader.c -I. -I../include -D__WINESRC__ -fno-builtin -Wall -pipe \ -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers \ -Wstrict-prototypes -Wtype-limits -Wunused-but-set-parameter -Wvla -Wwrite-strings -Wpointer-arith \ -Wlogical-op -gdwarf-2 -gstrict-dwarf -fno-omit-frame-pointer -Werror -g -O2 -fno-diagnostics-show-caret {standard input}: Assembler messages: {standard input}:5: Warning: setting incorrect section attributes for .dynamic -- Alexandre Julliard julliard(a)winehq.org

2 6

Some code ambiguity in tab control code.
by John Found Oct. 5, 2016

Oct. 5, 2016

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] make_unicode: Change handling of Turkish i to match Windows
by Dmitry Timoshkov Oct. 3, 2016

Oct. 3, 2016

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 v6] winebus.sys: Watch for hid raw device addition and removal
by Sebastian Lackner Sept. 30, 2016

Sept. 30, 2016

On 29.09.2016 20:48, Aric Stewart wrote: > v2: Correct poll timeout > Style changes > v3: vtable style instead of a callback > v4: Suggestions from Sebastian Lackner > v5: Fixing handling of other native in the compare function > v6: Tweaks suggested by Sebastian Lackner > > Includes an implementation of a common bus_remove_hid_device > > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/winebus.sys/bus.h | 13 +++++- > dlls/winebus.sys/bus_udev.c | 106 +++++++++++++++++++++++++++++++++++++++++++- > dlls/winebus.sys/main.c | 64 +++++++++++++++++++++----- > 3 files changed, 169 insertions(+), 14 deletions(-) > > > > v6-0001-winebus.sys-Watch-for-hid-raw-device-addition-and-r.txt > > > diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h > index dcb50f2..719d8fd 100644 > --- a/dlls/winebus.sys/bus.h > +++ b/dlls/winebus.sys/bus.h > @@ -19,8 +19,17 @@ > /* 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; > +DEVICE_OBJECT *find_hid_device(const platform_vtbl* vtbl, void *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, > +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) DECLSPEC_HIDDEN; > + const GUID *class, const platform_vtbl* vtbl, DWORD platform_data_size) 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 1525861..b7995bc 100644 > --- a/dlls/winebus.sys/bus_udev.c > +++ b/dlls/winebus.sys/bus_udev.c > @@ -26,6 +26,11 @@ > #ifdef HAVE_UNISTD_H > # include <unistd.h> > #endif > + > +#ifdef HAVE_SYS_POLL_H > +# include <sys/poll.h> > +#endif > + > #ifdef HAVE_LIBUDEV_H > # include <libudev.h> > #endif > @@ -55,6 +60,10 @@ 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 DWORD get_sysattr_dword(struct udev_device *dev, const char *sysattr, int base) > { > const char *attr = udev_device_get_sysattr_value(dev, sysattr); > @@ -82,6 +91,17 @@ 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 = ((struct platform_private*)get_platform_private(device))->udev_device; There is a whitespace issue in the line above. Also, I would suggest to use a wrapper like for COM interfaces to avoid having this conversion at multiple places. For example: static inline platform_private *impl_from_DEVICE_OBJECT(DEVICE_OBJECT *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; > @@ -117,12 +137,16 @@ 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) > + { > + ((struct platform_private*)get_platform_private(device))->udev_device = dev; > udev_device_ref(dev); udev_device_ref returns the device, so you could also do the assignment and incref in one line if you prefer. ;) Not really an issue though. > + IoInvalidateDeviceRelations(device, BusRelations); > + } > else > WARN("Ignoring device %s with subsystem %s\n", debugstr_a(devnode), subsystem); > > @@ -164,6 +188,77 @@ static void build_initial_deviceset(void) > udev_enumerate_unref(enumerate); > } > > +/* This is our main even loop for reading devices */ > +static DWORD CALLBACK deviceloop_thread(void *args) > +{ > + struct pollfd plfds[1]; > + struct udev_monitor *monitor = NULL; > + > + monitor = udev_monitor_new_from_netlink(udev_context, "udev"); > + if (!monitor) > + { > + WARN("Unable to get udev monitor, device insertion and removal cannot be tracked\n"); > + goto exit; > + } > + if (udev_monitor_filter_add_match_subsystem_devtype(monitor, "hidraw", NULL) < 0) > + { > + WARN("Failed to add 'hidraw' subsystem to monitor\n"); > + goto exit; > + } > + > + if (udev_monitor_enable_receiving(monitor) < 0) > + { > + WARN("Failed to start monitoring\n"); > + goto exit; > + } > + > + plfds[0].fd = udev_monitor_get_fd(monitor); > + plfds[0].events = POLLIN; > + if (plfds[0].fd < 0) > + { > + WARN("Failed to get monitor fd\n"); > + goto exit; > + } > + /* Run the event loop */ > + while (1) > + { > + struct udev_device *dev; > + const char* action; > + > + if (poll(plfds, 1, -1) <= 0) continue; > + > + TRACE("udev reports device changes\n"); > + dev = udev_monitor_receive_device(monitor); > + if (!dev) > + { > + FIXME("Failed to get device that has changed\n"); > + continue; > + } > + action = udev_device_get_action(dev); > + if (!action) > + WARN("No action recieved\n"); > + else if (strcmp(action, "add") == 0) > + try_add_device(dev); > + else if (strcmp(action, "remove") == 0) > + { > + DEVICE_OBJECT *device = find_hid_device(&hidraw_vtbl, dev); > + if (device) > + { > + struct udev_device *original = ((struct platform_private*)get_platform_private(device))->udev_device; > + bus_remove_hid_device(device); > + udev_device_unref(original); > + } > + } > + udev_device_unref(dev); > + } > + > +exit: > + TRACE("Monitor thread exiting\n"); > + if (monitor) > + udev_monitor_unref(monitor); > + return 1; > +} > + > NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) > { > TRACE("(%p, %s)\n", driver, debugstr_w(registry_path->Buffer)); > @@ -178,6 +273,13 @@ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry > driver->MajorFunction[IRP_MJ_PNP] = common_pnp_dispatch; > > build_initial_deviceset(); > + > + if (!CreateThread(NULL, 0, deviceloop_thread, NULL, 0, NULL)) > + { > + ERR("Unable to create udev device thread\n"); > + return STATUS_UNSUCCESSFUL; Wouldn't it make sense to proceed anyway? The initial device set could still be working properly (and, you are not cleaning up already added drivers here). > + } > + > return STATUS_SUCCESS; > } > > diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c > index 1364eab..1cb8031 100644 > --- a/dlls/winebus.sys/main.c > +++ b/dlls/winebus.sys/main.c > @@ -47,13 +47,15 @@ struct pnp_device > > struct device_extension > { > - void *native; /* Must be the first member of the structure */ > - > WORD vid, pid; > DWORD uid, version, index; > BOOL is_gamepad; > WCHAR *serial; > const WCHAR *busid; /* Expected to be a static constant */ > + struct pnp_device *pnp_device; > + const platform_vtbl *vtbl; > + > + BYTE platform_private[1]; > }; > > static CRITICAL_SECTION device_list_cs; > @@ -157,11 +159,11 @@ 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, > +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 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}; > + static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e','\\','%','s','#','%','p','#','%','x',0}; > struct device_extension *ext; > struct pnp_device *pnp_dev; > DEVICE_OBJECT *device; > @@ -169,16 +171,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, > + TRACE("(%p, %s, %04x, %04x, %u, %u, %s, %u, %s)\n", driver, debugstr_w(busidW), > vid, pid, version, uid, debugstr_w(serialW), is_gamepad, debugstr_guid(class)); You forgot to add the vtbl and platform_data_size parameters to the TRACE. > > 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, GetTickCount()); Do you think the memory pointer (pnp_dev) alone is not sufficient? If not, it was already a problem before because "native" is also just a memory address for UDEV. > 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 +194,6 @@ 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->vid = vid; > ext->pid = pid; > ext->uid = uid; > @@ -199,6 +202,8 @@ 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->pnp_device = pnp_dev; > + ext->vtbl = vtbl; > > /* add to list of pnp devices */ > pnp_dev->device = device; > @@ -226,7 +231,6 @@ 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; > } > > @@ -265,6 +269,46 @@ static NTSTATUS handle_IRP_MN_QUERY_ID(DEVICE_OBJECT *device, IRP *irp) > return status; > } > > +void *get_platform_private(DEVICE_OBJECT *device) > +{ > + struct device_extension *ext = (struct device_extension*)device->DeviceExtension; > + return ext->platform_private; > +} > + > +DEVICE_OBJECT *find_hid_device(const platform_vtbl* vtbl, void *device) > +{ > + struct pnp_device *dev, *ptr; > + DEVICE_OBJECT *ret = NULL; > + > + EnterCriticalSection(&device_list_cs); > + LIST_FOR_EACH_ENTRY_SAFE(dev, ptr, &pnp_devset, struct pnp_device, entry) You do no longer need the _SAFE enumeration here because the deletion is done separately. > + { > + struct device_extension *ext = (struct device_extension*)dev->device->DeviceExtension; > + if ((vtbl == ext->vtbl) && > + (ext->vtbl->compare_platform_device(dev->device, device) == 0)) > + { > + TRACE("Found as device %p\n", dev->device); > + ret = dev->device; > + break; > + } > + } > + LeaveCriticalSection(&device_list_cs); > + return ret; > +} > + > +void bus_remove_hid_device(DEVICE_OBJECT *device) > +{ > + struct device_extension *ext = (struct device_extension*)device->DeviceExtension; > + TRACE("Remove hid device %p\n", device); > + EnterCriticalSection(&device_list_cs); > + list_remove(&ext->pnp_device->entry); > + LeaveCriticalSection(&device_list_cs); > + IoInvalidateDeviceRelations(device, RemovalRelations); > + HeapFree(GetProcessHeap(), 0, ext->serial); > + HeapFree(GetProcessHeap(), 0, ext->pnp_device); > + IoDeleteDevice(device); > +} > + > NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) > { > NTSTATUS status = irp->IoStatus.u.Status; > > >

3 2

Re: uianimation: add stub dll
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

Austin English <austinenglish(a)gmail.com> writes: > For https://bugs.winehq.org/show_bug.cgi?id=41369 > > -- > -Austin > GPG: 14FB D7EA A041 937B > > From ddd3a6f3212f620f6f8379f295e6211f0db17129 Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Thu, 22 Sep 2016 01:23:54 -0500 > Subject: [PATCH] uianimation: add stub dll That doesn't seem very useful without the corresponding registrations. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: shell32/tests: Move test after return
by Alexandre Julliard Sept. 27, 2016

Sept. 27, 2016

André Hentschel <nerv(a)dawncrow.de> writes: > diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c > index 1591b7b..1f5dc33 100644 > --- a/dlls/shell32/tests/shlfolder.c > +++ b/dlls/shell32/tests/shlfolder.c > @@ -1588,11 +1588,11 @@ static void test_FolderShortcut(void) { > if (hr != S_OK) return; > > hr = IShellFolder_GetDisplayNameOf(pShellFolder, NULL, SHGDN_FORPARSING, &strret); > - ok(hr == S_OK, "IShellFolder_GetDisplayNameOf(NULL) failed! hr = %08x\n", hr); > if (hr != S_OK) { > IShellFolder_Release(pShellFolder); > return; > } > + ok(hr == S_OK, "IShellFolder_GetDisplayNameOf(NULL) failed! hr = %08x\n", hr); It would be better to check for the expected error instead of disabling the test. -- Alexandre Julliard julliard(a)winehq.org

1 0