March 2017 - Wine-Devel - list.winehq.org

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

COM tracing ...
by Michael Meeks Aug. 21, 2018

Aug. 21, 2018

Hi guys, Rather a peripheral question; apologies for that - but I'd imagine there are experts here that may be able to help. I have a black-box problem - a Windows app dealing with confidential data that I can't easily touch (and thus can't get to run under Wine) - which does some small but critical automation of MS Office - using VBS / COM scripting. I'd -really- love some input on how best to trace that series of COM method calls on Windows itself ie. the (remote) service activation, and the RPC beyond that - particularly the method names, parameters etc. of the COM/OLE Office API. I've tried (so far): http://www.rohitab.com/apimonitor which, while closed, looks interesting; but traces a lot in a hard-to-search way and doesn't appear to do the trick. https://support.microsoft.com/en-us/help/926098/how-to-enable-com-and-com-d… Sounds useful: using Event Tracing for Windows (ETW) but has this rather unhelpful property: "The binary file must be formatted by Microsoft so that it can be analyzed. Please forward the .etl files to your support contact. ..." ;-) Component models used to be all the rage in my youth ;-) surely someone solved the "strace for COM calls" problem elegantly some-when ! Crazily - might it be possible to instrument, interpose and use Wine's COM impl. on Windows [ which sounds a bit 'exciting' ;-], or ? Anyhow - help much appreciated & sorry for the noise ! Regards, Michael. -- michael.meeks(a)collabora.com <><, Pseudo Engineer, itinerant idiot

2 4

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: [PATCH] server_ioctl_file() - Prefix printed hex values with '0x'
by Alexandre Julliard Oct. 12, 2017

Oct. 12, 2017

Chris Morgan <chmorgan(a)gmail.com> writes: > Avoids the ambiguity with non-alphanumeric hex values. > > Signed-off-by: Chris Morgan <chmorgan(a)gmail.com> > --- > dlls/ntdll/file.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c > index fd7f3dd..4d081b7 100644 > --- a/dlls/ntdll/file.c > +++ b/dlls/ntdll/file.c > @@ -1567,7 +1567,7 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, > SERVER_END_REQ; > > if (status == STATUS_NOT_SUPPORTED) > - FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n", > + FIXME("Unsupported ioctl 0x%x (device=0x%x access=0x%x func=0x%x method=0x%x)\n", That's mostly a matter of taste, so I don't think it's necessary to change it. -- Alexandre Julliard julliard(a)winehq.org

3 2

[v6 PATCH 00/21] x86: Enable User-Mode Instruction Prevention
by Ricardo Neri May 15, 2017

May 15, 2017

This is v6 of this series. The five previous submissions can be found here [1], here [2], here[3], here[4], and here[5]. This version addresses the comments received in v4 plus improvements of the handling of emulation in 64-bit builds. Please see details in the change log. === What is UMIP? User-Mode Instruction Prevention (UMIP) is a security feature present in new Intel Processors. If enabled, it prevents the execution of certain instructions if the Current Privilege Level (CPL) is greater than 0. If these instructions were executed while in CPL > 0, user space applications could have access to system-wide settings such as the global and local descriptor tables, the segment selectors to the current task state and the local descriptor table. These are the instructions covered by UMIP: * SGDT - Store Global Descriptor Table * SIDT - Store Interrupt Descriptor Table * SLDT - Store Local Descriptor Table * SMSW - Store Machine Status Word * STR - Store Task Register If any of these instructions is executed with CPL > 0, a general protection exception is issued when UMIP is enabled. === How does it impact applications? There is a caveat, however. Certain applications rely on some of these instructions to function. An example of this are applications that use WineHQ[6]. For instance, these applications rely on sidt returning a non- accessible memory location[8]. During the discussions, it was proposed that the fault could be relied to the user-space and perform the emulation in user-mode. However, this would break existing applications until, for instance, they update to a new WineHQ version. However, this approach would require UMIP to be disabled by default. The consensus in this forum is to always enable it. This patchset initially treated tasks running in virtual-8086 mode as a special case. However, I received clarification that DOSEMU[8] does not support applications that use these instructions. It relies on WineHQ for this [9]. Furthermore, the applications for which the concern was raised run in protected mode [8]. Please note that UMIP is always enabled for both 64-bit and 32-bit Linux builds. However, emulation of the UMIP-protected instructions is not done for 64-bit processes. 64-bit user space applications will receive the SIGSEGV signal when UMIP instructions causes a general protection fault. === How are UMIP-protected instructions emulated? This version keeps UMIP enabled at all times and by default. If a general protection fault caused by the instructions protected by UMIP is detected, such fault will be fixed-up by returning dummy values as follows: * SGDT and SIDT return hard-coded dummy values as the base of the global descriptor and interrupt descriptor tables. These hard-coded values correspond to memory addresses that are near the end of the kernel memory map. This is also the case for virtual-8086 mode tasks. In all my experiments in x86_32, the base of GDT and IDT was always a 4-byte address, even for 16-bit operands. Thus, my emulation code does the same. In all cases, the limit of the table is set to 0. * STR and SLDT return 0 as the segment selector. This looks appropriate since we are providing a dummy value as the base address of the global descriptor table. * SMSW returns the value with which the CR0 register is programmed in head_32/64.S at boot time. This is, the following bits are enabled: CR0.0 for Protection Enable, CR.1 for Monitor Coprocessor, CR.4 for Extension Type, which will always be 1 in recent processors with UMIP; CR.5 for Numeric Error, CR0.16 for Write Protect, CR0.18 for Alignment Mask. As per the Intel 64 and IA-32 Architectures Software Developer's Manual, SMSW returns a 16-bit results for memory operands. However, when the operand is a register, the results can be up to CR0[63:0]. Since the emulation code only kicks-in in x86_32, we return up to CR[31:0]. * The proposed emulation code is handles faults that happens in both protected and virtual-8086 mode. === How is this series laid out? ++ Fix bugs in MPX address evaluator I found very useful the code for Intel MPX (Memory Protection Extensions) used to parse opcodes and the memory locations contained in the general purpose registers when used as operands. I put some of this code in a separate library file that both MPX and UMIP can access and avoid code duplication. Before creating the new library, I fixed a couple of bugs that I found in how MPX determines the address contained in the instruction and operands. ++ Provide a new x86 instruction evaluating library With bugs fixed, the MPX evaluating code is relocated in a new insn-eval.c library. The basic functionality of this library is extended to obtain the segment descriptor selected by either segment override prefixes or the default segment by the involved registers in the calculation of the effective address. It was also extended to obtain the default address and operand sizes as well as the segment base address. Also, support to process 16-bit address encodings. Armed with this arsenal, it is now possible to determine the linear address onto which the emulated results shall be copied. This code supports Normal 32-bit and 64-bit (i.e., __USER32_CS and/or __USER_CS) protected mode, virtual-8086 mode, 16-bit protected mode with 32-bit base address. ++ Emulate UMIP instructions A new fixup_umip_exception functions inspect the instruction at the instruction pointer. If it is an UMIP-protected instruction, it executes the emulation code. This uses all the address-computing code of the previous section. ++ Add self-tests Lastly, self-tests are added to entry_from_v86.c to exercise the most typical use cases of UMIP-protected instructions in a virtual-8086 mode. ++ Extensive tests Extensive tests were performed to test all the combinations of ModRM, SiB and displacements for 16-bit and 32-bit encodings for the ss, ds, es, fs and gs segments. Tests also include a 64-bit program that uses segmentation via fs and gs. For this purpose, I temporarily, and not as part of this patchset, enabled UMIP support for 64-bit process with the intention to test the computations of linear addresses in 64-bit mode, including the extra R8-R15 registers. Extensive test is also implemented for virtual-8086 tasks. Code of these tests can be found here [10] and here [11]. [1]. https://lwn.net/Articles/705877/ [2]. https://lkml.org/lkml/2016/12/23/265 [3]. https://lkml.org/lkml/2017/1/25/622 [4]. https://lkml.org/lkml/2017/2/23/40 [5]. https://lkml.org/lkml/2017/3/3/678 [7]. https://www.winehq.org/ [8]. https://www.winehq.org/pipermail/wine-devel/2016-November/115320.html [9]. http://www.dosemu.org/ [9]. http://marc.info/?l=linux-kernel&m=147876798717927&w=2 [10]. https://github.com/01org/luv-yocto/tree/rneri/umip/meta-luv/recipes-core/um… [11]. https://github.com/01org/luv-yocto/commit/a72a7fe7d68693c0f4100ad86de6ecabd… Thanks and BR, Ricardo Changes since V5: * Relocate the page fault error code enumerations to traps.h Changes since V4: * Audited patches to use braces in all the branches of conditional. statements, except those in which the conditional action only takes one line. * Implemented support in 64-builds for both 32-bit and 64-bit tasks in the instruction evaluating library. * Split segment selector function in the instruction evaluating library into two functions to resolve the segment type by instruction override or default and a separate function to actually read the segment selector. * Fixed a bug when evaluating 32-bit effective addresses with 64-bit kernels. * Split patches further for for easier review. * Use signed variables for computation of effective address. * Fixed issue with a spurious static modifier in function insn_get_addr_ref found by kbuild test bot. * Removed comparison between true and fixup_umip_exception. * Reworked check logic when identifying erroneous vs invalid values of the SiB base and index. Changes since V3: * Limited emulation to 32-bit and 16-bit modes. For 64-bit mode, a general protection fault is still issued when UMIP-protected instructions are executed with CPL > 0. * Expanded instruction-evaluating code to obtain segment descriptor along with their attributes such as base address and default address and operand sizes. Also, support for 16-bit encodings in protected mode was implemented. * When getting a segment descriptor, this include support to obtain those of a local descriptor table. * Now the instruction-evaluating code returns -EDOM when the value of registers should not be used in calculating the effective address. The value -EINVAL is left for errors. * Incorporate the value of the segment base address in the computation of linear addresses. * Renamed new instruction evaluation library from insn-kernel.c to insn-eval.c * Exported functions insn_get_reg_offset_* to obtain the register offset by ModRM r/m, SiB base and SiB index. * Improved documentation of functions. * Split patches further for easier review. Changes since V2: * Added new utility functions to decode the memory addresses contained in registers when the 16-bit addressing encodings are used. This includes code to obtain and compute memory addresses using segment selectors for real-mode address translation. * Added support to emulate UMIP-protected instructions for virtual-8086 tasks. * Added self-tests for virtual-8086 mode that contains representative use cases: address represented as a displacement, address in registers and registers as operands. * Instead of maintaining a static variable for the dummy base addresses of the IDT and GDT, a hard-coded value is used. * The emulated SMSW instructions now return the value with which the CR0 register is programmed in head_32/64.S This is: PE | MP | ET | NE | WP | AM. For x86_64, PG is also enabled. * The new file arch/x86/lib/insn-utils.c is now renamed as arch/x86/lib/ insn-kernel.c. It also has its own header. This helps keep in sync the the kernel and objtool instruction decoders. Also, the new insn-kernel.c contains utility functions that are only relevant in a kernel context. * Removed printed warnings for errors that occur when decoding instructions with invalid operands. * Added more comments on fixes in the instruction-decoding MPX functions. * Now user_64bit_mode(regs) is used instead of test_thread_flag(TIF_IA32) to determine if the task is 32-bit or 64-bit. * Found and fixed a bug in insn-decoder in which X86_MODRM_RM was incorrectly used to obtain the mod part of the ModRM byte. * Added more explanatory code in emulation and instruction decoding code. This includes a comment regarding that copy_from_user could fail if there exists a memory protection key in place. * Tested code with CONFIG_X86_DECODER_SELFTEST=y and everything passes now. * Prefixed get_reg_offset_rm with insn_ as this function is exposed via a header file. For clarity, this function was added in a separate patch. Changes since V1: * Virtual-8086 mode tasks are not treated in a special manner. All code for this purpose was removed. * Instead of attempting to disable UMIP during a context switch or when entering virtual-8086 mode, UMIP remains enabled all the time. General protection faults that occur are fixed-up by returning dummy values as detailed above. * Removed umip= kernel parameter in favor of using clearcpuid=514 to disable UMIP. * Removed selftests designed to detect the absence of SIGSEGV signals when running in virtual-8086 mode. * Reused code from MPX to decode instructions operands. For this purpose code was put in a common location. * Fixed two bugs in MPX code that decodes operands. Ricardo Neri (21): x86/mpx: Use signed variables to compute effective addresses x86/mpx: Do not use SIB index if index points to R/ESP x86/mpx: Do not use R/EBP as base in the SIB byte with Mod = 0 x86/mpx, x86/insn: Relocate insn util functions to a new insn-kernel x86/insn-eval: Add utility functions to get register offsets x86/insn-eval: Add utility functions to get segment selector x86/insn-eval: Add utility function to get segment descriptor x86/insn-eval: Add utility function to get segment descriptor base address x86/insn-eval: Add functions to get default operand and address sizes x86/insn-eval: Do not use R/EBP as base if mod in ModRM is zero insn/eval: Incorporate segment base in address computation x86/insn: Support both signed 32-bit and 64-bit effective addresses x86/insn-eval: Add support to resolve 16-bit addressing encodings x86/insn-eval: Add wrapper function for 16-bit and 32-bit address encodings x86/mm: Relocate page fault error codes to traps.h x86/cpufeature: Add User-Mode Instruction Prevention definitions x86: Add emulation code for UMIP instructions x86/umip: Force a page fault when unable to copy emulated result to user x86/traps: Fixup general protection faults caused by UMIP x86: Enable User-Mode Instruction Prevention selftests/x86: Add tests for User-Mode Instruction Prevention arch/x86/Kconfig | 10 + arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/disabled-features.h | 8 +- arch/x86/include/asm/insn-eval.h | 23 + arch/x86/include/asm/traps.h | 18 + arch/x86/include/asm/umip.h | 15 + arch/x86/include/uapi/asm/processor-flags.h | 2 + arch/x86/kernel/Makefile | 1 + arch/x86/kernel/cpu/common.c | 16 +- arch/x86/kernel/traps.c | 4 + arch/x86/kernel/umip.c | 298 +++++++++ arch/x86/lib/Makefile | 2 +- arch/x86/lib/insn-eval.c | 832 ++++++++++++++++++++++++++ arch/x86/mm/fault.c | 88 ++- arch/x86/mm/mpx.c | 120 +--- tools/testing/selftests/x86/entry_from_vm86.c | 39 +- 16 files changed, 1301 insertions(+), 176 deletions(-) create mode 100644 arch/x86/include/asm/insn-eval.h create mode 100644 arch/x86/include/asm/umip.h create mode 100644 arch/x86/kernel/umip.c create mode 100644 arch/x86/lib/insn-eval.c -- 2.9.3

7 109

Re: ntdll: Use environment variable "WINESERVER" first on search for wineserver to start.
by Ralf Habacker April 28, 2017

April 28, 2017

Am 07.03.2017 um 15:20 schrieb Sebastian Lackner: > Was it intentional that you did not CC the wine-devel mailing list? no, I Just replyed to all; fixed that > > On 07.03.2017 10:22, Ralf Habacker wrote: >> In the opposite having wineserver environment variable set in users >> environment will make it sure to always starts wineserver with the >> requested settings. > Well, you could also change $PATH globally to let "wine" point to your > special wrapper executable. This would not really be different from using > a global WINESERVER variable. Really ? Adding an additional path looks more invasive in terms of security and maintenance as using a dedicated environment variable affecting only one executable. > > I think there is a misunderstanding here, each wineprefix uses its own > wineserver instance. Wineservers started for other prefixes will never > inherit any timeout settings. Thanks for this pointer, I wasn't aware of that. >> [...] >> >> With the mentioned patch applied to a local wine build (or with a >> renamed wineserver) the site now runs about two weeks and one noticable >> change is that the initial >> mentioned communication issue did not happens. This let me think that >> there may be a long time running issue with wineserver, which affects >> the dde interface. > It is nice that you have found a workaround, however we would also like > to fix such issues of course. If you find any way to trigger this issue, > please file a bug report. I will do but unfortunally I'm not at this point yet. Observations from the last weeks shows that the error happened two times: 1. wineserver is running 12 days and not restarted because one application showed a message box, therefore did not quit and blocked wineserver restart, which let other wine applications dde communication fail 20170309-061102.523831920: starting '/srv/www/gauszweb-prod/tools/usr/bin/wineserver --foreground --persistent=3600 ' -> last wineserver restart 20170321-150057.967117185: starting '/srv/www/gauszweb-prod/tools/usr/bin/wineserver --foreground --persistent=3600 ' -> manual restarted because of application freeze 2. wineserver is running 3 days and applications dde communications fails because wineserver has been restarted immediatly 20170322-061003.064358739: starting '/srv/www/gauszweb-prod/tools/usr/bin/wineserver --foreground --persistent=3600 ' -> last restart .... 20170325-220751 -> print job starts 20170325-220753.202518273: starting '/srv/www/gauszweb-prod/tools/usr/bin/wineserver --foreground --persistent=3600 ' -> wineserver has been restarted by timeout 20170325-220805 applications dde communication fails and wine reports wine: chdir to /tmp/.wine-37002/server-fd0a-9602cwine: : No such file or directory chdir to /tmp/.wine-37002/server-fd0a-9602c : No such file or directoryThis is expected and not a bug. It can happen when multiple wine > instances try to start up wineserver at the same time. Only the first > wineserver instance will be able to acquire the lock, all others will > exit and then connect to the existing wineserver. Sound reasonable Best regards Ralf

1 1

`setupapi` patch from staging
by Donat Enikeev April 24, 2017

April 24, 2017

Hi Guys, Number of recent well-known games are based on Starling game engine (Adobe Air+Stage3D for gpu rendering), such as: The Banner Saga 2, Samorost 3, The Inner World, Angry Birds. They are are falling into Software rendering mode on plain Wine and thus barely playable (bug #41635) Thanks to Béla Gyebrószki finding @ bug #41653, Wine makes these games consider d3d9 rendering with the following single patch from wine-staging https://github.com/wine-compholio/wine-staging/blob/master/patches/setupapi… This patch implements support of the case when a full driver path is passed to SetupDiGetClassDevs (trace successfully reaching AddDeviceToSet for a game below [1]). I was unable to find @wine-devel discussion around this patch, I would be grateful if one could kindly remind why it was staged, probably it just requires refactoring around the change or additional tests? I am asking this, because Adobe stopped Linux support for the Air years ago and we could never see such games ported, and therefore plain Wine's support of gpu acceleration for such games looks important. Thanks in advance Best regards, Donnie [1] 0009:trace:setupapi:SetupDiGetClassDevsExW {4d36e968-e325-11ce-bfc1-08002be10318} L"PCI\\VEN_0000&DEV_0000" (nil) 0x0000000a (nil) (null) (nil) 0009:warn:setupapi:SetupDiGetClassDevsExW unsupported flags 0000000a 0009:trace:setupapi:SetupDiCreateDeviceInfoListExW {4d36e968-e325-11ce-bfc1-08002be10318} (nil) (null) (nil) 0009:trace:setupapi:SETUPDI_EnumerateDevices 0x464ac90, {4d36e968-e325-11ce-bfc1-08002be10318}, L"PCI\\VEN_0000&DEV_0000", 0000000a 0009:trace:setupapi:SETUPDI_EnumerateMatchingDeviceInstances L"PCI" L"VEN_0000&DEV_0000" 0009:trace:setupapi:SETUPDI_AddDeviceToSet 0x464ac90, {4d36e968-e325-11ce-bfc1-08002be10318}, 0, L"PCI\\VEN_0000&DEV_0000\\13&12345&0", 0

3 6

Re: [PATCH] comctl32/taskdialog: Implement buttons.
by Nikolay Sivov April 24, 2017

April 24, 2017

On 23.03.2017 21:22, Fabian Maurer wrote: > Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> > --- > dlls/comctl32/taskdialog.c | 224 ++++++++++++++++++++++++++++++++------------- > 1 file changed, 161 insertions(+), 63 deletions(-) > > diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c > index 6b8bcfcae6..037b85e082 100644 > --- a/dlls/comctl32/taskdialog.c > +++ b/dlls/comctl32/taskdialog.c > @@ -41,10 +41,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(taskdialog); > #define ALIGN_LENGTH(_Len, _Align) _Len = ALIGNED_LENGTH(_Len, _Align) > #define ALIGN_POINTER(_Ptr, _Align) _Ptr = ALIGNED_POINTER(_Ptr, _Align) > > -static const UINT DIALOG_MIN_WIDTH = 180; > +static const UINT DIALOG_MIN_WIDTH = 240; > static const UINT DIALOG_SPACING = 5; > -static const UINT DIALOG_BUTTON_WIDTH = 50; > -static const UINT DIALOG_BUTTON_HEIGHT = 14; > +static const UINT DIALOG_BUTTON_WIDTH_MIN = 45; > +static const UINT DIALOG_BUTTON_HEIGHT = 13; This was taken from MSGBOX template, what's a point in making it different? > +static const UINT DIALOG_SPACING_BUTTONS_LEFT = 30; /* minimum distance from the left dialog border */ > +static const UINT DIALOG_SPACING_BUTTON_H = 1; /* Distance between buttons */ > +static const UINT DIALOG_SPACING_BUTTON_W = 4; /* Distance between buttons */ > > static const UINT ID_MAIN_INSTRUCTION = 0xf000; > > @@ -67,6 +70,15 @@ struct taskdialog_template_desc > HFONT font; > }; > > +typedef struct > +{ > + int id; > + const WCHAR *text; > + UINT width; > + UINT x; > + UINT y; > +} button_info; > + > static void pixels_to_dialogunits(const struct taskdialog_template_desc *desc, LONG *width, LONG *height) > { > if (width) > @@ -83,6 +95,44 @@ static void dialogunits_to_pixels(const struct taskdialog_template_desc *desc, L > *height = MulDiv(*height, desc->y_baseunit, 8); > } > > +/* used to calculate size for the controls */ > +static RECT text_get_rect(const struct taskdialog_template_desc *desc, const WCHAR *text) > +{ > + const WCHAR *textW = NULL; > + unsigned int length; > + HFONT oldfont; > + HDC hdc; > + static const WCHAR nulW; > + RECT rect = { 0, 0, desc->dialog_width - DIALOG_SPACING * 2, 0}; /* padding left and right of the control */ > + > + if (IS_INTRESOURCE(text)) > + { > + if (!(length = LoadStringW(desc->taskconfig->hInstance, (UINT_PTR)text, (WCHAR *)&textW, 0))) > + { > + WARN("Failed to load text\n"); > + textW = &nulW; > + length = 0; > + } > + } > + else > + { > + textW = text; > + length = strlenW(textW); > + } > + > + hdc = GetDC(0); > + oldfont = SelectObject(hdc, desc->font); > + > + dialogunits_to_pixels(desc, &rect.right, NULL); > + DrawTextW(hdc, textW, length, &rect, DT_LEFT | DT_EXPANDTABS | DT_CALCRECT | DT_WORDBREAK); > + pixels_to_dialogunits(desc, &rect.right, &rect.bottom); > + > + SelectObject(hdc, oldfont); > + ReleaseDC(0, hdc); > + > + return rect; > +} > + Did you test that buttons are supposed to support multiple lines of text? > static void template_write_data(char **ptr, const void *src, unsigned int size) > { > memcpy(*ptr, src, size); > @@ -90,7 +140,7 @@ static void template_write_data(char **ptr, const void *src, unsigned int size) > } > > static unsigned int taskdialog_add_control(struct taskdialog_template_desc *desc, WORD id, const WCHAR *class, > - HINSTANCE hInstance, const WCHAR *text, short x, short y, short cx, short cy) > + DWORD style, HINSTANCE hInstance, const WCHAR *text, short x, short y, short cx, short cy) > { > struct taskdialog_control *control = Alloc(sizeof(*control)); > unsigned int size, class_size, text_size; > @@ -117,7 +167,7 @@ static unsigned int taskdialog_add_control(struct taskdialog_template_desc *desc > control->template = template = Alloc(size); > control->template_size = size; > > - template->style = WS_VISIBLE; > + template->style = WS_VISIBLE | WS_CHILD | style; You don't use styles in this patch, this is unnecessary change. > template->dwExtendedStyle = 0; > template->x = x; > template->y = y; > @@ -136,78 +186,126 @@ static unsigned int taskdialog_add_control(struct taskdialog_template_desc *desc > > static unsigned int taskdialog_add_main_instruction(struct taskdialog_template_desc *desc) > { > - RECT rect = { 0, 0, desc->dialog_width - DIALOG_SPACING * 2, 0}; /* padding left and right of the control */ > - const WCHAR *textW = NULL; > - unsigned int size, length; > - HFONT oldfont; > - HDC hdc; > + unsigned int size; > + RECT rect; > > if (!desc->taskconfig->pszMainInstruction) > return 0; > > - if (IS_INTRESOURCE(desc->taskconfig->pszMainInstruction)) > - { > - if (!(length = LoadStringW(desc->taskconfig->hInstance, (UINT_PTR)desc->taskconfig->pszMainInstruction, > - (WCHAR *)&textW, 0))) > - { > - WARN("Failed to load main instruction text\n"); > - return 0; > - } > - } > - else > - { > - textW = desc->taskconfig->pszMainInstruction; > - length = strlenW(textW); > - } > - > - hdc = GetDC(0); > - oldfont = SelectObject(hdc, desc->font); > - > - dialogunits_to_pixels(desc, &rect.right, NULL); > - DrawTextW(hdc, textW, length, &rect, DT_LEFT | DT_EXPANDTABS | DT_CALCRECT | DT_WORDBREAK); > - pixels_to_dialogunits(desc, &rect.right, &rect.bottom); > - > - SelectObject(hdc, oldfont); > - ReleaseDC(0, hdc); > + rect = text_get_rect(desc, desc->taskconfig->pszMainInstruction); > > - size = taskdialog_add_control(desc, ID_MAIN_INSTRUCTION, WC_STATICW, desc->taskconfig->hInstance, > + size = taskdialog_add_control(desc, ID_MAIN_INSTRUCTION, WC_STATICW, 0, desc->taskconfig->hInstance, > desc->taskconfig->pszMainInstruction, DIALOG_SPACING, desc->dialog_height, > rect.right, rect.bottom); > - desc->dialog_height += rect.bottom; > + desc->dialog_height += rect.bottom + DIALOG_SPACING; > return size; > } > > -static unsigned int taskdialog_add_common_buttons(struct taskdialog_template_desc *desc) > +static button_info make_button(struct taskdialog_template_desc *desc, int id, const WCHAR *text) > +{ > + RECT rect; > + button_info button; > + > + button.id = id; > + button.text = text; > + rect = text_get_rect(desc, text); > + button.width = rect.right + 10; > + if (button.width < DIALOG_BUTTON_WIDTH_MIN) > + button.width = DIALOG_BUTTON_WIDTH_MIN; > + > + return button; > +} This does not handle "text" correctly. > + > +static unsigned int taskdialog_add_buttons(struct taskdialog_template_desc *desc) > { > - short button_x = desc->dialog_width - DIALOG_BUTTON_WIDTH - DIALOG_SPACING; > DWORD flags = desc->taskconfig->dwCommonButtons; > + const TASKDIALOGCONFIG *taskconfig = desc->taskconfig; > + UINT alignment = DIALOG_SPACING_BUTTONS_LEFT; /* minimum distance from the left dialog border */ > + UINT location_x; > + BOOL first_row = TRUE; > + button_info *buttons; > + int count = 0; > + int i; > unsigned int size = 0; > > -#define TASKDIALOG_ADD_COMMON_BUTTON(id) \ > - do { \ > - size += taskdialog_add_control(desc, ID##id, WC_BUTTONW, COMCTL32_hModule, MAKEINTRESOURCEW(IDS_BUTTON_##id), \ > - button_x, desc->dialog_height + DIALOG_SPACING, DIALOG_BUTTON_WIDTH, DIALOG_BUTTON_HEIGHT); \ > - button_x -= DIALOG_BUTTON_WIDTH + DIALOG_SPACING; \ > - } while(0) > - if (flags & TDCBF_CLOSE_BUTTON) > - TASKDIALOG_ADD_COMMON_BUTTON(CLOSE); > - if (flags & TDCBF_CANCEL_BUTTON) > - TASKDIALOG_ADD_COMMON_BUTTON(CANCEL); > - if (flags & TDCBF_RETRY_BUTTON) > - TASKDIALOG_ADD_COMMON_BUTTON(RETRY); > - if (flags & TDCBF_NO_BUTTON) > - TASKDIALOG_ADD_COMMON_BUTTON(NO); > - if (flags & TDCBF_YES_BUTTON) > - TASKDIALOG_ADD_COMMON_BUTTON(YES); > + /* Allocate enough memory for the custom and the default buttons */ > + if (taskconfig->cButtons && taskconfig->pButtons) > + buttons = HeapAlloc(GetProcessHeap(), 0, (taskconfig->cButtons + 6) * sizeof(button_info)); > + else > + { > + buttons = HeapAlloc(GetProcessHeap(), 0, 6 * sizeof(button_info)); > + } > + > + /* Custom buttons */ > + if (taskconfig->cButtons && taskconfig->pButtons) > + { > + for (i = 0; i < taskconfig->cButtons; i++) > + { > + buttons[count++] = make_button(desc, taskconfig->pButtons[i].nButtonID, taskconfig->pButtons[i].pszButtonText); > + } > + } > + > + /* Default buttons */ > if (flags & TDCBF_OK_BUTTON) > - TASKDIALOG_ADD_COMMON_BUTTON(OK); > - /* Always add OK button */ > - if (list_empty(&desc->controls)) > - TASKDIALOG_ADD_COMMON_BUTTON(OK); > -#undef TASKDIALOG_ADD_COMMON_BUTTON > - > - /* make room for common buttons row */ > - desc->dialog_height += DIALOG_BUTTON_HEIGHT + 2 * DIALOG_SPACING; > + buttons[count++] = make_button(desc, IDOK, MAKEINTRESOURCEW(IDS_BUTTON_OK)); > + if (flags & TDCBF_YES_BUTTON) > + buttons[count++] = make_button(desc, IDYES, MAKEINTRESOURCEW(IDS_BUTTON_YES)); > + if (flags & TDCBF_NO_BUTTON) > + buttons[count++] = make_button(desc, IDNO, MAKEINTRESOURCEW(IDS_BUTTON_NO)); > + if (flags & TDCBF_RETRY_BUTTON) > + buttons[count++] = make_button(desc, IDRETRY, MAKEINTRESOURCEW(IDS_BUTTON_RETRY)); > + if (flags & TDCBF_CANCEL_BUTTON) > + buttons[count++] = make_button(desc, IDCANCEL, MAKEINTRESOURCEW(IDS_BUTTON_CANCEL)); > + if (flags & TDCBF_CLOSE_BUTTON) > + buttons[count++] = make_button(desc, IDCLOSE, MAKEINTRESOURCEW(IDS_BUTTON_CLOSE)); > + > + /* There must be at least one button */ > + if (count == 0) > + buttons[count++] = make_button(desc, IDOK, MAKEINTRESOURCEW(IDS_BUTTON_OK)); > + > + /* Position buttons */ > + location_x = alignment; > + for (i = 0; i < count; i++) > + { > + /* When beginning new row, align the first */ > + if (location_x + buttons[i].width + DIALOG_SPACING_BUTTON_W > desc->dialog_width) > + { > + if (first_row) > + { > + int diff = desc->dialog_width - location_x; > + > + first_row = FALSE; > + for (int j = 0; j < i; j++) /* Align first row to the right */ > + buttons[j].x += diff; > + alignment = buttons[0].x; /* left-align all coming rows to the first row */ > + } > + location_x = alignment; > + desc->dialog_height += DIALOG_BUTTON_HEIGHT + DIALOG_SPACING_BUTTON_H; > + } > + > + buttons[i].x = location_x; > + buttons[i].y = desc->dialog_height; > + > + location_x += buttons[i].width + DIALOG_SPACING_BUTTON_W; > + } > + if (first_row) /* Always align first row to the right */ > + { > + int diff = desc->dialog_width - (buttons[count - 1].x + buttons[count - 1].width + DIALOG_SPACING_BUTTON_W); > + for (int i = 0; i < count; i++) > + buttons[i].x += diff; > + } I don't like this. Why do you need temporary array, and iterating twice seems excessive. > + > + /* Now that we got them all positioned, create all buttons */ > + for (i = 0; i < count; i++) > + { > + size += taskdialog_add_control(desc, buttons[i].id, WC_BUTTONW, BS_PUSHBUTTON, COMCTL32_hModule, > + buttons[i].text, buttons[i].x, buttons[i].y, buttons[i].width, DIALOG_BUTTON_HEIGHT); > + } This won't work for custom buttons. > + > + /* Add height for last row and spacing */ > + desc->dialog_height += DIALOG_BUTTON_HEIGHT + DIALOG_SPACING; > + > + HeapFree(GetProcessHeap(), 0, buttons); > return size; > } > > @@ -295,7 +393,7 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi > desc.dialog_width = min(desc.dialog_width, screen_width); > > size += taskdialog_add_main_instruction(&desc); > - size += taskdialog_add_common_buttons(&desc); > + size += taskdialog_add_buttons(&desc); I'd rather have it separated if possible. I'll do some testing myself, before commenting further. > > template = Alloc(size); > if (!template) >

2 8

Re: [v2 1/2] d3dx9: Support relative addressing in preshader.
by Matteo Bruni April 10, 2017

April 10, 2017

2017-03-24 23:12 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > @@ -697,13 +739,13 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u > for (i = 0; i < pres->ins_count; ++i) > { > for (j = 0; j < pres_op_info[pres->ins[i].op].input_count; ++j) > - update_table_size(pres->regs.table_sizes, pres->ins[i].inputs[j].table, > - get_reg_offset(pres->ins[i].inputs[j].table, > - pres->ins[i].inputs[j].offset + pres->ins[i].component_count - 1)); > + update_table_size(pres->regs.table_sizes, pres->ins[i].inputs[j].reg.table, > + get_reg_offset(pres->ins[i].inputs[j].reg.table, > + pres->ins[i].inputs[j].reg.offset + pres->ins[i].component_count - 1)); > > - update_table_size(pres->regs.table_sizes, pres->ins[i].output.table, > - get_reg_offset(pres->ins[i].output.table, > - pres->ins[i].output.offset + pres->ins[i].component_count - 1)); > + update_table_size(pres->regs.table_sizes, pres->ins[i].output.reg.table, > + get_reg_offset(pres->ins[i].output.reg.table, > + pres->ins[i].output.reg.offset + pres->ins[i].component_count - 1)); Do these update_table_size() always do the right thing with relative addressing? If I'm not mistaken, they should be fine because we only accept relative addressing for CONST and IMMED and the former is taken care by update_table_sizes_consts() just below while the latter's size is set statically just above this chunk. I think that means though that we don't need to call update_table_size() on the input arguments. If that sounds right to you, you could drop that "for(j)" altogether or, probably better, replace the update_table_size() with a check that the argument is not out of bounds (probably returning failure if the check doesn't pass). That should be a separate patch. > @@ -1088,18 +1130,65 @@ static HRESULT init_set_constants(struct d3dx_const_tab *const_tab, ID3DXConstan > return ret; > } > > +static double exec_get_reg_value(struct d3dx_regstore *rs, enum pres_reg_tables table, unsigned int offset) > +{ > + if (!regstore_is_val_set_reg(rs, table, offset / table_info[table].reg_component_count)) > + WARN("Using uninitialized input, table %u, offset %u.\n", table, offset); > + > + return regstore_get_double(rs, table, offset); > +} > + > static double exec_get_arg(struct d3dx_regstore *rs, const struct d3dx_pres_operand *opr, unsigned int comp) > { > - if (!regstore_is_val_set_reg(rs, opr->table, (opr->offset + comp) / table_info[opr->table].reg_component_count)) > - WARN("Using uninitialized input, table %u, offset %u.\n", opr->table, opr->offset + comp); > + unsigned int offset, base_index, reg_index, table; > + > + table = opr->reg.table; > + > + if (opr->index_reg.table == PRES_REGTAB_COUNT) > + base_index = 0; > + else > + base_index = lrint(exec_get_reg_value(rs, opr->index_reg.table, opr->index_reg.offset)); > + > + /* '4' is used instead of reg_component_count, as immediate constants (which have > + * reg_component_count of 1) are still indexed as 4 values according to the tests. > + */ > + offset = base_index * 4 + opr->reg.offset + comp; Actually, is there any reason why reg_component_count for PRES_REGTAB_IMMED isn't 4? Maybe change it to 4 and in parse_preshader() check that const_count is a multiple of 4 (which is something we're depending on anyway). That would be a separate patch too. Clue me if I'm missing anything. > + reg_index = offset / table_info[table].reg_component_count; > + > + if (reg_index >= rs->table_sizes[table]) > + { > + unsigned int wrap_size; > + > + if (table == PRES_REGTAB_CONST) > + { > + /* As it can be guessed from tests (by iterating base register value and > + * observing the period of result values repeat), offset into floating > + * constant table are wrapped to the nearest power of 2 and not to the > + * actual table size. > + */ > + for (wrap_size = 1; wrap_size < rs->table_sizes[table]; wrap_size <<= 1) > + ; Please close the comment on the last text line (i.e. "*/" shouldn't be on its own line) and maybe remove the part in parentheses which is pretty obvious. I like the comment otherwise. Another thing on this, maybe add a WARN() on wrapped accesses to show what offset (or value) is returned in that case? Ignore it if you don't think that's useful.

2 9

wine-2.0.1-rc1 Available
by Michael Stefaniuc April 4, 2017

April 4, 2017

Hello guys, I have pushed wine-2.0.1-rc1 (with tag) to https://github.com/mstefani/wine-stable https://static-winehq.rhcloud.com/stable/ Nothing particularly special in this release. Slow start into 2.0.x due to lack of time on my side as well as to give the more risky patches some more time to burn in. Same old, same old: one week for feedback followed by another rc if needed with the final release 3-4 days later. And now the interesting parts from the ANNOUNCE file: What's new in this release (see below for details): - Various bug fixes - Deprecated tools/wineinstall ---------------------------------------------------------------- Bugs fixed in 2.0.1 (total 47): 14897 DirectDraw games (Jojo's Fashion Show 2: Las Cruces demo, The Chosen: Well of Souls) try to lock surface with invalid dwSize 14939 Black & White: DXTC to ARGB converter not implemented 17495 Open dialog crashes if the desktop folder is at a Unicode path that cannot be represented in the current locale 18477 Need For Speed Most Wanted crashes after accepting video settings changes 19888 Venom Codename: Outbreak - initial menu screen is black (no menu items) 25700 MessageBox does not display last word if string contains '&' (ampersand) 26603 iMesh 10 crashes at startup (needs wmvcore.dll.WMCreateReaderPriv) 27580 Wine Notepad command line parser eats the first 2 letters when the path starts with / (it should only do this for valid command line options) 30308 Property sheet fails to display Page Title 35993 Graphical Glitches in Agarest Generations of War 38354 Multiple games and applications need msvcr120.dll._except1 (Audacity 2.1.0, Tera Online) 38485 New Marvel Heroes 2015 Launcher crashes on unimplemented function dhcpcsvc.dll.DhcpRequestParams 39048 MIDI Clock Messages are Corrupted Between Wine and ALSA 39920 Nanocad 5.: file open/import dialog does not open 40392 ComicRack 0.9.x (.NET 4.5 app) hangs/crashes on startup when executing WMI query 40938 UE4 games (Ether One Redux, Into the Stars) crash while loading with "BackBuffer->GetResource() has 3 refs, expected 1" error 40952 improper escaping of quotes in command line 41448 Civilization II Unhandled page fault on read access 41579 Rush for Berlin Gold crashes after the intro videos 41623 Odallus The Dark Call crashes while starting if a force feedback enabled controller is plugged in 41648 AmiBroker 6.00 fails, when run, with raise_exception Unhandled exception 41725 Unimplemented function api-ms-win-crt-math-l1-1-0.dll._except1 (Starcraft 2 main menu, Firefox) 41830 Updating group box text causes garbage 41926 Zafehouse demo crashes with Call from 0x7b43c14c to unimplemented function ddraw.dll.GetSurfaceFromDC, aborting 42001 SC2 unimplemented function ucrtbase.dll._except1 42022 The Magic School Bus Explores The Solar System needs msvideo.dll16.DRAWDIBPROFILEDISPLAY 42023 The Magic School Bus Explores The Solar System crashes on launch; appears to be missing some files 42078 Dungeons & Dragons: Chronicles of Mystara needs d3dx11_43.dll.D3DX11CreateShaderResourceViewFromMemory 42093 Git for Windows 2.7.0 needs unimplemented function rstrtmgr.dll.RmShutdown 42094 winamp needs unimplemented function ntoskrnl.exe.IoStopTimer 42096 Steam -> RPGMaker 2003 needs unimplemented function KERNEL32.dll.BaseFlushAppcompatCache 42159 Sega Bug crashes immediately 42212 WOLF RPG Editor: Division by zero when winegstreamer is enabled 42218 mshtml/tests/dom crashes in xul while running test_doc_elem 42244 QQ 2013 needs ntoskrnl.exe.IoCreateFile 42245 QQ 2013 needs ntoskrnl.exe.KeClearEvent 42257 Warpath 21st Century does not have sound 42303 Magic: The Gathering Online 4.0 crashes when entering the battle 42306 One Note Free Retail installer crashes in xmllite 42315 Piriform Speccy 1.3 needs setupapi.dll.CM_Get_Child_Ex 42361 DX Library: PlaySoundFile() doesn't play MP3 files with specific extra headers 42365 Unimplemented function msvcr120.dll.fesetenv 42367 KiriKiri Z based games: main screen doesn't update. 42469 GetOpenFileName should expand environment variables in lpstrInitialDir 42483 Build for Ubuntu Precise fails because MPG123_IGNORE_INFOFRAME is undeclared 42557 NVIDIA GeForce GT 525M detected as GeForce GTX 470 42567 Acid Pro Trial 7.0e fails to install ---------------------------------------------------------------- Changes since 2.0: Adam Bolte (1): wined3d: Add GPU information for AMD FIJI. Akihiro Sagawa (3): d3d9/tests: Add LockRect tests with dynamic textures. d3d8/tests: Add LockRect tests with dynamic textures. wined3d: Upload textures if NO_DIRTY_UPDATE flag is set when locking dynamic textures. Alex Henrie (3): ddraw: Don't crash if writing out a new ddraw1 surface segfaults. comdlg32: Don't crash if an IShellFolder could not be created. user32: Include space for ampersands when determining MessageBox size. Alexandre Julliard (1): make_announce: Update version number parsing for the new versioning scheme. Alistair Leslie-Hughes (1): include: Add dhcpcsdk.h. Andrew Wesie (1): ntdll: Read entry point in LdrInitializeThunk. Andrey Gusev (2): setupapi: Add CM_Get_Child_Ex stub. d3dx11: Add D3DX11CreateShaderResourceViewFromMemory stub. Anton Romanov (1): user32: Add OCR_RDR* cursors. Austin English (6): ntoskrnl.exe: Add IoCreateFile stub. ntoskrnl.exe: Add stub KeClearEvent. kernel32: Add BaseFlushAppcompatCache stub. rstrtmgr: Add RmShutdown stub. dhcpsvc: Add DhcpRequestParams stub. readme: Remove wineinstall. Bruno Jesus (8): winmm: Fix the ordinal number for function PlaySound. dinput: DISFFC_RESET will not release the effects. notepad: Only skip valid command options. winemp3.acm: Ignore XING headers when parsing MP3 files. winemp3.acm: Fixes compilation for older mpg123 library versions. winealsa.drv: Fix handling of system real time MIDI messages. wined3d: Recognize Geforce GT 525M. wined3d: Recognize GeForce 940M. Can Taşan (3): wine.desktop: Add Turkish translation. kernel32: Add Unicode character for Turkish lira. documentation: Update Turkish translation. Christoph Brill (1): setupapi: Stub CM_Open_DevNode_Key and CM_Get_Child. Daniel Lehman (1): msvcrt: Implement nan. Dmitry Timoshkov (4): avifil32: AVIFileGetStream should set stream to NULL in case of an error. user32: BUTTON_CalcLabelRect should use the button font. user32: Fix groupbox rectangle calculation in the button's WM_SETTEXT handler. kernel32: Replace Peb->BeingDebugged check by CheckRemoteDebuggerPresent(). Fabian Maurer (1): msvcr120: Add fesetenv stub. François Gouget (3): readme: Note that Wine may also use Mac APIs. readme: Adjust a couple of section separators. readme: Update and rewrap the French translation. Gerald Pfeifer (1): winedump: Increase buffer size and potential string length inoutput_spec_symbol. Hans Leidekker (1): wbemprox: Only include matching rows in the table row count. Henri Verbeet (5): ddraw/tests: Rewrite GetDCTest(). ddraw: Implement GetSurfaceFromDC(). ddraw: Kill stray tabs. wined3d: Allow decompression blits on system memory resources in arbfp_blit_supported(). wined3d: Disallow upload conversion from compressed formats in surface_convert_format(). Jacek Caban (1): mshtml: Initialize nsAString in IHTMLDocument3::get_dir. Jacob Lifshay (1): kernel32: Fix improper escaping of quotes in command line. Jarkko Korpi (1): ntoskrnl: Add IoStopTimer stub. Jefferson Carpenter (1): wmvcore: Implement WMCreateReaderPriv. Julian Rüger (2): readme: Update German translation. readme: Fix typo in German translation. Józef Kucia (6): d3d11/tests: Add tests showing that views do not keep resource reference. d3d11: Do not keep reference to resources. ddraw: Relax "dwSize" validation in ddraw_surface*_Lock(). ddraw: Implement D3DOP_TEXTURELOAD. ddraw/tests: Add basic test for D3DOP_TEXTURELOAD. d3d9: Do not decrease swapchain surface refcount when it is already 0. Lauri Kenttä (2): readme: Update Finnish translation. readme: Update Swedish translation. Louis Lenders (2): xmllite/reader: Handle NULL node type argument in Read(). wmvcore: Add version resource. Masanori Kakura (1): winegstreamer: Avoid zero division in amt_from_gst_caps_video(). Matteo Bruni (1): d3d9: Fix DrawIndexedPrimitiveUP with non-zero min_vertex_idx. Michael Müller (2): msvideo.dll16: Implement DrawDibProfileDisplay. msvideo.dll16: Check if any 16 bit thunks have been allocated before accessing pointer. Michael Stefaniuc (1): tools: Get the ANNOUNCE bug list from the stable-notes git notes. Nikolay Sivov (5): comdlg32: Always use original Open File dialog template. comctl32/propsheet: Force wizard header if any of pages has title/subtitle. comctl32/propsheet: Only use header bitmap when asked for it. comdlg32: Expand initial directory path for file open dialog. readme: Update Russian translation. Piotr Caban (2): msvcrt: Add fesetenv implementation. msvcr120: Add _except1 implementation. Zebediah Figura (7): storage.dll16: Fix bad type in IStorage16_fnOpenStorage. winebuild: Use unsigned int in spec file variable parameters. compobj: Implement several IIDs. ole2: Implement several IIDs. avifile: Implement several IIDs. ole2disp: Implement several IIDs. typelib: Implement several IIDs. -- Michael Stefaniuc mstefani(a)winehq.org

4 4

APPDB Intro email
by Bijie Zhu April 3, 2017

April 3, 2017

Hi,My name is Bijie Zhu and I am currently a computer science student studying at City University of New York - Queens College. This is my first time participate in an open source project, and I hope I can get some guidance and feedback for the outreach project application process. I want to apply for improving APPDB website project. And I want to improve the app voting system. I would like to design an evaluation metric system for the app voting. So when people votes, we know why they vote for the app. People now can not only search for the most voted app, but also search for the app with the most desired attributes. Thank you,Bijie Zhu

2 1

Re: [PATCH] wmvcore: Add WMReader stubs.
by Alistair Leslie-Hughes March 31, 2017

March 31, 2017

Hi Jefferson, On 30/03/17 10:18, Jefferson Carpenter wrote: > > I have not written unit tests for this code. I would like to add some > wmvcore tests, but am not very familiar with Wine's build system > autotools, and have not been able to get tests to compile and run. > I have a basic patch for adding tests in the works, but I was waiting for my IDL changes to be accepted first. So, If someone wants to review the IDL changes, Since Sebastian has been busy with other stuff. https://source.winehq.org/patches/data/131403 > > Signed-off-by: Jefferson Carpenter > --- > dlls/wmvcore/wmvcore_main.c | 1234 +++++++++++++++++++++++++++++++++++++++++++ > +static HRESULT WINAPI WMHeaderInfo_GetScriptCount(IWMHeaderInfo3 *iface, WORD *pcScripts) > +{ > + WMReader *This = impl_from_IWMHeaderInfo3(iface); > + FIXME("(%p)->(WMHeaderInfo_GetScriptCount)\n", This); This is incorrect. The FIXME will insert the function name into the logs. You need to specify each parameter in the FIXME, there are plenty of examples of how to do this. Best Regards Alistair Leslie-Hughes

3 3

Re: [PATCH 2/2] regedit: Handle comment lines with leading spaces and tabs
by Alexandre Julliard March 31, 2017

March 31, 2017

Hugh McMaster <hugh.mcmaster(a)outlook.com> writes: > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > programs/regedit/regproc.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c > index 131149f..bce551b 100644 > --- a/programs/regedit/regproc.c > +++ b/programs/regedit/regproc.c > @@ -749,6 +749,7 @@ static char *get_lineA(FILE *fp) > next = line; > continue; > } > + while (*line == ' ' || *line == '\t') line++; > if (*line == ';' || *line == '#') > { > line = next; This is going to affect non-comment lines too, is that what you want? If so, the commit message is a bit misleading. -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: [PATCH 04/13] msvcrt: Add CurrentScheduler class stub
by Gijs Vermeulen March 31, 2017

March 31, 2017

Hi, I'm sorry if this is a stupid question. But shouldn't this also change: ?_Get(a)_CurrentScheduler@details(a)Concurrency@@SA?AV_Scheduler(a)23@XZ ?_GetNumberOfVirtualProcessors(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ ?_Id(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ -arch=win32 ?_ScheduleTask(a)_CurrentScheduler@details(a)Concurrency@ @SAXP6AXPAX(a)Z0@Z -arch=win64 ?_ScheduleTask(a)_CurrentScheduler@details(a)Concurrency@ @SAXP6AXPEAX(a)Z0@Z Or do these not do the same? Sorry if I'm wasting your time. Sincerely, Gijs 2017-03-30 22:47 GMT+02:00 Piotr Caban <piotr(a)codeweavers.com>: > Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> > --- > dlls/concrt140/concrt140.spec | 40 ++++++++--------- > dlls/msvcr100/msvcr100.spec | 28 ++++++------ > dlls/msvcr110/msvcr110.spec | 40 ++++++++--------- > dlls/msvcr120/msvcr120.spec | 40 ++++++++--------- > dlls/msvcr120_app/msvcr120_app.spec | 40 ++++++++--------- > dlls/msvcrt/scheduler.c | 88 ++++++++++++++++++++++++++++++ > +++++++ > 6 files changed, 182 insertions(+), 94 deletions(-) > > > > > >

2 1

Re: d3d10: sync spec file to Windows 10
by Henri Verbeet March 30, 2017

March 30, 2017

On 29 March 2017 at 23:51, Austin English <austinenglish(a)gmail.com> wrote: > -- We may not necessarily care, but RevertToOldImplementation() is the first export instead of the last on my Windows 10.

3 3

Re: [2/3] windowscodecs: Test for png codec seeking too far
by Vincent Povirk March 30, 2017

March 30, 2017

Is there a reason to switch to SHCreateMemStream to do this test in particular? If not, it would probably make more sense as a separate cleanup project. On Mon, Mar 27, 2017 at 3:09 PM, Viktor Semykin <thesame.ml(a)gmail.com> wrote: > Signed-off-by: Viktor Semykin <thesame.ml(a)gmail.com> > --- > dlls/windowscodecs/tests/Makefile.in | 2 +- > dlls/windowscodecs/tests/pngformat.c | 19 ++++++++++--------- > 2 files changed, 11 insertions(+), 10 deletions(-) > > diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in > index e11d184..e006e3d 100644 > --- a/dlls/windowscodecs/tests/Makefile.in > +++ b/dlls/windowscodecs/tests/Makefile.in > @@ -1,5 +1,5 @@ > TESTDLL = windowscodecs.dll > -IMPORTS = windowscodecs oleaut32 ole32 user32 gdi32 > +IMPORTS = windowscodecs oleaut32 ole32 user32 gdi32 shlwapi > > C_SRCS = \ > bitmap.c \ > diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c > index 34cb533..20b6e93 100644 > --- a/dlls/windowscodecs/tests/pngformat.c > +++ b/dlls/windowscodecs/tests/pngformat.c > @@ -25,6 +25,7 @@ > #include "windef.h" > #include "wincodec.h" > #include "wine/test.h" > +#include "shlwapi.h" > > /* 1x1 pixel PNG image */ > static const char png_no_color_profile[] = { > @@ -277,21 +278,16 @@ static IWICImagingFactory *factory; > > static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size) > { > - HGLOBAL hmem; > - BYTE *data; > HRESULT hr; > IWICBitmapDecoder *decoder = NULL; > IStream *stream; > GUID format; > LONG refcount; > + ULARGE_INTEGER pos; > + LARGE_INTEGER zero; > > - hmem = GlobalAlloc(0, image_size); > - data = GlobalLock(hmem); > - memcpy(data, image_data, image_size); > - GlobalUnlock(hmem); > - > - hr = CreateStreamOnHGlobal(hmem, TRUE, &stream); > - ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); > + stream = SHCreateMemStream (image_data, image_size); > + ok(stream != NULL, "SHCreateMemStream error\n"); > > hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); > ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); > @@ -302,6 +298,11 @@ static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size > ok(IsEqualGUID(&format, &GUID_ContainerFormatPng), > "wrong container format %s\n", wine_dbgstr_guid(&format)); > > + zero.QuadPart = 0; > + IStream_Seek (stream, zero, STREAM_SEEK_CUR, &pos); > + todo_wine ok(pos.QuadPart < image_size, "seek beyond the end of stream: %lu >= %u\n", > + pos.QuadPart, image_size); > + > refcount = IStream_Release(stream); > ok(refcount > 0, "expected stream refcount > 0\n"); > > -- > 2.12.1 > > >

2 3

Re: [PATCH 3/3] shlwapi/tests: A test to query ISequentialStream from memory stream
by Marvin March 30, 2017

March 30, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=29831 Your paranoid android. === wxppro (32 bit istream) === istream.c:44: Test failed: got 0x80004002 istream.c:45: Test failed: unexpected interface pointer 09f0:istream: unhandled exception c0000005 at 00405AEC === w2003std (32 bit istream) === istream.c:44: Test failed: got 0x80004002 istream.c:45: Test failed: unexpected interface pointer 05f0:istream: unhandled exception c0000005 at 00405AEC

1 0

Re: [PATCH 2/3] shlwapi: Fix QueryInterface for file-based streams
by Marvin March 30, 2017

March 30, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=29830 Your paranoid android. === wxppro (32 bit istream) === istream.c:44: Test failed: got 0x80004002 istream.c:45: Test failed: unexpected interface pointer 09ec:istream: unhandled exception c0000005 at 00405AEC === w2003std (32 bit istream) === istream.c:44: Test failed: got 0x80004002 istream.c:45: Test failed: unexpected interface pointer 05f0:istream: unhandled exception c0000005 at 00405AEC

1 0

Re: [PATCH] wmvcore: Add WMReader stubs.
by Alistair Leslie-Hughes March 30, 2017

March 30, 2017

Hi Jefferson, On 30/03/17 10:18, Jefferson Carpenter wrote: > > I have not written unit tests for this code. I would like to add some > wmvcore tests, but am not very familiar with Wine's build system > autotools, and have not been able to get tests to compile and run. > I have a basic patch for adding tests in the works, but I was waiting for my IDL changes to be accepted first. So, If someone wants to review the IDL changes, Since Sebastian has been busy with other stuff. https://source.winehq.org/patches/data/131403 > > Signed-off-by: Jefferson Carpenter > --- > dlls/wmvcore/wmvcore_main.c | 1234 +++++++++++++++++++++++++++++++++++++++++++ > +static HRESULT WINAPI WMHeaderInfo_GetScriptCount(IWMHeaderInfo3 *iface, WORD *pcScripts) > +{ > + WMReader *This = impl_from_IWMHeaderInfo3(iface); > + FIXME("(%p)->(WMHeaderInfo_GetScriptCount)\n", This); This is incorrect. The FIXME will insert the function name into the logs. You need to specify each parameter in the FIXME, there are plenty of examples of how to do this. Best Regards Alistair Leslie-Hughes

1 0

Re: dpnaddr: sync spec file to Windows 10
by Alistair Leslie-Hughes March 30, 2017

March 30, 2017

On 30/03/17 08:51, Austin English wrote: > > > You appear to be comparing the stub version of this DLL. (It would be about 8k in size, the real version is larger). Same goes for dpnlobby. Best Regards Alistair Leslie-Hughes

1 0

Darren Stevens II -- Outreachy Internship
by Darren M. Stevens II March 30, 2017

March 30, 2017

Hello, my name is Darren and I'm a computer science major at the University of Maryland Baltimore County. I've never worked in open source software before, but the idea of letting windows apps run for linux sounds appealing, especially for games. Though it's my first time in open source, I have some experience in C. Looking at the project list, the graphical user interface seems to be the most interesting, but I'm also interested in the resource and dialog editor since I'd like to get some UI experience. I've also worked in html, php, and mysql before, so improving the AppDB website also interests me. If pressed, I'd prefer to work with the gui and learn about what goes into making one. I look forward to potentially working with you all more during the summer. Thank you for your time, -- --------------------------------------------- Darren Stevens II Meyerhoff Scholar [M25] Computer Science (Game Design Track) Major University of Maryland Baltimore County (UMBC)

2 1

Packaging related changes
by Michael Müller March 29, 2017

March 29, 2017

Hi everyone, I would like to announce some very important build server / packaging related changes that will take effect with the next release. As most of you should know, Sebastian and I took care of the Wine Development and Staging builds for more than a year now. So far we were using a collection of scripts which were run on a dedicated machine to build and upload the packages. This solution did not scale very well, so we decided to rework the whole build system. The new system can not only be controlled using a command line utility but also provides an easy to use website which gives us the possibility to provide some great new features. Interested Wine developers will be able to request access to the system so that they can start their own builds. This can for example be used to provide a patched Wine version for testing in a bug report or to verify that a patch is compatible with all platforms and compilers. Nevertheless, in this mail I would like to concentrate on the user related changes. The developer related features need some further polishing and will be announced in a separate mail. Starting with the next release, we will use our new build server to compile the packages, leading to the following differences: ====================================================================== Launchpad is no longer used for the Ubuntu builds ------------------------------------------------- In order to provide the possibility for Wine developers to create their own builds through our system, we had to move away from Launchpad. This will also have the advantage that we can provide older builds (see below). The disadvantage of this change is that our users will have to manually switch from the PPA to the new repository, since there is no way to push prebuilt Debian/Ubuntu packages into a PPA on Launchpad (not even with a commercial subscription). We already added the new Ubuntu repository to the CDN, so that users can start switching by now and don't have to wait till the next release. The repository can be added using the following commands: wget https://dl.winehq.org/wine-builds/Release.key sudo apt-key add Release.key sudo apt-add-repository 'https://dl.winehq.org/wine-builds/ubuntu/' To make sure that all users will be informed about this change, I will push at least one additional update (Wine 2.5) to the PPA that displays a warning during the package upgrade containing the necessary instructions (I hope this also works on Ubuntu, I have only tested it on Debian so far). This means users will have at least two weeks to switch from the PPA to the new repository - maybe a bit more if we push additional builds. Old packages for Ubuntu / Debian -------------------------------- On the last build server we used reprepo to generate the Debian repositories. One disadvantage of the tool is that it does not support multiple versions of a package. We tried several other tools, but they did not fit our needs, so I ended up writing my own tool that does not have this limitation. This will make it easy to download and test old versions of Wine when using the new repository. There are some small packaging changes left, but in the future you will be able to tell apt-get which version you would like to install using: sudo apt-get install winehq-devel=2.4.0-1~stretch You can get a list of all available versions with: apt-cache policy winehq-devel Notes: * The "-1~stretch" part is used for the packaging. * The additional ".0" version component is added for technical reasons, to ensure package managers can determine which version is the latest one. Wine Stable is now available as package --------------------------------------- We will start providing builds for Wine Stable, which will be called "winehq-stable". This is actually a change we have planned for quite some time now, but all the manual steps involved in the old build system and the limited resources blocked us from doing this change earlier. Added / removed distros ----------------------- The following distros have been removed as they are no longer supported or reach their EOL within the next month: * Ubuntu Precise * Fedora 23 * Mageia 4 One new distro has been added: * Fedora 25 We had to temporarily disable the building of packages for Mageia 5. The problem is that the tool used for generating the repository files is not very compatible with other distros and I did not find a working combination of genhdlist2, URPM and librpm that works on Debian without any warnings or errors. We therefore decided to pause the builds until we made sure that we can provide a fully working repository. repos.wine-staging.com changes ------------------------------ This only affects users who are still getting their packages from repos.wine-staging.com. So far we were providing two repositories, the original one at repos.wine-staging.com and the new one at dl.winehq.org. We wanted to get rid of the original one for quite some time now, since both repositories basically contain the same packages. We decided that it is now the perfect time to make this step. In order to receive further updates, those users will have to switch to the dl.winehq.org repository by following the normal installation instructions. We will also post an announcement on the wine-staging.com website to make all users aware of this change. ====================================================================== As you can see there are plenty of changes, and there are even more developer related changes ahead. Although we would like to avoid any inconvenience, there is some manual work involved for some of our users. Ubuntu users will have to switch to the WineHQ repository, and repos.wine-staging.com users will have to update repository paths for all distributions. Nevertheless, we believe that these changes are very useful and will make things much easier in the long term. Regards, Michael

5 5

Re: [PATCH 10/10] xmllite/tests: Added tests for returned string pointers.
by Marvin March 29, 2017

March 29, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=29805 Your paranoid android. === wxppro (32 bit reader) === reader.c:2517: Test failed: ns != value reader.c:2549: Test failed: xmlns_name != prefix reader.c:2555: Test failed: xmlns_name != prefix reader.c:2560: Test failed: p != prefix reader.c:2561: Test failed: empty != namespace reader.c:2566: Test failed: q != prefix reader.c:2567: Test failed: nsq != namespace reader.c:2570: Test failed: q == qname reader.c:2597: Test failed: ns+1 != p === w2003std (32 bit reader) === reader.c:2517: Test failed: ns != value reader.c:2549: Test failed: xmlns_name != prefix reader.c:2555: Test failed: xmlns_name != prefix reader.c:2560: Test failed: p != prefix reader.c:2561: Test failed: empty != namespace reader.c:2566: Test failed: q != prefix reader.c:2567: Test failed: nsq != namespace reader.c:2570: Test failed: q == qname reader.c:2597: Test failed: ns+1 != p

1 0

Re: [PATCH 3/9] xmllite: Merge reader_lookup_ns and reader_lookup_nsdef implementations.
by Alexandre Julliard March 29, 2017

March 29, 2017

Jacek Caban <jacek(a)codeweavers.com> writes: > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > --- > dlls/xmllite/reader.c | 53 > +++++++++++++++++++++------------------------------ > 1 file changed, 22 insertions(+), 31 deletions(-) This fails here: ../../../tools/runtest -q -P wine -T ../../.. -M taskschd.dll -p taskschd_test.exe.so scheduler && touch scheduler.ok wine: Unhandled page fault on read access to 0x00000014 at address 0x7e05d1a7 (thread 0009), starting debugger... Unhandled exception: page fault on read access to 0x00000014 in 32-bit code (0x7e05d1a7). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:7e05d1a7 ESP:0033f4e0 EBP:0033f518 EFLAGS:00010246( R- -- I Z- -P- ) EAX:00000000 EBX:00000005 ECX:0013dbf8 EDX:0013dc08 ESI:0013dba8 EDI:0033f4f8 Stack dump: 0x0033f4e0: 0013dba8 00000000 0033f4f8 0033f5ac 0x0033f4f0: 7e09dfe8 7e06d000 0033f518 00000005 0x0033f500: 0013d8b8 7e05d136 0033f530 7e0a7000 0x0033f510: 0013dba8 00008454 0033f5c8 7e08f52d 0x0033f520: 0013d8b8 00000001 7e085061 7e08f52d 0x0033f530: 0013dba8 0033f5ac 00000000 00000000 Backtrace: =>0 0x7e05d1a7 xmlreader_GetValue+0x87(iface=<couldn't compute location>, value=<couldn't compute location>, len=<couldn't compute location>) [/home/julliard/wine/wine/dlls/xmllite/reader.c:3301] in xmllite (0x0033f518) 1 0x7e08f52d TaskDefinition_put_XmlText+0x4fc(iface=<couldn't compute location>, xml=<couldn't compute location>) [/home/julliard/wine/wine/dlls/taskschd/../../include/xmllite.h:366] in taskschd (0x0033f5c8) 2 0x7e08655d TaskFolder_RegisterTask+0xdc(iface=<couldn't compute location>, name=<couldn't compute location>, xml=<couldn't compute location>, flags=<couldn't compute location>, user={n1={n2={vt=0x1, wReserved1=0x11, wReserved2=0xd7e6, wReserved3=0x7bc3, n3={cVal=-16, uiVal=0xf7f0, ulVal=0x33f7f0, intVal=0x33f7f0, uintVal=0x33f7f0, bVal=-16, iVal=0xfffff7f0, lVal=0x33f7f0, fltVal=0.000000, dblVal=1511150729130819689735093992150912839369984728108261507947203237810152168316886087549523621236115883856409333081269449041715263251744478647635819958016247928527492445059748209219694759120105362131911873167308517643014354124272586209814321930163516051621612695826549010655565890397283549184.000000, boolVal=0xfffff7f0, scode=0x33f7f0, date=1511150729130819689735093992150912839369984728108261507947203237810152168316886087549523621236115883856409333081269449041715263251744478647635819958016247928527492445059748209219694759120105362131911873167308517643014354124272586209814321930163516051621612695826549010655565890397283549184.000000, bstrVal="`?????`??3≥?", cyVal={={Lo=0x33f7f0, Hi=0x7bc3d926}, int64=0x7bc3d9260033f7f0}, punkVal=0x33f7f0, pdispVal=0x33f7f0, parray=0x33f7f0, llVal=0x7bc3d9260033f7f0, ullVal=0x7bc3d9260033f7f0, pcVal="`", puiVal="`?????`??3≥?", pulVal=0x33f7f0, pintVal=0x33f7f0, puintVal=0x33f7f0, pbVal="`", piVal=0x33f7f0, plVal=0x33f7f0, pfltVal=0x33f7f0, pdblVal=0x33f7f0, pboolVal=0x33f7f0, pscode=0x33f7f0, pdate=0x33f7f0, pbstrVal=0x33f7f0, pvarVal=0x33f7f0, byref=0x33f7f0, pcyVal=0x33f7f0, pdecVal=0x33f7f0, ppunkVal=0x33f7f0, ppdispVal=0x33f7f0, pparray=0x33f7f0, pllVal=0x33f7f0, pullVal=0x33f7f0, brecVal={pvRecord=0x33f7f0, pRecInfo=0x7bc3d926}}}, decVal={wReserved=0x1, ={={scale=17, sign=0}, signscale=0x11}, Hi32=0x7bc3d7e6, ={={Lo32=0x33f7f0, Mid32=0x7bc3d926}, Lo64=0x7bc3d9260033f7f0}}}}, password={n1={n2={vt=0x1, wReserved1=0x33, wReserved2=0xd7e6, wReserved3=0x7bc3, n3={cVal=0, uiVal=0xf800, ulVal=0x33f800, intVal=0x33f800, uintVal=0x33f800, bVal=0, iVal=0xfffff800, lVal=0x33f800, fltVal=0.000000, dblVal=1511150729130824017523893055520610957737502764212302110344498125717661440571014434062133365926164698282569564768952682214359048014142616051827027404016169084942804013460762242723410078969754872380504678452713624017530338190327992990462096150957280615769007395389364412955620604666965917696.000000, boolVal=0xfffff800, scode=0x33f800, date=1511150729130824017523893055520610957737502764212302110344498125717661440571014434062133365926164698282569564768952682214359048014142616051827027404016169084942804013460762242723410078969754872380504678452713624017530338190327992990462096150957280615769007395389364412955620604666965917696.000000, bstrVal="`??3≥?", cyVal={={Lo=0x33f800, Hi=0x7bc3d926}, int64=0x7bc3d9260033f800}, punkVal=0x33f800, pdispVal=0x33f800, parray=0x33f800, llVal=0x7bc3d9260033f800, ullVal=0x7bc3d9260033f800, pcVal="`", puiVal="`??3≥?", pulVal=0x33f800, pintVal=0x33f800, puintVal=0x33f800, pbVal="`", piVal=0x33f800, plVal=0x33f800, pfltVal=0x33f800, pdblVal=0x33f800, pboolVal=0x33f800, pscode=0x33f800, pdate=0x33f800, pbstrVal=0x33f800, pvarVal=0x33f800, byref=0x33f800, pcyVal=0x33f800, pdecVal=0x33f800, ppunkVal=0x33f800, ppdispVal=0x33f800, pparray=0x33f800, pllVal=0x33f800, pullVal=0x33f800, brecVal={pvRecord=0x33f800, pRecInfo=0x7bc3d926}}}, decVal={wReserved=0x1, ={={scale='3', sign=0}, signscale=0x33}, Hi32=0x7bc3d7e6, ={={Lo32=0x33f800, Mid32=0x7bc3d926}, Lo64=0x7bc3d9260033f800}}}}, logon=<couldn't compute location>, sddl={n1={n2={vt=0x1, wReserved1=0x33, wReserved2=0x9000, wReserved3=0x7bcd, n3={cVal='X', uiVal=0xf858, ulVal=0x33f858, intVal=0x33f858, uintVal=0x33f858, bVal='X', iVal=0xfffff858, lVal=0x33f858, fltVal=0.000000, dblVal=1599434225947997951839798187977314197247957319428824144722608502103490780437150503599313505255422560087677850314482444820949235532773538977575659441663949722412271782696123659963005719660434825558687050651416890927056302450102863675852450005771357260534626948999518468080309345769339486208.000000, boolVal=0xfffff858, scode=0x33f858, date=1599434225947997951839798187977314197247957319428824144722608502103490780437150503599313505255422560087677850314482444820949235532773538977575659441663949722412271782696123659963005719660434825558687050651416890927056302450102863675852450005771357260534626948999518468080309345769339486208.000000, bstrVal="?3????????", cyVal={={Lo=0x33f858, Hi=0x7bc501ff}, int64=0x7bc501ff0033f858}, punkVal=0x33f858, pdispVal=0x33f858, parray=0x33f858, llVal=0x7bc501ff0033f858, ullVal=0x7bc501ff0033f858, pcVal="ê°3", puiVal="?3????????", pulVal=0x33f858, pintVal=0x33f858, puintVal=0x33f858, pbVal="ê°3", piVal=0x33f858, plVal=0x33f858, pfltVal=0x33f858, pdblVal=0x33f858, pboolVal=0x33f858, pscode=0x33f858, pdate=0x33f858, pbstrVal=0x33f858, pvarVal=0x33f858, byref=0x33f858, pcyVal=0x33f858, pdecVal=0x33f858, ppunkVal=0x33f858, ppdispVal=0x33f858, pparray=0x33f858, pllVal=0x33f858, pullVal=0x33f858, brecVal={pvRecord=0x33f858, pRecInfo=0x7bc501ff}}}, decVal={wReserved=0x1, ={={scale='3', sign=0}, signscale=0x33}, Hi32=0x7bcd9000, ={={Lo32=0x33f858, Mid32=0x7bc501ff}, Lo64=0x7bc501ff0033f858}}}}, task=<couldn't compute location>) [/home/julliard/wine/wine/dlls/taskschd/../../include/taskschd.h:2719] in taskschd (0x0033f668) 3 0x7ed666c6 test_GetTask+0x385() [/home/julliard/wine/wine/dlls/taskschd/tests/../../../include/taskschd.h:2140] in taskschd_test (0x0033fd18) 4 0x7ed6bd20 func_scheduler+0x2f() [/home/julliard/wine/wine/dlls/taskschd/tests/scheduler.c:1488] in taskschd_test (0x0033fd28) 5 0x7ed6bf56 run_test+0x115(name=<is not available>) [/home/julliard/wine/wine/dlls/taskschd/tests/../../../include/wine/test.h:589] in taskschd_test (0x0033fd58) 6 0x7ed63c5b main+0x14a(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/dlls/taskschd/tests/../../../include/wine/test.h:673] in taskschd_test (0x0033fe08) 7 0x7ed6c95b __wine_spec_exe_entry+0x4a(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in taskschd_test (0x0033fe48) 8 0x7b45e5cc call_process_entry+0xb() in kernel32 (0x0033fe68) 9 0x7b45f509 start_process+0x68(entry=<couldn't compute location>) [/home/julliard/wine/wine/dlls/kernel32/process.c:1116] in kernel32 (0x0033fea8) 10 0x7bc80aac call_thread_func_wrapper+0xb() in ntdll (0x0033fec8) 11 0x7bc83869 call_thread_func+0xa8(entry=0x7b45f4a0, arg=0x7ed6c910, frame=0x33ffc8) [/home/julliard/wine/wine/dlls/ntdll/signal_i386.c:2759] in ntdll (0x0033ffa8) 12 0x7bc80a8a call_thread_entry_point+0x11() in ntdll (0x0033ffc8) 13 0x7bc540f3 start_process+0x12(arg=0xffb0e178) [/home/julliard/wine/wine/dlls/ntdll/loader.c:3054] in ntdll (0x0033ffe8) 14 0xf755a8dd __x86.get_pc_thunk.di+0x2a() in libwine.so.1 (0x00000000) 15 0xf755aa40 wine_switch_to_stack+0x1f(func=0x7bc540e0, arg=0xffb0e178, stack=0x340000) [/home/julliard/wine/wine/libs/wine/port.c:77] in libwine.so.1 (0xffb0e148) 16 0x7bc59ca6 LdrInitializeThunk+0x235(kernel_start=<couldn't compute location>, unknown2=<couldn't compute location>, unknown3=<couldn't compute location>, unknown4=<couldn't compute location>) [/home/julliard/wine/wine/dlls/ntdll/loader.c:3115] in ntdll (0xffb0e198) 17 0x7b46540f __wine_kernel_init+0xa4e() [/home/julliard/wine/wine/dlls/kernel32/process.c:1310] in kernel32 (0xffb0f088) 18 0x7bc5ab03 __wine_process_init+0x152() [/home/julliard/wine/wine/dlls/ntdll/loader.c:3324] in ntdll (0xffb0f0f8) 19 0xf7558b43 wine_init+0x2a2(argc=0x3, argv=0xffb0f644, error="", error_size=0x400) [/home/julliard/wine/wine/libs/wine/loader.c:956] in libwine.so.1 (0xffb0f148) 20 0x7c000b58 main+0x97(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/loader/main.c:254] in <wine-loader> (0xffb0f598) 21 0xf7362276 __libc_start_main+0xf5() in libc.so.6 (0x00000000) 0x7e05d1a7 xmlreader_GetValue+0x87 [/home/julliard/wine/wine/dlls/xmllite/reader.c:3301] in xmllite: movl 0x14(%eax),%edx -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 5/5] user32: Store the item rects as relative to the items_rect.
by Alexandre Julliard March 29, 2017

March 29, 2017

Huw Davies <huw(a)codeweavers.com> writes: > Signed-off-by: Huw Davies <huw(a)codeweavers.com> > --- > dlls/user32/menu.c | 68 ++++++++++++++++++++++++++---------------------------- > 1 file changed, 33 insertions(+), 35 deletions(-) This fails here: ../../../tools/runtest -q -P wine -T ../../.. -M user32.dll -p user32_test.exe.so win && touch win.ok win.c:1104: Test failed: window rect does not match: style:exstyle=0x94000000:0x00000000, menu=1, win=(110,100)-(335,300), calc=(110,99)-(335,300) win.c:1111: Test failed: window rect does not match: style:exstyle=0x94000000:0x00000000, menu=1, win=(110,100)-(335,300), calc=(110,99)-(335,300) win.c:1140: Test failed: synthetic rect does not match: style:exstyle=0x94000000:0x00000000, menu=1, client=(0,0)-(250,150), calc=(0,-1)-(250,150) win.c:1104: Test failed: window rect does not match: style:exstyle=0x15c00000:0x00000100, menu=1, win=(-3,-3)-(1923,1203), calc=(-3,-4)-(1923,1203) win.c:1111: Test failed: window rect does not match: style:exstyle=0x15c00000:0x00000100, menu=1, win=(-3,-3)-(1923,1203), calc=(-3,-4)-(1923,1203) win.c:1140: Test failed: synthetic rect does not match: style:exstyle=0x15c00000:0x00000100, menu=1, client=(0,0)-(250,150), calc=(0,-1)-(250,150) win.c:1104: Test failed: window rect does not match: style:exstyle=0x14c00000:0x00000100, menu=1, win=(110,100)-(335,300), calc=(110,99)-(335,300) win.c:1111: Test failed: window rect does not match: style:exstyle=0x14c00000:0x00000100, menu=1, win=(110,100)-(335,300), calc=(110,99)-(335,300) win.c:1140: Test failed: synthetic rect does not match: style:exstyle=0x14c00000:0x00000100, menu=1, client=(0,0)-(250,150), calc=(0,-1)-(250,150) win.c:1104: Test failed: window rect does not match: style:exstyle=0x14c00000:0x00000100, menu=1, win=(110,100)-(335,300), calc=(110,99)-(335,300) win.c:1111: Test failed: window rect does not match: style:exstyle=0x14c00000:0x00000100, menu=1, win=(110,100)-(335,300), calc=(110,99)-(335,300) win.c:1140: Test failed: synthetic rect does not match: style:exstyle=0x14c00000:0x00000100, menu=1, client=(0,0)-(250,150), calc=(0,-1)-(250,150) ... -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [v2 2/2] d3dx9/tests: Add more tests for preshader relative addressing.
by Matteo Bruni March 28, 2017

March 28, 2017

2017-03-24 23:12 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Again, I'd separate the update of the test effect blob and the existing test from the addition of a new test. Aside from that, I just had a quick glance. expected_light_specular_2[] doesn't seem like a good name, you can call that "test_light_specular_2" or similar and rename its "result" field "expected" (i.e. always calling the table driving the test "test_something" is nice and consistent, as is calling the array with expected results "expected").

1 0

Re: [PATCH 4/9] xmllite: Return static namespace instances for default namespaces in reader_lookup_ns.
by Nikolay Sivov March 28, 2017

March 28, 2017

On 28.03.2017 17:44, Jacek Caban wrote: > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > --- > dlls/xmllite/reader.c | 33 +++++++++++++++++++++++++++------ > 1 file changed, 27 insertions(+), 6 deletions(-) > > > +static struct ns default_ns = { > + { emptyW }, > + { emptyW } > }; > I think this could use a better name. Default namespace is something defined with unprefixed "xmlns" attribute name. Maybe empty_ns? To match empty strings naming. Also everything static in this patch should be also const, no?

2 1

Re: [v2 PATCH] ole32: Add CoRegisterSurrogate/Ex stubs
by Huw Davies March 28, 2017

March 28, 2017

On Mon, Mar 27, 2017 at 10:12:11PM +0000, Alistair Leslie-Hughes wrote: > v2 - Removed CoRegisterSurrogateEx from header > - Minor formatting changes > - Return E_NOTIMPL > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/ole32/compobj.c | 20 ++++++++++++++++++++ > dlls/ole32/ole32.spec | 4 ++-- > 2 files changed, 22 insertions(+), 2 deletions(-) Looks good. I've sent in a new version having run make_specfiles. Huw.

1 0

Re: [3/3] windowscodecs: Fixed loading png from streams
by Marvin March 28, 2017

March 28, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=29747 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [2/3] windowscodecs: Test for png codec seeking too far
by Marvin March 28, 2017

March 28, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=29746 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH v4 6/7] user32/tests: Workaround an intermittent failure.
by Marvin March 27, 2017

March 27, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=29730 Your paranoid android. === w7pro64 (64 bit msg) === msg.c:12609: Test failed: 54: ShowWindow(SW_MINIMIZE): 4: in msg 0x0047 expecting wParam 0x8170 got 0x1803 msg.c:12609: Test failed: 54: ShowWindow(SW_MINIMIZE): 5: the msg 0x0003 was expected, but got msg 0x0047 instead msg.c:12609: Test failed: 54: ShowWindow(SW_MINIMIZE): 6: the msg 0x0005 was expected, but got msg 0x0003 instead msg.c:12609: Test failed: 54: ShowWindow(SW_MINIMIZE): 7: the msg sequence is not complete: expected 0000 - actual 0005

1 0

[1/3] shlwapi: SHCreateMemStream added to shlwapi.h
by Viktor Semykin March 27, 2017

March 27, 2017

Where it belongs according to its documentation. Signed-off-by: Viktor Semykin <thesame.ml(a)gmail.com> --- include/shlwapi.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/shlwapi.h b/include/shlwapi.h index 2c68b7f..c19ca31 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -978,6 +978,7 @@ HRESULT WINAPI SHCreateStreamOnFileA(LPCSTR,DWORD,struct IStream**); HRESULT WINAPI SHCreateStreamOnFileW(LPCWSTR,DWORD,struct IStream**); #define SHCreateStreamOnFile WINELIB_NAME_AW(SHCreateStreamOnFile) +struct IStream * WINAPI SHCreateMemStream(const BYTE *lpbData, UINT dwDataLen); HRESULT WINAPI SHCreateStreamOnFileEx(LPCWSTR,DWORD,DWORD,BOOL,struct IStream*,struct IStream**); HRESULT WINAPI SHCreateStreamWrapper(LPBYTE,DWORD,DWORD,struct IStream**); -- 2.12.1

1 2

Re: [PATCH v4 4/7] user32: Always send WM_CANCELMODE when disabling a window.
by Marvin March 27, 2017

March 27, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=29728 Your paranoid android. === w7u (32 bit msg) === msg.c:5084: Test failed: ShowWindow(SW_RESTORE):overlapped: 18: the msg sequence is not complete: expected 0000 - actual 0088

1 0

Re: [2/3] windowscodecs: Test for png codec seeking too far
by Vincent Povirk March 27, 2017

March 27, 2017

Does this test fail on Wine without patch 3? If it fails, you should add a todo_wine to the failing test, and remove it when the test is fixed.

2 1

Re: [PATCH 2/2 v2] devenum: Implement IMoniker::IsEqual().
by Andrew Eikum March 27, 2017

March 27, 2017

Thanks, just a couple more tweaks. On Mon, Mar 27, 2017 at 10:57:36PM +0800, Jactry Zeng wrote: > diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c > index e3c0f47256..b6275be8d2 100644 > --- a/dlls/devenum/tests/devenum.c > +++ b/dlls/devenum/tests/devenum.c > @@ -135,6 +135,94 @@ static void test_devenum(IBindCtx *bind_ctx) > if(sizeof(void*) == 4) > ok(have_mrle, "mrle codec not found\n"); > } > +static void test_moniker_isequal(void) > +{ > + HRESULT res; > + ICreateDevEnum *create_devenum = NULL; > + IEnumMoniker *enum_moniker0 = NULL, *enum_moniker1 = NULL; > + IMoniker *moniker0 = NULL, *moniker1 = NULL; > + > + res = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, > + &IID_ICreateDevEnum, (LPVOID*)&create_devenum); > + if (res) Please use FAILED() here. > + if (SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL)) && > + SUCCEEDED(IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL))) > + { > + res = IMoniker_IsEqual(moniker0, moniker1); > + ok(SUCCEEDED(res), "IMoniker_IsEqual failed (res = %x)\n", res); > + > + res = IMoniker_IsEqual(moniker1, moniker0); > + ok(SUCCEEDED(res), "IMoniker_IsEqual failed (res = %x)\n", res); These should be compared against S_OK, otherwise S_FALSE will also pass the test. Andrew

2 1

Re: [PATCH 2/2] devenum: Implement IMoniker::IsEqual().
by Andrew Eikum March 27, 2017

March 27, 2017

On Sun, Mar 26, 2017 at 04:31:55PM +0800, Jactry Zeng wrote: > + res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker0, 0); > + ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); > + res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker1, 0); > + ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); > + if (!res) > + { > + if (!IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) && !IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL)) > + { > + res = IMoniker_IsEqual(moniker0, moniker1); > + ok(!res, "IMoniker_IsEqual should failed (res = %x)\n", res); > + > + res = IMoniker_IsEqual(moniker1, moniker0); > + ok(!res, "IMoniker_IsEqual should failed (res = %x)\n", res); > + > + IMoniker_Release(moniker0); > + IMoniker_Release(moniker1); > + } These patches look fine to me except the ok() message is wrong on these two. Also, I think it's easier to read code that explicitly compares against S_OK or uses SUCCEEDED() instead of using !. Andrew

2 1

Re: iphlpapi: Implement GetUnicastIpAddressTable (try 2)
by Hans Leidekker March 27, 2017

March 27, 2017

> +DWORD WINAPI GetUnicastIpAddressTable(ADDRESS_FAMILY family, MIB_UNICASTIPADDRESS_TABLE **table) > +{ > + IP_ADAPTER_ADDRESSES *aa, *ptr; > + MIB_UNICASTIPADDRESS_TABLE *data; > + DWORD ret, count = 0; > + ULONG size; > + > + TRACE("%u, %p\n", family, table); > + > + if (!table || (family != WS_AF_INET && family != WS_AF_INET6 && family != WS_AF_UNSPEC)) > + return ERROR_INVALID_PARAMETER; > + > + ret = GetAdaptersAddresses(family, 0, NULL, NULL, &size); You should pass GAA_FLAG_SKIP_* flags here to exclude any data that will not be used.

2 1

Wine | Bug Query
by Akarsha Sehwag March 27, 2017

March 27, 2017

Hi I started with the bug( https://bugs.winehq.org/show_bug.cgi?id=39640 ). As of what I understood, I am writing it below. Kindly correct me wherever I go wrong. To implement ProcessPage_OnEndProcessTree() correctly we need to kill all its children and grandchildren also. So for that purpose, we need to iterate through all the active processes and check if their parent process is same as the process we wish to terminate. If yes, we kill them, if no, we continue our iteration. Now, for implementing this, can we use 'ps' or 'top' command. An example code: char string[30] = "ps -o pid --ppid "; char ppid[7]; sprintf(ppid , "%d" , getpid() ) ; strcat ( string , ppid ) ; system ( string ) ; ps -o pid --ppid <parent_Id> will give us the pid of all the child_processes whose parent has a PID. And now, get the parentProcess's PID by getpid(). Next, convert the integer into string and concatenate the result with string to get the final command which is then executed by system(string). Kindly tell me if I am anywhere near the right solution and also guide me how to proceed. Thanks :) Regards -- Akarsha Sehwag

3 2

Re: [PATCH v3 1/6] user32: Move internal message from EnableWindow() to WIN_SetStyle().
by Alexandre Julliard March 27, 2017

March 27, 2017

Zebediah Figura <z.figura12(a)gmail.com> writes: > The capture is already killed by handling WM_CANCELMODE, as in Windows. This should be a separate change, with its own tests. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] ole32: Add CoRegisterSurrogate/Ex stubs
by Huw Davies March 27, 2017

March 27, 2017

On Mon, Mar 27, 2017 at 04:29:24AM +0000, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > diff --git a/include/objbase.h b/include/objbase.h > index 875f0e1..8f89389 100644 > --- a/include/objbase.h > +++ b/include/objbase.h > @@ -331,6 +331,7 @@ HRESULT WINAPI CoRevokeClassObject(DWORD dwRegister); > HRESULT WINAPI CoGetPSClsid(REFIID riid,CLSID *pclsid); > HRESULT WINAPI CoRegisterPSClsid(REFIID riid, REFCLSID rclsid); > HRESULT WINAPI CoRegisterSurrogate(LPSURROGATE pSurrogate); > +HRESULT WINAPI CoRegisterSurrogateEx(REFGUID guid, void *reserved); I don't see this in my Windows 10 SDK. Where does it come from? Huw.

2 2

Re: [v2 PATCH] oledb32/tests: Add convert to DBTYPE_NUMERIC tests
by Huw Davies March 27, 2017

March 27, 2017

On Sun, Mar 26, 2017 at 10:14:00PM +0000, Alistair Leslie-Hughes wrote: > v2 > - Added VT_NULL test > - Use result variables for each test. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> convert.c:3349: Test succeeded inside todo block: got 00000000 convert.c:3350: Test succeeded inside todo block: got 00000003 I've fixed these, removed the unnecessary src array, and resent. Huw.

1 0

Re: [PATCH v3 3/6] user32: Always send WM_CANCELMODE when disabling a window.
by Marvin March 26, 2017

March 26, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=29708 Your paranoid android. === w7u (32 bit msg) === msg.c:12062: Test failed: WmMouseHoverSeq: 0: the msg sequence is not complete: expected 0118 - actual 0000 msg.c:12064: Test failed: wrong tme.dwFlags 00000001, expected 00000000 msg.c:12064: Test failed: wrong tme.hwndTrack 0012017C, expected 00000000 msg.c:12064: Test failed: wrong tme.dwHoverTime 400, expected 0

1 0

Re: [PATCH 4/7] wined3d: Save pixel and vertex shader resource views in stateblocks.
by Henri Verbeet March 26, 2017

March 26, 2017

On 24 March 2017 at 17:14, Józef Kucia <jkucia(a)codeweavers.com> wrote: > @@ -3132,6 +3132,8 @@ struct wined3d_saved_states > WORD vertexShaderConstantsB; /* WINED3D_MAX_CONSTS_B, 16 */ > WORD vertexShaderConstantsI; /* WINED3D_MAX_CONSTS_I, 16 */ > BOOL vs_consts_f[WINED3D_MAX_VS_CONSTS_F]; > + DWORD pixel_shader_resource_views : 16; /* MAX_FRAGMENT_SAMPLERS, 16 */ > + DWORD vertex_shader_resource_views : 16; /* MAX_VERTEX_SAMPLERS, 4 */ So why is it 16 bits wide?

2 1

Re: [PATCH 2/7] wined3d: Allow creating shader resource views with NULL description.
by Henri Verbeet March 26, 2017

March 26, 2017

On 24 March 2017 at 17:14, Józef Kucia <jkucia(a)codeweavers.com> wrote: > For ddraw, d3d8 and d3d9. > I think we'd rather just create a wined3d_view_desc in those DLLs.

1 0

Re: cmd: Adjust CMD_LIST to a tree-like structure and implement command chains
by Flávio J. Saraiva March 26, 2017

March 26, 2017

Hi, Some time ago I was told that every patch in a patch set all patches should produce a state that passes all the tests. Given how much the current code is interconnected, i don't think i can split this while keeping the tests functional. How should I proceed in this case, can I split the code into logical bits knowing that the intermediate states will not pass the tests? Flávio J. Saraiva 2017-03-21 21:06 GMT+00:00 Marvin <testbot(a)winehq.org>: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Needs splitting". > > This means that the patch needs to be split, either because it > contains unrelated changes that should be their own separate patch, or > because it's too large for review. You need to find a way to resend > the changes in smaller chunks. > > If you do not understand the reason for this status, disagree with our > assessment, or are simply not sure how to proceed next, please ask for > clarification by replying to this email.

5 8

Re: [PATCH v2 1/5] user32: Fix handling of internal messages.
by Alexandre Julliard March 25, 2017

March 25, 2017

Zebediah Figura <z.figura12(a)gmail.com> writes: > This patch adds a new flag and a server reply, allowing GetQueueStatus > to ignore internal messages, and MsgWaitForMultipleObjects to process > internal messages until a real sent message is found. There's a lot of code duplication in there, and adding private flags to public headers is discouraged. There has to be a better way of doing this, or else it would need a stronger justification than a couple of EnableWindow tests. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH] oleaut32: Implement GetAltMonthNames()
by Jacek Caban March 25, 2017

March 25, 2017

Hi Nikolay, On 3/24/17 7:32 PM, Nikolay Sivov wrote: > diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c > index f9734e6d78..816b18ce35 100644 > --- a/dlls/oleaut32/oleaut.c > +++ b/dlls/oleaut32/oleaut.c > @@ -935,3 +935,109 @@ HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hIcon) > /* FIXME: make an extended conversation from HICON to HCURSOR */ > return CopyCursor(hIcon); > } > + > +BOOL WINAPI GetAltMonthNames(LCID lcid, LPOLESTR **str) Shouldn't it return HRESULT? Thanks, Jacek

2 1

Re: [PATCH 2/3] d3dx9: Support relative addressing in preshader.
by Matteo Bruni March 24, 2017

March 24, 2017

2017-03-23 16:06 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/preshader.c | 103 ++++++++++++++++++++++++++++++++++++------- > dlls/d3dx9_36/tests/effect.c | 38 ++++++++-------- > 2 files changed, 106 insertions(+), 35 deletions(-) > > diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c > index 9aedc99..2974ffd 100644 > --- a/dlls/d3dx9_36/preshader.c > +++ b/dlls/d3dx9_36/preshader.c > @@ -191,6 +191,8 @@ struct d3dx_pres_operand > /* offset is component index, not register index, e. g. > offset for component c3.y is 13 (3 * 4 + 1) */ > unsigned int offset; > + enum pres_reg_tables base_reg_table; > + unsigned int base_reg_offset; > }; It would be nicer to create a struct for storing together table and offset and to pass it around to the various functions taking both arguments, like parse_pres_reg(). It should probably be a separate patch before this one. > + ptr = parse_pres_reg(ptr + 1, &opr->base_reg_table, &opr->base_reg_offset); > + } > + else > + { > + opr->base_reg_table = PRES_REGTAB_COUNT; > + ++ptr; > } > - opr->table = reg_table[*ptr++]; > - opr->offset = *ptr++; > + > + ptr = parse_pres_reg(ptr, &opr->table, &opr->offset); This would crash if the previous parse_pres_reg() call returned NULL. > + size = rs->table_sizes[table] * table_info[table].reg_component_count; > + if (offset >= size) > + { > + if ((offset & 255) < size) > + offset &= 255; > + else > + offset = offset % size; > + } Is this just to try and avoid the modulo operation in some cases or is there a deeper reason? If the former, you could extend that to all the power-of-two sizes by first checking if that's the case (!(size & size - 1)) and, if so, and-ing offset with the mask (size - 1). That's assuming the compiler doesn't do the same optimization already. Let me know if there is some other reason instead. > static double exec_get_arg(struct d3dx_regstore *rs, const struct d3dx_pres_operand *opr, unsigned int comp) > { > - if (!regstore_is_val_set_reg(rs, opr->table, (opr->offset + comp) / table_info[opr->table].reg_component_count)) > - WARN("Using uninitialized input, table %u, offset %u.\n", opr->table, opr->offset + comp); > + unsigned int base_offset, index; > + > + if (opr->base_reg_table == PRES_REGTAB_COUNT) > + index = 0; > + else > + index = (int)exec_get_reg_value(rs, opr->base_reg_table, opr->base_reg_offset); I think it's better with lrint() in place of the cast. > + if (index >= rs->table_sizes[opr->table] && opr->table == PRES_REGTAB_CONST) > + { > + unsigned int size_pow2; > + > + for (size_pow2 = 1; size_pow2 < rs->table_sizes[opr->table]; size_pow2 <<= 1) > + ; > + index &= (size_pow2 - 1); > + if (index >= rs->table_sizes[opr->table]) > + return 0.0; > + } I don't think we necessarily have to follow native's madness on buffer overflows to the letter. Since you did, that's certainly fine though.

2 6

Re: [PATCH v2] winex11: Use GLX_OML_sync_control to synchronise buffer swaps with X11DRV_FLUSH_GL_DRAWABLE requests.
by Jacek Caban March 24, 2017

March 24, 2017

Hi Henri, On 23.03.2017 23:58, Henri Verbeet wrote: > diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c > index af2fd92..7efd603 100644 > --- a/dlls/winex11.drv/init.c > +++ b/dlls/winex11.drv/init.c > @@ -375,9 +375,6 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d > RECT rect = physDev->dc_rect; > > OffsetRect( &rect, -physDev->dc_rect.left, -physDev->dc_rect.top ); > - /* The GL drawable may be lagged behind if we don't flush first, so > - * flush the display make sure we copy up-to-date data */ > - XFlush( gdi_display ); Shouldn't this be called if GLX_OML_sync_control is not available? It seems to me that it should either depend on extension availability or be a separated patch. Thanks, Jacek

2 1

Re: [PATCH] oledb32/tests: Add convert to DBTYPE_NUMERIC tests
by Huw Davies March 24, 2017

March 24, 2017

On Fri, Mar 24, 2017 at 01:11:17AM +0000, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/oledb32/tests/convert.c | 147 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 147 insertions(+) > > diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c > index b8b3c6f..4e49058 100644 > --- a/dlls/oledb32/tests/convert.c > +++ b/dlls/oledb32/tests/convert.c > @@ -3264,6 +3264,152 @@ static void test_converttoiunknown(void) > ok(dst_len == 44, "got %ld\n", dst_len); > } > > +#define test_numberic_val(dst, array) _test_numberic_val(__LINE__, dst, array); > +static inline void _test_numberic_val(unsigned line, DB_NUMERIC *dst, BYTE *array) > +{ > + int same = !memcmp(dst->val, array, sizeof(dst->val)); > + ok_(__FILE__,line) (same, "Invalid byte array\n"); > + if(!same) > + { > + int i; > + for(i=0; i < sizeof(dst->val); i++) > + ok_(__FILE__,line) (dst->val[i] == array[i], " byte %d got 0x%02x\n", i, dst->val[i]); > + } > +} > + > +static inline void set_numberic_array(BYTE *dst, > + BYTE x0, BYTE x1, BYTE x2, BYTE x3, BYTE x4, BYTE x5, BYTE x6, > + BYTE x7, BYTE x8, BYTE x9, BYTE x10, BYTE x11, BYTE x12, BYTE x13, > + BYTE x14, BYTE x15) > +{ > + dst[0] = x0; dst[1] = x1; dst[2] = x2; dst[3] = x3; > + dst[4] = x4; dst[5] = x5; dst[6] = x6; dst[7] = x7; > + dst[8] = x8; dst[9] = x9; dst[10] = x10; dst[11] = x11; > + dst[12] = x12; dst[13] = x13; dst[14] = x14; dst[15] = x15; > +} > + > +static void test_converttonumeric(void) > +{ > + HRESULT hr; > + DBSTATUS dst_status; > + DBLENGTH dst_len; > + DB_NUMERIC dst; > + BYTE src[20]; > + static WCHAR strW[] = {'1','2','3','.','4','5',0}; > + static WCHAR largeW[] = {'1','2','3','4','5','6','7','8','9','0',0}; > + BSTR bstr; > + FLOAT fvalue = 543.21f; > + VARIANT_BOOL boolean = VARIANT_TRUE; > + LARGE_INTEGER i8; > + BYTE array[16]; > + > + *(INT *)src = 4098; > + dst_len = 0x1234; > + dst.scale = 30; > + memset(dst.val, 0xfe, sizeof(dst.val)); > + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_NUMERIC, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 10, 0, 0); > + todo_wine ok(hr == S_OK, "got %08x\n", hr); > + todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); > + todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); > + todo_wine ok(dst.precision == 10, "returned %d\n", dst.precision); > + todo_wine ok(dst.scale == 0, "returned %d\n", dst.scale); > + todo_wine ok(dst.sign == 1, "returned %d\n", dst.sign); > + set_numberic_array(array, 0x02, 0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ); > + todo_wine test_numberic_val(&dst, array); All this seems overly complicated. How about something like: DB_NUMERIC val1 = {10, 0, 1, {0x02, 0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }}; /* 4098 */ .... hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_NUMERIC, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 10, 0, 0); todo_wine ok(hr == S_OK, "got %08x\n", hr); todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); todo_wine ok(!memcmp(&dst, &val1, sizeof(dst), "mismatch\n"); It doesn't print out the retrieved value on failure, and you could add this if you want. However, once the conversion is actually implemented, you won't need that anyway. You should probably add a test for converting a variant of type VT_NULL too. Huw.

1 0

Star Trek Online changed their routine for d3dcompiler_47.dll
by cyfer3＠googlemail.com March 23, 2017

March 23, 2017

Hi dev's! I'd like to report something that might have been working in wine-staging 2.3 but doesn't work in wine-staging current (2.4) but that's not necessarily a wine (mis)understanding as it looks, but I'd rather like to point out, the workaround that has been posted here <https://www.codeweavers.com/compatibility/crossover/forum/star-trek-online?…> doesn't seem to work anymore and with wine-devel 2.4 it is at least possible to see any characters on the login screen, but it crashes right after picking any. This issue might be connected with Cryptic has abandoned dx9 support entirely and I'm very grateful that it worked until today and hopefully will work again in future. Thank you for your work and heart to the project! I hope you will reply to this mail but it's ok if you don't. Regards.

3 3

Re: [v2 3/3] d3dx9/tests: Add more tests for preshader relative addressing.
by Matteo Bruni March 23, 2017

March 23, 2017

2017-03-23 16:25 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > +static void test_effect_preshader_relative_addressing(IDirect3DDevice9 *device) > +{ > + static const struct > + { > + D3DXVECTOR4 opvect2; > + D3DXVECTOR4 g_ivect; > + unsigned int result[4]; > + } > + test_out_of_bounds_index[] = Better as out_of_bounds_index_tests[] or similar. > + static const struct > + { > + unsigned int zw[2]; > + } > + test_index_range[] = This one would be clearer as expected_light_specular[] or something like that. > + fvect.x = 1001.f; fvect.y = 1002.f; fvect.z = 1003.f; fvect.w = 1004.f; For consistency, please write out the 0 after the decimal separator. > + for (j = 0; j < 4; ++j) > + { > + ok(compare_float(v[j], ((const float *)test_out_of_bounds_index[i].result)[j], 0), > + "Test %u, component %u, expected %#x (%g), got %#x (%g).\n", > + i, j, test_out_of_bounds_index[i].result[j], > + ((const float *)test_out_of_bounds_index[i].result)[j], > + ((const unsigned int *)v)[j], v[j]); You could factor out a variable for the const float * (expected_float?) and use it twice here. > + for (j = 0; j < 2; ++j) > + { > + ok(compare_float(v[j + 2], ((const float *)test_index_range[(unsigned int)i & 7].zw)[j], 0), > + "Test %u, component %u, expected %#x (%g), got %#x (%g).\n", > + i, j, test_index_range[(unsigned int)i & 7].zw[j], > + ((const float *)test_index_range[(unsigned int)i & 7].zw)[j], > + ((const unsigned int *)v)[j + 2], v[j + 2]); Same here. In addition you could set v to &light.Specular.b before this part of the test and avoid those "+ 2".

1 0

Re: [PATCH 1/5] winex11: Use GLX_OML_sync_control to synchronise buffer swaps with X11DRV_FLUSH_GL_DRAWABLE requests.
by Ken Thomases March 23, 2017

March 23, 2017

On Mar 23, 2017, at 4:49 PM, Henri Verbeet <hverbeet(a)codeweavers.com> wrote: > > @@ -3330,17 +3343,26 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) > gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top ); > break; > } > - pglXSwapBuffers(gdi_display, gl->drawable); > + if (pglXSwapBuffersMscOML) > + target_sbc = pglXSwapBuffersMscOML( gdi_display, gl->drawable, 0, 0, 0 ); > + else > + pglXSwapBuffers( gdi_display, gl->drawable ); > break; > case DC_GL_CHILD_WIN: > if (ctx) sync_context( ctx ); > escape.gl_drawable = gl->window; > /* fall through */ > default: > - pglXSwapBuffers(gdi_display, gl->drawable); > + if (pglXSwapBuffersMscOML) > + target_sbc = pglXSwapBuffersMscOML( gdi_display, gl->drawable, 0, 0, 0 ); > + else > + pglXSwapBuffers( gdi_display, gl->drawable ); > break; > } > > + if (escape.gl_drawable && pglXWaitForSbcOML) > + pglXWaitForSbcOML( gdi_display, gl->drawable, target_sbc, &ust, &msc, &sbc ); > + > release_gl_drawable( gl ); > > if (escape.gl_drawable) ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); According to the spec <https://www.khronos.org/registry/OpenGL/extensions/OML/GLX_OML_sync_control…>, glXSwapBuffersMscOML() does not perform an implicit glFlush() as glXSwapBuffers() does. Also, there's no indication that glXWaitForSbcOML() performs one either, although it sort of seems like it should. Is that a problem? -Ken

2 1

Re: [PATCH 4/5] include: Add comments to blocks of render states added with each D3D version.
by Henri Verbeet March 23, 2017

March 23, 2017

On 22 March 2017 at 23:17, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > include/wine/wined3d.h | 5 +++++ > 1 file changed, 5 insertions(+) > Are you using these? I'm not necessarily opposed, but in principle wined3d has no concept of Direct3D versions. There's also the consideration that in principle render states will eventually go away in favour of DIrect3D 10 style state object.

2 1

Re: [PATCH v5 1/2] d3d10core/tests: Add a geometry shader test.
by Henri Verbeet March 23, 2017

March 23, 2017

On 22 March 2017 at 23:53, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > v2: Update for the changed get_texture_readback() and the new > create_buffer() helpers. > v3: Strip debug info from the GS. > v4: Drop some unnecessary state setup. > v5: Get rid of an unused variable. > > This now passes on r600g. It looks like it was indirectly fixed by Mesa > commit 0d383a79a8f13bb00ed5e5d84f41071b43c7e92d "glsl/lower_output_reads: > fix geometry shader output handling with conditional emit" which is in > Mesa 17.0+. > And 13.0.2+, for what it's worth.

1 0

Re: [PATCH 4/7] msvcrt: Add Context::Id tests
by Marvin March 23, 2017

March 23, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=29651 Your paranoid android. === wxppro (32 bit msvcr100) === msvcr100.c:874: Test failed: Context::Id() = 0 msvcr100.c:863: Test failed: Context::Id() = 8 === w2003std (32 bit msvcr100) === msvcr100.c:874: Test failed: Context::Id() = 0 msvcr100.c:863: Test failed: Context::Id() = 15 === wvistau64 (32 bit msvcr100) === msvcr100.c:874: Test failed: Context::Id() = 0 msvcr100.c:863: Test failed: Context::Id() = 2 === w2008s64 (32 bit msvcr100) === msvcr100.c:874: Test failed: Context::Id() = 0 msvcr100.c:863: Test failed: Context::Id() = 21 === w8 (32 bit msvcr100) === msvcr100.c:874: Test failed: Context::Id() = 0 msvcr100.c:863: Test failed: Context::Id() = 2 === w864 (32 bit msvcr100) === msvcr100.c:874: Test failed: Context::Id() = 0 msvcr100.c:863: Test failed: Context::Id() = 7 === wvistau64 (64 bit msvcr100) === msvcr100.c:874: Test failed: Context::Id() = 0 msvcr100.c:863: Test failed: Context::Id() = 12 === w2008s64 (64 bit msvcr100) === msvcr100.c:874: Test failed: Context::Id() = 0 msvcr100.c:863: Test failed: Context::Id() = 11 === w864 (64 bit msvcr100) === msvcr100.c:874: Test failed: Context::Id() = 0 msvcr100.c:863: Test failed: Context::Id() = 12

1 0

Re: [PATCH] mshtml/tests: Free ready state BSTR (Valgrind)
by Nikolay Sivov March 23, 2017

March 23, 2017

On 23.03.2017 6:07, Daniel Lehman wrote: > 1 loop of xmlview tests: > ==2633== 32 bytes in 1 blocks are definitely lost in loss record 624 of 2,647 > ==2633== at 0x7BC516E5: RtlAllocateHeap (heap.c:254) > ==2633== by 0x5123CAA: IMalloc_fnAlloc (ifs.c:187) > ==2633== by 0x512416C: IMalloc_Alloc (objidl.h:1508) > ==2633== by 0x512416C: CoTaskMemAlloc (???:0) > ==2633== by 0x4DC843E: alloc_bstr (oleaut.c:177) > ==2633== by 0x4DC89C8: SysAllocStringLen (oleaut.c:355) > ==2633== by 0x4DC8AC6: SysAllocString (oleaut.c:247) > ==2633== by 0x77B4DE8: get_readystate_string (htmlelem.c:248) > ==2633== by 0x779A522: HTMLDocument_get_readyState (htmldoc.c:641) > ==2633== by 0x4C6B064: HTMLEvents_Invoke (mshtml.h:56005) > ==2633== by 0x77BC74A: call_event_handlers (oaidl.h:887) > ==2633== by 0x77BCC70: fire_event_obj.isra.6 (htmlevent.c:1134) > ==2633== by 0x783CE76: notif_readystate (persist.c:451) > ==2633== by 0x7823B30: handle_load (nsevents.c:253) > ==2633== by 0x6B18A8A8: ??? > > 3 loops of xmlview tests: > ==23851== 96 bytes in 3 blocks are definitely lost in loss record 1,767 of 2,701 > ==23851== at 0x7BC516D5: RtlAllocateHeap (heap.c:254) > ==23851== by 0x5123CAA: IMalloc_fnAlloc (ifs.c:187) > ==23851== by 0x512416C: IMalloc_Alloc (objidl.h:1508) > ==23851== by 0x512416C: CoTaskMemAlloc (???:0) > ==23851== by 0x4DC843E: alloc_bstr (oleaut.c:177) > ==23851== by 0x4DC89C8: SysAllocStringLen (oleaut.c:355) > ==23851== by 0x4DC8AC6: SysAllocString (oleaut.c:247) > ==23851== by 0x7683DE8: get_readystate_string (htmlelem.c:248) > ==23851== by 0x7669522: HTMLDocument_get_readyState (htmldoc.c:641) > ==23851== by 0x4C6B314: HTMLEvents_Invoke (mshtml.h:56005) > ==23851== by 0x768B74A: call_event_handlers (oaidl.h:887) > ==23851== by 0x768BC70: fire_event_obj.isra.6 (htmlevent.c:1134) > ==23851== by 0x770BE76: notif_readystate (persist.c:451) > ==23851== by 0x76F2B30: handle_load (nsevents.c:253) > ==23851== by 0x6B18A8A8: ??? > > Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> > --- > dlls/msxml3/tests/xmlview.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/dlls/msxml3/tests/xmlview.c b/dlls/msxml3/tests/xmlview.c > index 3c1d8d9..dc8ab7d 100644 > --- a/dlls/msxml3/tests/xmlview.c > +++ b/dlls/msxml3/tests/xmlview.c > @@ -130,6 +130,7 @@ static HRESULT WINAPI HTMLEvents_Invoke(IDispatch *iface, DISPID dispIdMember, R > ok(hr == S_OK, "got 0x%08x\n", hr); > if(!memcmp(state, completeW, sizeof(completeW))) > loaded = TRUE; > + SysFreeString(state); > } > > return S_OK; > This obviously looks correct, please resend with subject changed to msxml3/tests.

1 0

Re: Nikolay Sivov : comctl32/taskdialog: Initial implementation of a minimal task dialog.
by Fabian Maurer March 23, 2017

March 23, 2017

> Author: Nikolay Sivov <nsivov(a)codeweavers.com> > Date: Tue Mar 21 17:31:20 2017 +0300 > > comctl32/taskdialog: Initial implementation of a minimal task dialog. > > Based on patches by Fabian Maurer. Thanks for taking the time to rework it, really appreciate it! However, there's a few questions I'd like to ask. > static const WCHAR nulW; Shouldn't this be set 0? > if (radio_button) *radio_button = taskconfig->nDefaultButton; This probably should have been changed, it was already wrong in the old implementation. > /* write control entries */ > LIST_FOR_EACH_ENTRY_SAFE(control, control2, &desc.controls, struct taskdialog_control, entry) > { > ALIGN_POINTER(ptr, 3); > > template_write_data(&ptr, control->template, control->template_size); > > /* list item won't be needed later */ > list_remove(&control->entry); > Free(control->template); > Free(control); > } Wouldn't it be shorter to also use "taskdialog_clear_controls" here? Just curious on why you chose to write it again. Also, wouldn't it make sense to keep the template generating code separated from the taskdialog specific bits? I intentionally split it, so we could use those function in another place, if needed. In my opinion, that also makes the code easier readable. Finally, are you adding the rest from my latest patch-set too, or should I adapt the missing parts? Regards, Fabian Maurer

2 1

Re: [PATCH 2/5] usp10: Avoid LPPOINT.
by Aric Stewart March 22, 2017

March 22, 2017

Hi, I think I would personally almost prefer if all 4 of these where one patch. A few of them are only 1-2 changes and this one does both avoid LPPOINT and avoid LPCVOID, some of them rename variables as well. All changes I am happy to sign-off on. -aric On 3/21/17 4:59 PM, Henri Verbeet wrote: > Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> > --- > dlls/usp10/opentype.c | 41 +++++++++++++++++++++++------------------ > 1 file changed, 23 insertions(+), 18 deletions(-) > > diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c > index 701e1a0..0579aed 100644 > --- a/dlls/usp10/opentype.c > +++ b/dlls/usp10/opentype.c > @@ -1529,7 +1529,7 @@ static INT GPOS_get_device_table_value(const OT_DeviceTable *DeviceTable, WORD p > return 0; > } > > -static VOID GPOS_get_anchor_values(LPCVOID table, LPPOINT pt, WORD ppem) > +static void GPOS_get_anchor_values(const void *table, POINT *pt, WORD ppem) > { > const GPOS_AnchorFormat1* anchor1 = (const GPOS_AnchorFormat1*)table; > > @@ -1607,7 +1607,8 @@ static INT GPOS_get_value_record(WORD ValueFormat, const WORD data[], GPOS_Value > return offset; > } > > -static VOID GPOS_get_value_record_offsets(const BYTE* head, GPOS_ValueRecord *ValueRecord, WORD ValueFormat, INT ppem, LPPOINT ptPlacement, LPPOINT ptAdvance) > +static void GPOS_get_value_record_offsets(const BYTE *head, GPOS_ValueRecord *ValueRecord, > + WORD ValueFormat, unsigned int ppem, POINT *ptPlacement, POINT *ptAdvance) > { > if (ValueFormat & 0x0001) ptPlacement->x += (short)ValueRecord->XPlacement; > if (ValueFormat & 0x0002) ptPlacement->y += (short)ValueRecord->YPlacement; > @@ -1639,8 +1640,9 @@ static const BYTE *GPOS_get_subtable(const OT_LookupTable *look, int index) > return (const BYTE *)look + offset; > } > > -static VOID GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, > - INT glyph_count, INT ppem, LPPOINT ptAdjust, LPPOINT ptAdvance) > +static void GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, > + const WORD *glyphs, unsigned int glyph_index, unsigned int glyph_count, unsigned int ppem, > + POINT *adjust, POINT *advance) > { > int j; > > @@ -1658,7 +1660,7 @@ static VOID GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const SCRIPT > GPOS_ValueRecord ValueRecord = {0,0,0,0,0,0,0,0}; > WORD ValueFormat = GET_BE_WORD(spf1->ValueFormat); > GPOS_get_value_record(ValueFormat, spf1->Value, &ValueRecord); > - GPOS_get_value_record_offsets((const BYTE*)spf1, &ValueRecord, ValueFormat, ppem, ptAdjust, ptAdvance); > + GPOS_get_value_record_offsets((const BYTE *)spf1, &ValueRecord, ValueFormat, ppem, adjust, advance); > TRACE("Glyph Adjusted by %i,%i\n",ValueRecord.XPlacement,ValueRecord.YPlacement); > } > } > @@ -1680,7 +1682,7 @@ static VOID GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const SCRIPT > offset = size * index; > GPOS_get_value_record(ValueFormat, &spf2->Value[offset], &ValueRecord); > } > - GPOS_get_value_record_offsets((const BYTE*)spf2, &ValueRecord, ValueFormat, ppem, ptAdjust, ptAdvance); > + GPOS_get_value_record_offsets((const BYTE *)spf2, &ValueRecord, ValueFormat, ppem, adjust, advance); > TRACE("Glyph Adjusted by %i,%i\n",ValueRecord.XPlacement,ValueRecord.YPlacement); > } > } > @@ -1713,13 +1715,14 @@ static void apply_pair_value( const void *pos_table, WORD val_fmt1, WORD val_fmt > } > } > > -static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, > - INT glyph_count, INT ppem, LPPOINT ptAdjust, LPPOINT ptAdvance) > +static int GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, > + const WORD *glyphs, unsigned int glyph_index, unsigned int glyph_count, unsigned int ppem, > + POINT *adjust, POINT *advance) > { > int j; > int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; > > - if (glyph_index + write_dir < 0 || glyph_index + write_dir >= glyph_count) > + if (glyph_index + write_dir >= glyph_count) > return 1; > > TRACE("Pair Adjustment Positioning Subtable\n"); > @@ -1754,7 +1757,8 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_AN > { > int next = 1; > TRACE("Format 1: Found Pair %x,%x\n",glyphs[glyph_index],glyphs[glyph_index+write_dir]); > - apply_pair_value( ppf1, ValueFormat1, ValueFormat2, pair_val_rec->Value1, ppem, ptAdjust, ptAdvance ); > + apply_pair_value(ppf1, ValueFormat1, ValueFormat2, > + pair_val_rec->Value1, ppem, adjust, advance); > if (ValueFormat2) next++; > return next; > } > @@ -1787,7 +1791,7 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_AN > > TRACE( "Format 2: Found Pair %x,%x\n", glyphs[glyph_index], glyphs[glyph_index + write_dir] ); > > - apply_pair_value( ppf2, ValueFormat1, ValueFormat2, pair_val, ppem, ptAdjust, ptAdvance ); > + apply_pair_value(ppf2, ValueFormat1, ValueFormat2, pair_val, ppem, adjust, advance); > if (ValueFormat2) next++; > return next; > } > @@ -1799,13 +1803,14 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_AN > return 1; > } > > -static VOID GPOS_apply_CursiveAttachment(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, > - INT glyph_count, INT ppem, LPPOINT pt) > +static void GPOS_apply_CursiveAttachment(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, > + const WORD *glyphs, unsigned int glyph_index, unsigned int glyph_count, unsigned int ppem, POINT *pt) > { > int j; > int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; > > - if (glyph_index + write_dir < 0 || glyph_index + write_dir >= glyph_count) return; > + if (glyph_index + write_dir >= glyph_count) > + return; > > TRACE("Cursive Attachment Positioning Subtable\n"); > > @@ -1925,8 +1930,8 @@ static int GPOS_apply_MarkToBase(const ScriptCache *script_cache, const OT_Looku > return rc; > } > > -static VOID GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, > - INT glyph_count, INT ppem, LPPOINT pt) > +static void GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, > + const WORD *glyphs, unsigned int glyph_index, unsigned int glyph_count, unsigned int ppem, POINT *pt) > { > int j; > int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; > @@ -2015,8 +2020,8 @@ static VOID GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_A > } > } > > -static BOOL GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, > - INT glyph_count, INT ppem, LPPOINT pt) > +static BOOL GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, > + const WORD *glyphs, unsigned int glyph_index, unsigned int glyph_count, unsigned int ppem, POINT *pt) > { > int j; > BOOL rc = FALSE; >

2 2

Re: [PATCH 1/5] d3d11: Downgrade unknown DWORD FIXMEs() to TRACE() messages.
by Henri Verbeet March 22, 2017

March 22, 2017

On 22 March 2017 at 09:40, Józef Kucia <jkucia(a)codeweavers.com> wrote: > @@ -727,11 +727,11 @@ void skip_dword_unknown(const char **ptr, unsigned int count) > unsigned int i; > DWORD d; > > - FIXME("Skipping %u unknown DWORDs:\n", count); > + TRACE("Skipping %u unknown DWORDs:\n", count); > for (i = 0; i < count; ++i) > { > read_dword(ptr, &d); > - FIXME("\t0x%08x\n", d); > + TRACE("\t0x%08x\n", d); > } > } > I think WARN would be appropriate.

1 0

Re: [PATCH 1/3] odbccp32: Implement SQLInstallTranslator
by Hans Leidekker March 22, 2017

March 22, 2017

On Wed, 2017-03-22 at 00:14 +0000, Alistair Leslie-Hughes wrote: > + reg_ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBCINST.INI\\WINE ODBC Translator", 0, KEY_READ, &hkey); > + ok(reg_ret == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); > + if (reg_ret == ERROR_SUCCESS) > + { > + DWORD type, size = MAX_PATH; > + char driverpath[MAX_PATH]; > + > + strcpy(driverpath, syspath); > + strcat(driverpath, "\\sample.dll"); > + > + reg_ret = RegGetValueA(hkey, NULL, "Translator", RRF_RT_REG_SZ, &type, &path, &size); > + ok(reg_ret == ERROR_SUCCESS, "RegGetValueA failed\n"); > + ok(!strcmp(path, driverpath), "invalid path %s\n", path); RegGetValueA is not available on XP. A warning dialog is shown but it's never closed, which can cause failures in tests that follow: https://testbot.winehq.org/JobDetails.pl?Key=29622&scrshot_101=1#k101 I've submitted a patch that avoids RegGetValueA. Please do something similar in these patches.

1 0

Re: [PATCH v2] msvcp100: Add stub for Concurrency::is_current_task_group_canceling
by Piotr Caban March 22, 2017

March 22, 2017

Hi, Is any application working thanks to this patch (not crashing on next unimplemented function)? Thanks, Piotr

2 3

Outreachy Internships
by Iwona Kotlarska March 21, 2017

March 21, 2017

Hi everyone, I'm new to contributing to Wine and I would like to apply to Outreachy Internship. I'm generally comfortable with C, but I don't understand Wine's code yet. I tried to download and build Wine on my computer, I followed this: https://wiki.winehq.org/Developer_FAQ#How_do_I_download_and_build_the_very_… and make fails (linking actually) with undefined reference to yywrap in function yylex in file programs/winhlp32/macro.lex.yy.c line 1032. I'm using gcc 5.4.0. Could anyone help me solve this compilation issue? And suggest some small bugs to work on after succesfully compiling wine? Thanks in advance for help! Iwona Kotlarska

4 3

Re: cmd: Adjust CMD_LIST to a tree-like structure and implement command chains
by Marvin March 21, 2017

March 21, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=29617 Your paranoid android. === wxppro (32 bit) === Found no trace of a test summary line or of a crash === w2003std (32 bit) === Found no trace of a test summary line or of a crash === wvistau64 (32 bit) === Found no trace of a test summary line or of a crash === w2008s64 (32 bit) === Found no trace of a test summary line or of a crash === w7u (32 bit) === Found no trace of a test summary line or of a crash === w7pro64 (32 bit) === Found no trace of a test summary line or of a crash === w8 (32 bit) === Found no trace of a test summary line or of a crash === w864 (32 bit) === Found no trace of a test summary line or of a crash === w1064 (32 bit) === Found no trace of a test summary line or of a crash === wvistau64 (64 bit) === Found no trace of a test summary line or of a crash === w2008s64 (64 bit) === Found no trace of a test summary line or of a crash === w7pro64 (64 bit) === Found no trace of a test summary line or of a crash === w864 (64 bit) === Found no trace of a test summary line or of a crash === w1064 (64 bit) === Found no trace of a test summary line or of a crash

1 0

Re: [PATCH 3/4] xmllite: Set empty value for end element nodes.
by Nikolay Sivov March 21, 2017

March 21, 2017

On 21.03.2017 18:19, Jacek Caban wrote: > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > --- > dlls/xmllite/reader.c | 1 + > 1 file changed, 1 insertion(+) > Could you make this another node type case in GetValue? Like for XmlNodeType_XmlDeclaration. The goal is to make sure empty static string is returned unconditionally for certain node types, as opposed to heap-allocated empty string.

2 1

Re: [PATCH v2 resend] user32: Don't call IsChild with NULL window in EnableWindow
by Marvin March 21, 2017

March 21, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=29610 Your paranoid android. === w7u (32 bit win) === win.c:999: Test failed: wrong dwWindowStatus: 0000 != 0001 active 00A90148 fg 000F0138 in hook HCBT_MINMAX

1 0

Re: [6/7] [resend] version: Add support for FILE_VER_GET_LOCALISED flag.
by Alexandre Julliard March 21, 2017

March 21, 2017

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > @@ -356,7 +356,10 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) > TRACE("No resid entry found\n" ); > goto done; > } > - resPtr = find_entry_language( resPtr, resDir ); > + if ( flags & FILE_VER_GET_LOCALISED ) > + resPtr = find_entry_language( resPtr, resDir ); > + else > + resPtr = find_entry_default( resPtr, resDir ); This won't do what you want, it will return the first available resource which may not be English. > @@ -642,12 +645,12 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD h > SetLastError(ERROR_BAD_PATHNAME); > return 0; > } > - if (flags) > - FIXME("flags 0x%x ignored\n", flags); > + if (flags & ~FILE_VER_GET_LOCALISED) > + FIXME("flags 0x%x ignored\n", flags & ~FILE_VER_GET_LOCALISED); > > if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR) > { > - magic = find_version_resource( lzfd, &len, &offset ); > + magic = find_version_resource( lzfd, &len, &offset, flags ); > LZClose( lzfd ); > } You'd also need to change the FindResourceW call a few lines below. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: wined3d: A grammar fix in a comment.
by Henri Verbeet March 21, 2017

March 21, 2017

On 12 March 2017 at 20:47, Francois Gouget <fgouget(a)free.fr> wrote: > @@ -3645,8 +3645,8 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) > gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS, &gl_max); > gl_info->limits.compute_samplers = gl_max; > TRACE("Max compute samplers: %u.\n", gl_info->limits.compute_samplers); > - /* A majority of OpenGL implementations allow to statically partition > - * the set of texture bindings into six separate sets. */ > + /* A majority of OpenGL implementations allow applications to statically > + * partition the set of texture bindings into six separate sets. */ I think that changes the meaning somewhat.

2 2

32-bit dlls in 64-bit process
by Viktor Semykin March 21, 2017

March 21, 2017

Hello. I'm trying to run Adobe Photoshop Lightroom using Wine. One of the showstoppers was the fact that 64-bit process of Lightroom is loading 32-bit DLLs containing various resources. While Windows allows it [1 <https://support.microsoft.com/en-us/help/282423/list-of-limitations-in-64-b…>] wine does not. I made this simple change to Wine code just to make it work for my local usecase: > --- a/server/mapping.c > +++ b/server/mapping.c > @@ -414,8 +414,6 @@ static unsigned int get_image_params( struct > mapping *mapping, file_pos_t file_s > if (nt.opt.hdr32.Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC) > return STATUS_INVALID_IMAGE_FORMAT; > break; > case CPU_x86_64: > - if (nt.FileHeader.Machine != IMAGE_FILE_MACHINE_AMD64) return > STATUS_INVALID_IMAGE_FORMAT; > - if (nt.opt.hdr64.Magic != IMAGE_NT_OPTIONAL_HDR64_MAGIC) > return STATUS_INVALID_IMAGE_FORMAT; > break; > case CPU_POWERPC: > if (nt.FileHeader.Machine != IMAGE_FILE_MACHINE_POWERPC) > return STATUS_INVALID_IMAGE_FORMAT; From what I can tell this change looks neigher neat nor correct. My question is, what is /the/ correct way to allow loading 32-bit dll into 64-bit process just for loading its resources. Thank you. [1] https://support.microsoft.com/en-us/help/282423/list-of-limitations-in-64-b… -- best, Viktor.

1 0

Re: Fabian Maurer : comctl32/taskdialog: Move TaskDialogIndirect and its tests into own source files.
by Fabian Maurer March 20, 2017

March 20, 2017

Is there a reason you changed that copyright notice from "Copyright 2017 Fabian Maurer for the Wine project" to "Copyright 2017 Fabian Maurer" only in one place? If you wanted that "for the Wine project" part removed, I don't mind that, but I figured you'd do it at both places then. Regards, Fabian Maurer

3 4

Re: [PATCH 1/3] uiautomationcore: Add UiaLookupId stub.
by Jacek Caban March 20, 2017

March 20, 2017

Hi Andrey, On 19.03.2017 00:13, Andrey Gusev wrote: > Fixes bug 42665 > > Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> > --- > dlls/uiautomationcore/uia_main.c | 10 ++++++++++ > dlls/uiautomationcore/uiautomationcore.spec | 2 +- > include/uiautomationcoreapi.h | 10 ++++++++++ > 3 files changed, 21 insertions(+), 1 deletion(-) > > diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c > index 994d8e6..a16d3d1 100644 > --- a/dlls/uiautomationcore/uia_main.c > +++ b/dlls/uiautomationcore/uia_main.c > @@ -17,6 +17,7 @@ > */ > > #include "uiautomationcore.h" > +#include "uiautomationcoreapi.h" Please just use uiautomation.h instead of both includes. Thanks, Jacek

1 0

Re: [PATCH 2/3] uiautomationcore: Add UiaGetReservedMixedAttributeValue stub.
by Alistair Leslie-Hughes March 20, 2017

March 20, 2017

Hi Andrey, > +HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value) > +{ > + FIXME("(%p) stub!\n", value); > + return S_OK; > +} Your returning success but not assigning anything to the out parameter "value". If you have to return S_OK, maybe *value = NULL might be good enough. Same goes for patch 3. Best Regards Alistair Leslie-Hughes

1 0

Re: [PATCH] ntdll: Implement ProcessVmCounters for Linux.
by Alex Henrie March 20, 2017

March 20, 2017

So, I think Alexandre has been ignoring this patch because it only reports correct information for the current process, even though the Mac implementation has the same problem. I can think of a few ways to fix that: 1. Do nothing if the handle passed to NtQueryInformationProcess is the handle of another process. 2. Add a wineserver call such as get_process_unix_pid to get the process's Unix PID from its handle. Modify the Mac code to use task_for_pid and the Linux code to use /proc/%u/status. 3. Add a wineserver call such as get_process_vm_counters to get all the information that ProcessVmCounters needs without exposing the Unix PID. Move the Mac code into the wineserver and add the Linux code there too. Of those options, I think #3 makes the most sense. Ken, do you think it will cause any problems on Mac? -Alex

2 2

Re: [PATCH v4] msvcrt: Add stub for Concurrency::Alloc
by Gijs Vermeulen March 18, 2017

March 18, 2017

Hi, What is the difference between this version and my v3? Thank you in advance. Sincerely, Gijs Op 18 mrt. 2017 12:27 p.m. schreef "Piotr Caban" <piotr(a)codeweavers.com>: > From: Gijs Vermeulen <gijsvrm(a)gmail.com> > > Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> > Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> > --- > dlls/concrt140/concrt140.spec | 4 ++-- > dlls/msvcr100/msvcr100.spec | 4 ++-- > dlls/msvcr110/msvcr110.spec | 4 ++-- > dlls/msvcr120/msvcr120.spec | 4 ++-- > dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- > dlls/msvcrt/heap.c | 9 +++++++++ > 6 files changed, 19 insertions(+), 10 deletions(-) > > > > > >

2 2

Wine | Outreachy Applicant
by Akarsha Sehwag March 18, 2017

March 18, 2017

Hi everyone I am a second yr Btech student at IIIT Delhi, India. I am a newcomer so I'll need some help to start off. I am really willing to be a part of Wine as an Outreachy intern and upgrade to becoming a regular contributor. Also, I know I am starting very late but I am confident that I'll complete the tasks given by the mentor soon. The projects which attract me the most : 1. Winetest GUI 2. Implement resource editor and/or dialog editor I am well-versed with knowledge of C. Though User interface implementation I have only done in Java as of now. 3. Winetest Scripting Interface. I know C and I have also written many scripts in Python. Apart from scripting and UI, I am also very interested in computer graphics but have no experience with that. I am looking forward to some help regarding the projects and the tasks expected to be done before the application deadline. Also, I would appreciate some suggestions regarding the project choice (since I am starting late and the mentors must have already chosen certain favourites by now) Regards -- Akarsha Sehwag 2015010 CSE Undergrad, IIIT Delhi

2 1

Re: [v2 2/2] msvcrt: Add stub for Concurrency::Free
by Piotr Caban March 18, 2017

March 18, 2017

Hi, Please also move this code to heap.c and rename the function and argument (e.g. to mem). On 03/16/17 23:12, Gijs Vermeulen wrote: > +/* ?Free(a)Concurrency@@YAXPAX(a)Z */ > +/* ?Free(a)Concurrency@@YAXPEAX(a)Z */ > +void __cdecl Free(void * _PAllocation) > +{ > + FIXME("(%p) stub\n", _PAllocation); Even so it's a semi-stub it's better to free the memory here. Applications have no guarantee that memory block will be cached anyway. Thanks, Piotr

2 1

Re: [PATCH v2 4/5] user32: Always send WM_CANCELMODE when disabling a window.
by Marvin March 17, 2017

March 17, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=29573 Your paranoid android. === w2003std (32 bit msg) === msg.c:5724: Test failed: ShowWindow(SW_SHOWMINNOACTIVE) child with invisible parent: 1: in msg 0x0046 expecting wParam 0x8170 got 0x8160 msg.c:5724: Test failed: ShowWindow(SW_SHOWMINNOACTIVE) child with invisible parent: 4: the msg 0x0047 was expected, but got msg 0x0022 instead msg.c:5724: Test failed: ShowWindow(SW_SHOWMINNOACTIVE) child with invisible parent: 5: the msg 0x0003 was expected, but got msg 0x0047 instead msg.c:5724: Test failed: ShowWindow(SW_SHOWMINNOACTIVE) child with invisible parent: 6: the msg 0x0005 was expected, but got msg 0x0003 instead msg.c:5724: Test failed: ShowWindow(SW_SHOWMINNOACTIVE) child with invisible parent: 11: the msg sequence is not complete: expected 0000 - actual 0005

1 0

Re: [PATCH v2 3/5] user32/tests: Add tests for EnableWindow().
by Marvin March 17, 2017

March 17, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=29572 Your paranoid android. === w7u (32 bit win) === win.c:3891: Test failed: hwnd 000301BC/000301BC message 0200 win.c:3895: Test failed: hwnd 000301BC/000301BC message 0201 win.c:3904: Test failed: hwnd 0011015A/0011015A message 0202 win.c:3907: Test failed: hwnd 0011015A/0011015A message 0201

1 0

Re: [v2 1/2] msvcrt: Add stub for Concurrency::Alloc
by Piotr Caban March 17, 2017

March 17, 2017

Hi, On 03/16/17 23:12, Gijs Vermeulen wrote: > dlls/msvcrt/lock.c | 9 +++++++++ I think it would be better to implement the function in heap.c file. Could you please move the implementation there. > +void * __cdecl Alloc(MSVCRT_size_t _NumBytes) Please rename the function to Concurrency_Alloc and argument name to size. > + void *p = MSVCRT_malloc(_NumBytes); > + FIXME("(%ld, %p) stub\n", _NumBytes, p); How about changing the FIXME message to something like: FIXME("(%ld) returning %p\n", size, p); (this matches the trace of operator new). Thanks, Piotr

1 0

Re: [PATCH 1/6] wined3d: Introduce "copy sub-resource" command stream operation.
by Henri Verbeet March 17, 2017

March 17, 2017

On 17 March 2017 at 12:57, Józef Kucia <jkucia(a)codeweavers.com> wrote: > The idea behind the patch series is to split blit and memcpy-like copy > operations. That wasn't the direction I was going with this though. > A few arguments in favor of this idea: > * memcpy-like is simpler operation (doesn't support conversion or > stretching), Sure, but we do already check for that in wined3d_surface_blt(). > * we shouldn't need to extend blitter to handle other resource types > (it's fine to support just 2D textures), Sure, but extending that interface is trivial, and arguably it should be using texture/sub-resource index anyway. > * blit and copy operations should produce different results between > different formats (blitter performs conversions), That's somewhat of an issue, but we do already have blitter flags for alpha test, color keying, flipping, mirroring, etc. > * copy operation should be allowed between various formats of the same > size (including compressed and non-compressed formats), > * it should be possible to implement wined3d_device_update_texture() > on top of wined3d_cs_emit_copy_sub_resource(). I don't think those are incompatible with the current blitter interface.

1 0

Re: shell32/tests: Return early if the shell folder creation fails in order to avoid a compiler warning.
by Marvin March 17, 2017

March 17, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=29562 Your paranoid android. === wvistau64 (32 bit shlfolder) === shlfolder.c:457: Test failed: 0: got 7480017f expected 7080017f shlfolder.c:457: Test failed: 1: got f480017f expected 7080017f shlfolder.c:457: Test failed: 2: got 44400177 expected 40400177 shlfolder.c:457: Test failed: 3: got 44400177 expected 40400177 shlfolder.c:457: Test failed: 4: got 44400177 expected 40400177 === wvistau64 (64 bit shlfolder) === shlfolder.c:457: Test failed: 0: got 7480017f expected 7080017f shlfolder.c:457: Test failed: 1: got f480017f expected 7080017f shlfolder.c:457: Test failed: 2: got 44400177 expected 40400177 shlfolder.c:457: Test failed: 3: got 44400177 expected 40400177 shlfolder.c:457: Test failed: 4: got 44400177 expected 40400177

2 1

Re: [v4 PATCH] odbccp32: Implement SQLRemoveDriver/SQLRemoveDriverW
by Huw Davies March 17, 2017

March 17, 2017

On Fri, Mar 17, 2017 at 04:22:20AM +0000, Alistair Leslie-Hughes wrote: > v2 - Support Usage Count. > v3 - Write key when not zero. > v4 - Only Close key when it was successfully opened. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/odbccp32/odbccp32.c | 69 +++++++++++++++++++++++++++++++++++++++++----- > dlls/odbccp32/tests/misc.c | 4 +-- > 2 files changed, 64 insertions(+), 9 deletions(-) > > diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c > index 037a2a9..5e70a9d 100644 > --- a/dlls/odbccp32/odbccp32.c > +++ b/dlls/odbccp32/odbccp32.c > @@ -1132,22 +1132,77 @@ BOOL WINAPI SQLRemoveDefaultDataSource(void) > return FALSE; > } > > -BOOL WINAPI SQLRemoveDriverW(LPCWSTR lpszDriver, BOOL fRemoveDSN, > - LPDWORD lpdwUsageCount) > +BOOL WINAPI SQLRemoveDriverW(LPCWSTR drivername, BOOL remove_dsn, LPDWORD usage_count) > { > + HKEY hkey; > + DWORD usagecount = 1; > + > clear_errors(); > - FIXME("%s %d %p\n", debugstr_w(lpszDriver), fRemoveDSN, lpdwUsageCount); > - if (lpdwUsageCount) *lpdwUsageCount = 1; > + TRACE("%s %d %p\n", debugstr_w(drivername), remove_dsn, usage_count); > + > + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey) == ERROR_SUCCESS) > + { > + HKEY hkeydriver; > + > + if (RegOpenKeyW(hkey, drivername, &hkeydriver) == ERROR_SUCCESS) > + { > + DWORD size, type; > + > + size = sizeof(usagecount); > + RegGetValueA(hkeydriver, NULL, "UsageCount", RRF_RT_DWORD, &type, &usagecount, &size); > + TRACE("Usage count %d\n", usagecount); > + RegCloseKey(hkeydriver); > + } > + > + if (usagecount) > + usagecount--; > + > + if (!usagecount) > + { > + if (RegDeleteKeyW(hkey, drivername) != ERROR_SUCCESS) > + ERR("Failed to delete registry key: %s\n", debugstr_w(drivername)); > + > + if (RegOpenKeyW(hkey, odbcdrivers, &hkeydriver) == ERROR_SUCCESS) > + { > + if(RegDeleteValueW(hkeydriver, drivername) != ERROR_SUCCESS) > + ERR("Failed to delete registry value: %s\n", debugstr_w(drivername)); > + RegCloseKey(hkeydriver); > + } > + } > + else > + { > + if (RegOpenKeyW(hkey, drivername, &hkeydriver) == ERROR_SUCCESS) > + { > + if (RegSetValueExA(hkeydriver, "UsageCount", 0, REG_DWORD, (BYTE*)&usagecount, sizeof(usagecount)) != ERROR_SUCCESS) > + ERR("Failed to write registry UsageCount key\n"); > + RegCloseKey(hkeydriver); > + } > + } > + > + RegCloseKey(hkey); > + } > + It should be possible to do this without needing to open the drivername key twice. Huw.

1 0

Re: [PATCH v2] user32: Always send WM_NCACTIVATE when changing the foreground window.
by Alexandre Julliard March 17, 2017

March 17, 2017

Alex Henrie <alexhenrie24(a)gmail.com> writes: > Fixes https://bugs.winehq.org/show_bug.cgi?id=7198 > > v2: Use the wineserver to determine if the new foreground window is > already active in its thread. It still looks suspicious to do it here, particularly since we already have code for this in set_active_window. It would need more tests to determine where it fits with the other messages of the sequence. -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: ddraw/tests: Fix Android build by replacing log2f(x) with logf(x)/logf(2)
by Alexandre Julliard March 16, 2017

March 16, 2017

André Hentschel <nerv(a)dawncrow.de> writes: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > dlls/ddraw/tests/ddraw1.c | 2 +- > dlls/ddraw/tests/ddraw2.c | 2 +- > dlls/ddraw/tests/ddraw4.c | 2 +- > dlls/ddraw/tests/ddraw7.c | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) It builds fine here, are you using an old API version? -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [v2 2/6] d3dx9: Apply changed states only in CommitChanges.
by Matteo Bruni March 16, 2017

March 16, 2017

2017-03-14 13:46 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> The current subject might be slightly confusing, something like "d3dx9: Don't apply unmodified states in CommitChanges." would be probably better. The patch looks generally good. Comments follow. > --- > v2: > - stored current_light and current_material in effect structure instead of pass; > - renamed clear_dirty_all() -> clear_dirty_params(). > --- > +static BOOL param_clear_dirty_func(void *dummy, struct d3dx_parameter *param) > +{ > + *param->dirty_flag_ptr &= ~PARAMETER_FLAG_DIRTY; > + return FALSE; > +} > + > +static void clear_dirty_params(struct d3dx9_base_effect *base) > +{ > + unsigned int i; > + > + for (i = 0; i < base->parameter_count; ++i) > + walk_parameter_tree(&base->parameters[i], param_clear_dirty_func, NULL); > +} The walk seems unnecessary since we know that all the children parameters share their dirty flag with their parents. > - param = param->referenced_param; > - TRACE("Array index %u.\n", array_idx); > - if (array_idx >= param->element_count) > + if (array_idx >= ref_param->element_count) > { > - ERR("Computed array index %u is out of bound %u.\n", array_idx, param->element_count); > + ERR("Computed array index %u is out of bound %u.\n", array_idx, ref_param->element_count); > return D3DERR_INVALIDCALL; > } > - param = &param->members[array_idx]; > + param = &ref_param->members[array_idx]; > + *param_dirty = state->index != array_idx || is_param_dirty(param); This looked a bit weird to me at first because of reusing "param". Maybe use a separate "selected_param" variable (or something to that effect)? > - if (FAILED(hr = d3dx9_get_param_value_ptr(effect, pass, state, &param_value, &param))) > + if (FAILED(hr = d3dx9_get_param_value_ptr(effect, pass, state, &param_value, &param, > + update_all, &param_dirty))) > /* Native d3dx returns D3D_OK from BeginPass or Commit involving out of bounds array > - * access and does not touch affected state. */ > + * access and does not touch affected state, except for BeginPass fails with E_FAIL if > + * out of bounds array index depends on dirty parameter(s) in BeginPass. The latter case > + * is TODO. */ Nitpicking on the comment, it sounds better to me with something like "...except for BeginPass when the out of bounds array index depends on dirty parameters. The latter case is supposed to return E_FAIL but is currently TODO". BTW, the ERR in d3dx9_get_param_value_ptr() should probably be a WARN since it can be triggered by the application. > + TRACE("d3dx9_get_param_value_ptr error %#x.\n", hr); This one shouldn't be necessary, I think there should have been a more specific error / warning printed out by d3dx9_get_param_value_ptr() or one of its callees. Otherwise you could repurpose this to say that you're returning D3D_OK notwithstanding the failure. > + return D3D_OK; > + } Actually, it's probably better to change the d3dx9_get_param_value_ptr() return on out of bounds to E_FAIL and only override the return value to D3D_OK in that specific case. > +BOOL is_param_eval_input_dirty(struct d3dx_param_eval *peval) > +{ > + return is_const_tab_input_dirty(&peval->pres.inputs) > + || is_const_tab_input_dirty(&peval->shader_inputs); > +} If I'm not mistaken this only needs to check pres.inputs, given that it's only reasonably going to be called on FXLC and ARRAY_SELECTOR preshaders (not on actual shaders' preshaders). It doesn't matter much though. > - set_constants(rs, &pres->inputs); > - if (FAILED(hr = execute_preshader(pres))) > - return hr; > + if (update_all || is_const_tab_input_dirty(&pres->inputs)) > + { > + set_constants(rs, &pres->inputs, TRUE); > + if (FAILED(hr = execute_preshader(pres))) > + return hr; > + regstore_reset_table(rs, PRES_REGTAB_CONST); > + } This is technically a separate bugfix which would be better as a separate patch, before this one.

2 6

Re: [PATCH 2/2] rpcrt4/tests: Added more server listening tests.
by Marvin March 16, 2017

March 16, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=29547 Your paranoid android. === w8 (32 bit server) === server.c:1769: Test failed: RpcServerUseProtseqEp(ncacn_np) failed with status 1740 server.c:1776: Test failed: RpcServerListen failed with status 1714 server.c:1777: Test failed: RpcMgmtIsServerListening returned 1715, expected 0 server.c:1780: Test failed: RpcServerListen failed with status 1714 server.c:1783: Test failed: RpcMgmtStopServerListening server.c:1787: Test failed: RpcMgmtWaitServerListening failed with status 1715 === w864 (32 bit server) === server.c:1769: Test failed: RpcServerUseProtseqEp(ncacn_np) failed with status 1740 server.c:1776: Test failed: RpcServerListen failed with status 1714 server.c:1777: Test failed: RpcMgmtIsServerListening returned 1715, expected 0 server.c:1780: Test failed: RpcServerListen failed with status 1714 server.c:1783: Test failed: RpcMgmtStopServerListening server.c:1787: Test failed: RpcMgmtWaitServerListening failed with status 1715 === w1064 (32 bit server) === server.c:1769: Test failed: RpcServerUseProtseqEp(ncacn_np) failed with status 1740 server.c:1776: Test failed: RpcServerListen failed with status 1714 server.c:1777: Test failed: RpcMgmtIsServerListening returned 1715, expected 0 server.c:1780: Test failed: RpcServerListen failed with status 1714 server.c:1783: Test failed: RpcMgmtStopServerListening server.c:1787: Test failed: RpcMgmtWaitServerListening failed with status 1715 === w864 (64 bit server) === server.c:1769: Test failed: RpcServerUseProtseqEp(ncacn_np) failed with status 1740 server.c:1776: Test failed: RpcServerListen failed with status 1714 server.c:1777: Test failed: RpcMgmtIsServerListening returned 1715, expected 0 server.c:1780: Test failed: RpcServerListen failed with status 1714 server.c:1783: Test failed: RpcMgmtStopServerListening server.c:1787: Test failed: RpcMgmtWaitServerListening failed with status 1715 === w1064 (64 bit server) === server.c:1769: Test failed: RpcServerUseProtseqEp(ncacn_np) failed with status 1740 server.c:1776: Test failed: RpcServerListen failed with status 1714 server.c:1777: Test failed: RpcMgmtIsServerListening returned 1715, expected 0 server.c:1780: Test failed: RpcServerListen failed with status 1714 server.c:1783: Test failed: RpcMgmtStopServerListening server.c:1787: Test failed: RpcMgmtWaitServerListening failed with status 1715

1 0

Re: [PATCH] wined3d: Zero-initialize count.
by Henri Verbeet March 16, 2017

March 16, 2017

On 15 March 2017 at 17:50, Huw Davies <huw(a)codeweavers.com> wrote: > This prevents the loop below accessing beyond multisample_types > if the GL_NUM_SAMPLE_COUNTS call fails. > I think making this a little more robust is fine, but that call should never fail.

1 0

Re: [PATCH 4/8] wined3d: Allow using more than MAX_COMBINED_SAMPLERS texture image units.
by Matteo Bruni March 16, 2017

March 16, 2017

2017-03-14 13:15 GMT+01:00 Józef Kucia <jkucia(a)codeweavers.com>: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c > index b1cda46..6fe96e4 100644 > --- a/dlls/wined3d/utils.c > +++ b/dlls/wined3d/utils.c > @@ -5994,40 +5994,28 @@ void wined3d_gl_limits_get_uniform_block_range(const struct wined3d_gl_limits *g > void wined3d_gl_limits_get_texture_unit_range(const struct wined3d_gl_limits *gl_limits, > enum wined3d_shader_type shader_type, unsigned int *base, unsigned int *count) > { > - static const struct > + if (shader_type == WINED3D_SHADER_TYPE_COMPUTE) > { > - enum wined3d_shader_type type; > - unsigned int base_idx; > - unsigned int count; > + if (gl_limits->combined_samplers == gl_limits->graphics_samplers) > + *base = 0; > + else > + *base = gl_limits->graphics_samplers - 1; > + *count = gl_limits->compute_samplers; > + return; > } Late to the party and not really important but shouldn't *base in the else case be set to gl_limits->graphics_samplers (i.e. without the "- 1")?

2 1

Re: [v3 PATCH] odbccp32: Implement SQLRemoveDriver/SQLRemoveDriverW
by Huw Davies March 16, 2017

March 16, 2017

On Thu, Mar 16, 2017 at 04:54:08AM +0000, Alistair Leslie-Hughes wrote: > v2 - Support Usage Count. > v3 - Write key when not zero. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/odbccp32/odbccp32.c | 66 +++++++++++++++++++++++++++++++++++++++++----- > dlls/odbccp32/tests/misc.c | 4 +-- > 2 files changed, 61 insertions(+), 9 deletions(-) > > diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c > index 037a2a9..ace801f 100644 > --- a/dlls/odbccp32/odbccp32.c > +++ b/dlls/odbccp32/odbccp32.c > @@ -1132,22 +1132,74 @@ BOOL WINAPI SQLRemoveDefaultDataSource(void) > return FALSE; > } > > -BOOL WINAPI SQLRemoveDriverW(LPCWSTR lpszDriver, BOOL fRemoveDSN, > - LPDWORD lpdwUsageCount) > +BOOL WINAPI SQLRemoveDriverW(LPCWSTR drivername, BOOL remove_dsn, LPDWORD usage_count) > { > + HKEY hkey; > + DWORD usagecount = 1; > + > clear_errors(); > - FIXME("%s %d %p\n", debugstr_w(lpszDriver), fRemoveDSN, lpdwUsageCount); > - if (lpdwUsageCount) *lpdwUsageCount = 1; > + TRACE("%s %d %p\n", debugstr_w(drivername), remove_dsn, usage_count); > + > + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey) == ERROR_SUCCESS) > + { > + HKEY hkeydriver; > + > + if (RegOpenKeyW(hkey, drivername, &hkeydriver) == ERROR_SUCCESS) > + { > + DWORD size, type; > + > + size = sizeof(usagecount); > + RegGetValueA(hkeydriver, NULL, "UsageCount", RRF_RT_DWORD, &type, &usagecount, &size); > + TRACE("Usage count %d\n", usagecount); > + } > + > + if (usagecount) > + usagecount--; > + > + if (!usagecount) > + { > + RegCloseKey(hkeydriver); > + > + if (RegDeleteKeyW(hkey, drivername) != ERROR_SUCCESS) > + ERR("Failed to delete registry key: %s\n", debugstr_w(drivername)); > + > + if (RegOpenKeyW(hkey, odbcdrivers, &hkeydriver) == ERROR_SUCCESS) > + { > + if(RegDeleteValueW(hkeydriver, drivername) != ERROR_SUCCESS) > + ERR("Failed to delete registry value: %s\n", debugstr_w(drivername)); > + } > + } > + else > + { > + if (RegSetValueExA(hkeydriver, "UsageCount", 0, REG_DWORD, (BYTE*)&usagecount, sizeof(usagecount)) != ERROR_SUCCESS) > + ERR("Failed to write registry UsageCount key\n"); > + } > + RegCloseKey(hkeydriver); > + > + RegCloseKey(hkey); > + } > + > + if (usage_count) > + *usage_count = usagecount; > + > return TRUE; > } This isn't correct if RegOpenKeyW(hkey, drivername, &hkeydriver) fails. The clue that something is wrong (at least for this style of handling errors) is the two RegCloseKey()s in the same block. Huw.

1 0

Re: [v2 6/6] d3dx9/tests: Add test for CommitChanges in effect.
by Matteo Bruni March 15, 2017

March 15, 2017

2017-03-14 13:47 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> I haven't looked in detail to this patch, just a couple bits I noticed. > + for (i = 0; i < sizeof(check_op_parameters) / sizeof(*check_op_parameters); ++i) You can use ARRAY_SIZE() here too. > + { > + unsigned int j; > + > + for (j = 0; j < 8; ++j) > + { > + hr = IDirect3DDevice9_SetLight(device, j, &test_effect_preshader_light_empty); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); Please add the values of i and j to the message.

1 0

Re: [v2 5/6] d3dx9/tests: Factor out vertex shader constants check helper function from test_effect_preshader().
by Matteo Bruni March 15, 2017

March 15, 2017

2017-03-14 13:47 GMT+01:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Looks pretty good, I only have a few nitpicks here. > -static void test_effect_preshader(IDirect3DDevice9 *device) > +static const D3DXVECTOR4 fvect_empty = {-9999.0f, -9999.0f, -9999.0f, -9999.0f}; I don't like the "empty" suffix much. Not sure about a better name though... Maybe fvect_filler? > +#define TEST_EFFECT_PRES_NFLOATV ARRAY_SIZE(test_effect_preshader_fconstsv) Same as the previous patch, if you want to keep this define please call it *_COUNT. The naming in general isn't very consistent, probably better to stick to _FVECT_ and similar here and below. > + if (const_updated_mask[i / TEST_EFFECT_FLOATV_BITMASK_BLOCK_SIZE] > + & (1 << (i % TEST_EFFECT_FLOATV_BITMASK_BLOCK_SIZE))) Please use 1u here. > + } > + > +} Spurious empty line.

1 0

Re: [v4 5/5] comctl32: TaskDialog - Implement buttons
by Fabian Maurer March 15, 2017

March 15, 2017

> They are properly placed but aren't working yet. Sorry, forgot to remove that line, please ignore it. Regards, Fabian Maurer

1 0

Re: [v2 PATCH 2/2] odbccp32: Implement SQLRemoveDriver/SQLRemoveDriverW
by Vincent Povirk March 15, 2017

March 15, 2017

I think you forgot to write the new usage count to the registry in the case where the driver is not removed.

1 0

Oureachy Applicant Introduction
by chhavi gupta March 15, 2017

March 15, 2017

Hello! I am Chhavi Gupta, a final year Computer Science Student with an interest in applying for the next round of Outreachy with Wine as some of the ideas have really caught my attention. I am familiar with C and have taken a course in Computer Graphics during my third year in college. Github Profile: https://github.com/chhavip I am interested in the following projects: - Winetest Graphical User Interface - Winecfg / winemenubuilder - enhance MIME type handling - WineCE: Implement the CommandBar I am quite new to Windows programming hence any guidance on how to get started will be extremely helpful! Thank You Chhavi Gupta

2 1

Re: [4/4] kernel32: Add localized version resource.
by Alexandre Julliard March 15, 2017

March 15, 2017

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > diff --git a/dlls/kernel32/version.rc b/dlls/kernel32/version.rc > index 411bd6e..dbaee67 100644 > --- a/dlls/kernel32/version.rc > +++ b/dlls/kernel32/version.rc > @@ -16,6 +16,13 @@ > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > */ > > +#include "winresrc.h" > + > +#pragma makedep po > + > +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT > + > +#define WINE_FILEDESCRIPTION_STR "#msgctxt#kernel32#Wine Core DLL" > #define WINE_FILENAME_STR "kernel32.dll" Is there a reason that this needs to be kernel32 specific? Why couldn't other dlls use the translation too? -- Alexandre Julliard julliard(a)winehq.org

2 2

[PATCH] user32: Fix handling of internal messages.
by Zebediah Figura March 15, 2017

March 15, 2017

I'm submitting this to wine-devel because the code is probably messy and I'm not sure if this is the right approach to solving the problem. This patch adds a new flag and a server reply, allowing GetQueueStatus to ignore internal messages, and MsgWaitForMultipleObjects to process internal messages until a real sent message is found. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/message.c | 129 +++++++++++++++++++++++++++++++++++++++-- dlls/user32/tests/msg.c | 8 +-- include/wine/server_protocol.h | 4 +- include/winuser.h | 3 + server/protocol.def | 1 + server/queue.c | 14 ++++- server/request.h | 3 +- server/trace.c | 1 + 8 files changed, 150 insertions(+), 13 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 9bfb453..92caf64 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2964,6 +2964,98 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags /*********************************************************************** + * receive_internal_message + * + * Retrieves and processes a single sent internal message. + */ +static DWORD receive_internal_message(size_t buffer_size) +{ + LRESULT result; + struct user_thread_info *thread_info = get_user_thread_info(); + struct received_message_info info, *old_info; + void *buffer; + size_t size = 0; + + buffer = HeapAlloc(GetProcessHeap(), 0, buffer_size); + + SERVER_START_REQ( get_message ) + { + NTSTATUS res; + + req->flags = PM_REMOVE | PM_QS_SENDMESSAGE; + req->get_win = 0; + req->get_first = 0; + req->get_last = 0; + req->hw_id = 0; + req->wake_mask = 0; + req->changed_mask = 0; + wine_server_set_reply( req, buffer, buffer_size ); + + if ((res = wine_server_call( req )) != STATUS_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, buffer); + if (res == STATUS_BUFFER_OVERFLOW) + return receive_internal_message(reply->total); + + return RtlNtStatusToDosError(res); + } + + size = wine_server_reply_size( reply ); + info.type = reply->type; + info.msg.hwnd = wine_server_ptr_handle( reply->win ); + info.msg.message = reply->msg; + info.msg.wParam = reply->wparam; + info.msg.lParam = reply->lparam; + info.msg.time = reply->time; + info.msg.pt.x = reply->x; + info.msg.pt.y = reply->y; + thread_info->active_hooks = reply->active_hooks; + } + SERVER_END_REQ; + + switch(info.type) + { + case MSG_ASCII: + case MSG_UNICODE: + info.flags = ISMEX_SEND; + break; + case MSG_NOTIFY: + info.flags = ISMEX_NOTIFY; + break; + case MSG_CALLBACK: + info.flags = ISMEX_CALLBACK; + break; + case MSG_HOOK_LL: + info.flags = ISMEX_SEND; + reply_message(&info, 0, TRUE); + return STATUS_SUCCESS; + case MSG_OTHER_PROCESS: + info.flags = ISMEX_SEND; + if (!unpack_message(info.msg.hwnd, info.msg.message, &info.msg.wParam, + &info.msg.lParam, &buffer, size)) + { + /* ignore it */ + reply_message(&info, 0, TRUE); + return ERROR_SUCCESS; + } + break; + default: + ERR("unexpected type %d for internal message %08x\n", info.type, info.msg.message); + } + + old_info = thread_info->receive_info; + thread_info->receive_info = &info; + result = handle_internal_message(info.msg.hwnd, info.msg.message, + info.msg.wParam, info.msg.lParam); + reply_message( &info, result, TRUE ); + thread_info->receive_info = old_info; + + HeapFree(GetProcessHeap(), 0, buffer); + return ERROR_SUCCESS; +} + + +/*********************************************************************** * process_sent_messages * * Process all pending sent messages. @@ -3811,7 +3903,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH PeekMessageA( MSG *msg, HWND hwnd, UINT first, UIN BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT last ) { HANDLE server_queue = get_server_queue_handle(); - unsigned int mask = QS_POSTMESSAGE | QS_SENDMESSAGE; /* Always selected */ + unsigned int mask = QS_POSTMESSAGE | QS_SENDMESSAGE | QS_WINE_SENDMESSAGE; /* Always selected */ USER_CheckNotLock(); check_for_driver_events( 0 ); @@ -3825,7 +3917,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT if ((first <= WM_SYSTIMER) && (last >= WM_SYSTIMER)) mask |= QS_TIMER; if ((first <= WM_PAINT) && (last >= WM_PAINT)) mask |= QS_PAINT; } - else mask = QS_ALLINPUT; + else mask |= QS_ALLINPUT; while (!peek_message( msg, hwnd, first, last, PM_REMOVE | (mask << 16), mask )) { @@ -4142,7 +4234,7 @@ DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *pHandles, DWORD timeout, DWORD mask, DWORD flags ) { HANDLE handles[MAXIMUM_WAIT_OBJECTS]; - DWORD i; + DWORD i, res; if (count > MAXIMUM_WAIT_OBJECTS-1) { @@ -4154,8 +4246,37 @@ DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *pHandles, for (i = 0; i < count; i++) handles[i] = pHandles[i]; handles[count] = get_server_queue_handle(); - return wait_objects( count+1, handles, timeout, + mask |= QS_WINE_SENDMESSAGE; + + for (;;) + { + res = wait_objects( count+1, handles, timeout, (flags & MWMO_INPUTAVAILABLE) ? mask : 0, mask, flags ); + if (res == WAIT_OBJECT_0+count) + { + NTSTATUS server_res; + UINT msg; + SERVER_START_REQ( get_queue_status ) + { + req->clear_bits = 0; + if ((server_res = wine_server_call( req )) != STATUS_SUCCESS) + { + SetLastError(RtlNtStatusToDosError(server_res)); + return WAIT_FAILED; + } + msg = reply->first_sent_msg; + } + SERVER_END_REQ; + + if (msg & 0x80000000) + { + /* If it's a WINE internal message, process it and keep waiting */ + receive_internal_message(256); + continue; + } + } + return res; + } } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 19a1f31..a682b70 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16332,7 +16332,7 @@ static void test_SendMessage_other_thread(int thread_n) GetMessageA(&msg, 0, 0, 0); ok(msg.message == WM_USER, "expected WM_USER, got %04x\n", msg.message); DispatchMessageA(&msg); - ok_sequence(send_message_1, "SendMessage from other thread 1", thread_n == 2); + ok_sequence(send_message_1, "SendMessage from other thread 1", FALSE); /* intentionally yield */ MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input); @@ -16347,7 +16347,7 @@ static void test_SendMessage_other_thread(int thread_n) trace("main: call PeekMessage\n"); ok(PeekMessageA(&msg, 0, 0, 0, PM_NOREMOVE), "PeekMessage should not fail\n"); ok(msg.message == WM_USER+1, "expected WM_USER+1, got %04x\n", msg.message); - ok_sequence(send_message_3, "SendMessage from other thread 3", thread_n == 2); + ok_sequence(send_message_3, "SendMessage from other thread 3", FALSE); trace("main: call PeekMessage\n"); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should not fail\n"); @@ -16359,13 +16359,11 @@ static void test_SendMessage_other_thread(int thread_n) MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input); ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); - /* FIXME: remove once Wine is fixed */ -todo_wine_if (thread_n == 2) ok(ret == 0, "wrong status %08x\n", ret); trace("main: call PeekMessage\n"); ok(!PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should fail\n"); - ok_sequence(WmEmptySeq, "SendMessage from other thread 5", thread_n == 2); + ok_sequence(WmEmptySeq, "SendMessage from other thread 5", FALSE); ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); ok(ret == 0, "wrong status %08x\n", ret); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ee9fdd1..4417cb6 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2941,6 +2941,8 @@ struct get_queue_status_reply struct reply_header __header; unsigned int wake_bits; unsigned int changed_bits; + unsigned int first_sent_msg; + char __pad_20[4]; }; @@ -6412,6 +6414,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 524 +#define SERVER_PROTOCOL_VERSION 525 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/include/winuser.h b/include/winuser.h index 2b8331c..d10caba 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2898,6 +2898,9 @@ typedef struct tagTRACKMOUSEEVENT { /* Extra (undocumented) queue wake bits - see "Undoc. Windows" */ #define QS_SMRESULT 0x8000 +/* Internal WINE message */ +#define QS_WINE_SENDMESSAGE 0x80000000 + /* InSendMessageEx flags */ #define ISMEX_NOSEND 0x00000000 #define ISMEX_SEND 0x00000001 diff --git a/server/protocol.def b/server/protocol.def index 60865a6..7b797af 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2162,6 +2162,7 @@ enum char_info_mode @REPLY unsigned int wake_bits; /* wake bits */ unsigned int changed_bits; /* changed bits since last time */ + unsigned int first_sent_msg; /* first message in the sent message queue */ @END diff --git a/server/queue.c b/server/queue.c index c479b38..ea6d5e6 100644 --- a/server/queue.c +++ b/server/queue.c @@ -744,7 +744,8 @@ static void receive_message( struct msg_queue *queue, struct message *msg, queue->recv_result = result; } free( msg ); - if (list_empty( &queue->msg_list[SEND_MESSAGE] )) clear_queue_bits( queue, QS_SENDMESSAGE ); + if (list_empty( &queue->msg_list[SEND_MESSAGE] )) + clear_queue_bits( queue, QS_SENDMESSAGE | QS_WINE_SENDMESSAGE ); } /* set the result of the current received message */ @@ -2272,11 +2273,17 @@ DECL_HANDLER(set_queue_mask) DECL_HANDLER(get_queue_status) { struct msg_queue *queue = current->queue; + struct list *ptr; if (queue) { reply->wake_bits = queue->wake_bits; reply->changed_bits = queue->changed_bits; queue->changed_bits &= ~req->clear_bits; + + if ((ptr = list_head( &queue->msg_list[SEND_MESSAGE] ))) + reply->first_sent_msg = LIST_ENTRY( ptr, struct message, entry )->msg; + else + reply->first_sent_msg = 0; } else reply->wake_bits = reply->changed_bits = 0; } @@ -2339,7 +2346,10 @@ DECL_HANDLER(send_message) /* fall through */ case MSG_NOTIFY: list_add_tail( &recv_queue->msg_list[SEND_MESSAGE], &msg->entry ); - set_queue_bits( recv_queue, QS_SENDMESSAGE ); + if (msg->msg & 0x80000000) /* Wine internal message */ + set_queue_bits( recv_queue, QS_WINE_SENDMESSAGE ); + else + set_queue_bits( recv_queue, QS_SENDMESSAGE ); break; case MSG_POSTED: list_add_tail( &recv_queue->msg_list[POST_MESSAGE], &msg->entry ); diff --git a/server/request.h b/server/request.h index cd396ee..374150d 100644 --- a/server/request.h +++ b/server/request.h @@ -1480,7 +1480,8 @@ C_ASSERT( FIELD_OFFSET(struct get_queue_status_request, clear_bits) == 12 ); C_ASSERT( sizeof(struct get_queue_status_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_queue_status_reply, wake_bits) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_queue_status_reply, changed_bits) == 12 ); -C_ASSERT( sizeof(struct get_queue_status_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_queue_status_reply, first_sent_msg) == 16 ); +C_ASSERT( sizeof(struct get_queue_status_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_process_idle_event_request, handle) == 12 ); C_ASSERT( sizeof(struct get_process_idle_event_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_process_idle_event_reply, event) == 8 ); diff --git a/server/trace.c b/server/trace.c index e0ce45a..5ba65da 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2698,6 +2698,7 @@ static void dump_get_queue_status_reply( const struct get_queue_status_reply *re { fprintf( stderr, " wake_bits=%08x", req->wake_bits ); fprintf( stderr, ", changed_bits=%08x", req->changed_bits ); + fprintf( stderr, ", first_sent_msg=%08x", req->first_sent_msg ); } static void dump_get_process_idle_event_request( const struct get_process_idle_event_request *req ) -- 2.7.4

2 1

Re: [PATCH v2 2/3] msvcrt: Implement Concurrency::event
by Piotr Caban March 15, 2017

March 15, 2017

Hi Daniel, I think it would be better to also avoid the static critical section. Here are some hints how it can be achieved: typedef struct { struct list *waiters; INT_PTR signaled; critical_section cs; } event; struct thread_wait; typedef struct { struct thread_wait *wait; struct list entry; } thread_wait_entry; typedef struct thread_wait { event *signaled; int pending_waits; thread_wait_entry entries[1]; } thread_wait; (thread_wait structure will need to be accessed in a thread safe way) With such structures event_set may be implemented in following way (this describes the idea, it's not a fully correct code): void __thiscall event_set(event *this) { critical_section_lock(&this->cs); if (this->signaled) unlock and return; this->signaled = TRUE; LIST_FOR_EACH_ENTRY(cur, this->waiters) { if (!InterlockedDecrement(&cur->wait->pending_waits)) { if (!InterlockedCompareExchangePtr(&cur->wait->signaled, this, 0)) NtReleaseKeyedEvent(keyed_event, cur->wait, 0, NULL); } } critical_section_unlock(&this->cs); } void __thiscall event_reset(event *this) { critical_section_lock(&this->cs); if (!this->signaled) unlock and return; this->signaled = FALSE; LIST_FOR_EACH_ENTRY(cur, this->waiters) InterlockedIncrement(&cur->wait->pending_waits); critical_section_unlock(&this->cs); } int __cdecl wait_for_multiple(event **events, MSVCRT_size_t count, MSVCRT_bool wait_all, unsigned int timeout) { wait = allocate thread_wait struct; initialize wait struct; (wait->pending_waits = wait_all ? count : 1) for(int i=0; i<count; i++) { critical_section_lock(events[i]); add wait to waiters queue (decrease wait->pending_waits if necessary) critical_section_unlock(events[i]); } status = NtWaitForKeyedEvent(keyed_event, wait, ...); if(!status || InterlockedCompareExchangePtr(wait->signaled, 1, 0)) get ret from wait->signaled else ret = COOPERATIVE_WAIT_TIMEOUT; for(int i=0; i<count; i++) { critical_section_lock(events[i]); remove wait from waiters queue critical_section_unlock(events[i]); } } Also I think it would be nice to avoid allocation in case of waiting for only one handle (or just in event_wait function). What do you think about it? Thank you, Piotr

2 1

Re: [PATCH] msxml3: Don't QI for IPersistStream in internal_parse
by Nikolay Sivov March 15, 2017

March 15, 2017

Hi, Daniel. I think it would be better to add a ok(0, ...) call at istream_QueryInterface() instead of adding new stub for interface we are not supposed to support. This function is actually incomplete, because it does not respond to ISequentialStream. If you want to test order of QI calls, just add another QueryInterface test implementation that does that, and reuse the rest of vtable. Did you test with all versions, 3, 4, and 6?

2 1

Re: [PATCH 4/5] server: Added server side mamed pipe read and write implementation and use it for message mode pipes.
by Sebastian Lackner March 15, 2017

March 15, 2017

On 22.02.2017 14:51, Jacek Caban wrote: > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > --- > dlls/kernel32/tests/pipe.c | 28 ++- > dlls/ntdll/file.c | 7 +- > dlls/ntdll/tests/file.c | 2 +- > server/async.c | 9 + > server/file.h | 1 + > server/named_pipe.c | 446 > ++++++++++++++++++++++++++++++++++++++++++--- > 6 files changed, 447 insertions(+), 46 deletions(-) As I see this updated patchset allows to return the result immediately, but still uses a USR1 signal to transfer back the IO completion info. Wouldn't it be useful to get rid of that aswell? Also please note that we need to distinguish "immediate returns" and "async returns" to properly implement FileIoCompletionNotificationInformation. This especially means that waiting internally is not an option. > + iosb = async_get_iosb( async ); > + if ((blocking || iosb->status != STATUS_PENDING) > + && !(handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ))) > + async_terminate( async, get_error() ); I don't think this will work as expected. async_terminate might queue an APC, but the caller will immediately deallocate the async struct in server_write_file because status != STATUS_PENDING.

3 14