May 2016 - 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

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: user32: Avoid -Wmisleading-indentation warnings and fix comments in comments in test_AppendMenu.
by Dmitry Timoshkov Aug. 11, 2016

Aug. 11, 2016

Gerald Pfeifer <gerald(a)pfeifer.com> wrote: > diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c > index 33d8eb8..ea965cd 100644 > --- a/dlls/user32/tests/menu.c > +++ b/dlls/user32/tests/menu.c > @@ -3992,13 +3992,15 @@ static void test_AppendMenu(void) > mii.wID = 206; > ret = InsertMenuItemA(hmenu, 0, TRUE, &mii); > ok(ret, "InsertMenuItem failed\n"); > -if (0) /* FIXME: uncomment once Wine is fixed */ > +if (0) /* FIXME: enable once Wine is fixed */ { > check_menu_items(hmenu, 206, MF_SEPARATOR, MFS_GRAYED); > +} > mii.wID = 207; > ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii); > ok(ret, "SetMenuItemInfo failed\n"); > -if (0) /* FIXME: uncomment once Wine is fixed */ > +if (0) /* FIXME: enable once Wine is fixed */ { > check_menu_items(hmenu, 207, MF_SEPARATOR, MFS_GRAYED); > +} > DestroyMenu(hmenu); > > hbmp = CreateBitmap(1, 1, 1, 1, NULL); Please don't make the code look uglier than it already is. I'd personally argue that checking and forcing indentation rules by a C compiler is pretty disappointing and actually misleading. That warning should be turned off by default IMHO. -- Dmitry.

3 2

WineHQ upgrade breaking dinput8:dinput?
by Francois Gouget Aug. 7, 2016

Aug. 7, 2016

This is a truly weird one. dinput8:dinput start failing on the 17th, the day after WineHQ was upgraded: https://test.winehq.org/data/tests/dinput8:dinput.html What makes this weird is that: * There has been no change to these tests between bd332f53f2d7 and 966a07149a02. In fact the last patch goes back to 2013. So it's not a bad patch. * The failures happen on every 32 bit test environment, from XP to Windows 10, VM or not, TestBot or not. Only 64 bit is spared. * I compiled a dinput8_crosstest.exe binary bd332f53f2d7 which was not failing according to the test.winehq.org results. But all I got is failures: - 887b445bb878, 8th, 0 test.winehq.org failures, 13 here: https://testbot.winehq.org/JobDetails.pl?Key=21611 - bd332f53f2d7, 16th, 0 test.winehq.org failures, 13 here: https://testbot.winehq.org/JobDetails.pl?Key=21610 - 329dfee70c35, 22nd, 13 test.winehq.org failures, 13 here https://testbot.winehq.org/JobDetails.pl?Key=21609 My MinGW compiler is more recent than the one WineHQ was using before the upgrade however. So I think this points to a compiler-related issue. The official WineTest binaries are build on WineHQ so I suspect the MinGW upgrade is somehow responsible for the new failures. However I don't know if the old compiler was masking them, of if the new one is causing them. Any ideas? For reference: * Debian Testing (my environment): $ i686-w64-mingw32-gcc --version i686-w64-mingw32-gcc (GCC) 5.3.1 20160205 * Debian 7 (close to former WineHQ environment): $ i686-w64-mingw32-gcc --version i686-w64-mingw32-gcc (GCC) 4.9.1 -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Nouvelle version : les anciens bogues ont été remplacés par de nouveaux.

5 15

Wine's forked version of fontforge
by Jens Reyer Aug. 1, 2016

Aug. 1, 2016

Hi, in Debian we're currently moving to enable the maintainer mode to e.g. rebuild Wine's TrueType fonts. AJ already warned us that this is risky: On 04/01/2016 04:54 AM, wine-bugs(a)winehq.org wrote: > https://bugs.winehq.org/show_bug.cgi?id=40391 > > --- Comment #3 from Alexandre Julliard <julliard(a)winehq.org> --- > There is definitely a risk too, particularly for fonts. They are supposed to be > built with our forked version of fontforge > (https://source.winehq.org/git/fontforge.git) that contains a couple of fixes > compared to the upstream version. I really appreciate that warning, thanks again! See a "short" explanation at the end of the mail, why we want to do this anyway. I'd like to figure out how to improve the resulting situation by getting the Wine changes to fontforge applied upstream (and/or in Debian). With "upstream" I mean github.com/fontforge. I will contact them in a later step. Wine and Debian are both using the quite old fontforge version 20120731-b, the patches apply cleanly in Debian. But upstream is actively developing and in Debian someone is working on packaging a recent version (not sure with what outcome, e.g. afaik there is at least one upstream regression blocking an update). Are there any plans in Wine to update to a newer version? Wine's fontforge has 4 changes. I recreated them based on AJ's merge for 20120731-b and by myself for 20160404 to get a *rough* picture of their current state (not tested and I'm absolutely no expert in this): 1. Various hacks to avoid putting timestamps in generated files (AJ). No relevant changes upstream, but there is some work going to allow one to specify the timestamp in order to get the build deterministic/reproducible. Would this make this patch obsolete? I don't know why upstream wants timestamps at all, nor what problems these cause for Wine. Is this Wine specific, or would it make sense to drop timestamping upstream, too? 2. - Avoid outputting trailing spaces in sfd files (AJ). About a third seems to be applied in 20160404. I assume the rest would still be relevant if Wine updated its fontforge version. Is this patch only relevant for creating fonts/glyphs, but not for building the TrueType fonts? Looks like a good candidate for forwarding to upstream. 3. Enable the width of individual bitmap strikes to be altered (Huw Davies). Since the import of upstream version 20120731-b this patch only has a third of its original size. Are the remaining Wine changes still necessary, or are they cruft? If still needed, I guess they should be pushed upstream. In 20160404 not much seems to have changed, but the containing file bitmapview.c was moved ("splitting ui code from fontforge/ to fontforgeexe/"). Same as above: is this only needed when creating fonts? Looks like a candidate for upstream. 4. Don't save the selected state. (Huw Davies) I found no relevant changes upstream. No idea about this. Why are we doing this? ---------------------- The Debian Free Software Guidelines [DFSG] (which are the fundamental basis for the Debian project) mandate that binaries must be accompanied by their source (which is usually ensured by building from source), and that you must be able to modify and redistribute the package with only the software available in Debian. The reasons for these are e.g. philosophical (empowering the user), QA (rebuilding if there was an issue in the build tools), reproducibility (recreate byte-by-byte-identically, e.g. to rule out attacks at a build machine or do QA) or security (a build from correct source code may be manipulated by specific compilers). The TrueType fonts are pre-built with a forked fontforge, which isn't (and very unlikely will ever be) in Debian. To package the pre-built fonts imo we would have to remove Wine from official Debian (main), and move it to the non/semi-official contrib section. For the same reason (AFAIK, I'm not the author of these changes) we're also regenerating opengl files, request code and unicode. This problem was ignored/missed in the past for the Debian Wine packages, yet this is no argument against fixing them now. We definitely don't want Wine removed from Debian, instead keep it in and get it there as good as possible. btw, we're also adding a patch (based on wine staging) to append '(Debian)' to the version string now. btw2, can you recommend some alternative free fonts to install (either as partial replacement or as extension to the Wine fonts)? Greets, and thanks in advance jre [DFSG] https://www.debian.org/doc/debian-policy/ch-archive.html#s-dfsg, see also the following chapter "The main archive area".

2 3

Re: [PATCH v2] kernel32: Use setprogname(3) to set the program name if available.
by Theodore Dubois July 12, 2016

July 12, 2016

This patch causes a segfault in the event that __wine_main_argv is not the argv that got passed to main. This happened in a program I wrote that acts as a custom wine loader. It creates an argv by using malloc, then passes that to wine_init. Why wouldn’t setprogname(argv[1]) be adequate? ~Theodore > On Feb 19, 2016, at 2:33 PM, Charles Davis <cdavis5x(a)gmail.com> wrote: > > Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> > --- > Try 2: > * Clean up the #ifdefs a bit. (I'm not happy about the duplicated code, though.) > * Don't copy the progname into a static array. There's no need; the argument vector lasts as long as the process itself. (I suppose I was being overly defensive with that.) > > configure.ac | 1 + > dlls/kernel32/process.c | 17 ++++++++++++++--- > 2 files changed, 15 insertions(+), 3 deletions(-) > > diff --git a/configure.ac b/configure.ac > index c9445e7..2ebbb10 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -2026,6 +2026,7 @@ AC_CHECK_FUNCS(\ > sched_yield \ > select \ > setproctitle \ > + setprogname \ > setrlimit \ > settimeofday \ > sigaltstack \ > diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c > index 86333be..4771108 100644 > --- a/dlls/kernel32/process.c > +++ b/dlls/kernel32/process.c > @@ -1118,9 +1118,20 @@ static void set_process_name( int argc, char *argv[] ) > { > #ifdef HAVE_SETPROCTITLE > setproctitle("-%s", argv[1]); > -#endif > + /* remove argv[0] */ > + memmove( argv, argv + 1, argc * sizeof(argv[0]) ); > +#elif defined(HAVE_SETPROGNAME) > + int i, offset; > + char *end = argv[argc-1] + strlen(argv[argc-1]) + 1; > > -#ifdef HAVE_PRCTL > + offset = argv[1] - argv[0]; > + memmove( argv[1] - offset, argv[1], end - argv[1] ); > + memset( end - offset, 0, offset ); > + for (i = 1; i < argc; i++) argv[i-1] = argv[i] - offset; > + argv[i-1] = NULL; > + > + setprogname( argv[0] ); > +#elif defined(HAVE_PRCTL) > int i, offset; > char *p, *prctl_name = argv[1]; > char *end = argv[argc-1] + strlen(argv[argc-1]) + 1; > @@ -1141,11 +1152,11 @@ static void set_process_name( int argc, char *argv[] ) > argv[i-1] = NULL; > } > else > -#endif /* HAVE_PRCTL */ > { > /* remove argv[0] */ > memmove( argv, argv + 1, argc * sizeof(argv[0]) ); > } > +#endif /* HAVE_PRCTL */ > } > > > -- > 2.7.1 > > >

4 12

WineConf 2016
by Michael Stefaniuc June 19, 2016

June 19, 2016

Hello guys, it's that time of the year again where we start thinking about the next WineConf. Last year would already have been the turn for North America so the next WineConf will happen definitely there. Jeremy White / CodeWeavers, as always, was very generous and offered to host it in Minneapolis (or was it St. Paul? ;). But if you're in US / Canada and really hoped to host the next WineConf now is your time to speak up! The Twin Cities are beautiful at -30 C but we wouldn't mind seeing other places too. bye michael

4 4

IMM / IME work
by Aric Stewart June 16, 2016

June 16, 2016

Hello all, I know this will only interest a small portion of you but thought i would give a quick update on the state of IMM32 since I have brought it to a major milestone. All the main patches are in which now separate IMM32 and IMEs. There is still more work to do but the major framework is in place. X11 XIM processing should be unchanged. However wine can now begin to load native windows IMEs as well. I have tested with windows ATOK20 (a popular Japanese IME) and successfully had text processing in a fully IME aware application. There are still clear issues to resolve in many aspects of this processing but we have forward progress. ImmInstallIME does not work yet, nor does switching keyboards. So to get the native IME to work you need to add this registry key. [System\\CurrentControlSet\\Control\\Keyboard Layouts\\<keyboard layout>] "Ime File"=<IME filename> so for example for ATOK20 in Japanese i used. [System\\CurrentControlSet\\Control\\Keyboard Layouts\\e0010411] "Ime File"="ATOK20W.IME" I would love to hear how well things work. I am sure using native IMEs will quickly show us many places where IMM32 needs to be improved. One issues I am going to investigate next is that sometimes non x11drv ime initialization, if occurring too early, causes x11drv to fail to create windows. I have not investigated with the latest changes to xim.c (which may already correct this problem) but if you see this problem this patch may help and i believe the IME_UpdateAssociation(NULL) is already unneeded. diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index d4df9f7..0c98136 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -475,7 +475,6 @@ static void X11DRV_OpenIM(Display *display, XPointer ptr, XP XUnregisterIMInstantiateCallback(display, NULL, NULL, NULL, X11DRV_OpenIM, wine_tsx11_unlock(); IME_XIMPresent(TRUE); - IME_UpdateAssociation(NULL); } thanks, -aric

5 7

Broken AppDB Test Results Pages
by Jimi Huotari June 1, 2016

June 1, 2016

Greetings! I sent two mails about this to appdb(a)winehq.org the other day, but austin987 suggested I'll mail here (and Cc jnewman), too, since it has been a few days now. So I broke a couple of pages: //appdb.winehq.org/objectManager.php?sClass=version&iId=24670 //appdb.winehq.org/objectManager.php?sClass=version&iId=24695 Using QupZilla (QtWebEngine edition), the Xinha editor took its built-in ad-block rules, with some of the style code, and included them in the code for the page, which breaks most of it (none of the test results or notes/comments\bugs show up). Loading up the form at AppDB resulted into a count of HTML: 259501, and this number goes up by about the same amount every time the form is reloaded, and (probably) all of it will be included in the code. It would be great if someone with the power to do so could undo my edits to the two pages I mentioned, as I can't do anything about it myself. :] I already reported the issue upstream of QupZilla, and a fix was quickly put in place there, but the editor itself remains vulnerable (no idea how big of an annoyance /really/ exploiting it could become). Thank you, and apologies for the inconvenience!

2 1

Re: [PATCH] d3dx9: Improve performance and memory usage in preshader constants setting.
by Matteo Bruni May 31, 2016

May 31, 2016

2016-05-26 20:28 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/d3dx9_private.h | 25 +++- > dlls/d3dx9_36/preshader.c | 259 +++++++++++++++++++++++++++++++++++------- > 2 files changed, 237 insertions(+), 47 deletions(-) > > diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h > index 9938d83..970ef2f 100644 > --- a/dlls/d3dx9_36/d3dx9_private.h > +++ b/dlls/d3dx9_36/d3dx9_private.h > @@ -129,14 +129,33 @@ enum pres_reg_tables > PRES_REGTAB_FIRST_SHADER = PRES_REGTAB_CONST, > }; > > +enum const_param_copy_state_type > +{ > + COPY_STATE_TYPE_PARAM, > + COPY_STATE_TYPE_TABLE, > + COPY_STATE_TYPE_PARAM_OFFSET, > + COPY_STATE_TYPE_TABLE_OFFSET, > + COPY_STATE_TYPE_COPY_COUNT The name of the last enumerator is a bit ambiguous (it might be mistaken to be a _COUNT entry == last actual enumerator + 1). I would either change the name a bit or move it from the last place. Although this might be moot, see below. > +struct d3dx_const_copy_state I'm not entirely happy with the name, maybe d3dx_const_param_eval_output or something in that fashion? > @@ -811,10 +820,10 @@ static void d3dx_free_const_tab(struct d3dx_const_tab *ctab) > { > HeapFree(GetProcessHeap(), 0, ctab->inputs); > HeapFree(GetProcessHeap(), 0, ctab->inputs_param); > - if (ctab->ctab) > - ID3DXConstantTable_Release(ctab->ctab); > + HeapFree(GetProcessHeap(), 0, ctab->const_set); > } > > + > static void d3dx_free_preshader(struct d3dx_preshader *pres) That extra blank line doesn't seem necessary. > @@ -835,14 +844,181 @@ void d3dx_free_param_eval(struct d3dx_param_eval *peval) > HeapFree(GetProcessHeap(), 0, peval); > } > > -static HRESULT set_constants_param(struct d3dx_regstore *rs, struct d3dx_const_tab *const_tab, > - D3DXHANDLE hc, struct d3dx_parameter *param) > +static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const_tab) > +{ > + unsigned int i; > + struct d3dx_const_copy_state set_state; > + > + memset(&set_state, 0, sizeof(set_state)); > + for (i = 0; i < const_tab->const_set_count; ++i) > + { > + switch (const_tab->const_set[i].copy_state_type) > + { > + case COPY_STATE_TYPE_PARAM: > + set_state.param = const_tab->const_set[i].state_change.param; > + break; > + case COPY_STATE_TYPE_TABLE: > + set_state.table = const_tab->const_set[i].state_change.value; > + break; > + case COPY_STATE_TYPE_PARAM_OFFSET: > + set_state.param_offset = const_tab->const_set[i].state_change.value; > + break; > + case COPY_STATE_TYPE_TABLE_OFFSET: > + set_state.table_offset = const_tab->const_set[i].state_change.value; > + break; > + case COPY_STATE_TYPE_COPY_COUNT: > + { > + unsigned int count; > + struct d3dx_parameter *param; > + enum pres_value_type table_type; > + unsigned int j; > + > + count = const_tab->const_set[i].state_change.value; > + param = set_state.param; > + table_type = table_info[set_state.table].type; > + if ((set_state.table_offset + count - 1) / table_info[set_state.table].reg_component_count > + >= rs->table_sizes[set_state.table]) > + { > + FIXME("Insufficient table space allocated.\n"); > + break; > + } > + if ((param->type == D3DXPT_FLOAT && table_type == PRES_VT_FLOAT) > + || (param->type == D3DXPT_INT && table_type == PRES_VT_INT) > + || (param->type == D3DXPT_BOOL && table_type == PRES_VT_BOOL)) > + { > + regstore_set_values(rs, set_state.table, (unsigned int *)param->data + set_state.param_offset, > + set_state.table_offset, count); > + } > + else > + { > + for (j = 0; j < count; ++j) > + { > + unsigned int out; > + unsigned int *in = (unsigned int *)param->data + set_state.param_offset + j; > + switch (table_info[set_state.table].type) > + { > + case PRES_VT_FLOAT: set_number(&out, D3DXPT_FLOAT, in, param->type); break; > + case PRES_VT_INT: set_number(&out, D3DXPT_INT, in, param->type); break; > + case PRES_VT_BOOL: set_number(&out, D3DXPT_BOOL, in, param->type); break; > + default: > + FIXME("Unexpected type %#x.\n", table_info[set_state.table].type); > + break; > + } > + regstore_set_values(rs, set_state.table, &out, set_state.table_offset + j, 1); > + } > + } > + set_state.param_offset += count; > + set_state.table_offset += count; > + break; > + } > + } > + } > +} This seems overly complicated and fragile. Instead of this kind of "5 instructions bytecode" isn't it easier to just store and then lookup a struct with all the info you need? I guess the end result would be something akin to storing an array of struct d3dx_const_copy_state in place of struct d3dx_const_param_set. I don't know how the code would exactly look like but I would start by moving building all the struct d3dx_const_copy_param to init time. BTW the coalescing you currently do in add_const_set() could be potentially done as a separate pass after you generate all the "d3dx_const_copy_state-like" structures (but still at init time), which might be simpler. Does this make sense? Am I missing something? > +static HRESULT add_const_set_value(struct d3dx_const_tab *const_tab, unsigned int value, > + unsigned int *current_value, enum const_param_copy_state_type type) > +{ > + struct d3dx_const_param_set set; > + HRESULT hr; > + > + if (*current_value != value) > + { > + *current_value = value; > + set.copy_state_type = type; > + set.state_change.value = value; > + if (FAILED(hr=append_const_set(const_tab, &set))) Whitespace. > @@ -931,21 +1107,17 @@ static HRESULT set_constants_param(struct d3dx_regstore *rs, struct d3dx_const_t > major_stride = max(minor, table_info[table].reg_component_count); > n = min(major * major_stride, > desc.RegisterCount * table_info[table].reg_component_count + major_stride - 1) / major_stride; > + > for (i = 0; i < n; ++i) > { > for (j = 0; j < minor; ++j) > { > - unsigned int out; > - unsigned int *in; > unsigned int offset; > > offset = start_offset + i * major_stride + j; > - if (offset / table_info[table].reg_component_count >= rs->table_sizes[table]) > - { > - if (table_info[table].reg_component_count != 1) > - FIXME("Output offset exceeds table size, name %s, component %u.\n", desc.Name, i); > + if ((offset - start_offset) / table_info[table].reg_component_count >= desc.RegisterCount) > break; Maybe keeping a WARN or something makes sense here?

2 2

Re: [PATCH 6/7] d3drm: Partially implement IDirect3DRMTexture*::InitFromFile. (v5)
by Aaryaman Vasishta May 31, 2016

May 31, 2016

Hi, Now that the first 5 patches in the series are committed, I was wondering if there's any changes required in this patch (and 7/7) ? Cheers, Aaryaman On Mon, May 23, 2016 at 8:58 PM, Marvin <testbot(a)winehq.org> wrote: > 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 "Assigned". > > This means that the patch has been assigned to a reviewer. If the > reviewer signs off on the patch, it will be committed, otherwise > you'll receive advice on how to improve it. If you don't hear anything > after a couple of weeks, please resend the patch. >

2 5

Re: [PATCH] user32/tests: Fix a leak when creating test icons (Valgrind)
by Marvin May 31, 2016

May 31, 2016

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=23256 Your paranoid android. === w864 (32 bit cursoricon) === cursoricon.c:1438: Test failed: Create cursor failed. cursoricon.c:1443: Test failed: GetIconInfo() failed. cursoricon.c:1445: Test failed: Last error: 1402 cursoricon.c:1460: Test failed: DestroyCursor() failed. cursoricon.c:1462: Test failed: Last error: 1402 cursoricon.c:1595: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1602: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1603: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0x0). cursoricon.c:1604: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 1). cursoricon.c:1610: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1622: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1628: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1637: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1639: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1640: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1643: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1637: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1639: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1640: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1643: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1637: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1639: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1640: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1643: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1662: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1668: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1674: Test failed: Unexpected number of steps in cursor (0 != 1) cursoricon.c:1681: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1683: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1684: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1687: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != ~0). cursoricon.c:1704: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1716: Test failed: Create cursor failed (error = deadbeef). cursoricon.c:1722: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1733: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1735: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1736: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xc0de). cursoricon.c:1739: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1733: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1735: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1736: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xcafe). cursoricon.c:1739: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1733: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1735: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1736: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbabe). cursoricon.c:1739: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1747: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:2624: Test failed: LoadImage() failed with 0. cursoricon.c:2624: Test failed: LoadImage() failed with 0. === w1064 (32 bit cursoricon) === cursoricon.c:1438: Test failed: Create cursor failed. cursoricon.c:1443: Test failed: GetIconInfo() failed. cursoricon.c:1445: Test failed: Last error: 1402 cursoricon.c:1460: Test failed: DestroyCursor() failed. cursoricon.c:1462: Test failed: Last error: 1402 cursoricon.c:1595: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1602: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1603: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0x0). cursoricon.c:1604: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 1). cursoricon.c:1610: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1622: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1628: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1637: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1639: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1640: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1643: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1637: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1639: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1640: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1643: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1637: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1639: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1640: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1643: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1662: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1668: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1674: Test failed: Unexpected number of steps in cursor (0 != 1) cursoricon.c:1681: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1683: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1684: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1687: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != ~0). cursoricon.c:1704: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1716: Test failed: Create cursor failed (error = deadbeef). cursoricon.c:1722: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1733: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1735: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1736: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xc0de). cursoricon.c:1739: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1733: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1735: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1736: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xcafe). cursoricon.c:1739: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1733: Test failed: GetCursorFrameInfo() failed for cursor 00000000: (00000000, 00000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1735: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1736: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbabe). cursoricon.c:1739: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1747: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:2624: Test failed: LoadImage() failed with 0. cursoricon.c:2624: Test failed: LoadImage() failed with 0. === w864 (64 bit cursoricon) === cursoricon.c:1438: Test failed: Create cursor failed. cursoricon.c:1443: Test failed: GetIconInfo() failed. cursoricon.c:1445: Test failed: Last error: 1402 cursoricon.c:1460: Test failed: DestroyCursor() failed. cursoricon.c:1462: Test failed: Last error: 1402 cursoricon.c:1595: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1602: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1603: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0x0). cursoricon.c:1604: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 1). cursoricon.c:1610: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1622: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1628: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1637: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1639: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1640: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1643: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1637: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1639: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1640: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1643: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1637: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1639: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1640: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1643: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1662: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1668: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1674: Test failed: Unexpected number of steps in cursor (0 != 1) cursoricon.c:1681: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1683: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1684: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1687: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != ~0). cursoricon.c:1704: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1716: Test failed: Create cursor failed (error = deadbeef). cursoricon.c:1722: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1733: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1735: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1736: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xc0de). cursoricon.c:1739: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1733: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1735: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1736: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xcafe). cursoricon.c:1739: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1733: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1735: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1736: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbabe). cursoricon.c:1739: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1747: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:2624: Test failed: LoadImage() failed with 0. cursoricon.c:2624: Test failed: LoadImage() failed with 0. === w1064 (64 bit cursoricon) === cursoricon.c:1438: Test failed: Create cursor failed. cursoricon.c:1443: Test failed: GetIconInfo() failed. cursoricon.c:1445: Test failed: Last error: 1402 cursoricon.c:1460: Test failed: DestroyCursor() failed. cursoricon.c:1462: Test failed: Last error: 1402 cursoricon.c:1595: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1602: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1603: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0x0). cursoricon.c:1604: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 1). cursoricon.c:1610: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1622: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1628: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1637: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1639: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1640: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1643: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1637: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1639: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1640: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1643: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1637: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1639: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1640: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1643: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1662: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1668: Test failed: Create cursor failed (error = -559038737). cursoricon.c:1674: Test failed: Unexpected number of steps in cursor (0 != 1) cursoricon.c:1681: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1683: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1684: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbeef). cursoricon.c:1687: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != ~0). cursoricon.c:1704: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:1716: Test failed: Create cursor failed (error = deadbeef). cursoricon.c:1722: Test failed: Unexpected number of steps in cursor (0 != 3) cursoricon.c:1733: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1735: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 0. cursoricon.c:1736: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xc0de). cursoricon.c:1739: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1733: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1735: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 1. cursoricon.c:1736: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xcafe). cursoricon.c:1739: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1733: Test failed: GetCursorFrameInfo() failed for cursor 0000000000000000: (0000000000000000, 0000000000000000). cursoricon.c:1474: Test failed: GetIconInfo() failed cursoricon.c:1735: Test failed: GetCursorFrameInfo() returned wrong cursor data for frame 2. cursoricon.c:1736: Test failed: GetCursorFrameInfo() unexpected param 4 value (0xdead != 0xbabe). cursoricon.c:1739: Test failed: GetCursorFrameInfo() unexpected param 5 value (57005 != 3). cursoricon.c:1747: Test failed: DestroyCursor() failed (error = 1402). cursoricon.c:2624: Test failed: LoadImage() failed with 0. cursoricon.c:2624: Test failed: LoadImage() failed with 0.

2 1

Re: [PATCH 2/5] wined3d: Implement pure integer vertex attributes.
by Henri Verbeet May 31, 2016

May 31, 2016

On 30 May 2016 at 14:24, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + if (stream_info->use_pure_integers > + && (element->format->flags[WINED3D_GL_RES_TYPE_BUFFER] & WINED3DFMT_FLAG_INTEGER)) > + { > + GL_EXTCALL(glVertexAttribIPointer(i, element->format->gl_vtx_format, element->format->gl_vtx_type, > + element->stride, element->data.addr + state->load_base_vertex_index * element->stride)); > + } > + else > + { > + GL_EXTCALL(glVertexAttribPointer(i, element->format->gl_vtx_format, element->format->gl_vtx_type, > + element->format->gl_normalized, element->stride, > + element->data.addr + state->load_base_vertex_index * element->stride)); > + } stream_info->use_pure_integers strikes me more as a property of the shader. I.e., if you replaced it with something like "state->vs && state->vs->reg_maps.shader_version.major >= 4", would anything of value be lost?

2 1

Re: [PATCH] msi: Use special errorctrl-flag for CreateService
by Hans Leidekker May 31, 2016

May 31, 2016

On Sun, 2016-05-29 at 23:07 +0200, Andreas Maier wrote: > diff --git a/dlls/msi/action.c b/dlls/msi/action.c > index 370007c..5675900 100644 > --- a/dlls/msi/action.c > +++ b/dlls/msi/action.c > @@ -5811,6 +5811,7 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) > LPWSTR name = NULL, disp = NULL, load_order = NULL, serv_name = NULL; > LPWSTR depends = NULL, pass = NULL, args = NULL, image_path = NULL; > DWORD serv_type, start_type, err_control; > + BOOL can_fail; 'is_vital' would be better. > SERVICE_DESCRIPTIONW sd = {NULL}; > UINT ret = ERROR_SUCCESS; > > @@ -5848,6 +5849,13 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) > deformat_string(package, MSI_RecordGetString(rec, 10), &pass); > deformat_string(package, MSI_RecordGetString(rec, 11), &args); > deformat_string(package, MSI_RecordGetString(rec, 13), &sd.lpDescription); > + > + /* Should the complete install fail if CreateService fails? */ > + can_fail = (err_control && msidbServiceInstallErrorControlVital >= 0); This can't work. You want: is_vital = (err_control & msidbServiceInstallErrorControlVital); > + /* Remove the msidbServiceInstallErrorControlVital-flag from err_control. > + CreateService (under Windows) would fail if not. */ > + err_control &= ~msidbServiceInstallErrorControlVital; > > /* fetch the service path */ > row = MSI_QueryGetRecord(package->db, query, comp); > @@ -5890,7 +5898,12 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) > if (!service) > { > if (GetLastError() != ERROR_SERVICE_EXISTS) > + { > ERR("Failed to create service %s: %d\n", debugstr_w(name), GetLastError()); > + if (can_fail) > + return ERROR_INSTALL_FAILURE; While you're at it, this ERR should be a WARN.

1 0

Re: [v3 1/2] d3dx9: Implement IsParameterUsed function in effect.
by Matteo Bruni May 30, 2016

May 30, 2016

2016-05-26 20:18 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > +static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_func param_func, > + void *data); > + > +static BOOL walk_param_eval_dep(struct d3dx_param_eval *param_eval, walk_parameter_dep_func param_func, > + void *data) > +{ Depending on what you will do with the other planned use, it might make sense to specialize these functions for the only use case you have at the moment, simplifying (e.g. dropping the callback) and renaming (e.g. is_param_eval_param_used() - a name that shows what you expect from these functions) them in the process.

1 0

CSMT
by Snorri Sturluson May 30, 2016

May 30, 2016

I'm experimenting with the CSMT (Commandstream multithreading) feature in wine-staging for improved graphic performance in EVE when running on Mac. My initial tests are promising in performance aspect, but unfortunately parts of the scene are flickering in and out. Has anyone seen anything similar? Anyone have any pointers on what I should look for to fix this? /Snorri Sturluson

2 1

Re: [PATCH 1/5] d3d11: Validate offsets and sizes in parse_dxbc() (AFL).
by Michael Stefaniuc May 30, 2016

May 30, 2016

Hello Henri, I see you marked a couple of patches with "(AFL)". What tool is that? Marcus mentioned it might be the AFL fuzzer http://lcamtuf.coredump.cx/afl/ thanks bye michael

1 0

Re: [PATCH 1/2] include: Add ID3D10InfoQueue interface
by Henri Verbeet May 30, 2016

May 30, 2016

As a general comment, please follow the style of the other Direct3D code. On 27 May 2016 at 10:07, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > +import "oaidl.idl"; > +import "ocidl.idl"; > +import "d3d10.idl"; This doesn't match my version of the SDK headers, what version is this supposed to match?

1 0

Re: d3dxof: Spelling fixes.
by Henri Verbeet May 30, 2016

May 30, 2016

On 29 May 2016 at 12:42, Francois Gouget <fgouget(a)free.fr> wrote: > @@ -748,7 +748,7 @@ static WORD parse_TOKEN(parse_buffer * buf) > { > buf->list_nb_elements--; > buf->list_separator = FALSE; > - /* Insert separarator between each values and since list does not accept separator at the end > + /* Insert separator between each value, and since list does not accept separator at the end > use a comma so any extra separator will generate an error */ > token = TOKEN_COMMA; > } > @@ -761,7 +761,7 @@ static WORD parse_TOKEN(parse_buffer * buf) > *(DWORD*)buf->value = value; > > buf->list_separator = TRUE; > - /* Convert list into a serie of their basic type counterpart */ > + /* Convert list into a series of their basic type counterpart */ > token = buf->list_type_float ? TOKEN_FLOAT : TOKEN_INTEGER; > } > dump_TOKEN(token); Not to hold it against the patch too much, but there's a lot more wrong there than just the spelling.

1 0

Re: imm32, user32: Create and destroy the default IME window implicitly. (try 3) (resend)
by Alexandre Julliard May 30, 2016

May 30, 2016

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > + /* create default IME window */ > + > + if (imm_register_window && needs_ime_window( hwnd )) > + { > + struct user_thread_info *thread_info = get_user_thread_info(); > + thread_info->ime_win_refs++; > + TRACE("ime_win_refs=%u\n", thread_info->ime_win_refs); > + if (thread_info->ime_win_refs == 1) > + { > + HWND win = imm_register_window( hwnd ); > + TRACE("create ime window (hwnd=%p)\n", win); > + } > + } > + > /* send WM_NCCALCSIZE */ Do you have a test showing that this is supposed to happen between WM_NCCREATE and WM_NCCALCSIZE? If not, I think it would be useful to add one. Also since the window class is in user32 now the window creation could probably happen there too. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH] kernel32/tests: Fix a leak in tests (Valgrind)
by Marvin May 29, 2016

May 29, 2016

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=23231 Your paranoid android. === w1064 (32 bit locale) === locale.c:2367: Test failed: LCMapStringEx should fail with bad locale name locale.c:2368: Test failed: unexpected error code -559038737 locale.c:2459: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4189: Test failed: IsValidLocaleName should have failed locale.c:4191: Test failed: IsValidLocaleName should have failed locale.c:4558: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4560: Test failed: For id 7, Expected IVC, got '' === w1064 (64 bit locale) === locale.c:2367: Test failed: LCMapStringEx should fail with bad locale name locale.c:2368: Test failed: unexpected error code -559038737 locale.c:2459: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4189: Test failed: IsValidLocaleName should have failed locale.c:4191: Test failed: IsValidLocaleName should have failed locale.c:4558: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4560: Test failed: For id 7, Expected IVC, got ''

1 0

Re: ddraw/tests: A spelling fix for a d3d ok() message.
by Marvin May 29, 2016

May 29, 2016

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=23226 Your paranoid android. === w864 (32 bit d3d) === d3d.c:2326: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2510: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2657: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level === w1064 (32 bit d3d) === d3d.c:2326: Test failed: Unexpected destination texture level pixels; 2031 differences at 0 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 518 differences at 1 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 138 differences at 2 level d3d.c:2326: Test failed: Unexpected destination texture level pixels; 46 differences at 3 level d3d.c:2510: Test failed: Unexpected destination texture level pixels; 257 differences d3d.c:2657: Test failed: Unexpected destination texture level pixels; 256 differences at 2 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 64 differences at 3 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 16 differences at 4 level d3d.c:2657: Test failed: Unexpected destination texture level pixels; 4 differences at 5 level

1 0

Re: d3d9/tests: Fix a trailing ok() '\n'.
by Marvin May 29, 2016

May 29, 2016

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=23225 Your paranoid android. === w864 (64 bit device) === device.c:4351: Test failed: cw is 0xf60, expected 0x7f. device.c:4360: Test failed: Callback cw is 0xf60, expected 0x7f. === w1064 (64 bit device) === device.c:4351: Test failed: cw is 0xf60, expected 0x7f. device.c:4360: Test failed: Callback cw is 0xf60, expected 0x7f.

1 0

Re: setupapi: Add stub for setupapi.dll.CM_Get_DevNode_Status
by André Hentschel May 28, 2016

May 28, 2016

Am 28.05.2016 um 15:55 schrieb Rob Walker: > Fixes https://bugs.winehq.org/show_bug.cgi?id=40691 The Ex function is wrong, have a look at msdn

1 0

AW: setupapi: Add stub for setupapi.dll.CM_Get_DevNode_Status
by siro＠das-labor.org May 28, 2016

May 28, 2016

Sent from BlackBerry Z30mcfmrrmf Originalnachricht Von: Rob Walker ef Cm f fmrc Fmrrrfmcfmf J efmf‎ Gesendet: Samstag, 28. Mai 2016 15:56 An: wine-patches R‎ Antwort an: wine-devel(a)winehq.org Betreff: setupapi: Add stub for setupapi.dll.CM_Get_DevNode_Stmcv Fcmmcfvefgermfrrfcm rrfmr Fmatus Ff 4M fete c‎ Ec Fixes https://bugs.winehq.org/show_bug.cgi?id=40691 The application launches cleanly without a backtrace dialog generated by FabCheck.exe (which calls CM_Get_DevNode_Status). Tested on Gentoo Linux (wine - without staging patches). Signed-off-by: Rob Walker <bob.mt.wya(a)gmail.com> --- dlls/cfgmgr32/cfgmgr32.spec | 4 ++-- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index f442157..b6e73ac 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -60,8 +60,8 @@ @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr long long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExA @ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExW -@ stub CM_Get_DevNode_Status -@ stub CM_Get_DevNode_Status_Ex +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status +@ stdcall CM_Get_DevNode_Status_Ex(ptr ptr long long) setupapi.CM_Get_DevNode_Status_Ex @ stdcall CM_Get_Device_IDA(ptr ptr long long) setupapi.CM_Get_Device_IDA @ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW @ stdcall CM_Get_Device_ID_ExA(ptr ptr long long ptr) setupapi.CM_Get_Device_ID_ExA diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 9bfaadd..a336fc2 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -71,8 +71,8 @@ @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr long long) @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) -@ stub CM_Get_DevNode_Status -@ stub CM_Get_DevNode_Status_Ex +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) +@ stdcall CM_Get_DevNode_Status_Ex(ptr ptr long long) @ stdcall CM_Get_Device_IDA(ptr ptr long long) @ stdcall CM_Get_Device_IDW(ptr ptr long long) @ stdcall CM_Get_Device_ID_ExA(ptr ptr long long ptr) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index ffc766b..e315ea9 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -419,6 +419,26 @@ CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyW(DEVINST dev, ULONG prop, PULO } /*********************************************************************** + * CM_Get_DevNode_Status (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Status(PULONG pulStatus, PULONG pulProblemNumber, DEVINST dnDevInst, + ULONG ulFlags) +{ + FIXME("%p %p 0x%08x 0x%08x: stub\n", pulStatus, pulProblemNumber, dnDevInst, ulFlags); + return CR_FAILURE; +} + +/*********************************************************************** + * CM_Get_DevNode_Status_Ex (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(PULONG pulStatus, PULONG pulProblemNumber, DEVINST dnDevInst, + ULONG ulFlags) +{ + FIXME("%p %p 0x%08x 0x%08x: stub\n", pulStatus, pulProblemNumber, dnDevInst, ulFlags); + return CR_FAILURE; +} + +/*********************************************************************** * CM_Enumerate_Classes (SETUPAPI.@) */ CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags) -- 2.8.3

1 0

Re: [PATCH] comctl32: Use SetRect() instead of open coding it.
by Nikolay Sivov May 28, 2016

May 28, 2016

if (dis->itemAction & ODA_FOCUS) { - rect.left = xbase + xioff - 1; - rect.right = rect.left + txtsize.cx + 2; - rect.top = dis->rcItem.top; - rect.bottom = dis->rcItem.bottom; + SetRect(&rect, xbase + xioff - 1, dis->rcItem.top, rect.left + txtsize.cx + 2, dis->rcItem.bottom); DrawFocusRect(dis->hDC, &rect); } This change is obviously wrong. I think it's better to leave this one as is.

1 0

Re: [PATCH 2/3] msctf: Added Push/Pop context tests.
by Marvin May 27, 2016

May 27, 2016

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=23219 Your paranoid android. === w1064 (32 bit inputprocessor) === inputprocessor.c:834: Test failed: Deactivation came unexpectedly

2 1

Re: [PATCH 3/3] msctf: Fixed ref counts in tests.
by Marvin May 27, 2016

May 27, 2016

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=23220 Your paranoid android. === w1064 (64 bit inputprocessor) === inputprocessor.c:834: Test failed: Deactivation came unexpectedly

1 0

Re: [v2 3/3] d3dx9: Add test for IsParameterUsed function.
by Matteo Bruni May 26, 2016

May 26, 2016

2016-05-23 12:40 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > dlls/d3dx9_36/tests/effect.c | 537 ++++++++++++++++++++++++++----------------- > 1 file changed, 321 insertions(+), 216 deletions(-) You forgot the "/tests" part of the patch subject prefix. > +static void test_effect_isparameterused(IDirect3DDevice9 *device) > +{ > + ID3DXEffect *effect; > + HRESULT hr; > + D3DXHANDLE param, tech, param_child; > + unsigned int i; > + > + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), > + NULL, NULL, 0, NULL, &effect, NULL); > + ok(hr == D3D_OK, "Got result %#x.\n", hr); > + > + tech = effect->lpVtbl->GetTechniqueByName(effect, "tech0"); > + ok(!!tech, "GetTechniqueByName failed.\n"); > + > + param = effect->lpVtbl->GetParameterByName(effect, NULL, "opvect3"); > + ok(!!param, "GetParameterByName failed.\n"); > + ok(effect->lpVtbl->IsParameterUsed(effect, param, tech), "IsParameterUsed should be TRUE for opvect3.\n"); Pretty minor but I would prefer something like ok(..., "Unexpected IsParameterUsed() result for opvect3.\n"); Same for the other IsParameterUsed() ok() calls. > + param = effect->lpVtbl->GetParameterByName(effect, NULL, "arr2"); > + ok(!!param, "GetParameterByName failed.\n"); > + ok(effect->lpVtbl->IsParameterUsed(effect, param, tech), "IsParameterUsed should be TRUE for arr2.\n"); > + for (i = 0; i < 2; ++i) > + { > + param_child = effect->lpVtbl->GetParameterElement(effect, param, i); > + ok(!!param_child, "GetParameterElement failed.\n"); > + ok(!effect->lpVtbl->IsParameterUsed(effect, param_child, tech), > + "IsParameterUsed should be FALSE for arr2[%u].\n", i); > + } You could make a small function from this and use it through. You would check that IsParameterUsed() for the parameter gives the expected result, then enumerate the parameter elements and members and check that they are all unused. BTW, is there any case where IsParameterUsed() for a child is TRUE?

2 1

Re: [v2 2/3] d3dx9: Implement IsParameterUsed function in effect.
by Matteo Bruni May 26, 2016

May 26, 2016

2016-05-23 12:40 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> It looks generally good, I only have minor "complaints" (and sorry for the delay in reviewing...). > --- > dlls/d3dx9_36/effect.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 110 insertions(+), 3 deletions(-) > > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c > index 31aa2d6..cdfc494 100644 > --- a/dlls/d3dx9_36/effect.c > +++ b/dlls/d3dx9_36/effect.c > @@ -3545,15 +3545,122 @@ static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect* iface, > return E_NOTIMPL; > } > > +typedef BOOL (*walk_parameter_dep_func)(void *data, struct d3dx_parameter *param); > +static BOOL walk_state_dep(struct d3dx_state *state, walk_parameter_dep_func param_func, > + void *data); > +static BOOL walk_param_eval_dep(struct d3dx_param_eval *param_eval, walk_parameter_dep_func param_func, > + void *data); I guess you intend to reuse all these functions down the line for some other API, what are your plans? > +static BOOL compare_param_ptr(void *param_comp, struct d3dx_parameter *param) > +{ > + return param_comp == (void *)param; I think the cast is unnecessary here. > +} > + > static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDLE parameter, D3DXHANDLE technique) > { > struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); > + unsigned int i, j; > struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); > + struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); > + struct d3dx_pass *pass; > > - FIXME("iface %p, parameter %p, technique %p stub.\n", iface, parameter, technique); > - TRACE("param %p (%s).\n", param, param ? debugstr_a(param->name) : ""); > + TRACE("iface %p, parameter %p, technique %p.\n", iface, parameter, technique); > + TRACE("param %p, name %s, tech %p.\n", param, param ? debugstr_a(param->name) : "", tech); > + if (!tech || !param) > + return FALSE; > > - return TRUE; > + for (i = 0; i < tech->pass_count; ++i) > + { > + pass = &tech->passes[i]; > + for (j = 0; j < pass->state_count; ++j) > + { > + if (walk_state_dep(&pass->states[j], compare_param_ptr, param)) > + { > + TRACE("technique %p, parameter %s, TRUE.\n", tech, param ? debugstr_a(param->name) : ""); I don't think you need to trace technique and parameter again, they are in the immediately preceding ID3DXEffectImpl_IsParameterUsed() TRACE anyway. Maybe the message could simply be "Returning TRUE.\n" or similar. > + return TRUE; > + } > + } > + } > + TRACE("technique %p, parameter %s, FALSE.\n", tech, param ? debugstr_a(param->name) : ""); Same here. > + return FALSE; > } > > static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DWORD flags) > -- > 2.5.5

2 1

How to finish implementing serial port read interval timeouts?
by Alex Henrie May 26, 2016

May 26, 2016

Alexandre, A problem with serial port read interval timeouts was brought up in bug 40540.[1] The code that you wrote [2] works great for some applications, but it does not help others. The problem is that the read interval timer needs to be started immediately if ReadFile is able to read any data from the serial port buffer, rather than waiting for more data to arrive before starting the timer. It seems to me that NtReadFile [3] needs to tell serial_queue_async [4] if it read anything from the serial port before it sent the asynchronous read request to the Wineserver. If anything was read, serial_queue_async needs to start the read interval timer. Otherwise, serial_reselect_async should be the one to start the timer like it is now. I could hack something in to achieve the desired behavior, but before I submit anything, I wanted to ask your opinion on how it should be done. -Alex [1] https://bugs.winehq.org/show_bug.cgi?id=40540 [2] https://source.winehq.org/git/wine.git/commitdiff/bc0bf9e505922b81df1c317d6… [3] https://source.winehq.org/git/wine.git/blob/698d4114677205c3e5a0df659d230fe… [4] https://source.winehq.org/git/wine.git/blob/698d4114677205c3e5a0df659d230fe…

2 1

Re: [PATCH 2/2] secur32/tests: Add AcquireCredentialsHandleW tests
by Hans Leidekker May 26, 2016

May 26, 2016

On Thu, 2016-05-26 at 08:07 +0000, Alistair Leslie-Hughes wrote: > + /* Test using the ASCI Structure. */ > + idA.User = (unsigned char*) test_user; > + idA.UserLength = strlen((char *) id.User); > + idA.Domain = (unsigned char *) workgroup; > + idA.DomainLength = strlen((char *) id.Domain); > + idA.Password = (unsigned char*) test_pass; > + idA.PasswordLength = strlen((char *) id.Password); > + idA.Flags = SEC_WINNT_AUTH_IDENTITY_ANSI; id.User, id.Domain and id.Password are Unicode strings.

1 0

Re: [PATCH 1/2] secur32: Fix handling of ANSI NTLM credentials
by Hans Leidekker May 26, 2016

May 26, 2016

On Thu, 2016-05-26 at 08:07 +0000, Alistair Leslie-Hughes wrote: > --- a/dlls/secur32/ntlm.c > +++ b/dlls/secur32/ntlm.c > @@ -174,27 +174,74 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( > if(pAuthData != NULL) > { > PSEC_WINNT_AUTH_IDENTITY_W auth_data = pAuthData; > + LPWSTR domain = NULL, user = NULL, password = NULL; > + int domain_len = 0, user_len = 0, password_len = 0; > > - TRACE("Username is %s\n", debugstr_wn(auth_data->User, auth_data->UserLength)); > - TRACE("Domain name is %s\n", debugstr_wn(auth_data->Domain, auth_data->DomainLength)); > + if (auth_data->Flags & SEC_WINNT_AUTH_IDENTITY_ANSI) > + { > + if (auth_data->DomainLength) > + { > + domain_len = MultiByteToWideChar(CP_ACP, 0, (char *)auth_data->Domain, > + auth_data->DomainLength, NULL, 0); > + domain = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * domain_len); > + MultiByteToWideChar(CP_ACP, 0, (char *)auth_data->Domain, auth_data->DomainLength, > + domain, domain_len); Please check the result of HeapAlloc calls.

1 0

Re: [PATCH 7/8] d3d11/tests: Add test for SM4 breakc instruction.
by Henri Verbeet May 25, 2016

May 25, 2016

On 25 May 2016 at 10:51, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + static const DWORD ps_breakc_nz_code[] = > + { > +#if 0 > + uint bits; > + > + float4 main() : SV_TARGET > + { > + uint counter = 0; > + > + for (uint i = 0; i < 255; ++i) > + ++counter; > + > + if (counter == 255) > + return float4(0.0f, 1.0f, 0.0f, 1.0f); > + else > + return float4(1.0f, 0.0f, 0.0f, 1.0f); > + } > +#endif It's pretty minor, but "bits" is unused. I'll also note that a sufficiently smart compiler could optimise the shader down to "return float4(0.0f, 1.0f, 0.0f, 1.0f);", although clearly the current version hasn't.

1 0

Re: [PATCH 2/2] d3d10core/test: Added DXGI_FORMAT_R16_TYPELESS D3D11_BIND_DEPTH_STENCIL test
by Henri Verbeet May 25, 2016

May 25, 2016

On 25 May 2016 at 08:06, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/d3d10core/tests/device.c | 1 + > 1 file changed, 1 insertion(+) > The subject line certainly has room for improvement, but otherwise this is fine.

1 0

Re: [PATCH 5/5] jscript: Added non-zero timezone offset tests.
by Marvin May 25, 2016

May 25, 2016

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=23195 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no trace of the test summary line or of a crash === w2008s64 (32 bit) === Found no trace of the test summary line or of a crash === w7u (32 bit) === Found no trace of the test summary line or of a crash === w7pro64 (32 bit) === Found no trace of the test summary line or of a crash === w8 (32 bit) === Found no trace of the test summary line or of a crash === w864 (32 bit) === Found no trace of the test summary line or of a crash === w1064 (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (64 bit) === Found no trace of the test summary line or of a crash === w2008s64 (64 bit) === Found no trace of the test summary line or of a crash === w7pro64 (64 bit) === Found no trace of the test summary line or of a crash === w864 (64 bit) === Found no trace of the test summary line or of a crash === w1064 (64 bit) === Found no trace of the test summary line or of a crash

1 0

Re: [PATCH 4/5] jscript: Removed obsolete FIXME comments in tests and add relevant tests.
by Marvin May 25, 2016

May 25, 2016

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=23194 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no trace of the test summary line or of a crash === w2008s64 (32 bit) === Found no trace of the test summary line or of a crash === w7u (32 bit) === Found no trace of the test summary line or of a crash === w7pro64 (32 bit) === Found no trace of the test summary line or of a crash === w8 (32 bit) === Found no trace of the test summary line or of a crash === w864 (32 bit) === Found no trace of the test summary line or of a crash === w1064 (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (64 bit) === Found no trace of the test summary line or of a crash === w2008s64 (64 bit) === Found no trace of the test summary line or of a crash === w7pro64 (64 bit) === Found no trace of the test summary line or of a crash === w864 (64 bit) === Found no trace of the test summary line or of a crash === w1064 (64 bit) === Found no trace of the test summary line or of a crash

1 0

Re: [PATCH 3/5] jscript: Added RegExp.global getter implementation.
by Marvin May 25, 2016

May 25, 2016

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=23193 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no trace of the test summary line or of a crash === w2008s64 (32 bit) === Found no trace of the test summary line or of a crash === w7u (32 bit) === Found no trace of the test summary line or of a crash === w7pro64 (32 bit) === Found no trace of the test summary line or of a crash === w8 (32 bit) === Found no trace of the test summary line or of a crash === w864 (32 bit) === Found no trace of the test summary line or of a crash === w1064 (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (64 bit) === Found no trace of the test summary line or of a crash === w2008s64 (64 bit) === Found no trace of the test summary line or of a crash === w7pro64 (64 bit) === Found no trace of the test summary line or of a crash === w864 (64 bit) === Found no trace of the test summary line or of a crash === w1064 (64 bit) === Found no trace of the test summary line or of a crash

1 0

Re: [PATCH 2/5] jscript: Added RegExp.multiline getter implementation.
by Marvin May 25, 2016

May 25, 2016

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=23192 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no trace of the test summary line or of a crash === w2008s64 (32 bit) === Found no trace of the test summary line or of a crash === w7u (32 bit) === Found no trace of the test summary line or of a crash === w7pro64 (32 bit) === Found no trace of the test summary line or of a crash === w8 (32 bit) === Found no trace of the test summary line or of a crash === w864 (32 bit) === Found no trace of the test summary line or of a crash === w1064 (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (64 bit) === Found no trace of the test summary line or of a crash === w2008s64 (64 bit) === Found no trace of the test summary line or of a crash === w7pro64 (64 bit) === Found no trace of the test summary line or of a crash === w864 (64 bit) === Found no trace of the test summary line or of a crash === w1064 (64 bit) === Found no trace of the test summary line or of a crash

1 0

Re: [PATCH 1/5] jscript: Added RegExp.ignoreCase getter implementation.
by Marvin May 25, 2016

May 25, 2016

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=23191 Your paranoid android. === wxppro (32 bit) === Found no trace of the test summary line or of a crash === w2003std (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (32 bit) === Found no trace of the test summary line or of a crash === w2008s64 (32 bit) === Found no trace of the test summary line or of a crash === w7u (32 bit) === Found no trace of the test summary line or of a crash === w7pro64 (32 bit) === Found no trace of the test summary line or of a crash === w8 (32 bit) === Found no trace of the test summary line or of a crash === w864 (32 bit) === Found no trace of the test summary line or of a crash === w1064 (32 bit) === Found no trace of the test summary line or of a crash === wvistau64 (64 bit) === Found no trace of the test summary line or of a crash === w2008s64 (64 bit) === Found no trace of the test summary line or of a crash === w7pro64 (64 bit) === Found no trace of the test summary line or of a crash === w864 (64 bit) === Found no trace of the test summary line or of a crash === w1064 (64 bit) === Found no trace of the test summary line or of a crash

1 0

Re: [PATCH 5/5] reg: Simplify syntax and help logic
by Alexandre Julliard May 25, 2016

May 25, 2016

Hugh McMaster <hugh.mcmaster(a)outlook.com> writes: > @@ -907,19 +915,16 @@ int wmain(int argc, WCHAR *argvW[]) > return 0; > } > > + option_help = (!lstrcmpW(argvW[2], slashHelpW) || !lstrcmpiW(argvW[2], slashHW)); You should check argc first. > - if (argc < 3) > - { > - output_message(STRING_INVALID_SYNTAX); > - output_message(STRING_FUNC_HELP, struprW(argvW[1])); > - return 1; > - } > - else if (argc == 3 && (!lstrcmpW(argvW[2], slashHelpW) || > - !lstrcmpiW(argvW[2], slashHW))) > + if (argc < 3 || (argc > 3 && option_help)) > + return invalid_syntax(argvW[1]); > + else if (option_help) > { This doesn't feel like much of an improvement. You could probably come up with more useful helper functions. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH] jscript: Date.parse: make "UTC"/"GMT" optional before the timezone offset
by Jacek Caban May 24, 2016

May 24, 2016

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>

1 0

Re: [PATCH 1/5] d3d9/tests: Add some tests for draw methods.
by Marvin May 24, 2016

May 24, 2016

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=23169 Your paranoid android. === w864 (64 bit device) === device.c:4351: Test failed: cw is 0xf60, expected 0x7f. device.c:4360: Test failed: Callback cw is 0xf60, expected 0x7f. === w1064 (64 bit device) === device.c:4351: Test failed: cw is 0xf60, expected 0x7f. device.c:4360: Test failed: Callback cw is 0xf60, expected 0x7f.

1 0

Re: ddraw/tests: Fix a typo in ok() messages
by Marvin May 23, 2016

May 23, 2016

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=23163 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw2) === ddraw2.c:2360: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw1) === ddraw1.c:2209: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw1) === ddraw1.c:2209: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw7) === ddraw7.c:2275: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (64 bit ddraw4) === ddraw4.c:2545: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH 1/1] libwine: Use WINEUSER as user_name, if set
by Bruno Jesus May 23, 2016

May 23, 2016

On Mon, May 9, 2016 at 1:01 AM, Lucian Poston <lucian.poston(a)gmail.com> wrote: > Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> > --- > libs/wine/config.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) Hi, can you describe some useful scenarios and programs where this could be useful?

3 2

Re: [PATCH] msacm32: Added converter for ADPCM to PCM 8 bit mono.
by Andrew Eikum May 23, 2016

May 23, 2016

Thanks for working on this. Some comments below. On Fri, May 20, 2016 at 02:54:01AM +0200, Fabian Maurer wrote: > +/*********************************************************************** > + * R8 > + * > + * Read a 8 bit sample > + */ > +static inline short R8(const unsigned char* src) > +{ > + return *src; > +} > + R8 is never used. > + nsamp_blk--; /* remove the sample in block header */ > + for (; nblock > 0; nblock--) > + { > + const unsigned char* in_src = src; > + > + /* handle header first */ > + sample = R16(src); > + stepIndex = (unsigned)*(src + 2); > + clamp_step_index(&stepIndex); > + src += 4; > + W8(dst, sample); dst += 1; > + > + for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 2) > + { > + process_nibble(*src, &stepIndex, &sample); > + W8(dst, sample); dst += 1; > + process_nibble(*src++ >> 4, &stepIndex, &sample); > + W8(dst, sample); dst += 1; > + } The indentation here and elsewhere is a mess. I suggest just using 4-space indents, no hard tabs. > + /* we have now to realign the source pointer on block */ > + src = in_src + adsi->pwfxSrc->nBlockAlign; > + } > +} > + The only difference between cvtMMima8K and cvtMMima16K is a couple of multiplications by 2 and the use of W8 instead of W16, right? I think you can have just one function and use adsi->pwfxDst->wBitsPerSample to determine sample size, to avoid so much code duplication. > - /* adpcm decoding... */ > - if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 2) > - aad->convert = cvtSSima16K; > - if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 1) > - aad->convert = cvtMMima16K; > + /* adpcm decoding... */ > + if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 2) > + aad->convert = cvtSSima16K; > + if (adsi->pwfxDst->wBitsPerSample == 16 && adsi->pwfxDst->nChannels == 1) > + aad->convert = cvtMMima16K; > + if (adsi->pwfxDst->wBitsPerSample == 8 && adsi->pwfxDst->nChannels == 1) > + aad->convert = cvtMMima8K; > + /* FIXME: Stereo support for 8bit samples*/ > + if (adsi->pwfxDst->wBitsPerSample == 8 && adsi->pwfxDst->nChannels == 2) > + goto theEnd; More bad indentation. Andrew

2 1

Re: shell32: Initialize all of wszDstPath in ISFHelper_fnCopyItems. ISFHelper_fnCopyItems.
by Alexandre Julliard May 23, 2016

May 23, 2016

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > wszDstPath is an array of WCHAR, which are wider than one byte, > so this should have been (MAXPATH+1)*sizeof(WCHAR) -- or the more > robust approach I here propose. Actually there's no reason to initialize the entire buffer. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH] wined3d: Don't accept WINED3DFMT_NULL
by Stefan Dösinger May 22, 2016

May 22, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, Thanks for catching this bug. You'll have to submit your patch with your real name, and as Aaryaman stated, a signed off line. Am 2016-05-21 um 10:46 schrieb contrib(a)maxqia.com: > - if (!surface) > + if (!surface || surface->container->resource.format->id == WINED3DFMT_NULL) > { > key->objects[idx].object = 0; > key->objects[idx].target = 0; My sense is that a D3DFMT_NULL texture should hever have a GL texture allocated, so going through the final else path should be ok - surface_get_texture_name returns 0, and context_attach_surface_fbo ignores the other fields if object is 0. Can you check if object is != 0 in the case where it fails, and see where the value comes from? I can imagine that the game manually calls PreLoad on a NULL texture as a possible cause. In our draw and clear code we're skipping the GL texture allocation for NULL resources. If the GL texture is not 0 I expect that you get a GL error before context_set_fbo_key_for_surface is run. If it is indeed 0 and something goes wrong at a later point then my reasoning above must be wrong in some way. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXQG4IAAoJEN0/YqbEcdMwQOQP/20p3/P+Ej25ABqMh83F9l1/ OlhCUM3BdjYxYaZacopDInmudVALgTLaQe28dlKMw181XSqQ1op9acwHXSvXkNKM ZyvNIsqtLxenX37ZWu0I22xqV+DFU07D4TbzrQMAlgMd9XUK2713PhNVKRuYSLpS LazcTMldRoiHOxrJF7spbAr0Nn2JPGwHV/4NA0baQdIycnVQqztFQHPmdRVSP/eO 9zOacv0AKDaPt3GXgJV0+S7QuDW9EEsXI6nkytDJpazBnfSrJRCVQIGhPiokf9ik dlFkwYKuZe/fSTgSfyxyB0IhQoaOsfM4LTSJymQpneADRLhbmPORORMdzFMW/GrN qKPgK28U2oES3u3YF6u5/2YgfrSUvJvvqPe8077Tyl60uG5W7lBWeMQ4HUDaDHgW vWcDbvX1vYh+BG5zIvvVzGvmRKoKYnnEj65iqGqpi/vcJMz2f4ff/vmAiT1y23Hl 0Y50ZUxTWXpUVi4uzoQlKgpmXbny2je0P2K12zbA13J3kJ/LxoHqefm1RW9VJ1w4 VxYD94lbk4zchO0AQwbLK83b7f8QoTZH2quqyzbgyFoAynXv0RDhQ2ZjtRN66Jh+ HmFOprGcCEmOnFs9c0JS8c9MSBVc8g1i6XmnnnccO3wyaw7vrNQbNmnqPRhkpPEV ELMYspnFGK8apZ7633Dq =QeKV -----END PGP SIGNATURE-----

3 3

Re: [PATCH 12/12] wined3d: Use ARB_fragment_coord_conventions for vpos fixups when supported.
by Henri Verbeet May 22, 2016

May 22, 2016

On 20 May 2016 at 19:56, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > if (reg_maps->vpos) > { > - if (shader->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) > + if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) > + shader_addline(buffer, "vpos = gl_FragCoord;\n"); > + else if (shader->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) Isn't it harder than that? You're dropping the y-flip completely now. I think we can actually do that regardless of ARB_fragment_coord_conventions if we have always_offscreen, but not in general. It does look like the benefits of ARB_fragment_coord_conventions are somewhat limited. I probably mixed it up with ARB_clip_control when I initially suggested it. I think that would allow us to get rid of the position fixup, but we'd have to make it a requirement for shader model 4 if we wanted to avoid patch 6/12.

2 1