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

Re: include: Fix a typo in IDirect3D9Ex method
by Henri Verbeet May 22, 2016

May 22, 2016

On 22 May 2016 at 14:30, Andrey Gusev <andrey.goosev(a)gmail.com> wrote: > - STDMETHOD(GetAdapterLUID)(THIS_ UINT Adatper, LUID *pLUID) PURE; > + STDMETHOD(GetAdapterLUID)(THIS_ UINT Adapter, LUID *pLUID) PURE; If you're touching it anyway, "Adapter" => "adapter" and "pLUID" => "luid".

1 0

Re: [PATCH v2 09/12] d3d10core/tests: Add a geometry shader test.
by Henri Verbeet May 22, 2016

May 22, 2016

On 20 May 2016 at 19:56, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > +#if 0 > +struct gs_data > +{ > + float4 pos : SV_POSITION; > + float4 color : COLOR; > +}; > + > +[maxvertexcount(4)] > +void main(point struct gs_data vin[1], inout TriangleStream<gs_data> vout) > +{ > + float offset = 0.2 * vin[0].pos.w; > + gs_data v; > + > + v.color = vin[0].color; > + > + v.pos = float4(vin[0].pos.x - offset, vin[0].pos.y - offset, vin[0].pos.z, 1.0); > + vout.Append(v); > + v.pos = float4(vin[0].pos.x - offset, vin[0].pos.y + offset, vin[0].pos.z, 1.0); > + vout.Append(v); > + v.pos = float4(vin[0].pos.x + offset, vin[0].pos.y - offset, vin[0].pos.z, 1.0); > + vout.Append(v); > + v.pos = float4(vin[0].pos.x + offset, vin[0].pos.y + offset, vin[0].pos.z, 1.0); > + vout.Append(v); > +} > +#endif > + static const DWORD gs_code[] = > + { > + 0x43425844, 0x5c14d638, 0x1089a334, 0x4103d097, 0x218e3173, 0x00000001, 0x00000428, 0x00000005, > + 0x00000034, 0x0000008c, 0x000000e0, 0x00000134, 0x000003ac, 0x46454452, 0x00000050, 0x00000000, > + 0x00000000, 0x00000000, 0x0000001c, 0x47530400, 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, > + 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x2e302e30, > + 0x31303031, 0x36312e31, 0x00343833, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, > + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, > + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, > + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, > + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, > + 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x00000270, 0x00020040, > + 0x0000009c, 0x05000061, 0x002010f2, 0x00000001, 0x00000000, 0x00000001, 0x0400005f, 0x002010f2, > + 0x00000001, 0x00000001, 0x02000068, 0x00000001, 0x0100085d, 0x0100285c, 0x04000067, 0x001020f2, > + 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x0200005e, 0x00000004, 0x0f000032, > + 0x00100032, 0x00000000, 0x80201ff6, 0x00000041, 0x00000000, 0x00000000, 0x00004002, 0x3e4ccccd, > + 0x3e4ccccd, 0x00000000, 0x00000000, 0x00201046, 0x00000000, 0x00000000, 0x05000036, 0x00102032, > + 0x00000000, 0x00100046, 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0020102a, 0x00000000, > + 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2, > + 0x00000001, 0x00201e46, 0x00000000, 0x00000001, 0x01000013, 0x05000036, 0x00102012, 0x00000000, > + 0x0010000a, 0x00000000, 0x0e000032, 0x00100052, 0x00000000, 0x00201ff6, 0x00000000, 0x00000000, > + 0x00004002, 0x3e4ccccd, 0x00000000, 0x3e4ccccd, 0x00000000, 0x00201106, 0x00000000, 0x00000000, > + 0x05000036, 0x00102022, 0x00000000, 0x0010002a, 0x00000000, 0x06000036, 0x00102042, 0x00000000, > + 0x0020102a, 0x00000000, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, > + 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, 0x00000000, 0x00000001, 0x01000013, 0x05000036, > + 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x05000036, 0x00102022, 0x00000000, 0x0010001a, > + 0x00000000, 0x06000036, 0x00102042, 0x00000000, 0x0020102a, 0x00000000, 0x00000000, 0x05000036, > + 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, > + 0x00000000, 0x00000001, 0x01000013, 0x05000036, 0x00102032, 0x00000000, 0x00100086, 0x00000000, > + 0x06000036, 0x00102042, 0x00000000, 0x0020102a, 0x00000000, 0x00000000, 0x05000036, 0x00102082, > + 0x00000000, 0x00004001, 0x3f800000, 0x06000036, 0x001020f2, 0x00000001, 0x00201e46, 0x00000000, > + 0x00000001, 0x01000013, 0x0100003e, 0x54415453, 0x00000074, 0x00000019, 0x00000001, 0x00000000, > + 0x00000004, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, > + 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000005, 0x00000004, 0x00000000, > + 0x00000000, 0x00000000, > + }; That looks like it still contains debug info.

1 0

Re: [PATCH v3 01/12] wined3d: Alpha test emulation for core profile contexts.
by Henri Verbeet May 22, 2016

May 22, 2016

On 20 May 2016 at 19:55, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > +static void shader_glsl_generate_alpha_test(struct wined3d_string_buffer *buffer, > + const struct wined3d_gl_info *gl_info, enum wined3d_cmp_func alpha_func) > +{ > + /* alpha_func is the PASS condition, not the DISCARD condition. Instead of > + * flipping all the operators here, just negate the comparison below. */ > + static const char * const comparison_operator[] = > + { > + "", /* WINED3D_CMP_NEVER */ > + "<", /* WINED3D_CMP_LESS */ > + "==", /* WINED3D_CMP_EQUAL */ > + "<=", /* WINED3D_CMP_LESSEQUAL */ > + ">", /* WINED3D_CMP_GREATER */ > + "!=", /* WINED3D_CMP_NOTEQUAL */ > + ">=", /* WINED3D_CMP_GREATEREQUAL */ > + "" /* WINED3D_CMP_ALWAYS */ > + }; > + > + if (alpha_func == WINED3D_CMP_ALWAYS) > + return; > + > + if (alpha_func != WINED3D_CMP_NEVER) > + shader_addline(buffer, "if (!(%s[0].a %s alpha_test_ref))\n", > + get_fragment_output(gl_info), comparison_operator[alpha_func - WINED3D_CMP_NEVER]); > + shader_addline(buffer, " discard;\n"); > +} I'm calling this good enough for a start. In case of WINED3D_CMP_EQUAL and WINED3D_CMP_NOTEQUAL in particular there may come a point where we'll have to do a range check like for color keys though.

1 0

Re: [PATCH] d3d11: Honor render state FrontCounterClockwise.
by Józef Kucia May 22, 2016

May 22, 2016

On Sun, May 22, 2016 at 1:32 PM, Johannes Brandstätter <jbrandst(a)2ds.eu> wrote: > This fixes geometry flickering in Unigine's Valley and Heaven bechmarks. > The user interface would at least show some parts, but using this patch > it completly vanishes as well as the credits image upon closing. > > Signed-off-by: Johannes Brandstätter <jbrandst(a)2ds.eu> > --- > dlls/d3d11/device.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c > index 7fb28ac..d54f81f 100644 > --- a/dlls/d3d11/device.c > +++ b/dlls/d3d11/device.c > @@ -808,10 +808,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon > > desc = &device->rasterizer_state->desc; > wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, desc->FillMode); > - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, desc->CullMode); > /* glFrontFace() */ > if (desc->FrontCounterClockwise) > - FIXME("Ignoring FrontCounterClockwise %#x.\n", desc->FrontCounterClockwise); > + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, WINED3D_CULL_CCW); > + else > + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, desc->CullMode); > /* OpenGL style depth bias. */ > if (desc->DepthBias || desc->SlopeScaledDepthBias) > FIXME("Ignoring depth bias.\n"); > -- > 2.8.1 > > > This patch doesn't make sense. The FrontCounterClockwise field needs to be mapped to glFrontFace(). The best what you can get using the current wined3d API is to invert the cull mode when FrontCounterClockwise is true. if (desc->FrontCounterClockwise) { switch (desc->CullMode) { default: case D3D11_CULL_NONE: cullmode = WINED3D_CULL_NONE; break; case D3D11_CULL_FRONT: cullmode = WINED3D_CULL_CCW; break; case D3D11_CULL_BACK: cullmode = WINED3D_CULL_CW; break; } This still is not a proper solution because the front face property can be read in shaders, see the SV_IsFrontFace system-value semantic. The proper solution is to introduce a rasterizer state object in wined3d API. You could probably start with a rasterizer state object containing a single property for FrontCounterClockwise.

1 0

Re: [PATCH resend] wined3d: Don't accept WINED3DFMT_NULL
by Aaryaman Vasishta May 21, 2016

May 21, 2016

Hi, Thanks for the contribution! I noticed that you're missing something: On Sat, May 21, 2016 at 4:14 PM, Maxqia <contrib(a)maxqia.com> wrote: > This fixes https://bugs.winehq.org/show_bug.cgi?id=40624 > --- > dlls/wined3d/context.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > You need to sign-off on this patch. FWIW, Use git commit --amend -s to add a signed-off by field to your patch and resend it. Cheers, Aaryaman

1 0

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

May 21, 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=23146 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/6] wined3d: Add wined3d creation flag for selecting unbound resource color.
by Henri Verbeet May 20, 2016

May 20, 2016

On 20 May 2016 at 11:47, Józef Kucia <jkucia(a)codeweavers.com> wrote: > diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h > index 8429bea..79ac440 100644 > --- a/include/wine/wined3d.h > +++ b/include/wine/wined3d.h > @@ -1237,6 +1237,7 @@ enum wined3d_display_rotation > #define WINED3D_PIXEL_CENTER_INTEGER 0x00000080 > #define WINED3D_LEGACY_FFP_LIGHTING 0x00000100 > #define WINED3D_SRGB_READ_WRITE_CONTROL 0x00000200 > +#define WINED3D_UNBOUND_RESOURCE_COLOR_ZERO 0x00000400 > We generally try to make the "reasonable" behaviours the defaults, and only have flags for extra functionality or more quirky behaviours. In this case it's perhaps arguable what the default should be, but all zeroes seems like the more reasonable default to me.

1 0

Re: dnsapi: add DnsGetCacheDataTable stub
by Sebastian Lackner May 20, 2016

May 20, 2016

On 20.05.2016 06:27, Austin English wrote: > +/****************************************************************************** > + * DnsGetCacheDataTable [DNSAPI.@] > + * > + */ > +DNS_GET_CACHE_DATA_TABLE WINAPI DnsGetCacheDataTable( DNSCACHEENTRY *cache ) I'm pretty sure it should not return a function pointer here. Also, you might want to move the struct to header file so that it can be used in tests later.

1 0

Re: ntdll: add WinSqmEndSession/WinSqmStartSession stubs
by Michael Müller May 20, 2016

May 20, 2016

Am 20.05.2016 um 06:15 schrieb Austin English: > +NTSTATUS WINAPI WinSqmStartSession(GUID *sessionguid, DWORD sessionid, DWORD unknown1) > +{ Your usage example indicates that the function returns a HANDLE and not a NTSTATUS value. Returning INVALID_HANDLE_VALUE would therefore be the most suitable value for a stub. The linked code also handles this case. > +@ stdcall WinSqmEndSession(ptr) The parameter is a handle, so you should mark it as long instead of ptr. Btw, the remaining functions seems to be sorted alphabetically, so you also might want to correctly insert this function.

1 0

Re: [PATCH] mshtml/tests: Use todo_wine_if() in tests.
by Jacek Caban May 20, 2016

May 20, 2016

Hi Hadrien, Please resend with your sign off. Other than that, the patch looks good. Thanks, Jacek

1 0

Re: [PATCH 3/7] d3drm: Implement IDirect3DRMTexture{2-3}_InitFromImage. (v6 resend)
by Henri Verbeet May 20, 2016

May 20, 2016

On 19 May 2016 at 12:55, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index 583dbec..1f57058 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -1705,6 +1705,11 @@ static void test_Texture(void) > TRUE, 2 * sizeof(DWORD), NULL, NULL, > 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000, 0, NULL > }, *d3drm_img = NULL; > + D3DRMIMAGE testimg = { Formatting. (Yeah, the existing test is like that as well.) > + 0, 0, 0, 0, 0, > + TRUE, 0, (void *)0xcafebabe, NULL, > + 0x000000ff, 0x0000ff00, 0x00ff0000, 0, 0, NULL > + }; > DWORD pixel[4] = { 20000, 30000, 10000, 0 }; > DWORD size; > CHAR cname[64] = {0}; > @@ -1853,22 +1858,95 @@ static void test_Texture(void) > ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4); > > /* InitFromImage tests */ > - d3drm_img = NULL; > + > + /* Tests for validation of D3DRMIMAGE struct */ > + hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2, (void **)&texture2); Line length. > + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %x).\n", hr); It's not a huge issue, but %#x, please.

1 0

Re: [PATCH 2/7] d3drm: Introduce d3drm_texture_destroy helper (v4 resend).
by Henri Verbeet May 20, 2016

May 20, 2016

On 19 May 2016 at 12:55, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > @@ -44,6 +44,14 @@ static inline struct d3drm_texture *impl_from_IDirect3DRMTexture3(IDirect3DRMTex > return CONTAINING_RECORD(iface, struct d3drm_texture, IDirect3DRMTexture3_iface); > } > > +static void d3drm_texture_destroy(struct d3drm_texture *texture) > +{ > + TRACE("texture %p is being destroyed.\n", texture); > +···· Trailing whitespace.

1 0

Re: [PATCH 1/7] d3drm: Use CreateObject in IDirect3DRM*::LoadTexture. (v3)
by Henri Verbeet May 20, 2016

May 20, 2016

On 19 May 2016 at 13:00, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > static HRESULT WINAPI d3drm1_LoadTexture(IDirect3DRM *iface, > const char *filename, IDirect3DRMTexture **texture) > { > - struct d3drm_texture *object; > HRESULT hr; > > FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture); > > - if (FAILED(hr = d3drm_texture_create(&object))) > + if (FAILED(hr = IDirect3DRM_CreateObject(iface, &CLSID_CDirect3DRMTexture, NULL, > + &IID_IDirect3DRMTexture, (void **)texture))) > return hr; > > - *texture = &object->IDirect3DRMTexture_iface; > - > return D3DRM_OK; > } Actually, after thinking it through for a bit, I don't think you need to use CreateObject() here at all. You can just add an extra parameter to d3drm_texture_create() in patch 3/7 and avoid going through all the COM stuff. (Of course at that point you'll also notice load_mesh_data() is broken...) > @@ -857,17 +855,19 @@ static HRESULT WINAPI d3drm2_CreateUserVisual(IDirect3DRM2 *iface, > static HRESULT WINAPI d3drm2_LoadTexture(IDirect3DRM2 *iface, > const char *filename, IDirect3DRMTexture2 **texture) > { > - struct d3drm_texture *object; > + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); > + IDirect3DRMTexture3 *texture3; > HRESULT hr; > > FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture); > > - if (FAILED(hr = d3drm_texture_create(&object))) > + if (FAILED(hr = IDirect3DRM3_LoadTexture(&d3drm->IDirect3DRM3_iface, filename, &texture3))) > return hr; This change isn't necessarily wrong, but it's something different from what the rest of the patch does. Note that if things were ordered so that the newest version of the interface came first, you could call d3drm3_LoadTexture() here directly. The file is the way it is of course, but perhaps we should consider fixing that at some point.

1 0

Re: [PATCH] dwrite: Resolve BNs and embedding and override formatting characters to preceding level
by Marvin May 20, 2016

May 20, 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=23120 Your paranoid android. === wvistau64 (32 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w2008s64 (32 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w7u (32 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w7pro64 (32 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w8 (32 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w864 (32 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w1064 (32 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === wvistau64 (64 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w2008s64 (64 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w7pro64 (64 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w864 (64 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w1064 (64 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057

1 0

Re: dnsapi: add DnsGetCacheDataTable stub
by Hans Leidekker May 20, 2016

May 20, 2016

On Thu, 2016-05-19 at 23:27 -0500, Austin English wrote: > +typedef int (*DNS_GET_CACHE_DATA_TABLE)(PDNSCACHEENTRY); You don't need this. > +DNS_GET_CACHE_DATA_TABLE WINAPI DnsGetCacheDataTable( DNSCACHEENTRY *cache ) > +{ > + FIXME( "(%p) stub\n", cache); > + return ERROR_SUCCESS; > +} It should probably return DNS_STATUS and the parameter might actually be DNSCACHEENTRY **. Some tests would be helpful here.

1 0

Re: user32: Also change rcUpdate when scrolling by more than the window size.
by Marvin May 19, 2016

May 19, 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=23115 Your paranoid android. === wvistau64 (32 bit win) === win.c:8207: Test failed: WindowFromPoint returned 00040170, expected 000201FC win.c:8214: Test failed: WindowFromPoint returned 000601BA, expected 000301FA

1 0

[PATCH] local debugging help
by Fabian Maurer May 19, 2016

May 19, 2016

Please ignore my patch 122481 dubbed "local debugging help", I sent that by mistake.

1 0

Re: [PATCH 07/11] wininet: Removed maximum URL length assumption from get_proxy_autoconfig_url.
by Sebastian Lackner May 19, 2016

May 19, 2016

On 17.05.2016 19:16, Jacek Caban wrote: > Also use correct encoding. > > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > --- > dlls/wininet/internet.c | 33 +++++++++++++++++++-------------- > 1 file changed, 19 insertions(+), 14 deletions(-) > > > > 0007-wininet-Removed-maximum-URL-length-assumption-from-ge.diff > > > diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c > index 371c3d0..78bea7c 100644 > --- a/dlls/wininet/internet.c > +++ b/dlls/wininet/internet.c > @@ -2307,13 +2307,14 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, > return res == ERROR_SUCCESS; > } > > -static BOOL get_proxy_autoconfig_url( char *buf, DWORD buflen ) > +static WCHAR *get_proxy_autoconfig_url(void) > { > #if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 > > CFDictionaryRef settings = CFNetworkCopySystemProxySettings(); > + WCHAR *ret = NULL; > + SIZE_T len; > const void *ref; > - BOOL ret = FALSE; > > if (!settings) return FALSE; > > @@ -2322,16 +2323,20 @@ static BOOL get_proxy_autoconfig_url( char *buf, DWORD buflen ) > CFRelease( settings ); > return FALSE; You forgot to replace FALSE -> NULL at a couple of places in this patch.

2 1

Re: [PATCH 1/7] d3drm: Use CreateObject in IDirect3DRM*::LoadTexture. (v2)
by Aaryaman Vasishta May 19, 2016

May 19, 2016

On Thu, May 19, 2016 at 4:25 PM, Aaryaman Vasishta < jem456.vasishta(a)gmail.com> wrote: > v2: Thunk 2->3 for LoadTexture. > > Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> > --- > dlls/d3drm/d3drm.c | 21 +++++++++------------ > 1 file changed, 9 insertions(+), 12 deletions(-) > > diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c > index edb46df..bc16b6f 100644 > --- a/dlls/d3drm/d3drm.c > +++ b/dlls/d3drm/d3drm.c > @@ -413,16 +413,13 @@ static HRESULT WINAPI > d3drm1_CreateUserVisual(IDirect3DRM *iface, > static HRESULT WINAPI d3drm1_LoadTexture(IDirect3DRM *iface, > const char *filename, IDirect3DRMTexture **texture) > { > - struct d3drm_texture *object; > HRESULT hr; > > FIXME("iface %p, filename %s, texture %p stub!\n", iface, > debugstr_a(filename), texture); > > - if (FAILED(hr = d3drm_texture_create(&object))) > + if (FAILED(hr = IDirect3DRM_CreateObject(iface, > &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture, (void > **)texture))) > return hr; > This line is too long, I'm resending v3 of this patch. Cheers, Aaryaman

1 0

Re: [v2 PATCH] user32/scroll: Move GetDCEx to stop DC leak
by Alexandre Julliard May 19, 2016

May 19, 2016

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/user32/scroll.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Since it can't happen there's no leak to fix. You could replace the return by an assert(0) if you want to make it clearer. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v3 PATCH] wined3d: Add missing WINED3DUSAGE flags to debug_d3dusage
by Henri Verbeet May 19, 2016

May 19, 2016

On 18 May 2016 at 12:33, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > const char *debug_d3dusage(DWORD usage) > { > - char buf[333]; > + char buf[512]; 512 is insufficient, how did you arrive at that number?

1 0

Re: configure: Fix a typo in comments
by Nikolay Sivov May 19, 2016

May 19, 2016

On 19.05.2016 12:13, Andrey Gusev wrote: > > --- a/configure > +++ b/configure > @@ -371,7 +371,7 @@ as_fn_executable_p () > # ---------------------- > # Append the text in VALUE to the end of the definition contained in VAR. Take > # advantage of any shell optimizations that allow amortized linear growth over > -# repeated appends, instead of the typical quadratic growth present in naive > +# repeated appends, instead of the typical quadratic growth present in native > # implementations. This is a generated part, if it had a typo it should be fixed in tools, not in Wine. For this patch, comment looks correct to me as it is.

1 0

Re: [PATCH 4/4] d3d9: Allow to pass NULL pointers to IDirect3DDevice9_GetRenderTargetData().
by Marvin May 19, 2016

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

1 0

Re: comctl32: Fix a typo in comment
by Huw Davies May 19, 2016

May 19, 2016

On Thu, May 19, 2016 at 11:42:11AM +0300, Andrey Gusev wrote: > diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c > index 8c99ad0..ba4cec3 100644 > --- a/dlls/comctl32/trackbar.c > +++ b/dlls/comctl32/trackbar.c > @@ -920,7 +920,7 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst) > > GetClientRect (infoPtr->hwndSelf, &rcClient); > > - /* try to render offscreen, if we fail, carrry onscreen */ > + /* try to render offscreen, if we fail, carry onscreen */ > hdc = CreateCompatibleDC(hdcDst); > if (hdc) { > hOffScreenBmp = CreateCompatibleBitmap(hdcDst, rcClient.right, rcClient.bottom); Apart from the fact that this comment still doesn't make sense (it should probably have an additional 'on'), I'm not sure why we have this fallback in the first place. If the dc or bitmap creation fails then we've probably got bigger problems. I'd suggest just returning early in those cases (with the appropriate cleanup). Huw.

1 0

Re: user32: Fix a typo in a comment
by Ken Thomases May 18, 2016

May 18, 2016

On May 18, 2016, at 2:46 PM, Frédéric Delanoy <frederic.delanoy(a)gmail.com> wrote: > > Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> > --- > dlls/user32/combo.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c > index c9b969f..143d992 100644 > --- a/dlls/user32/combo.c > +++ b/dlls/user32/combo.c > @@ -416,7 +416,7 @@ static void CBCalcPlacement( > > /* > * In the case of a dropdown, the popup listbox is offset to the right. > - * so, we want to make sure it's flush with the right side of the > + * so, we want to make sure it's flushed with the right side of the > * combobox > */ > if( CB_GETTYPE(lphc) == CBS_DROPDOWN ) The original is actually correct English. "Flush" is an adjective meaning aligned. Cheers, Ken

1 0

Re: [PATCH 1/5] usp10: Resolve BNs and explicit formatting characters to the preceding level in resolveResolved().
by Marvin May 18, 2016

May 18, 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=23083 Your paranoid android. === w1064 (32 bit usp10) === usp10.c:1433: Test failed: 0: uJustification incorrect (0) usp10.c:1433: Test failed: 1: uJustification incorrect (0) usp10.c:1433: Test failed: 2: uJustification incorrect (0) usp10.c:1433: Test failed: 3: uJustification incorrect (0) usp10.c:1433: Test failed: 4: uJustification incorrect (0) usp10.c:1433: Test failed: 5: uJustification incorrect (0) usp10.c:1433: Test failed: 6: uJustification incorrect (0) usp10.c:1433: Test failed: 7: uJustification incorrect (0) usp10.c:1433: Test failed: 8: uJustification incorrect (0) usp10.c:1433: Test failed: 9: uJustification incorrect (0) usp10.c:1449: Test failed: 3: uJustification incorrect (0) usp10.c:1449: Test failed: 5: fDiacritic incorrect (1) usp10.c:1449: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1449: Test failed: 15: fDiacritic incorrect (1) usp10.c:1449: Test failed: 15: fZeroWidth incorrect (1) === w1064 (64 bit usp10) === usp10.c:1433: Test failed: 0: uJustification incorrect (0) usp10.c:1433: Test failed: 1: uJustification incorrect (0) usp10.c:1433: Test failed: 2: uJustification incorrect (0) usp10.c:1433: Test failed: 3: uJustification incorrect (0) usp10.c:1433: Test failed: 4: uJustification incorrect (0) usp10.c:1433: Test failed: 5: uJustification incorrect (0) usp10.c:1433: Test failed: 6: uJustification incorrect (0) usp10.c:1433: Test failed: 7: uJustification incorrect (0) usp10.c:1433: Test failed: 8: uJustification incorrect (0) usp10.c:1433: Test failed: 9: uJustification incorrect (0) usp10.c:1449: Test failed: 3: uJustification incorrect (0) usp10.c:1449: Test failed: 5: fDiacritic incorrect (1) usp10.c:1449: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1449: Test failed: 15: fDiacritic incorrect (1) usp10.c:1449: Test failed: 15: fZeroWidth incorrect (1)

2 1

Re: [PATCH 3/6] wininet: Use compose_request_url in INTERNET_OPTION_URL implementation.
by Marvin May 18, 2016

May 18, 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=23082 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH] msvcr120/tests: Add critical section test.(resend)
by Piotr Caban May 18, 2016

May 18, 2016

Hi, On 05/18/16 15:25, YongHao Hu wrote: > +#if _MSVCR_VER >= 110 _MSVCR_VER is not defined in tests. (I didn't look on rest of the patch yet) Thanks, Piotr

1 0

Re: [PATCH] msvcr120/tests: Add critical section test.(resend)
by Marvin May 18, 2016

May 18, 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=23080 Your paranoid android. === w2008s64 (64 bit msvcr120) === Found no trace of the test summary line or of a crash

1 0

Re: [PATCH] user32/scroll: Move GetDCEx to stop DC leak
by Alexandre Julliard May 18, 2016

May 18, 2016

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > @@ -920,9 +919,12 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) > break; > > default: > + WARN("unsupported msg %s\n", SPY_GetMsgName(msg,hwnd)); > return; /* Should never happen */ > } > > + hdc = GetDCEx( hwnd, 0, DCX_CACHE | ((nBar == SB_CTL) ? 0 : DCX_WINDOW)); The function is only called for the messages it supports, so there's no need to add handling for other cases. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: ddraw/tests: Fix a typo in an ok() call
by Marvin May 18, 2016

May 18, 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=23075 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: [PATCH] oleaut32 todo: formatting 0 with "000#"
by Marvin May 18, 2016

May 18, 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=23070 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH] msxml3/tests: Simplify refcount checks
by Marvin May 17, 2016

May 17, 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=23060 Your paranoid android. === w1064 (32 bit httpreq) === httpreq.c:1628: Test failed: got 0x80070057, expected 0x00000000 === w1064 (64 bit httpreq) === httpreq.c:1628: Test failed: got 0x80070057, expected 0x00000000

1 0

Re: [PATCH v2 3/6] ddraw: Forbid creating flippable cubemaps.
by Henri Verbeet May 17, 2016

May 17, 2016

On 13 May 2016 at 13:55, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) > + { > + WARN("Tried to create a flippable cubemap.\n"); > + HeapFree(GetProcessHeap(), 0, texture); > + return DDERR_INVALIDPARAMS; > + } > + > if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) > { > FIXME("Flippable textures not implemented.\n"); > @@ -5748,6 +5755,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ > { > WARN("Tried to specify a back buffer count for a non-flippable surface.\n"); > HeapFree(GetProcessHeap(), 0, texture); > + if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) > + return DDERR_INVALIDPARAMS; > return DDERR_INVALIDCAPS; > } I suppose it ends up being more or less the same thing, but to me this looks like DDSD_BACKBUFFERCOUNT being disallowed for cubemaps rather than DDSCAPS_FLIP.

1 0

Re: [PATCH] kernel32/nls: Added SSHORTESTDAYNAME* entries
by Henri Verbeet May 17, 2016

May 17, 2016

> diff --git a/dlls/kernel32/nls/urd.nls b/dlls/kernel32/nls/urd.nls > index 65b57f7..9ce5689 100644 > --- a/dlls/kernel32/nls/urd.nls > +++ b/dlls/kernel32/nls/urd.nls > @@ -134,6 +134,13 @@ STRINGTABLE LANGUAGE LANG_URDU, SUBLANG_URDU_PAKISTAN > LOCALE_SPOSITIVESIGN "" > LOCALE_SSCRIPTS "Arab;" > LOCALE_SSHORTDATE "dd/MM/yyyy" > + LOCALE_SSHORTESTDAYNAME1 "پ" > + LOCALE_SSHORTESTDAYNAME2 "م" > + LOCALE_SSHORTESTDAYNAME3 "ب" > + LOCALE_SSHORTESTDAYNAME4 "ج" > + LOCALE_SSHORTESTDAYNAME5 "ج" I'm no expert on Urdu, but it seems suspicious to have the same abbreviation for two different days.

2 1

Re: [PATCH 2/2] include: Use inline functions for common RECT helpers.
by Alexandre Julliard May 17, 2016

May 17, 2016

Michael Stefaniuc <mstefani(a)redhat.de> writes: > Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> > --- > dlls/user32/tests/uitools.c | 1 + > dlls/user32/uitools.c | 1 + > include/winuser.h | 38 +++++++++++++++++++++++++++++++++++--- > 3 files changed, 37 insertions(+), 3 deletions(-) Not really your fault, but this is causing some warnings here: gcc -m32 -c -o device.o device.c -I. -I../../include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe \ -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers \ -Wstrict-prototypes -Wtype-limits -Wunused-but-set-parameter -Wvla -Wwrite-strings -Wpointer-arith \ -Wlogical-op -gdwarf-2 -gstrict-dwarf -fno-omit-frame-pointer -Werror -g -O2 -fno-diagnostics-show-caret device.c: In function ‘device_clear_render_targets’: device.c:393:9: error: ‘ds_rect.bottom’ may be used uninitialized in this function [-Werror=maybe-uninitialized] device.c:393:9: error: ‘ds_rect.right’ may be used uninitialized in this function [-Werror=maybe-uninitialized] cc1: all warnings being treated as errors make: *** [device.o] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 1

Re: [PATCH] winex11: Send SC_KEYMENU on managed windows.
by Marvin May 17, 2016

May 17, 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=23042 Your paranoid android. === wvistau64 (32 bit msg) === msg.c:11039: Test failed: expected PeekMessage to return FALSE, got 1 === w864 (32 bit msg) === msg.c:6484: Test failed: Update region shouldn't be empty msg.c:6718: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6720: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6490: Test failed: Regions are different msg.c:6490: Test failed: Regions are different msg.c:6490: Test failed: Regions are different === w1064 (32 bit msg) === msg.c:6484: Test failed: Update region shouldn't be empty msg.c:6718: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6720: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6490: Test failed: Regions are different msg.c:6490: Test failed: Regions are different msg.c:6490: Test failed: Regions are different msg.c:7440: Test failed: destroy child on thread exit: 3: the msg sequence is not complete: expected 0000 - actual 001a === w1064 (64 bit msg) === msg.c:6484: Test failed: Update region shouldn't be empty msg.c:6718: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6720: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6490: Test failed: Regions are different msg.c:6490: Test failed: Regions are different msg.c:6490: Test failed: Regions are different msg.c:7440: Test failed: destroy child on thread exit: 3: the msg sequence is not complete: expected 0000 - actual 001a

1 0

Re: [PATCH 11/11] wininet: Added test of cookies with long URL.
by Marvin May 16, 2016

May 16, 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=23039 Your paranoid android. === w1064 (32 bit internet) === internet.c:1092: Test failed: expected ret == 0, got 87 === w1064 (64 bit internet) === internet.c:1092: Test failed: expected ret == 0, got 87

1 0

Re: [PATCH 02/11] wininet: Fixed handing NULL buffer in InternetReadFileExW.
by Marvin May 16, 2016

May 16, 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=23038 Your paranoid android. === w864 (64 bit http) === http.c:5241: Test failed: HttpSendRequest failed: 8

1 0

Re: [PATCH 01/11] wininet: Fixed internet tests on win10.
by Marvin May 16, 2016

May 16, 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=23037 Your paranoid android. === w1064 (32 bit internet) === internet.c:1074: Test failed: expected ret == 0, got 87 === w1064 (64 bit internet) === internet.c:1074: Test failed: expected ret == 0, got 87

1 0

Re: [PATCH 6/7] d3drm: Partially implement IDirect3DRMTexture*::InitFromFile. (v3)
by Stefan Dösinger May 16, 2016

May 16, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-05-13 um 22:21 schrieb Aaryaman Vasishta: > static HRESULT WINAPI d3drm_texture1_InitFromFile(IDirect3DRMTexture *iface, const char *filename) > { > - FIXME("iface %p, filename %s stub!\n", iface, debugstr_a(filename)); > + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); > + D3DRMIMAGE *image; > + HRESULT hr; > > - return E_NOTIMPL; > + TRACE("iface %p, filename %s.\n", iface, debugstr_a(filename)); > + > + if (texture->image) > + { > + /* d3drm intentionally leaks a reference IDirect3DRM if texture is already initialized. */ > + IDirect3DRM_AddRef(texture->d3drm); > + return D3DRMERR_BADOBJECT; > + } > + if (FAILED(hr = d3drm_texture_load(texture, filename, FALSE, &image))) > + return hr; > + > + hr = IDirect3DRMTexture3_InitFromImage(&texture->IDirect3DRMTexture3_iface, image); I think you forgot to remove the extra check here :-) . (https://www.winehq.org/pipermail/wine-devel/2016-May/113212.html) > - IDirect3DRM_AddRef(texture->d3drm); > + if (texture->d3drm) > + IDirect3DRM_AddRef(texture->d3drm); This if check looks like it is an accidental leftover from before you reordered patch 1 too. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXOiCxAAoJEN0/YqbEcdMwpSkP/ifqzhJnNWI0ZRqMQa9/rOUg MgbEJEGLC2xFFWwGWHL3biuf+ibZOkmmAPBUznU9+E70ekzegvvRGquc2HTHP0y+ 43PXR5A9TXFoOEDvkIiYF6KGiTyEoC2K3N3KzMabm5Iz8ReDLqvF4MmwlggTBsWQ RS1hbDgP4KKSGRECJFKmI3F0WJk52T2TtPjVXmHrYLYgSKQ8QmCj0BSCGBLFlqWF uQtH6sM/dI4w6LiqjG83JAlt7VmKZ5hrWJIY7IakF7vZLIOwni4x9+CJyh9b6dc6 gAY27wojqiBtk7x8weQXG2o3kToCL0+dpHTcLNKuJy80tPZa5QVTmXNF5B+Eqtjf 7u3ZWOOEKGdVKKDaztnoEtxlXHfZDn4ST+2pdUhbOW9X5gcxxSQWyour9FnD/fGj i/OkgvM4gszu1RwcZlpbUY8CkyboOJyziVSUxt7cnW2gHDXY0FwhQMvfpHoPSxiq +UmsuTFwopoJzK30kh4kwmJSkBGtackb2nA0i34tb69ixIAfQy55cqYTgozEzclh +2T/wa5q2DhOlHBScjPlUu46j3AqI8B0mtfrLuURB2UWzxKOZpZYtVsTLErVSFqT 745Z+bPbYWGETBJYx+BVxFE4bpGpwqJTI5IH/jITDv4qmNxoLgHKeYnxU9dwayhx PcvR3vpmTKw/C2N84u+n =3f/e -----END PGP SIGNATURE-----

2 1

Re: [PATCH 4/7] d3drm: Implement IDirect3DRM*_CreateTexture. (v6)
by Stefan Dösinger May 16, 2016

May 16, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-05-13 um 22:21 schrieb Aaryaman Vasishta: > - *texture = &object->IDirect3DRMTexture3_iface; > + if (FAILED(IDirect3DRMTexture3_InitFromImage(*texture, image))) > + { > + IDirect3DRMTexture3_Release(*texture); > + return D3DRMERR_BADVALUE; > + } This will leave a non-NULL pointer stored in *texture, which is most likely wrong. Please extend your tests to check for this. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXOgmWAAoJEN0/YqbEcdMw4PQP/1Ri28V/xXTb90aSLvHLi3QQ 47cGk1M2C9/z3bj9kZUKfYGADCJVgdf52bcFQUb4yBBEkxtY2RrAYMAY2218l0PB QcNpkFhVEnauRII4CsoLShByEtKLfLo6sqflABUKoBfK9BELjz4QpDEUiMvyKHXk vRtesZBK16VaFnwbpQekFb233/sID9oCLitNzIXJ6ntNLEvGYCgfWmaT9VdXNGvv zvnQfWh8ayXbJGulUclNectDqA2ww+vRxHmC5dkgAVGHsfxOp1dY3Z45b6CNPksE iyxn6A3mAVgy6hhjbm8AjgN/8agkvwDRhL2774ZdemBCL1FAq39kFobSNju4evAx YH6r8bFiN1y3814hxMe74Zk2oXJsCN4ZL5ZxOOabJHdWHCxTDWU8yikordtlfdF2 q1Va/GVi9aKLXiWhfNjusP5bG/DY8hK14dRe570eWP2U9fKbDaFLc8iVhwxZRs0N 3EJddB286uvLjAGEbGEe5iSPTuTKCER0L/8rRTliczYt5rJeX+2955bTZu3ek5Uu XjmOzBP5374IiBDai1dhHX2EwTD3UxisN2olDUfFGee8DkDjzowKt5hFBYVT7x8j hDU7rkRKht2loO7vKEqX+uM9twplIWVIIcQWY2ZXT7gZ8x07bCqVa8eHhKy63cGp J1YMc8wPUUENq+iVYZ1W =sm0l -----END PGP SIGNATURE-----

2 1

Re: [PATCH 1/7] d3drm: Use CreateObject in IDirect3DRM*::LoadTexture.
by Stefan Dösinger May 16, 2016

May 16, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-05-13 um 22:21 schrieb Aaryaman Vasishta: > - if (FAILED(hr = d3drm_texture_create(&object))) > + if (FAILED(hr = IDirect3DRM_CreateObject(iface, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture, (void **)texture))) This line is fairly long and could profit from a line break IMHO. > - if (FAILED(hr = d3drm_texture_create(&object))) > + if (FAILED(hr = IDirect3DRM2_CreateObject(iface, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2, (void **)texture))) I think here you could already put the 2 -> 3 thunk from patch 7. It's a minor issue though. Overall I'd say wait if Henri has any other comments before resending. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXOh4hAAoJEN0/YqbEcdMwjeMP+wRn3MLnrgMlB85ZfafutK3g wml22BVCwzHvHjbPKFhqbrPUIjS4z/PcZ133djjS6dysL2sBfMK4zxKKqVDRp+0V RRphWDVQehg6dpfaSBEWcEqLvy5eUXbQlGQ9eWGT40++OVZQ/C5rmIDmPt1/pX/H f2vnjCIKhGaiDS7M29fnakQckr3sjGuQAJXJuAJqyUHyPo4Edu340UJQweLCOIXX kDXTAJM0ep17xln5FD8RDjukRc1SRg3P+/PzM1PsED0St/talBFdN16DnfNwzOWO XbE+wlTQnMxeu2ycY5gyTdFxWUq/lqCYL6Z0KYTwBUHIqryz0K2XPnb1fGZUTuKk B+XsxtOJYkcvJEoStUuEQSwsTEGipuOStj+fSFEoYnOHBqZWl6midQGWrU6Xyd39 TlOFMew6IldjQBgbfEbu9dSGr3xPi4jD5dPfThdTZFTMOmD++K2APKGmhVmc5bon QOJ+M6uJJQvnyCqnik63uNQcX5UlBf5Guq1op2K6Zbm3V1neipVBQj8+8mUr7weV HQDccTIyzErBJuEdSDoCuw4womh+UGcFbusWpRjP5lRaa57X9poZO58Ofw61f/HZ Tqm9bbnuVjwk4hLa8z5wVbd2bQAytkK0ISFP9bnmGIVk8SZIwuU471pqunF6UMsF Yl/jFc8sJKIeRAe+bGq2 =LMsi -----END PGP SIGNATURE-----

1 0

Re: [PATCH] qedit: Don't require SampleGrabber to be playing to call callback
by Marvin May 16, 2016

May 16, 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=23019 Your paranoid android. === w2008s64 (32 bit mediadet) === mediadet.c:148: Test failed: CoCreateInstance failed: 80040154 mediadet: unhandled exception c0000005 at 00401A5F === w2008s64 (64 bit mediadet) === mediadet.c:148: Test failed: CoCreateInstance failed: 80040154 mediadet: unhandled exception c0000005 at 0000000000401995

2 1

Re: kernel32/tests: Fix a typo in comment
by Marvin May 16, 2016

May 16, 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=23020 Your paranoid android. === w864 (64 bit process) === process.c:1192: Test failed: expected 1, got 0 process.c:1195: Test failed: Child process termination process.c:1199: Test failed: Toolhelp:cntUsage expected 0, but got 1 process.c:1200: Test failed: Toolhelp:th32DefaultHeapID expected 0, but got 1 process.c:1201: Test failed: Toolhelp:th32ModuleID expected 0, but got 1 process.c:1202: Test failed: Toolhelp:th32ParentProcessID expected 280, but got 0 process.c:1204: Test failed: Toolhelp:dwFlags expected 0, but got 1

1 0

Rebased command stream patches
by Stefan Dösinger May 15, 2016

May 15, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, In the past weeks I have rebased my command stream patches on top of Henri's recent texture restructuring work. They can be found as usual on https://github.com/stefand/wine/ (git repo URL is https://github.com/stefand/wine.git) They are essentially the same state as the last ones, just rebased, and thus the surface and volume handling code is quite a bit changed. The new patches do a better, but not perfect, job at keeping the tests working during the rework. The tests pass with CSMT enabled, except for a d3d10/11 test. I will hopefully investigate this in the next days and push an updated version. Performance seems to be generally unchanged. That's a good sign I guess. I tested a number of games, but I am sure there are some regressions compared to the last CSMT version. I probably will not do another rebase of this magnitude. Keeping up with the ongoing d3d work requires a lot of time, and I'd rather spend the time I have available for hacking on Wine on smaller tasks that I have a better chance of completing and upstreaming. Though if you run into problems I am interested in getting feedback. I just don't promise that I'll reply or fix anything :-) . Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXOMITAAoJEN0/YqbEcdMwmfwP/j0VXX+0YnFsZCG/u7Bt5Dth LLpbYrUeWcGnS9ddHppdb9VkU0sbrqnXo6j/PA/tXMdli2CFHsC8/DFoPi/A4dKE 5kLDagUE6CPsFOxjmCXdgvdb7yqK2EToz/0sBGJEHXl2tN/B+/yPpIGUfHz5prWb KE1M4w065Wxe39opuV3EkYKk1rFT4wrLUKaH7iBl2rVN4hqvZ4rxS2wFFLFlZk9S E6CR3SDC/HhGZU4ZPpdkMWk3pYi/YDDg1yRESd7PJZNHSVRAo7wgQu4KkQM2aGnG onqmpN6Prw06MKjixSdVF4jcQcPeYiY1dYVB61IslbR9Y7FRSmrxsGnrY51sqTCi pGITgl9loktSbA+hxouMa4xhaz80v6iVvpRkjR1vqnOGZxBRJUC9U9eqRAbdzoZs KhujuEVR74DQ54U5dZbX6+Z682WbPPPqdFMXZrRt0eR3y1TfOhC38Zky3ri7X7/p BleoWUQ4Hut4LK/Td0hhxxkPvfjOGvm6Jm+JPZO4+JnBVZl13WyWat1OOSSOrM2u jcZ7IPkBqeVFu7G1j3YCMoc0hQfa5nPzoHIcbb6DSKythILKSdBZ79KnKzlprvOy pc9EtJFlmSvFi/JiBSJTJuHeUyA9mokmkYtrBsEvh3KBXU/zHtRCLI7qlDpj9yZb +GAQ6tGuZmoUlW0VIwrN =pE16 -----END PGP SIGNATURE-----

1 0

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

May 15, 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=23014 Your paranoid android. === 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: [PATCH] kernel32: Set C3_KASHIDA only for kashida character
by Marvin May 15, 2016

May 15, 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=23006 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:4556: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4558: 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:4556: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4558: Test failed: For id 7, Expected IVC, got ''

2 1

Re: [PATCH] kernel32: Handle NULL locale name in IsValidLocaleName()
by Austin English May 15, 2016

May 15, 2016

On May 15, 2016 2:30 AM, "Nikolay Sivov" <nsivov(a)codeweavers.com> wrote: > > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > dlls/kernel32/locale.c | 3 +++ > dlls/kernel32/tests/locale.c | 2 ++ > 2 files changed, 5 insertions(+) > > diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c > index a69e76f..636187f 100644 > --- a/dlls/kernel32/locale.c > +++ b/dlls/kernel32/locale.c > @@ -2656,6 +2656,9 @@ BOOL WINAPI IsValidLocaleName( LPCWSTR locale ) > { > struct locale_name locale_name; > > + if (!locale) > + return FALSE; > + > /* string parsing */ > parse_locale_name( locale, &locale_name ); > > diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c > index 20f52d2..70944a2 100644 > --- a/dlls/kernel32/tests/locale.c > +++ b/dlls/kernel32/tests/locale.c > @@ -4179,6 +4179,8 @@ static void test_IsValidLocaleName(void) > ok(!ret, "IsValidLocaleName should have failed\n"); > ret = pIsValidLocaleName(LOCALE_NAME_INVARIANT); > ok(ret, "IsValidLocaleName failed\n"); > + ret = pIsValidLocaleName(NULL); > + ok(!ret, "IsValidLocaleName should have failed\n"); > } > > static void test_CompareStringOrdinal(void) > -- > 2.8.1 Hi Nikolay, I'm just curious what application this fixes? Or was this something you found while writing tests for something else?

2 1

Re: [PATCH] kernel32: Handle NULL locale name in IsValidLocaleName()
by Marvin May 15, 2016

May 15, 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=23005 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:4177: Test failed: IsValidLocaleName should have failed locale.c:4179: Test failed: IsValidLocaleName should have failed locale.c:4546: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4548: 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:4177: Test failed: IsValidLocaleName should have failed locale.c:4179: Test failed: IsValidLocaleName should have failed locale.c:4546: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4548: Test failed: For id 7, Expected IVC, got ''

1 0

Re: [4/5] imm32/tests: Add tests for life cycle of default IME window. (try 2)
by Alexandre Julliard May 14, 2016

May 14, 2016

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > Try 2: > Mark Vista's behaviour as broken and add visible window tests. > > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/imm32/tests/imm32.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 59 insertions(+) It fails here: ../../../tools/runtest -q -P wine -T ../../.. -M imm32.dll -p imm32_test.exe.so imm32 && touch imm32.ok imm32.c:895: Test failed: Expected IME window existence imm32.c:895: Test failed: Expected IME window existence make: *** [imm32.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/5] wininet: Fixed internet tests on win10.
by Marvin May 13, 2016

May 13, 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=22984 Your paranoid android. === wxppro (32 bit internet) === internet.c:1063: Test failed: expected ret == 0, got 234 internet.c:1076: Test failed: expected ret == 0, got 87 === w2003std (32 bit internet) === internet.c:1063: Test failed: expected ret == 0, got 234 internet.c:1076: Test failed: expected ret == 0, got 87 === wvistau64 (32 bit internet) === internet.c:1063: Test failed: expected ret == 0, got 234 internet.c:1076: Test failed: expected ret == 0, got 87 === w2008s64 (32 bit internet) === internet.c:1063: Test failed: expected ret == 0, got 234 internet.c:1076: Test failed: expected ret == 0, got 87 === w7u (32 bit internet) === internet.c:1063: Test failed: expected ret == 0, got 234 internet.c:1076: Test failed: expected ret == 0, got 87 === w7pro64 (32 bit internet) === internet.c:1063: Test failed: expected ret == 0, got 234 internet.c:1076: Test failed: expected ret == 0, got 87 === w8 (32 bit internet) === internet.c:1063: Test failed: expected ret == 0, got 234 internet.c:1076: Test failed: expected ret == 0, got 87 === w864 (32 bit internet) === internet.c:1063: Test failed: expected ret == 0, got 234 internet.c:1076: Test failed: expected ret == 0, got 87 === wvistau64 (64 bit internet) === internet.c:1063: Test failed: expected ret == 0, got 234 internet.c:1076: Test failed: expected ret == 0, got 87 === w2008s64 (64 bit internet) === internet.c:1063: Test failed: expected ret == 0, got 234 internet.c:1076: Test failed: expected ret == 0, got 87 === w7pro64 (64 bit internet) === internet.c:1063: Test failed: expected ret == 0, got 234 internet.c:1076: Test failed: expected ret == 0, got 87 === w864 (64 bit internet) === internet.c:1063: Test failed: expected ret == 0, got 234 internet.c:1076: Test failed: expected ret == 0, got 87

2 1

Re: [PATCH 2/5] wininet: Fixed http tests on win10.
by Marvin May 13, 2016

May 13, 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=22983 Your paranoid android. === wxppro (32 bit http) === http.c:1593: Test failed: HttpSendRequest failed: 12029 http.c:1597: Test failed: InternetQueryOptionA(INTERNET_OPTION_DATAFILE_NAME) failed: 12028 http.c:1600: Test failed: InternetLockRequestFile returned: 0(2) http.c:1601: Test failed: lock == NULL http.c:1604: Test failed: InternetLockRequestFile returned: 0(2) http: unhandled exception c0000005 at 3D955BDA

1 0

Re: [PATCH 1/5] wininet: Updated winehq.org cert info.
by Marvin May 13, 2016

May 13, 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=22982 Your paranoid android. === w1064 (32 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2413: Test failed: count was wrong http.c:2414: Test failed: http data wrong, got: Garbage: Header http.c:3077: Test failed: HttpAddRequestHeaders succeeded http.c:3078: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3083: Test failed: code = 200, expected 400 http.c:3083: Test failed: unexpected status code 200, expected 400 http.c:3083: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 === w1064 (64 bit http) === http.c:6030: http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2413: Test failed: count was wrong http.c:2414: Test failed: http data wrong, got: Garbage: Header http.c:3077: Test failed: HttpAddRequestHeaders succeeded http.c:3078: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3083: Test failed: code = 200, expected 400 http.c:3083: Test failed: unexpected status code 200, expected 400 http.c:3083: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

1 0

Re: [PATCH 5/6] d3drm: Partially implement IDirect3DRMTexture*::InitFromFile. (v2 resend)
by Henri Verbeet May 13, 2016

May 13, 2016

On 11 May 2016 at 21:19, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > @@ -47,7 +48,7 @@ static inline struct d3drm_texture *impl_from_IDirect3DRMTexture3(IDirect3DRMTex > void d3drm_texture_destroy(struct d3drm_texture *texture) > { > d3drm_object_cleanup((IDirect3DRMObject*)&texture->IDirect3DRMTexture3_iface, &texture->obj); > - if (texture->image) > + if (texture->image && texture->d3drm) > IDirect3DRM_Release(texture->d3drm); I guess this and the similar change in d3drm_texture3_InitFromImage() are because LoadTexture() still uses d3drm_texture_create(). Is there any reason you can't make the changes to LoadTexture() before this patch? (Or even as the first patch in the series, for that matter?) > +static void CDECL destroy_image_callback(IDirect3DRMObject *obj, void *arg) > +{ > + struct d3drm_texture *texture = arg; > + HeapFree(GetProcessHeap(), 0, texture->image->buffer1); > + HeapFree(GetProcessHeap(), 0, texture->image); > +} I suppose it doesn't matter much, but passing the image would be sufficient. > + if (bpl * h > UINT_MAX) > + { > + hr = D3DRMERR_BADALLOC; > + goto cleanup; > + } Did you test this does what you think it does? > + if (image) > + { > + if (image->buffer1) > + HeapFree(GetProcessHeap(), 0, image->buffer1); > + HeapFree(GetProcessHeap(), 0, image); > + } HeapFree() handles NULL pointers fine. I.e.: if (image) HeapFree(GetProcessHeap(), 0, image->buffer1); HeapFree(GetProcessHeap(), 0, image); > static HRESULT WINAPI d3drm_texture1_InitFromFile(IDirect3DRMTexture *iface, const char *filename) > { > - FIXME("iface %p, filename %s stub!\n", iface, debugstr_a(filename)); > + struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); > + D3DRMIMAGE *image; > + HRESULT hr; > > - return E_NOTIMPL; > + TRACE("iface %p, filename %s.\n", iface, debugstr_a(filename)); > + > + if (texture->image) > + { > + /* d3drm intentionally leaks a reference IDirect3DRM if texture is already initialized. */ > + IDirect3DRM_AddRef(texture->d3drm); > + return D3DRMERR_BADOBJECT; > + } > + if (FAILED(hr = d3drm_texture_load(texture, filename, FALSE, &image))) > + return hr; > + > + hr = IDirect3DRMTexture3_InitFromImage(&texture->IDirect3DRMTexture3_iface, image); > + > + return hr; > } This looks a bit awkward. Why do you need the "if (texture->image)" block? InitFromImage() should leak the d3drm reference fine on its own.

2 4

Re: [PATCH 3/6] d3drm: Implement IDirect3DRM*_CreateTexture. (v5)
by Henri Verbeet May 13, 2016

May 13, 2016

On 11 May 2016 at 21:19, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > + if (FAILED(hr = IDirect3DRMTexture3_InitFromImage(*texture, image))) > + { > + IDirect3DRMTexture3_Release(*texture); > + return D3DRMERR_BADVALUE; > + } You're not using the value of "hr", so the assignment is redundant.

2 1

Re: [PATCH v2 4/6] ddraw/tests: Test creating flippable cubemaps.
by Marvin May 13, 2016

May 13, 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=22978 Your paranoid android. === 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}.

1 0

Re: [PATCH 1/6] d3drm: Introduce d3drm_texture_destroy helper (v3).
by Henri Verbeet May 13, 2016

May 13, 2016

On 11 May 2016 at 21:19, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > +void d3drm_texture_destroy(struct d3drm_texture *texture) This should be static. I.e.: +static void d3drm_texture_destroy(struct d3drm_texture *texture) Adding static prevents the function from being available outside of texture.c. (See also http://port70.net/~nsz/c/c89/c89-draft.html#3.1.2.2 for the details, although "The C Programming Language" by Kernighan & Ritchie makes for better reading.) Applies to d3drm_validate_image() as well.

1 0

Re: mciavi32: Propely handle Heap[Re]Alloc failure (resend)
by Kirill Smirnov May 12, 2016

May 12, 2016

On 12.05.2016 22:39, Andrew Eikum wrote: > Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> > > Thanks. Just wondering, does this fix an issue in an application, or > you just happened to notice it? > > Andrew Just playing with clang static analyzer, nothing more :-) Unlike other patches in the series of clang-spotted, this one looked a little bit deeper than just "dereference of NULL pointer". That's why I did not stamped it with "spotted by clang" mark. -- Kirill

1 0

[PATCH] Use todo_wine_if() in tests.
by Hugh McMaster May 12, 2016

May 12, 2016

On Thursday, 12 May 2016, 04:55:54 CDT, Jacek Caban wrote: >Commit message should specify the module. > >Other than that: Signed-off-by: Jacek Caban <jacek at codeweavers.com> It's not clear which patch you're signing off on. They both have the same subject line. Hadrien (CC'd) also needs to add a Signed-Off-by line to his patches.

1 0

Re: dbghelp: add EnumerateLoadedModulesEx/EnumerateLoadedModulesExW stubs
by Nikolay Sivov May 12, 2016

May 12, 2016

On 12.05.2016 0:32, Austin English wrote: > For https://bugs.winehq.org/show_bug.cgi?id=40614 > > @ stdcall EnumerateLoadedModules(long ptr ptr) > @ stdcall EnumerateLoadedModules64(long ptr ptr) > -@ stub EnumerateLoadedModulesEx > -@ stub EnumerateLoadedModulesExW > +@ stdcall EnumerateLoadedModulesEx(ptr ptr ptr) > +@ stdcall EnumerateLoadedModulesExW(ptr ptr ptr) For historical reasons first argument is usually made 'long', not that it matters. > +BOOL WINAPI EnumerateLoadedModulesExW(HANDLE process, > + PENUMLOADED_MODULES_CALLBACK64 callback, > + void *context) This prototype is wrong. Are those calls any different from EnumerateLoadedModulesW64/EnumerateLoadedModules64? It looks like we could simply forward to existing calls. Also please update headers.

1 0

Re: [PATCH] Use todo_wine_if() in tests.
by Jacek Caban May 12, 2016

May 12, 2016

Commit message should specify the module. Other than that: Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>

1 0

Re: [PATCH 3/6] d3drm: Implement IDirect3DRM*_CreateTexture. (v4)
by Henri Verbeet May 11, 2016

May 11, 2016

On 11 May 2016 at 16:43, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > @@ -1152,15 +1156,21 @@ static HRESULT WINAPI d3drm3_CreateAnimationSet(IDirect3DRM3 *iface, IDirect3DRM > static HRESULT WINAPI d3drm3_CreateTexture(IDirect3DRM3 *iface, > D3DRMIMAGE *image, IDirect3DRMTexture3 **texture) > { > - struct d3drm_texture *object; > HRESULT hr; > > - FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, texture); > + TRACE("iface %p, image %p, texture %p.\n", iface, image, texture); > > - if (FAILED(hr = d3drm_texture_create(&object))) > + if (!d3drm_validate_image(image)) > + return D3DRMERR_BADVALUE; Why do you need the d3drm_validate_image() call? Purely for the error code?

2 5

Re: [PATCH 2/6] d3drm: Implement IDirect3DRMTexture{2-3}_InitFromImage. (v4)
by Henri Verbeet May 11, 2016

May 11, 2016

On 11 May 2016 at 16:43, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > @@ -46,10 +46,27 @@ static inline struct d3drm_texture *impl_from_IDirect3DRMTexture3(IDirect3DRMTex > > void d3drm_texture_destroy(struct d3drm_texture *texture) > { > + if (texture->image) > + IDirect3DRM_Release(texture->d3drm); > d3drm_object_cleanup((IDirect3DRMObject*)&texture->IDirect3DRMTexture3_iface, &texture->obj); It's somewhat hypothetical, but it seems safer to release the IDirect3DRM interface after the d3drm_object_cleanup() call, in case there are callbacks that (implicitly) depend on the Direct3DRM object still existing. (E.g., is it possible to call IDirect3DRMObject2::GetDirect3DRM() on textures?) > HeapFree(GetProcessHeap(), 0, texture); > } > > +BOOL d3drm_validate_image(D3DRMIMAGE *image) > +{ > + if (!image > + || !image->red_mask > + || !image->green_mask > + || !image->blue_mask > + || !image->buffer1 > + || !(image->rgb || (image->palette && image->palette_size))) > + { > + return FALSE; > + } > + > + return TRUE; > +} Like d3drm_texture_destroy(), you're not using this outside texture.c.

2 1

Re: [PATCH 1/6] d3drm: Introduce d3drm_texture_destroy helper (v2).
by Henri Verbeet May 11, 2016

May 11, 2016

On 11 May 2016 at 16:43, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > +void d3drm_texture_destroy(struct d3drm_texture *texture) > +{ > + d3drm_object_cleanup((IDirect3DRMObject*)&texture->IDirect3DRMTexture3_iface, &texture->obj); > + HeapFree(GetProcessHeap(), 0, texture); > +} You're not using d3drm_texture_destroy() outside texture.c, so you don't need the declaration in d3drm_private.h, and this should just be static.

2 1

Re: [PATCH] wined3d: Add missing WINED3DUSAGE flags to debug_d3dusage
by Henri Verbeet May 11, 2016

May 11, 2016

On 11 May 2016 at 08:15, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/wined3d/utils.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c > index e2e3ec9..69c5b3b 100644 > --- a/dlls/wined3d/utils.c > +++ b/dlls/wined3d/utils.c > @@ -3572,9 +3572,23 @@ const char *debug_d3dusage(DWORD usage) > WINED3DUSAGE_TO_STR(WINED3DUSAGE_NPATCHES); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_DYNAMIC); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_AUTOGENMIPMAP); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_RESTRICTED_CONTENT); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_RESTRICT_SHARED_RESOURCE_DRIVER); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_RESTRICT_SHARED_RESOURCE); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_DMAP); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_TEXTAPI); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_LEGACY_CUBEMAP); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_TEXTURE); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_OWNDC); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_STATICDECL); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_OVERLAY); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_LEGACYBUMPMAP); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_FILTER); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_SRGBREAD); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_SRGBWRITE); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_VERTEXTEXTURE); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_WRAPANDMIP); > #undef WINED3DUSAGE_TO_STR > if (usage) FIXME("Unrecognized usage flag(s) %#x\n", usage); > That's better, but now buf[] is too small to contain all the flags, and debug_d3dusagequery() is redundant.

1 0

Re: [PATCH] d3d11/test: Test for ID3D11InfoQueue interface
by Henri Verbeet May 11, 2016

May 11, 2016

On 11 May 2016 at 08:15, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > @@ -6795,7 +6802,8 @@ static void test_getdc(void) > START_TEST(d3d11) > { > test_create_device(); > - test_device_interfaces(); > + test_device_interfaces(0); > + test_device_interfaces(D3D11_CREATE_DEVICE_DEBUG); I think it makes more sense to just handle this inside test_device_interfaces(). Note that d3d10 has an equivalent interface.

1 0

Re: [PATCH] Use todo_wine_if() in tests.
by Marvin May 11, 2016

May 11, 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=22950 Your paranoid android. === w8 (32 bit capture) === capture.c:181: Test failed: Position 1015 expected 0 capture.c:231: Test failed: Position 2167 expected 1463 capture.c:262: Test failed: Position 2167 expected 1463 capture.c:324: Test failed: Position 3255 gap 1344 capture.c:348: Test failed: Position 4343 expected 3703 capture.c:373: Test failed: Position 4791 expected 4151 === w864 (32 bit capture) === capture.c:181: Test failed: Position 1079 expected 0 capture.c:231: Test failed: Position 2167 expected 1527 capture.c:262: Test failed: Position 2167 expected 1527 capture.c:324: Test failed: Position 3127 gap 1152 capture.c:328: Test failed: GCP 13888 vs. BufferSize 21996 capture.c:348: Test failed: Position 4215 expected 3575 capture.c:349: Test failed: flags 1 capture.c:373: Test failed: Position 5303 expected 4023 capture.c:374: Test failed: flags 1 === w1064 (32 bit capture) === capture.c:181: Test failed: Position 1143 expected 0 capture.c:231: Test failed: Position 2167 expected 1591 capture.c:262: Test failed: Position 2167 expected 1591 capture.c:324: Test failed: Position 4215 gap 2176 capture.c:328: Test failed: GCP 11648 vs. BufferSize 21996 capture.c:348: Test failed: Position 5303 expected 4663 capture.c:349: Test failed: flags 1 capture.c:373: Test failed: Position 6391 expected 5111 capture.c:374: Test failed: flags 1 === w1064 (64 bit capture) === capture.c:181: Test failed: Position 1143 expected 0 capture.c:231: Test failed: Position 2167 expected 1591 capture.c:262: Test failed: Position 2167 expected 1591 capture.c:324: Test failed: Position 4215 gap 2176 capture.c:328: Test failed: GCP 11648 vs. BufferSize 21996 capture.c:348: Test failed: Position 5303 expected 4663 capture.c:349: Test failed: flags 1 capture.c:373: Test failed: Position 7287 expected 5111 capture.c:374: Test failed: flags 1

1 0

Re: fusion: Clear all memory for the pathname in test_assembly_name_props_line.
by André Hentschel May 10, 2016

May 10, 2016

Am 08.05.2016 um 22:09 schrieb Gerald Pfeifer: > str is declared WCHAR str[MAX_PATH], so we need to account for > the size of WCHAR when clearing memory. > > Gerald > > Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> > --- > dlls/fusion/tests/asmname.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c > index e415c3a9..8962630 100644 > --- a/dlls/fusion/tests/asmname.c > +++ b/dlls/fusion/tests/asmname.c > @@ -358,7 +358,7 @@ static void test_assembly_name_props_line(IAssemblyName *name, > to_widechar(expect, vals[i].val); > > size = MAX_PATH; > - ZeroMemory(str, MAX_PATH); > + ZeroMemory(str, MAX_PATH*sizeof(WCHAR)); why not sizeof(str)?

1 0

Re: [v2] riched20: Properly clear all of a buffer of type WCHAR. WCHAR.
by Huw Davies May 10, 2016

May 10, 2016

On 10 May 2016, at 12:53, Gerald Pfeifer <gerald(a)pfeifer.com> wrote: > > Per Huw's preference (when I offered an alternate approach), this now > properly clears this buffer (which is of type WCHAR, so MAX_BUF_LEN > fell short). > > Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> > --- > dlls/riched20/tests/editor.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c > index ae9c0a5..3678b95 100644 > --- a/dlls/riched20/tests/editor.c > +++ b/dlls/riched20/tests/editor.c > @@ -3822,7 +3822,7 @@ static void test_EM_SETTEXTEX(void) > getText.flags = GT_DEFAULT; > getText.lpDefaultChar = NULL; > getText.lpUsedDefChar = NULL; > - memset(buf, 0, MAX_BUF_LEN); > + memset(buf, 0, sizeof buf); > SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); > ok(lstrcmpW(buf, TestItem2) == 0, > "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n”); I’d prefer "sizeof(buf)", since that’s what’s used further down this function (and in most other places in Wine for that matter). Huw. > @@ -3837,7 +3837,7 @@ static void test_EM_SETTEXTEX(void) > getText.flags = GT_USECRLF; /* <-- asking for CR -> CRLF conversion */ > getText.lpDefaultChar = NULL; > getText.lpUsedDefChar = NULL; > - memset(buf, 0, MAX_BUF_LEN); > + memset(buf, 0, sizeof buf); > SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); > ok(lstrcmpW(buf, TestItem1) == 0, > "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); > -- > 2.8.1

1 0

Re: [5/5] imm32, user32: Create and destroy the default IME window implicitly. (try 2)
by Aric Stewart May 10, 2016

May 10, 2016

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> On 5/8/16 6:25 AM, Akihiro Sagawa wrote: > Fix bug 34056. > Try 2: > - Another approach to maintain default IME windows --- no more using hooks. > - Add an internal API to imm32 as thread_data is still there. > - User32 keeps reference counter in TEB block and call the new API > when creating/destroying a window. > > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/imm32/imm.c | 34 ++++++++++++++++++++++++++-------- > dlls/imm32/imm32.spec | 1 + > dlls/imm32/tests/imm32.c | 4 ++-- > dlls/user32/misc.c | 4 +++- > dlls/user32/user_private.h | 2 ++ > dlls/user32/win.c | 40 ++++++++++++++++++++++++++++++++++++++++ > 6 files changed, 74 insertions(+), 11 deletions(-) > > > >

1 0

Re: [4/5] imm32/tests: Add tests for life cycle of default IME window. (try 2)
by Aric Stewart May 10, 2016

May 10, 2016

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> On 5/8/16 6:25 AM, Akihiro Sagawa wrote: > Try 2: > Mark Vista's behaviour as broken and add visible window tests. > > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/imm32/tests/imm32.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 59 insertions(+) > > > >

1 0

Re: [3/5] imm32: Use wine_dbgstr_rect() and wine_dbgstr_point() in traces.
by Aric Stewart May 10, 2016

May 10, 2016

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> On 5/8/16 6:25 AM, Akihiro Sagawa wrote: > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/imm32/imm.c | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) > > > >

1 0

Re: [2/5] imm32: Avoid null pointer dereference in trace.
by Aric Stewart May 10, 2016

May 10, 2016

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> On 5/8/16 6:25 AM, Akihiro Sagawa wrote: > Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> > --- > dlls/imm32/imm.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > > >

1 0

Re: ddraw/tests: Fix a typo in ok() message (v2)
by Marvin May 9, 2016

May 9, 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=22928 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

No commits for a few days
by Alexandre Julliard May 9, 2016

May 9, 2016

Folks, I'll be out for a few days, so there won't be any commits this week. Feel free to still submit patches, I'll try to catch up next weekend, and release 1.9.10 early the week of May 16. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH v2] riched20: Don't call UpdateWindow after setting the background color.
by Huw Davies May 9, 2016

May 9, 2016

On Sun, May 08, 2016 at 11:42:59PM -0600, Alex Henrie wrote: > diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c > index ae9c0a5..a780c2e 100644 > --- a/dlls/riched20/tests/editor.c > +++ b/dlls/riched20/tests/editor.c > @@ -8337,6 +8337,18 @@ static void test_rtf_specials(void) > DestroyWindow( edit ); > } > > +static void test_background(void) > +{ > + HWND hwndRichEdit = new_richedit(NULL); > + > + /* set the background color to black */ > + ValidateRect(hwndRichEdit, NULL); > + SendMessageA(hwndRichEdit, EM_SETBKGNDCOLOR, FALSE, RGB(0, 0, 0)); > + ok(GetUpdateRect(hwndRichEdit, NULL, FALSE), "Update rectangle is empty!\n"); > + > + DestroyWindow(hwndRichEdit); > +} > + Please don't add an extra line after the function. > > START_TEST( editor ) > { Otherwise, this looks good. Thanks, Huw.

2 2

Re: [PATCH 1/6] d3drm: Introduce d3drm_texture_destroy helper (resend).
by Henri Verbeet May 9, 2016

May 9, 2016

On 8 May 2016 at 12:31, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > @@ -44,6 +44,11 @@ static inline struct d3drm_texture *impl_from_IDirect3DRMTexture3(IDirect3DRMTex > return CONTAINING_RECORD(iface, struct d3drm_texture, IDirect3DRMTexture3_iface); > } > > +void d3drm_texture_destroy(struct d3drm_texture *texture) You're not using this outside of texture.c. > @@ -724,7 +729,7 @@ static ULONG WINAPI d3drm_texture3_Release(IDirect3DRMTexture3 *iface) > if (!refcount) > { > d3drm_object_cleanup((IDirect3DRMObject*)iface, &texture->obj); > - HeapFree(GetProcessHeap(), 0, texture); > + d3drm_texture_destroy(texture); > } The d3drm_object_cleanup() call should be part of d3drm_texture_destroy().

1 0

Re: [PATCH 2/2] wined3d: Support WINED3DUSAGE_TEXTURE in debug_d3dusage
by Henri Verbeet May 9, 2016

May 9, 2016

On 7 May 2016 at 12:17, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > @@ -3573,6 +3573,7 @@ const char *debug_d3dusage(DWORD usage) > WINED3DUSAGE_TO_STR(WINED3DUSAGE_DYNAMIC); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_AUTOGENMIPMAP); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_DMAP); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_TEXTURE); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_STATICDECL); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_OVERLAY); > #undef WINED3DUSAGE_TO_STR Please add the other missing values as well.

1 0

Re: wined3d: Fix a typo in FIXME() messages
by Henri Verbeet May 9, 2016

May 9, 2016

On 1 May 2016 at 10:55, Andrey Gusev <andrey.goosev(a)gmail.com> wrote: > - FIXME("Unrecognied FBO status 0x%08x\n", status); > + FIXME("Unrecognized FBO status 0x%08x\n", status); ... > - FIXME("Unrecognied GL error 0x%08x\n", error); > + FIXME("Unrecognized GL error 0x%08x\n", error); Like the d3d9/tests patch.

1 0

Re: d3d9/tests: Fix a typo in skip() message
by Henri Verbeet May 9, 2016

May 9, 2016

On 1 May 2016 at 10:53, Andrey Gusev <andrey.goosev(a)gmail.com> wrote: > - skip("Failed to create a vetex shader\n"); > + skip("Failed to create a vertex shader\n"); The typo fix is fine of course, but if you're going to touch the line please fix the punctuation as well.

1 0

Re: [PATCH v2] d3d11/test: Test for ID3D11InfoQueue interface
by Józef Kucia May 9, 2016

May 9, 2016

On Mon, May 9, 2016 at 11:04 AM, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Added sign. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/d3d11/tests/d3d11.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c > index 03b6113..988c83b 100644 > --- a/dlls/d3d11/tests/d3d11.c > +++ b/dlls/d3d11/tests/d3d11.c > @@ -882,6 +882,11 @@ static void test_device_interfaces(void) > "Device should implement ID3D10Multithread interface, hr %#x.\n", hr); > if (SUCCEEDED(hr)) IUnknown_Release(iface); > > + hr = ID3D11Device_QueryInterface(device, &IID_ID3D11InfoQueue, (void **)&iface); > + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, > + "Device should implement ID3D11InfoQueue interface, hr %#x.\n", hr); > + if (SUCCEEDED(hr)) IUnknown_Release(iface); > + > hr = ID3D11Device_QueryInterface(device, &IID_ID3D10Device, (void **)&iface); > todo_wine ok(hr == E_NOINTERFACE, "Device should not implement ID3D10Device interface, hr %#x.\n", hr); > if (SUCCEEDED(hr)) IUnknown_Release(iface); I think this test is wrong. AFAIK ID3D11InfoQueue is only available when you have the debug layer enabled. You can enable the debug layer by creating a device with the D3D11_CREATE_DEVICE_DEBUG flag.

1 0

Re: msi: Do not return success on failure (spotted by clang)
by Hans Leidekker May 9, 2016

May 9, 2016

On Sun, 2016-05-08 at 18:31 +0300, Kirill Smirnov wrote: > Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> > --- > dlls/msi/where.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/msi/where.c b/dlls/msi/where.c > index e3bc9b7..ddd8c07 100644 > --- a/dlls/msi/where.c > +++ b/dlls/msi/where.c > @@ -593,7 +593,7 @@ static UINT WHERE_evaluate( MSIWHEREVIEW *wv, const > UINT rows[], > > default: > ERR("Invalid expression type\n"); > - break; > + return ERROR_FUNCTION_FAILED; > } > > return ERROR_SUCCESS; It doesn't apply here: $ patch -p1 --dry-run < 122148 checking file dlls/msi/where.c patch: **** malformed patch at line 16: UINT rows[], Looks like your mail client wrapped long lines.

1 0

Re: riched20: Properly clear all of a buffer of type WCHAR.
by Huw Davies May 9, 2016

May 9, 2016

On Sun, May 08, 2016 at 10:15:49PM +0200, Gerald Pfeifer wrote: > buf is an array of WCHAR, so this memset falls short. > > If you prefer, I can submit a patch that rather uses sizeof(buf); > just let me know. Hi Gerald, Yes, please use sizeof(buf). Thanks, Huw.

1 0

Re: [Bug 40598] Warframe launcher connection timeout
by Linda Licari May 9, 2016

May 9, 2016

yes here is a list of messages when run from the development version fixme:olepicture:OleLoadPictureEx (0x16d8524,3270,0,{7bf80980-bf32-101a-8bbb-00aa00300cab},x=0,y=0,f=0,0x32faa0), partially implemented. fixme:ieframe:OleControl_FreezeEvents (0x179240)->(1) fixme:ieframe:PersistStreamInit_Load (0x179240)->(0x16d8524) fixme:ieframe:ViewObject_SetAdvise aspects and/or flags not supported yet fixme:ieframe:WebBrowser_QueryInterface (0x179240)->({55980ba0-35aa-11cf-b671-00aa004cd6d8} 0x32fa4c) interface not supported fixme:nls:GetThreadPreferredUILanguages 00000034, 0x32ef14, 0x32ef84 0x32ef1c fixme:nls:get_dummy_preferred_ui_language (0x34 0x32ef14 0x32ef84 0x32ef1c) returning a dummy value (current locale) fixme:olepicture:OleLoadPictureEx (0x16d8524,4137,1,{7bf80980-bf32-101a-8bbb-00aa00300cab},x=0,y=0,f=0,0x32fa70), partially implemented. fixme:olepicture:OleLoadPictureEx (0x16d8524,359907,1,{7bf80980-bf32-101a-8bbb-00aa00300cab},x=0,y=0,f=0,0x32fa70), partially implemented. fixme:olepicture:OLEPictureImpl_SaveAsFile (0x16b270)->(0x148b48, 0, 0x0), hacked stub. fixme:olepicture:OLEPictureImpl_FindConnectionPoint no connection point for {33ad4ed2-6699-11cf-b70c-00aa0060d393} fixme:olepicture:OLEPictureImpl_FindConnectionPoint no connection point for {33ad4f92-6699-11cf-b70c-00aa0060d393} fixme:olepicture:OLEPictureImpl_FindConnectionPoint no connection point for {33ad4f92-6699-11cf-b70c-00aa0060d393} fixme:ieframe:OleControl_FreezeEvents (0x179240)->(0) fixme:ieframe:OleControl_FreezeEvents (0x179240)->(1) fixme:ieframe:ViewObject_SetAdvise aspects and/or flags not supported yet Regards, Linda Licari On Sun, May 8, 2016 at 5:41 PM <wine-bugs(a)winehq.org> wrote: > https://bugs.winehq.org/show_bug.cgi?id=40598 > > Sebastian Lackner <sebastian(a)fds-team.de> changed: > > What |Removed |Added > > ---------------------------------------------------------------------------- > Component|-unknown |-unknown > Product|Wine-staging |Wine > > --- Comment #1 from Sebastian Lackner <sebastian(a)fds-team.de> --- > Thanks for the bug report. Could you please test if this issue also occurs > with > the development version of Wine? If it occurs in both versions, the "Wine" > product is more appropriate. > > -- > Do not reply to this email, post in Bugzilla using the > above URL to reply. > You are receiving this mail because: > You are watching all bug changes. > > > -- - Try and fail but don't fail to try.

1 0

Re: [PATCH 1/2] riched20: Don't call UpdateWindow after setting the background color.
by Bruno Jesus May 9, 2016

May 9, 2016

On Fri, May 6, 2016 at 11:04 AM, Alex Henrie <alexhenrie24(a)gmail.com> wrote: > +static void test_background(void) > +{ > + HWND hwndRichEdit = new_richedit(NULL); > + RECT updateRect; > + > + /* set the background color to black */ > + ValidateRect(hwndRichEdit, NULL); > + SendMessageA(hwndRichEdit, EM_SETBKGNDCOLOR, FALSE, 0); > + GetUpdateRect(hwndRichEdit, &updateRect, FALSE); > + ok(!IsRectEmpty(&updateRect), "The update rect should not be empty\n"); > + > + DestroyWindow(hwndRichEdit); > +} I believe you should clear updateRect before calling GetUpdateRect, also according to msdn the return value of GetUpdateRect should also reflect if the rect was changed or not so it could be a double test. Best wishes, Bruno

2 1

[PATCH] po: Update Norwegian translation
by Beren Camlost May 8, 2016

May 8, 2016

A couple of my own errors that slipped through the cracks. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 5cc5229..848c720 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-05-04 12:00+0200\n" +"PO-Revision-Date: 2016-05-08 20:00+0200\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -11632,14 +11632,14 @@ msgid "" "occurred.\n" msgstr "" "reg: Kan ikke slette alle registerverdiene i \"%1\". Ett uventet " -"problemoppstod.\n" +"problem oppstod.\n" #: reg.rc:54 msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" msgstr "" -"reg: Kan ikke fullføre den spesifiserte operasjonen. Ett uventetproblem " +"reg: Kan ikke fullføre den spesifiserte operasjonen. Ett uventet problem " "oppstod.\n" #: reg.rc:55 -- 1.9.1

1 1

Re: [PATCH 5/6] d3drm: Implement IDirect3DRMTexture*::InitFromFile.
by Stefan Dösinger May 8, 2016

May 8, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-05-08 um 11:31 schrieb Aaryaman Vasishta: > + /* d3drm intentionally leaks a reference to IDirect3DRM here if texture has already been initialized. */ > + if (texture->d3drm) > + IDirect3DRM_AddRef(texture->d3drm); > + > + if (texture->image) > + return D3DRMERR_BADOBJECT; > + if (FAILED(hr = d3drm_texture_load(texture, filename, FALSE))) > + return hr; Does it also leak if the file fails to load? It's probably better to create the image and then pass it to InitFromImage instead of re-coding this part. Is there any situation where texture->d3drm would be NULL? The same question applies to the newly introduced check in d3drm_texture_destroy. > + /* Use an internal destroy callback to destroy image struct */ > + hr = IDirect3DRMObject_AddDestroyCallback(&texture->IDirect3DRMTexture3_iface, destroy_image_callback, texture); > + > +cleanup: > + UnmapViewOfFile(buffer); > + CloseHandle(hmapping); > + CloseHandle(hfile); > + > + return hr; You'll leak the image if AddDestroyCallback fails. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXL2hHAAoJEN0/YqbEcdMwezQP/0X9Ik1RbPNFRgvvFRxhrFQE VLstrghPD28bQQ2i7YoVsdNCZMCyIQa+7GVzI/3d5pakyldEr/7OVIvHHGyxa8j/ YP2O0JTNGxVVhNB0pUM6bEPpnUj7BOPm0uCkcPhU42QVevzKBL7jUnl5Jx/j+j0K Dld9+WDh3i2sSsrtFg2MLdsi4oG5ej3eOFuN2jibceK5hLR4UI1vwyyccCsD+Xd3 NmKnG6KMfiQsvVjxW7IoO5qDcmzZsKzdnMHFgL93KKkOkP2SBhODJckiWNNeswcr XFjd6r9NBIZsFGdIBM040ph4gd/cu7h3R/IWw2hG++oQ+qxX0NOH61GNoUasjyQh hKjyVqmjJa6MUPezzqoFv3XRPQGVnz4Q3l7GSp0QQYCJYtZR+8vey3ezkIuvfFNA GszecmBvvi3Bv4Ir6JriJSUjTC73EcluKhS6WmFk+UxABrn0TBGSgFWkMENdxP6F vE90h/a/JumNtdlCibpB/ctFP7NIWDs2Uz7RjrCQUPaXH86+hUtcs92farOi7JzV EuwzXW1a2qgb7O6ZHWSxdCTvmJZy9rjS1gP8aH0gqUWaxr1FjJsPiOvSWU1/P1QX qD/M/kENP4O0tmsI/dwnDRJ6lHf8FH71uNR0kRq2eWJa/clFdC+h5uMHRDx5w+iy jlZ0/xkcdFzzaOJV1Yw0 =cwCD -----END PGP SIGNATURE-----

2 1

Re: [PATCH 3/6] d3drm: Implement IDirect3DRM*_CreateTexture. (v3)
by Stefan Dösinger May 8, 2016

May 8, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-05-08 um 11:31 schrieb Aaryaman Vasishta: > + if (!d3drm_validate_image(image)) > + return D3DRMERR_BADVALUE; Is this necessary? InitFromImage does it anyway I think. > > if (FAILED(hr = d3drm_texture_create(&object))) > return hr; You could call the public CreateObject method here, but I don't have a strong opinion on this. > + object->d3drm = &d3drm->IDirect3DRM_iface; Afaics InitFromImage does it anyway. It also causes problems when InitFromImage fails for some reason - you'll decref the d3drm object in the error path below. > + if (FAILED(hr = IDirect3DRMTexture3_InitFromImage(&object->IDirect3DRMTexture3_iface, image))) > + { > + d3drm_texture_destroy(object); > + return hr; > + } -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXL2HbAAoJEN0/YqbEcdMw9JcP/iXXJN5PuvyuLqki+eKgQHCv fdRtBfdm57foN7+hfOcG9hZGgVWpdPMj5YFZmNhCaWKlnNjcxKDJE/ZsjsRaYXmD pKPb6mLbNcZVBHyNeqbRcwlgJBiDLYIHM8BiT5DwssQK2lo8UmhVGJgmNZNPlGy8 sw/drdMg0lW11N6rOZR/fXcm5NY9F7oIAuI9945uElbOXg3byBvLAQdpPE95yJ5p 8rAQotCsbnqzGFEyRw3E1+0uKplBoaXd6ML+jhDrHK9Eqw0XWUtUsCuWiaYkTDGX 82XXWjhjsxQ84GkSKOweqtum6HjGDSnSZz12YTDMbspLywIpKzSMO5+O/dtxsolI a5scAHlpYQ/bLK3TCWOkwNEsMkXBRjM8+j+PX1I3SQICdl3GmNxVo/b4ZU+0Wqt5 GwzyerUB2an5Dyf/+l7jqH0SxWgcrIiwa/ZTCxttAafDSooFhERwj402WhNQcZLN BD9Jef52AYCJrduV3b3udvTyPuWCrPkkrm3NTSO6dbCIZG9EzMcujJZnA0D52y2E qwfpfsfNNUJ7hkS1322u48i7GaSCZNoK6ISlA9RqtjVoRCGZKG/nGTwQgznrclB1 mvR24DUvAmogeTV0Akm20wUN3/n5sIkz47b0vb9Z5Jjg1v+90nTQ43pcMT0GCJhP cN0YfnUAgpi7yD4yfA1E =JJ9X -----END PGP SIGNATURE-----

2 2

Re: [PATCH 2/6] d3drm: Implement IDirect3DRMTexture{2-3}_InitFromImage. (v3)
by Stefan Dösinger May 8, 2016

May 8, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-05-08 um 11:31 schrieb Aaryaman Vasishta: > + hr = IDirect3DRMTexture2_InitFromImage(texture2, &initimg); > + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %x.\n", hr); > + /* Release leaked reference to d3drm1 */ > + IDirect3DRM_Release(d3drm1); I think it's a good idea to explicitly test the increased refcount after this failing call. > + if (!image > + || !image->rgb > + || !image->red_mask > + || !image->green_mask > + || !image->blue_mask > + || !image->buffer1) > + { > + return FALSE; > + } I guess that there's some way to pass palletized images, e.g. by setting rgb = 0, palette_size != 0 and palette != NULL. This shouldn't be part of this patch though and I am fine with this code as it is. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXL2SsAAoJEN0/YqbEcdMwkCQP/iPRJdsglD3on0uzy9v8iQo9 g0BexNDM4r1AtZASW9yp6dNRLY1oX15dTSM6GjdNlNFGp7jQRVJcJ6X71CJt4EEi oGWtq774F46ewtTjcufP/TOfOed6k6tv/qe6IKRn2rnI7CyusM124jIP4CYZfAlW dk48LOKp9G9kzF3loa6Cx4Eoxmy1jAfXJ5v/ERGqgU/wHwT8Vaim+5URIglfPq0H OUG++D6WTacsh1RWGZaeQqLAVq2zlc5YxNNsgJ7iJcd7DG1EYg6hOFFHebwp5FQP Jq6Dipy1GGB4q+Zt/ygb6HwWsv36taLMVn2erEL2RG6O88QxmM+P3VyxTBNdWKQc 65SHOcq0NjLhT6sO4SSfm5lEsWDBxftzbUuSg9NngrZjmLBa4pfreckYhA+N/p2Y Jd1GBtpvO7w5XTOLYoHWvco2rrRVCmJan/Q/XAensQyFBkkt7+S8Rjjo7KcT1avF Lv7WQqg+2HTHJbiiSp13BsoNZQaDZaDEaINsBv56B+LJjBKf3EwJLCZXpRRN3p0v ByLGPYr7QS3NrukltC9Zb3ZEf2FWBtB8mDBYjh5sHmquujAwlZx85HdaqFEi9ZCb tIzD3O8yO4k5rwM/+fClBLHmeTUEemnG1LrwxgvOR2pAq6/mK67clDmOZJ4CSBBt YjYtXXnjuSBzcnvnvp3J =KSDQ -----END PGP SIGNATURE-----

2 1

Re: [PATCH 4/6] d3drm: Implement IDirect3DRMTexture*_GetImage (resend).
by Stefan Dösinger May 8, 2016

May 8, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-05-08 um 11:31 schrieb Aaryaman Vasishta: > d3drm_img = NULL; d3drm_img = > IDirect3DRMTexture2_GetImage(texture2); - todo_wine > ok(!!d3drm_img, "Failed to get image.\n"); - todo_wine > ok(d3drm_img == &initimg, "Expected image returned == %p, got > %p.\n", &initimg, d3drm_img); + ok(!!d3drm_img, "Failed to get > image.\n"); + ok(d3drm_img == &initimg, "Expected image returned > == %p, got %p.\n", &initimg, d3drm_img); This is a problem of the exiting code code more than the patch: The d3drm_img = NULL assignment is redundant. Since GetImage returns the image as a return value the destination will be overwritten, no matter how GetImage behaves. The problem of a getter not writing anything can only happen when you pass a pointer and the function writes a value to that pointer. What happens when GetImage is called on an uninitialized Texture? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXL2QqAAoJEN0/YqbEcdMwYD0P/i4GqKylB9vvWa64h6Hph+li +tVW8KNgbjaPaJJfvEZRG3t1hToqFogSKU0TBBTnhv7zGuU5wKHr4a+UwkFFjQSx ww/jzuQXu7coJ28CZrGBeDqMAadR3RCZHcdKD+czzn5bBy/8LCzrX4Id/1qpdf+Y PZtdtF9R7e1poYjctPJXtcOzJlwtEF3+JkGUiyjcH3kNoammqmpRf6FeSFxXrvUB frVrNHIaLU6Cg8MaoyC6aYOOuf1KHH/5Nym3kAvR7Ty+0PNo38g23/+DMtN5553r IvaYHSsmzK10LsH6/xgkDQk9fpkEX6eTgW/wbd+p++L3fauDMjk6KxMVgPFpEF4g 2hRrKw5TTdvY3LftbC5VZDtnKZeFX5hwiysZZEztFLW/Rk85qgJUo36cq9QR1XE6 fwOH77QYO0+bv2+9TXyyh20RIQshLbN4Pzx5jWxC9Ym9InEWevLKXTQrjt+ve5bl YL+202MXZ1hc/cuCk/HOLrCg2B8XkSN/Sj5ziszhyXJk8kHv/FRyfMa5+p3Ngyrn ZBE464osVWL8pSdJeadb1Nud7aWVfW+RIaun8RgwDAhFpRnStEZyfW0FxrVkfQBY BdDTGORUrFDfsVs8xLsQwKI/xaq3vKZJJ2oZbnnIek0P2q0TVYCP8eXlu2o2ARvd rXSlOmyAYudSsOeqz9ED =mT+3 -----END PGP SIGNATURE-----

1 0

Re: [PATCH 6/6] d3drm: Partially implement IDirect3DRM*::LoadTexture. (v4)
by Aaryaman Vasishta May 8, 2016

May 8, 2016

See patch 5/6 for the v4 changes. Cheers, Aaryaman On Sun, May 8, 2016 at 4:01 PM, Aaryaman Vasishta <jem456.vasishta(a)gmail.com > wrote: > v4: Removed various leaks, avoided redundant usage of HEAP_ZERO_MEMORY. > > Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> > --- > dlls/d3drm/d3drm.c | 32 +++++++++++++++++++++++++------- > dlls/d3drm/tests/d3drm.c | 33 +++++++++++++-------------------- > 2 files changed, 38 insertions(+), 27 deletions(-) > > diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c > index 6c6007d..c74d5d8 100644 > --- a/dlls/d3drm/d3drm.c > +++ b/dlls/d3drm/d3drm.c > @@ -418,11 +418,18 @@ static HRESULT WINAPI d3drm1_LoadTexture(IDirect3DRM > *iface, > struct d3drm_texture *object; > HRESULT hr; > > - FIXME("iface %p, filename %s, texture %p stub!\n", iface, > debugstr_a(filename), texture); > + TRACE("iface %p, filename %s, texture %p.\n", iface, > debugstr_a(filename), texture); > > if (FAILED(hr = d3drm_texture_create(&object))) > return hr; > > + object->d3drm = iface; > + if (FAILED(hr = > IDirect3DRMTexture_InitFromFile(&object->IDirect3DRMTexture_iface, > filename))) > + { > + d3drm_texture_destroy(object); > + return hr; > + } > + > *texture = &object->IDirect3DRMTexture_iface; > > return D3DRM_OK; > @@ -861,17 +868,19 @@ static HRESULT WINAPI > d3drm2_CreateUserVisual(IDirect3DRM2 *iface, > static HRESULT WINAPI d3drm2_LoadTexture(IDirect3DRM2 *iface, > const char *filename, IDirect3DRMTexture2 **texture) > { > - struct d3drm_texture *object; > + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); > + IDirect3DRMTexture3 *texture3; > HRESULT hr; > > - FIXME("iface %p, filename %s, texture %p stub!\n", iface, > debugstr_a(filename), texture); > + TRACE("iface %p, filename %s, texture %p.\n", iface, > debugstr_a(filename), texture); > > - if (FAILED(hr = d3drm_texture_create(&object))) > + if (FAILED(hr = IDirect3DRM3_LoadTexture(&d3drm->IDirect3DRM3_iface, > filename, &texture3))) > return hr; > > - *texture = &object->IDirect3DRMTexture2_iface; > + hr = IDirect3DRMTexture3_QueryInterface(texture3, > &IID_IDirect3DRMTexture2, (void **)texture); > + IDirect3DRMTexture3_Release(texture3); > > - return D3DRM_OK; > + return hr; > } > > static HRESULT WINAPI d3drm2_LoadTextureFromResource(IDirect3DRM2 *iface, > HMODULE module, > @@ -1413,14 +1422,23 @@ static HRESULT WINAPI > d3drm3_CreateUserVisual(IDirect3DRM3 *iface, > static HRESULT WINAPI d3drm3_LoadTexture(IDirect3DRM3 *iface, > const char *filename, IDirect3DRMTexture3 **texture) > { > + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); > struct d3drm_texture *object; > HRESULT hr; > > - FIXME("iface %p, filename %s, texture %p stub!\n", iface, > debugstr_a(filename), texture); > + TRACE("iface %p, filename %s, texture %p.\n", iface, > debugstr_a(filename), texture); > > if (FAILED(hr = d3drm_texture_create(&object))) > return hr; > > + object->d3drm = &d3drm->IDirect3DRM_iface; > + if (FAILED(hr = > IDirect3DRMTexture3_InitFromFile(&object->IDirect3DRMTexture3_iface, > filename))) > + { > + d3drm_texture_destroy(object); > + return hr; > + } > + > + object->d3drm = &d3drm->IDirect3DRM_iface; > *texture = &object->IDirect3DRMTexture3_iface; > > return D3DRM_OK; > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index e6311d8..4cf3ba7 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -4510,18 +4510,16 @@ static void test_load_texture(void) > hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1); > ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", > i, hr); > ref2 = get_refcount((IUnknown *)d3drm1); > - todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got > ref1 = %u, ref2 = %u.\n", i, ref1, ref2); > + ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, > ref2 = %u.\n", i, ref1, ref2); > > hr = IDirect3DRMTexture_InitFromFile(texture1, filename); > - todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == > D3DRMERR_BADOBJECT, got %#x.\n", i, hr); > + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == > D3DRMERR_BADOBJECT, got %#x.\n", i, hr); > /* InitFromFile seems to AddRef IDirect3DRM even if it fails. */ > - if (FAILED(hr)) > - IDirect3DRM_Release(d3drm1); > + IDirect3DRM_Release(d3drm1); > > d3drm_img = IDirect3DRMTexture_GetImage(texture1); > ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); > - if (d3drm_img) > - test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, > tests[i].h, tests[i].palettized); > + test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, tests[i].h, > tests[i].palettized); > IDirect3DRMTexture_Release(texture1); > ref2 = get_refcount((IUnknown *)d3drm1); > ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, > ref2 = %u.\n", i, ref1, ref2); > @@ -4537,17 +4535,15 @@ static void test_load_texture(void) > hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2); > ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", > i, hr); > ref2 = get_refcount((IUnknown *)d3drm1); > - todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got > ref1 = %u, ref2 = %u.\n", i, ref1, ref2); > + ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, > ref2 = %u.\n", i, ref1, ref2); > > hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); > - todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == > D3DRMERR_BADOBJECT, got %#x.\n", i, hr); > - if (FAILED(hr)) > - IDirect3DRM_Release(d3drm1); > + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == > D3DRMERR_BADOBJECT, got %#x.\n", i, hr); > + IDirect3DRM_Release(d3drm1); > > d3drm_img = IDirect3DRMTexture2_GetImage(texture2); > ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); > - if (d3drm_img) > - test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, > tests[i].h, tests[i].palettized); > + test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, > tests[i].h, tests[i].palettized); > IDirect3DRMTexture2_Release(texture2); > ref2 = get_refcount((IUnknown *)d3drm1); > ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %u, > ref2 = %u.\n", i, ref1, ref2); > @@ -4563,25 +4559,22 @@ static void test_load_texture(void) > hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3); > ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", > i, hr); > ref2 = get_refcount((IUnknown *)d3drm1); > - todo_wine ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got > ref1 = %u, ref2 = %u.\n", i, ref1, ref2); > + ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, > ref2 = %u.\n", i, ref1, ref2); > > hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); > - todo_wine ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == > D3DRMERR_BADOBJECT, got %#x.\n", i, hr); > - if (FAILED(hr)) > - IDirect3DRM_Release(d3drm1); > + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == > D3DRMERR_BADOBJECT, got %#x.\n", i, hr); > + IDirect3DRM_Release(d3drm1); > > d3drm_img = IDirect3DRMTexture3_GetImage(texture3); > ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); > - if (d3drm_img) > - test_bitmap_data(i * 7 + 4, d3drm_img, TRUE, tests[i].w, > tests[i].h, tests[i].palettized); > + test_bitmap_data(i * 7 + 4, d3drm_img, TRUE, tests[i].w, > tests[i].h, tests[i].palettized); > /* Test whether querying a version 1 texture from version 3 > causes a > * change in the loading behavior. */ > hr = IDirect3DRMTexture3_QueryInterface(texture3, > &IID_IDirect3DRMTexture, (void **)&texture1); > ok(SUCCEEDED(hr), "Failed to get IDirect3DRMTexture interface, hr > %#x.\n", hr); > d3drm_img = IDirect3DRMTexture_GetImage(texture1); > ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); > - if (d3drm_img) > - test_bitmap_data(i * 7 + 5, d3drm_img, TRUE, tests[i].w, > tests[i].h, tests[i].palettized); > + test_bitmap_data(i * 7 + 5, d3drm_img, TRUE, tests[i].w, > tests[i].h, tests[i].palettized); > IDirect3DRMTexture_Release(texture1); > IDirect3DRMTexture3_Release(texture3); > ref2 = get_refcount((IUnknown *)d3drm1); > -- > 2.3.2 (Apple Git-55) > >

1 0

Re: [2/2] shlwapi: Fix crash in wvnsprintfW when buffer or spec is NULL
by Sebastian Lackner May 7, 2016

May 7, 2016

On 06.05.2016 03:56, 谢威 wrote: > Crashes on windows and wine when buffer == NULL && maxlen > 0 > > > 0002-shlwapi-Fix-crash-in-wvnsprintfW-when-buffer-or-spec.patch > > > From f60bd9a76cfc91cb873a15c69f35cea0c7950a68 Mon Sep 17 00:00:00 2001 > From: XieWei <xiewei(a)linuxdeepin.com> > Date: Fri, 6 May 2016 09:49:34 +0800 > Subject: shlwapi: Fix crash in wvnsprintfW when buffer or spec is NULL > > Signed-off-by: XieWei <xiewei(a)linuxdeepin.com> > --- > dlls/shlwapi/wsprintf.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/dlls/shlwapi/wsprintf.c b/dlls/shlwapi/wsprintf.c > index 6a36b6a..ceca82e 100644 > --- a/dlls/shlwapi/wsprintf.c > +++ b/dlls/shlwapi/wsprintf.c > @@ -439,6 +439,9 @@ INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, __ms_va_list ar > > TRACE("%p %u %s\n", buffer, maxlen, debugstr_w(spec)); > > + if (maxlen <= 0 || (spec == NULL && buffer != NULL)) > + return -1; The first part looks fine, but the second part is not really covered by tests. In fact, you even added a comment that it crashes on Windows XP under a similar situation. Do you really have an application which depends on it? > + > while (*spec && (maxlen > 1)) > { > if (*spec != '%') { *p++ = *spec++; maxlen--; continue; } > -- 2.7.0 > > >

1 0

Re: [1/2] shlwapi/tests: Add wvnsprintfW comformance test
by Sebastian Lackner May 7, 2016

May 7, 2016

Hi, thanks for your contribution. I have a couple of remarks below: On 06.05.2016 03:55, 谢威 wrote: > > 0001-shlwapi-Add-wvnsprintfW-comformance-test.patch > > > From cdaeba38efb4d2edcdff5e6ec7b75fa5b56d52d7 Mon Sep 17 00:00:00 2001 > From: XieWei <xiewei(a)linuxdeepin.com> > Date: Fri, 6 May 2016 09:42:05 +0800 > Subject: shlwapi: Add wvnsprintfW comformance test > > Signed-off-by: XieWei <xiewei(a)linuxdeepin.com> The Wine project requires all contributors to submit patches with their full first and last name. If this isn't your full name, please fix it in your git settings. > --- > dlls/shlwapi/tests/string.c | 78 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 78 insertions(+) > > diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c > index ac14db0..7896827 100644 > --- a/dlls/shlwapi/tests/string.c > +++ b/dlls/shlwapi/tests/string.c > @@ -68,6 +68,7 @@ static INT (WINAPIV *pwnsprintfW)(LPWSTR,INT,LPCWSTR, ...); > static LPWSTR (WINAPI *pStrChrNW)(LPCWSTR,WCHAR,UINT); > static BOOL (WINAPI *pStrToInt64ExA)(LPCSTR,DWORD,LONGLONG*); > static BOOL (WINAPI *pStrToInt64ExW)(LPCWSTR,DWORD,LONGLONG*); > +static INT (WINAPI *pwvnsprintfW)(LPWSTR,INT,LPCWSTR,__ms_va_list); > > static int strcmpW(const WCHAR *str1, const WCHAR *str2) > { > @@ -1601,6 +1602,81 @@ static void test_StrCatChainW(void) > ok(buf[5] == 'e', "Expected buf[5] = 'e', got %x\n", buf[5]); > } > > +static INT _wvnsprintfW_p_wrapper(LPWSTR pdest, INT maxlen, LPCWSTR format, ...) Please declare the function with WINAPIV calling convention. Also please note that a "p" or "lp" prefix is usually omitted new Wine code. > +{ > + INT ret; > + __ms_va_list valist; > + __ms_va_start(valist, format); > + ret = pwvnsprintfW(pdest, maxlen, format, valist); > + __ms_va_end(valist); > + return ret; > +} > + > +static void test_wvnsprintfW(void) > +{ > + INT ret = 0; > + WCHAR buffer[10] = {0}; > + const WCHAR fmt[] = {'1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 0}; > + const WCHAR emptyfmt[] = {0}; > + const WCHAR result1[] = {'1', '2', '3', '4', '5', '6', '7', '8', 0}; > + const WCHAR result2[] = {'1', '2', '3', '4', '5', '6', '7', '8', '9', 0}; > + const WCHAR result3[] = {'1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 0}; > + > + if (!pwvnsprintfW) > + { > + win_skip("wvnsprintfW not available\n"); > + return; > + } Its a matter of taste, but you usually don't need such a check unless you are aware of a specific Windows version where it does not exist. > + > + /* crashes on wine */ > + ret = _wvnsprintfW_p_wrapper(NULL, 0, fmt); > + ok(broken(ret == 0) || ret == -1 /* win7 */, > + "Expected wvnsprintfW to return %d, expected 0 or -1\n", ret); As you also noticed, those tests will crash on Wine, which means you can't really add them until the implementation is fixed. You can either move those tests to your second patch, or change the order of your patches. Also, I think the current ok() message is a bit misleading. Something like "Expected wvnsprintfW to return 0 or -1, got %d\n" would be more clear. This also affects a couple of places below. > + > + if (0) > + { > + /* crashes on wine and XP and win7 */ Wrong indentation in the line above. > + ret = _wvnsprintfW_p_wrapper(NULL, 3/* >0 */, fmt); > + ok(ret == -1, "Expected wvnsprintfW to return -1, got %d\n", ret); > + } > + > + /* crashes on wine */ > + ret = _wvnsprintfW_p_wrapper(buffer, 0, NULL); > + ok(broken(ret == 0) || ret == -1 /* win7 */, > + "Expected wvnsprintfW to return %d, expected 0 or -1\n", ret); > + > + ret = _wvnsprintfW_p_wrapper(buffer, 0, fmt); > + ok(broken(ret == 0) || ret == -1 /* win7 */, > + "Expected wvnsprintfW to return %d, expected 0 or -1\n", ret); > + > + if (0) > + { > + /* crashes on wine and XP */ > + ret = _wvnsprintfW_p_wrapper(buffer, 10, NULL); > + ok(ret == -1, "Expected wvnsprintfW to return -1, got %d\n", ret); > + } > + > + ret = _wvnsprintfW_p_wrapper(buffer, 1, emptyfmt); > + ok(ret == 0, "Expected wvnsprintfW to return 0, got %d\n", ret); This test fails in Wine, which means it should be marked with todo_wine. > + > + ret = _wvnsprintfW_p_wrapper(buffer, 10, emptyfmt); > + ok(ret == 0, "Expected wvnsprintfW to return 0, got %d\n", ret); > + > + ret = _wvnsprintfW_p_wrapper(buffer, sizeof(buffer)/sizeof(buffer[0])-1, fmt); > + ok(broken(ret == 8) || ret == -1 /* win7 */, > + "Expected wvnsprintfW to return %d, expected 8 or -1\n", ret); > + ok(lstrcmpW(buffer, result1) == 0, "Wrong result [%s]\n", wine_dbgstr_w(buffer)); You can omit the "[" and "]" here. wine_dbgstr_w will add quotation marks around the string. > + > + ret = _wvnsprintfW_p_wrapper(buffer, sizeof(buffer)/sizeof(buffer[0]), fmt); > + ok(broken(ret == 9) || ret == -1 /* win7 */, > + "Expected wvnsprintfW to return %d, expected 9 or -1\n", ret); > + ok(lstrcmpW(buffer, result2) == 0, "Wrong result [%s]\n", wine_dbgstr_w(buffer)); > + > + ret = _wvnsprintfW_p_wrapper(buffer, sizeof(buffer)/sizeof(buffer[0])+1, fmt); > + ok(ret == 10, "Expected wvnsprintfW to return 10, got %d\n", ret); > + ok(lstrcmpW(buffer, result3) == 0, "Wrong result [%s]\n", wine_dbgstr_w(buffer)); Those two tests above also fail in Wine, so they should be marked with todo_wine. > +} > + > START_TEST(string) > { > HMODULE hShlwapi; > @@ -1640,6 +1716,7 @@ START_TEST(string) > pwnsprintfW = (void *)GetProcAddress(hShlwapi, "wnsprintfW"); > pStrToInt64ExA = (void *)GetProcAddress(hShlwapi, "StrToInt64ExA"); > pStrToInt64ExW = (void *)GetProcAddress(hShlwapi, "StrToInt64ExW"); > + pwvnsprintfW = (void *)GetProcAddress(hShlwapi, "wvnsprintfW"); > > test_StrChrA(); > test_StrChrW(); > @@ -1687,6 +1764,7 @@ START_TEST(string) > test_StrStrNW(); > test_StrStrNIW(); > test_StrCatChainW(); > + test_wvnsprintfW(); > > CoUninitialize(); > } > -- 2.7.0 > > >

1 0

Re: [PATCH] winemac: Add support for a high-resolution ("Retina") rendering mode.
by Jacek Caban May 6, 2016

May 6, 2016

Hi Ken, On 05/05/16 20:53, Ken Thomases wrote: > This is intended to be combined with increasing the Windows DPI, as via winecfg. > If that is doubled to 192, then, in theory, graphical elements will remain the > same visual size on screen but be rendered with finer detail. Unfortunately, > many Windows programs don't correctly handle non-standard DPI so the results > are not always perfect. > > The registry setting to enable Retina mode is: > > [HKEY_CURRENT_USER\Software\Wine\Mac Driver] > "RetinaMode"="y" > > Note that this setting is not looked for in the AppDefaults\<exe name> key > because it doesn't make sense for only some processes in a Wine session to see > the high-resolution sizes and coordinates. Would it make sense to follow what Windows does in this case? Something like SetProcessDPIAware and manifest support feels related. Thanks, Jacek

2 1

Re: jscript: Properly handle function expressions with identifiers.
by Marvin May 6, 2016

May 6, 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=22883 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/2] riched20: Only call InvalidateRect if the background color changes.
by Alex Henrie May 6, 2016

May 6, 2016

Please ignore this patch. After sending it, I noticed that the backgrounds in Word Viewer changed from gray to white after leaving the tab and returning to it, when on Windows they stay gray the whole time. More tests are needed to determine when exactly InvalidateRect should be called. The first patch is still good, and does not appear to cause any negative side effects. -Alex

1 0

Re: (2/2) advapi32: add some advapi32 wmi functions
by Sebastian Lackner May 6, 2016

May 6, 2016

On 04.05.2016 06:47, Austin English wrote: > -- -Austin > > > 0002-advapi32-add-some-advapi32-wmi-functions.patch > > > From dcdc8a38a72921f17c15c4e39ca0dd6fdb578a0f Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Tue, 3 May 2016 02:17:15 -0500 > Subject: [PATCH 2/2] advapi32: add some advapi32 wmi functions > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > dlls/advapi32/Makefile.in | 3 +- > dlls/advapi32/advapi32.spec | 28 +++++----- > dlls/advapi32/wmi.c | 123 ++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 139 insertions(+), 15 deletions(-) > create mode 100644 dlls/advapi32/wmi.c > > diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in > index 6b54295..ff6452a 100644 > --- a/dlls/advapi32/Makefile.in > +++ b/dlls/advapi32/Makefile.in > @@ -18,7 +18,8 @@ C_SRCS = \ > lsa.c \ > registry.c \ > security.c \ > - service.c > + service.c \ > + wmi.c In general adding a new file for all those Wmi commands is probably fine, but please move the existing ones there, too. (for example "WmiOpenBlock") > > IDL_SRCS = svcctl.idl > > diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec > index 3f32aa3..af5286b 100644 > --- a/dlls/advapi32/advapi32.spec > +++ b/dlls/advapi32/advapi32.spec > @@ -795,35 +795,35 @@ > # @ stub WmiDevInstToInstanceNameA > # @ stub WmiDevInstToInstanceNameW > # @ stub WmiEnumerateGuids > -# @ stub WmiExecuteMethodA > -# @ stub WmiExecuteMethodW > +@ stdcall WmiExecuteMethodA(ptr str long long ptr long ptr) Handles should still be traced as "long", not as "ptr". ;) Also, the "outputsize" parameter is traced wrong (should be "ptr"). > +@ stdcall WmiExecuteMethodW(ptr wstr long long ptr long ptr) > # @ stub WmiFileHandleToInstanceNameA > # @ stub WmiFileHandleToInstanceNameW > -# @ stub WmiFreeBuffer > +@ stdcall WmiFreeBuffer(ptr) > # @ stub WmiGetFirstTraceOffset > # @ stub WmiGetNextEvent > # @ stub WmiGetTraceHeader > -# @ stub WmiMofEnumerateResourcesA > -# @ stub WmiMofEnumerateResourcesW > -# @ stub WmiNotificationRegistrationA > -# @ stub WmiNotificationRegistrationW > +@ stdcall WmiMofEnumerateResourcesA(ptr ptr ptr) > +@ stdcall WmiMofEnumerateResourcesW(ptr ptr ptr) > +@ stdcall WmiNotificationRegistrationA(ptr long ptr ptr long) > +@ stdcall WmiNotificationRegistrationW(ptr long ptr ptr long) > @ stdcall WmiOpenBlock(ptr long ptr) > # @ stub WmiOpenTraceWithCursor > # @ stub WmiParseTraceEvent > -# @ stub WmiQueryAllDataA > +@ stdcall WmiQueryAllDataA(ptr ptr ptr) > # @ stub WmiQueryAllDataMultipleA > # @ stub WmiQueryAllDataMultipleW > -# @ stub WmiQueryAllDataW > -# @ stub WmiQueryGuidInformation > +@ stdcall WmiQueryAllDataW(ptr ptr ptr) > +@ stdcall WmiQueryGuidInformation(ptr ptr) > # @ stub WmiQuerySingleInstanceA > # @ stub WmiQuerySingleInstanceMultipleA > # @ stub WmiQuerySingleInstanceMultipleW > @ stub WmiQuerySingleInstanceW > # @ stub WmiReceiveNotificationsA > # @ stub WmiReceiveNotificationsW > -# @ stub WmiSetSingleInstanceA > -@ stub WmiSetSingleInstanceW > -# @ stub WmiSetSingleItemA > -# @ stub WmiSetSingleItemW > +@ stdcall WmiSetSingleInstanceA(ptr str long long ptr) > +@ stdcall WmiSetSingleInstanceW(ptr wstr long long ptr) > +@ stdcall WmiSetSingleItemA(ptr str long long long ptr) > +@ stdcall WmiSetSingleItemW(ptr wstr long long long ptr) > # @ stub Wow64Win32ApiEntry > @ stdcall WriteEncryptedFileRaw(ptr ptr ptr) > diff --git a/dlls/advapi32/wmi.c b/dlls/advapi32/wmi.c > new file mode 100644 > index 0000000..de3f8fa > --- /dev/null > +++ b/dlls/advapi32/wmi.c > @@ -0,0 +1,123 @@ > +/* > + * Win32 advapi/wmi functions > + * > + * Copyright 2016 Austin English > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > + */ > + > +#include <stdarg.h> > + > +#include "windef.h" > +#include "winbase.h" > +#include "winerror.h" > +#include "winternl.h" > +#include "wmistr.h" > +#include "ddk/wmium.h" > + > +#include "wine/unicode.h" > +#include "wine/debug.h" > + > +#include "advapi32_misc.h" > + > +WINE_DEFAULT_DEBUG_CHANNEL(wmi); > + > +ULONG WMIAPI WmiExecuteMethodA(WMIHANDLE handle, const CHAR *instance, ULONG method, ULONG inputsize, Please use lowercase 'char' instead of CHAR. > + void *inputbuffer, ULONG *outputsize, void *outputbuffer) > +{ > + FIXME(": %p %s %u %u %p %p %p stub\n", handle, debugstr_a(instance), method, inputsize, inputbuffer, > + outputsize, outputbuffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiExecuteMethodW(WMIHANDLE handle, const WCHAR *instance, ULONG method, ULONG inputsize, > + void *inputbuffer, ULONG *outputsize, void *outputbuffer) > +{ > + FIXME(": %p %s %u %u %p %p %p stub\n", handle, debugstr_w(instance), method, inputsize, inputbuffer, > + outputsize, outputbuffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +VOID WMIAPI WmiFreeBuffer(void *buffer) Lowercase 'void' is usually preferred. > +{ > + HeapFree(GetProcessHeap(), 0, buffer); It doesn't really make sense to implement it unless we have at least one function which returns a buffer. > +} > + > +ULONG WMIAPI WmiMofEnumerateResourcesA(MOFHANDLE handle, ULONG *count, MOFRESOURCEINFOA **resource) > +{ > + FIXME(": %p %p %p stub\n", handle, count, *resource); Why do you dereference the pointer here? It looks like count and resource are output parameters here. > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiMofEnumerateResourcesW(MOFHANDLE handle, ULONG *count, MOFRESOURCEINFOW **resource) > +{ > + FIXME(": %p %p %p stub\n", handle, count, *resource); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiNotificationRegistrationA(GUID *guid, BOOLEAN enable, void *info, ULONG_PTR *context, ULONG flags) > +{ > + FIXME(": %p %u %p %p 0x%08x stub\n", guid, enable, info, context, flags); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiNotificationRegistrationW(GUID *guid, BOOLEAN enable, void *info, ULONG_PTR *context, ULONG flags) > +{ > + FIXME(": %p %u %p %p 0x%08x stub\n", guid, enable, info, context, flags); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiQueryAllDataA(WMIHANDLE handle, ULONG *buffersize, void *buffer) > +{ > + FIXME(": %p %p %p stub\n", handle, buffersize, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiQueryAllDataW(WMIHANDLE handle, ULONG *buffersize, void *buffer) > +{ > + FIXME(": %p %p %p stub\n", handle, buffersize, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiQueryGuidInformation(WMIHANDLE handle, WMIGUIDINFORMATION *guidinfo) > +{ > + FIXME(": %p %p stub\n", handle, guidinfo); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiSetSingleInstanceA(WMIHANDLE handle, const CHAR *name, ULONG reserved, ULONG size, void *buffer) > +{ > + FIXME(": %p %s %u %u %p stub\n", handle, debugstr_a(name), reserved, size, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiSetSingleInstanceW(WMIHANDLE handle, const WCHAR *name, ULONG reserved, ULONG size, void *buffer) > +{ > + FIXME(": %p %s %u %u %p stub\n", handle, debugstr_w(name), reserved, size, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiSetSingleItemA(WMIHANDLE handle, const CHAR *name, ULONG id, ULONG reserved, ULONG size, void *buffer) > +{ > + FIXME(": %p %s %u %u %p stub\n", handle, debugstr_a(name), reserved, size, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > +ULONG WMIAPI WmiSetSingleItemW(WMIHANDLE handle, const WCHAR *name, ULONG id, ULONG reserved, ULONG size, void *buffer) > +{ > + FIXME(": %p %s %u %u %p stub\n", handle, debugstr_w(name), reserved, size, buffer); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > + > -- 2.7.3 > > >

1 0

Re: (1/2) include/ddk: add wmium.h
by Sebastian Lackner May 6, 2016

May 6, 2016

On 04.05.2016 06:45, Austin English wrote: > This is from the XP DDK. > > For https://bugs.winehq.org/show_bug.cgi?id=37429 > > -- -Austin > > > 0001-include-add-wmium.h.patch > > > From 2f6b569db167a01c074d7655b2a285db313a5d83 Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Tue, 3 May 2016 00:59:30 -0500 > Subject: [PATCH] include: add wmium.h > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > include/Makefile.in | 1 + > include/wmium.h | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 120 insertions(+) > create mode 100644 include/wmium.h > > diff --git a/include/Makefile.in b/include/Makefile.in > index 250166d..a9e0565 100644 > --- a/include/Makefile.in > +++ b/include/Makefile.in > @@ -666,6 +666,7 @@ HEADER_SRCS = \ > winver.h \ > wlanapi.h \ > wmistr.h \ > + wmium.h \ > wnaspi32.h \ > wownt32.h \ > ws2def.h \ > diff --git a/include/wmium.h b/include/wmium.h > new file mode 100644 > index 0000000..b69f205 > --- /dev/null > +++ b/include/wmium.h > @@ -0,0 +1,119 @@ > +/* > + * Copyright (C) 2016 Austin English > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > + */ > +#ifndef _WMIUM_ > +#define _WMIUM_ > + > +#define WMIAPI DECLSPEC_IMPORT __stdcall There should be an #ifdef, DECLSPEC_IMPORT should not be added for the implementation itself. > + > +#include <guiddef.h> > +#include <basetsd.h> > +#include <wmistr.h> > + > +typedef PVOID WMIHANDLE, *PWMIHANDLE, MOFHANDLE, *PMOFHANDLE; > + > +#define MOFCI_reserved0 0x00000001 > +#define MOFCI_reserved1 0x00000002 > +#define MOFCI_reserved2 0x00000004 > + > +typedef struct > +{ > + char *ImagePath; Shouldn't this be a WCHAR pointer? > + WCHAR *ResourceName; > + ULONG ResourceSize; > + UCHAR *Resourcebuffer; > +} MOFRESOURCEINFOW, *PMOFRESOURCEINFOW; > + > +typedef struct > +{ > + char *ImagePath; > + char *ResourceName; > + ULONG ResourceSize; > + UCHAR *Resourcebuffer; > +} MOFRESOURCEINFOA, *PMOFRESOURCEINFOA; > + > +#ifdef UNICODE > +typedef MOFRESOURCEINFOW MOFRESOURCEINFO; > +typedef PMOFRESOURCEINFOW PMOFRESOURCEINFO; > +#else > +typedef MOFRESOURCEINFOA MOFRESOURCEINFO; > +typedef PMOFRESOURCEINFOA PMOFRESOURCEINFO; > +#endif > + > +#ifdef __cplusplus > +extern "C" { > +#endif > + > +#define NOTIFICATION_TRACE_FLAG 0x00010000 > +#define NOTIFICATION_CALLBACK_DIRECT 0x00000004 > +#define NOTIFICATION_CHECK_ACCESS 0x00000008 > + > +typedef void (WINAPI *NOTIFICATIONCALLBACK)(WNODE_HEADER *Wnode, UINT_PTR NotificationContext); There is no need to keep the original parameter names here. > + > +typedef struct _WMIGUIDINFORMATION > +{ > + ULONG Size; > + BOOLEAN IsExpensive; > + BOOLEAN IsEventOnly; > +} WMIGUIDINFORMATION, *PWMIGUIDINFORMATION; > + > +DEFINE_GUID(GUID_REGISTRATION_CHANGE_NOTIFICATION, 0xb48d49a1, 0xe777, 0x11d0, 0xa5, 0xc, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0x10); > +DEFINE_GUID(GUID_MOF_RESOURCE_ADDED_NOTIFICATION, 0xb48d49a2, 0xe777, 0x11d0, 0xa5, 0xc, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0x10); > +DEFINE_GUID(GUID_MOF_RESOURCE_REMOVED_NOTIFICATION, 0xb48d49a3, 0xe777, 0x11d0, 0xa5, 0xc, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0x10); > + > +ULONG WMIAPI WmiCloseBlock(WMIHANDLE handle); > +ULONG WMIAPI WmiDevInstTonameA(char *instance, ULONG length, char *dev, ULONG index); > +ULONG WMIAPI WmiDevInstTonameW(WCHAR *instance, ULONG length, WCHAR *dev, ULONG index); Those two functions above do not exist in any of my header files. Did you maybe mean WmiDevInstToInstanceNameA/W ? > +ULONG WMIAPI WmiEnumerateGuids(LPGUID list, ULONG *count); > +ULONG WMIAPI WmiExecuteMethodA(WMIHANDLE handle, const char *instance, ULONG method, ULONG inputsize, > + void *inputbuffer, ULONG *outputsize, void *outputbuffer); > +ULONG WMIAPI WmiExecuteMethodW(WMIHANDLE handle, const WCHAR *instance, ULONG method, ULONG inputsize, > + void *inputbuffer, ULONG *outputsize, void *outputbuffer); > +ULONG WMIAPI WmiFileHandleTonameA(WMIHANDLE handle, HANDLE filehandle, ULONG *num, char *names); > +ULONG WMIAPI WmiFileHandleTonameW(WMIHANDLE handle, HANDLE filehandle, ULONG *num, WCHAR *names); Those two functions also not exist. Did you mean WmiFileHandleToInstanceNameA/W? > +void WMIAPI WmiFreeBuffer(void *buffer); > +#define WmiInsertTimestamp(WnodeHeader) GetSystemTimeAsFileTime((FILETIME *)&((*WNODE_HEADER)WnodeHeader)->TimeStamp) > +ULONG WMIAPI WmiMofEnumerateResourcesA(MOFHANDLE handle, ULONG *count, PMOFRESOURCEINFOA *resource); > +ULONG WMIAPI WmiMofEnumerateResourcesW(MOFHANDLE handle, ULONG *count, PMOFRESOURCEINFOW *resource); > +ULONG WMIAPI WmiNotificationRegistrationA(LPGUID guid, BOOLEAN enable, void *info, ULONG_PTR context, ULONG flags); > +ULONG WMIAPI WmiNotificationRegistrationW(LPGUID guid, BOOLEAN enable, void *info, ULONG_PTR context, ULONG flags); > +ULONG WMIAPI WmiOpenBlock(GUID *guid, ULONG access, WMIHANDLE *handle); > +ULONG WMIAPI WmiQueryAllDataA(WMIHANDLE handle, ULONG *bufferSize, void *buffer); > +ULONG WMIAPI WmiQueryAllDataW(WMIHANDLE handle, ULONG *buffferSize, void *buffer); > +ULONG WMIAPI WmiQueryGuidInformation(WMIHANDLE handle, PWMIGUIDINFORMATION guidinfo); > +ULONG WMIAPI WmiQuerySingleInstanceA(WMIHANDLE handle, const char *name, ULONG *bufferSize, void *buffer); > +ULONG WMIAPI WmiQuerySingleInstanceW(WMIHANDLE handle, const WCHAR *name, ULONG *bufferSize, void *buffer); > +ULONG WMIAPI WmiSetSingleInstanceA(WMIHANDLE handle, const char *name, ULONG reserved, ULONG size, void *buffer); > +ULONG WMIAPI WmiSetSingleInstanceW(WMIHANDLE handle, const WCHAR *name, ULONG reserved, ULONG size, void *buffer); > +ULONG WMIAPI WmiSetSingleItemA(WMIHANDLE handle, const char *name, ULONG id, ULONG reserved, ULONG size, void *buffer); > +ULONG WMIAPI WmiSetSingleItemW(WMIHANDLE handle, const WCHAR *name, ULONG id, ULONG reserved, ULONG size, void *buffer); > + > +DECL_WINELIB_TYPE_AW(WmiDevInstToname) > +DECL_WINELIB_TYPE_AW(WmiExecuteMethod) > +DECL_WINELIB_TYPE_AW(WmiFileHandleToname) > +DECL_WINELIB_TYPE_AW(WmiMofEnumerateResources) > +DECL_WINELIB_TYPE_AW(WmiNotificationRegistration) > +DECL_WINELIB_TYPE_AW(WmiQueryAllData) > +DECL_WINELIB_TYPE_AW(WmiQuerySingleInstance) > +DECL_WINELIB_TYPE_AW(WmiSetSingleInstance) > +DECL_WINELIB_TYPE_AW(WmiSetSingleItem) > + > +#ifdef __cplusplus > +} > +#endif > + > +#endif /* _WMIUM_ */ > -- 2.7.3 > > >

1 0

GPU detection logic in wined3d
by Ken Thomases May 5, 2016

May 5, 2016

Hi, Now that the WGL_WINE_query_renderer extension is implemented for Mesa and OS X, I want to reconsider the logic for detecting the GPU in wined3d. See wined3d_adapter_init_gl_caps() and query_gpu_description() in dlls/wined3d/directx.c. First, let's assume that query_renderer is available and the user has not overridden the vendor or device IDs via the registry: If query_renderer provides vendor and device IDs, I think that those should carry a lot of weight. They are almost certainly the real values. So, if that combination isn't found in wined3d's tables, it should emit a winediag ERR. We want to update the tables to account for the devices, especially for Macs where there are relatively few GPUs and they're common to a lot of machines. Currently, the failure to find them is just silently ignored. If the combination isn't found or if query_renderer provided a vendor but no device, and the vendor is one of the known ones (i.e. from card_vendor_table), then it should be used to constrain the guessing. Wined3d should not attempt to guess the vendor. Currently, the vendor provided by query_renderer is just ignored in that case. If query_renderer provides a device ID but no vendor, then that's basically useless and should be ignored. If the user has overridden both the vendor and device in the registry but that combination is not in the tables, then we should go back to the values from query_renderer. Basically, this is user error to specify useless values in the override and it should be ignored. Currently, the overrides replace the values from query_renderer and they are lost. If the user has overridden just the vendor, then it should be used iff it's one of the known ones. This is the user telling us the vendor of their GPU. If it doesn't match the vendor provided by query_renderer, then any device provided by query_renderer should be ignored. It doesn't make sense to combine a device ID from one vendor with a different vendor. Wined3d will have to guess the device. If the user has overridden just the device, then it should be used with the vendor from query_renderer. If that combination is not found, then it should be ignored. The user presumably saw on some previous occasion that wined3d determined the right vendor but the wrong device and just corrected the device. If the combination is not found, then either the vendor has changed or the user did it wrong by specifying a device that's not known to wined3d. If people (mostly Henri) generally like the above proposed logic, I can work up a patch. -Ken

1 0

Wine Gecko 2.47-beta1
by Jacek Caban May 5, 2016

May 5, 2016

Hi all, I just uploaded a beta build of the next Gecko update. Wine patch is attached. All reviews and testing is appreciated. Thanks, Jacek

1 0

Re: [1/2] shlwapi/tests: Add wvnsprintfW comformance test
by Marvin May 5, 2016

May 5, 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=22849 Your paranoid android. === wxppro (32 bit string) === string: unhandled exception c0000005 at 77F6923B === w2003std (32 bit string) === string: unhandled exception c0000005 at 7D18A782

1 0

Re: [PATCH] winmm: Restrict some MCI actions to the creating thread
by Marvin May 4, 2016

May 4, 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=22848 Your paranoid android. === w864 (32 bit mci) === mci.c:1121: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close) === w1064 (32 bit mci) === mci.c:1121: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close) === w864 (64 bit mci) === mci.c:1121: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close) === w1064 (64 bit mci) === mci.c:1121: Test failed: got 0001 instead of MCI_NOTIFY_xyz 0004 from command play (aborted by close)

1 0

Re: [PATCH 11/11] msctf: Added ITfTransitoryExtensionSink tests.
by Marvin May 4, 2016

May 4, 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=22847 Your paranoid android. === wvistau64 (32 bit inputprocessor) === inputprocessor.c:1104: Test failed: Failed to get sink cookie === w2008s64 (32 bit inputprocessor) === inputprocessor.c:1104: Test failed: Failed to get sink cookie === w7u (32 bit inputprocessor) === inputprocessor.c:1104: Test failed: Failed to get sink cookie === w7pro64 (32 bit inputprocessor) === inputprocessor.c:1104: Test failed: Failed to get sink cookie === wvistau64 (64 bit inputprocessor) === inputprocessor.c:1104: Test failed: Failed to get sink cookie === w2008s64 (64 bit inputprocessor) === inputprocessor.c:1104: Test failed: Failed to get sink cookie === w7pro64 (64 bit inputprocessor) === inputprocessor.c:1104: Test failed: Failed to get sink cookie

1 0

Re: msctf: Improved ITfKeystrokeMgr::TestKeyUp and TestKeyDown stubs.
by Aric Stewart May 4, 2016

May 4, 2016

Signed-off-by: Aric Stewart <aric(a)codeweavers.com>

1 0

Re: comdlg32: Use SetRect() instead of open coding it.
by Dmitry Timoshkov May 4, 2016

May 4, 2016

Frédéric Delanoy <frederic.delanoy(a)gmail.com> wrote: > - cancel_rc.left = dialog_rc.right - cancel_width - hspacing; > - cancel_rc.top = dialog_rc.bottom - cancel_height - vspacing; > - cancel_rc.right = cancel_rc.left + cancel_width; > - cancel_rc.bottom = cancel_rc.top + cancel_height; > + SetRect(&cancel_rc, > + dialog_rc.right - cancel_width - hspacing, dialog_rc.bottom - cancel_height - vspacing, > + dialog_rc.right - hspacing , dialog_rc.bottom - vspacing); This is at least very strange and weird formatting of an API call. I don't see anything like that in the changed file. -- Dmitry.

3 5

Re: [PATCH 3/4] winemac.drv: Really fix our handling of DIBs on the clipboard.
by Ken Thomases May 4, 2016

May 4, 2016

Hi Chip, Thanks for working on this. I know you didn't originate this approach, but, as a general concern, is there really no better approach to converting DIBs than what we have with duplicated code for manually laying out the structure and copying data? I mean, that code has to go someplace, but shouldn't there be proper functions in GDI or something? Among other things, I worry that there might be subtle details that each duplicate gets slightly wrong or at least different from the others. For one thing, when converting from a DIBv5 to another format, you copy across the image data, but you drop the color profile. Shouldn't there be a color conversion to sRGB or whatever the default profile of a v3 DIB is? I know that most of Wine doesn't handle this stuff properly, anyway, but that's part of my point about doing these conversions in one place. When such support is added to that one place in the future, we'd want to automatically get the benefit of it here. Specific points about the code in-line below. In some cases, I may just be ignorant about the DIB format, so just let me know: On May 3, 2016, at 2:03 PM, Charles Davis <cdavis5x(a)gmail.com> wrote: > > +static HGLOBAL create_dib_from_dibv5(HGLOBAL src) … > + /* Calculate the size of the new packed DIB */ > + data_size = bv5->bV5SizeImage; MSDN says bV5SizeImage can be zero for BI_RGB DIBs. Is that only for zero-size DIBs or does it mean it's implicit in width, height, and bit count? > + packed_size = sizeof(BITMAPINFOHEADER) > + + ((bv5->bV5BitCount <= 8) ? (sizeof(RGBQUAD) * bv5->bV5ClrUsed) : 0) > + + ((bv5->bV5Compression == BI_BITFIELDS) ? (sizeof(DWORD) * 3) : 0) > + + data_size; MSDN says bV5BitCount can be 0 for BI_JPEG and BI_PNG. For that case, should a color table be included in the size? There's an existing function, bitmap_info_size(). Should that be extended for additional header types for its existing uses? Should it be used for these calculations in your new code? > +static HGLOBAL create_dibv5_from_dib(HGLOBAL src) … > + data_size = bmih->biSizeImage; > + packed_size = sizeof(BITMAPV5HEADER) > + + ((bmih->biBitCount <= 8) ? (sizeof(RGBQUAD) * bmih->biClrUsed) : 0) > + + data_size; > + offset_src = bmih->biSize > + + ((bmih->biBitCount <= 8) ? (sizeof(RGBQUAD) * bmih->biClrUsed) : 0); Shouldn't offset_src potentially include the color masks for biCompression == BI_BITFIELDS? > + if (bv5->bV5Compression == BI_BITFIELDS && bmih->biSize < sizeof(BITMAPV4HEADER)) > + { > + memcpy(&bv5->bV5RedMask, bmih+1, 3*sizeof(DWORD)); > + bv5->bV5AlphaMask = 0; > + } Is it OK to leave the masks uninitialized for other cases? > + hdc = GetDC(0); You never release this DC. > + if (GetLogColorSpaceW(GetColorSpace(hdc), &lcs, sizeof(lcs))) > + { > + if (bmih->biSize < sizeof(BITMAPV4HEADER)) > + { > + bv5->bV5CSType = lcs.lcsCSType; > + bv5->bV5Endpoints = lcs.lcsEndpoints; > + bv5->bV5GammaRed = lcs.lcsGammaRed; > + bv5->bV5GammaGreen = lcs.lcsGammaGreen; > + bv5->bV5GammaBlue = lcs.lcsGammaBlue; > + } > + bv5->bV5Intent = lcs.lcsIntent; > + } > + else > + { > + if (bmih->biSize < sizeof(BITMAPV4HEADER)) > + { > + bv5->bV5CSType = LCS_DEVICE_RGB; This type isn't listed as a valid value for bV5CSType in MSDN. > + memset(&bv5->bV5Endpoints, 0, sizeof(bv5->bV5Endpoints)); > + bv5->bV5Endpoints.ciexyzRed.ciexyzX = 0xffffffff; > + bv5->bV5Endpoints.ciexyzGreen.ciexyzY = 0xffffffff; > + bv5->bV5Endpoints.ciexyzBlue.ciexyzZ = 0xffffffff; > + bv5->bV5GammaRed = 0; > + bv5->bV5GammaGreen = 0; > + bv5->bV5GammaBlue = 0; Are gamma values of 0 right? I would expect the 16.16-fixed form of 2.2 or maybe 1.0. > @@ -724,6 +932,7 @@ static HANDLE import_bmp_to_dib(CFDataRef data) > } > > memcpy(p, bmi, len); > + Spurious whitespace change. > @@ -1254,8 +1552,35 @@ static CFDataRef export_bitmap_to_dib(HANDLE data) > dib = create_dib_from_bitmap(data); > if (dib) > { > - ret = export_clipboard_data(dib); > + HGLOBAL dib3 = create_dib_from_dibv5(dib); > + > + ret = export_clipboard_data(dib3); > + GlobalFree(dib); > + if (dib3 != dib) GlobalFree(dib3); > + } Is the above necessary? create_dib_from_bitmap() will only ever create v3 DIBs, right? It's specifically allocating and building a BITMAPINFOHEADER. -Ken

1 0

Re: [PATCH 3/3] wininet: Added IRD_NO_WAIT flag tests.
by Marvin May 4, 2016

May 4, 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=22837 Your paranoid android. === w1064 (32 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2413: Test failed: count was wrong http.c:2414: Test failed: http data wrong, got: Garbage: Header http.c:3077: Test failed: HttpAddRequestHeaders succeeded http.c:3078: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3083: Test failed: code = 200, expected 400 http.c:3083: Test failed: unexpected status code 200, expected 400 http.c:3083: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 === w1064 (64 bit http) === http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1 http.c:1762: Test failed: Expected 2, got 4 http.c:1763: Test failed: Expected CRLF, got ' http.c:2413: Test failed: count was wrong http.c:2414: Test failed: http data wrong, got: Garbage: Header http.c:3077: Test failed: HttpAddRequestHeaders succeeded http.c:3078: Test failed: Expected error ERROR_HTTP_HEADER_NOT_FOUND, got 0 http.c:3083: Test failed: code = 200, expected 400 http.c:3083: Test failed: unexpected status code 200, expected 400 http.c:3083: Test failed: unexpected status code 200, expected 400 http.c:523: Test failed: HTTP_QUERY_RAW_HEADERS: expected length 0, but got 1

1 0

Re: msctf: Improved ITfKeystrokeMgr::TestKeyUp and TestKeyDown stubs.
by Marvin May 4, 2016

May 4, 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=22836 Your paranoid android. === wvistau64 (32 bit inputprocessor) === inputprocessor.c:254: Test failed: Unexpected TextStoreACP_RequestLock sink inputprocessor.c:275: Test failed: Unexpected TextStoreACP_GetSelection sink inputprocessor.c:1241: Test failed: eaten = 1 === w2008s64 (32 bit inputprocessor) === inputprocessor.c:254: Test failed: Unexpected TextStoreACP_RequestLock sink inputprocessor.c:275: Test failed: Unexpected TextStoreACP_GetSelection sink inputprocessor.c:1241: Test failed: eaten = 1 === w864 (32 bit inputprocessor) === inputprocessor.c:793: Test failed: Deactivation came unexpectedly === wvistau64 (64 bit inputprocessor) === inputprocessor.c:254: Test failed: Unexpected TextStoreACP_RequestLock sink inputprocessor.c:275: Test failed: Unexpected TextStoreACP_GetSelection sink inputprocessor.c:1241: Test failed: eaten = 1 === w2008s64 (64 bit inputprocessor) === inputprocessor.c:254: Test failed: Unexpected TextStoreACP_RequestLock sink inputprocessor.c:275: Test failed: Unexpected TextStoreACP_GetSelection sink inputprocessor.c:1241: Test failed: eaten = 1

1 0

Re: winex11.drv: Use IsRectEmpty() instead of open coding it.
by Alexandre Julliard May 4, 2016

May 4, 2016

Michael Stefaniuc <mstefani(a)redhat.de> writes: > @@ -134,7 +134,7 @@ static inline void reset_bounds( RECT *bounds ) > > static inline void add_bounds_rect( RECT *bounds, const RECT *rect ) > { > - if (rect->left >= rect->right || rect->top >= rect->bottom) return; > + if (IsRectEmpty(rect)) return; I'm not sure it's an improvement to add a function call in such a simple inline function. -- Alexandre Julliard julliard(a)winehq.org

3 4

Re: [PATCH 2/4] winemac.drv: Move create_bitmap_from_dib() above the import/export functions.
by Ken Thomases May 4, 2016

May 4, 2016

Signed-off-by: Ken Thomases <ken(a)codeweavers.com>

1 0

Re: winemac.drv: Use IsRectEmpty() instead of open coding it.
by Ken Thomases May 4, 2016

May 4, 2016

On May 3, 2016, at 2:47 PM, Michael Stefaniuc <mstefani(a)redhat.de> wrote: > > Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> > --- > Not even compile tested. But as this is a purely generated patch there > was no opportunity for me to screw it up... In fact, it doesn't compile. :-/ You've added a call to IsRectEmpty() to macdrv.h, which doesn't #include winuser.h. That alone only causes an implicit declaration warning. However, clipboard.c includes winuser.h after macdrv.h, which causes an error about the conflict between the real and implicit declarations. You can move the include of winuser.h from all of the modules to macdrv.h, but make sure to #define OEMRESOURCE before it, as required by mouse.c. It also seems to need to come after the include of wingdi.h. -Ken > > > > dlls/winemac.drv/macdrv.h | 2 +- > dlls/winemac.drv/window.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h > index f3b5e65..81b642c 100644 > --- a/dlls/winemac.drv/macdrv.h > +++ b/dlls/winemac.drv/macdrv.h > @@ -47,7 +47,7 @@ > > static inline CGRect cgrect_from_rect(RECT rect) > { > - if (rect.left >= rect.right || rect.top >= rect.bottom) > + if (IsRectEmpty(&rect)) > return CGRectMake(rect.left, rect.top, 0, 0); > return CGRectMake(rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top); > } > diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c > index a48ac17..fbea49f 100644 > --- a/dlls/winemac.drv/window.c > +++ b/dlls/winemac.drv/window.c > @@ -401,7 +401,7 @@ static void sync_window_region(struct macdrv_win_data *data, HRGN win_region) > */ > static inline void add_bounds_rect(RECT *bounds, const RECT *rect) > { > - if (rect->left >= rect->right || rect->top >= rect->bottom) return; > + if (IsRectEmpty(rect)) return; > bounds->left = min(bounds->left, rect->left); > bounds->top = min(bounds->top, rect->top); > bounds->right = max(bounds->right, rect->right); > -- > 2.4.11 > >

1 0

Re: ntdll: Fix buffer allocation check in get_dir_data_space.
by Alexandre Julliard May 4, 2016

May 4, 2016

Sebastian Lackner <sebastian(a)fds-team.de> writes: > BTW: I assume its intentional that you realloc only the first buffer to release > some space, right? In the worst case we are wasting up to about > PATH_MAX * sizeof(WCHAR) space in the other buffers. Yes, in the common case it will only waste a few bytes. It's only the last buffer that can have significant space left. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: dbghelp: Fix a typo in comment
by Frédéric Delanoy May 4, 2016

May 4, 2016

Minor thing, but you wanna keep "*/" alignment consistent by adding a space. On Tue, May 3, 2016 at 4:01 PM, Andrey Gusev <andrey.goosev(a)gmail.com> wrote: > @@ -58,7 +58,7 @@ > /* order from highest-order term to lowest-order term. UARTs transmit */ > /* characters in order from LSB to MSB. By storing the CRC this way, */ > /* we hand it to the UART in the order low-byte to high-byte; the UART */ > -/* sends each low-bit to hight-bit; and the result is transmission bit */ > +/* sends each low-bit to high-bit; and the result is transmission bit */ > /* by bit from highest- to lowest-order term without requiring any bit */ > /* shuffling on our part. Reception works similarly. */ -- Frédéric Delanoy

1 0

Re: user32/tests: Don't test function directly when reporting GetLastError()
by Marvin May 3, 2016

May 3, 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=22828 Your paranoid android. === wvistau64 (64 bit win) === win.c:8154: Test failed: transparent window didn't get WM_NCHITTEST message win.c:8155: Test failed: button under static window didn't get WM_LBUTTONUP

1 0

Re: [PATCH 3/4] d3drm: Implement IDirect3DRM*_CreateTexture. (v2)
by Aaryaman Vasishta May 3, 2016

May 3, 2016

Please take a look at v2 of this patch and v2 of patch 2/4. 1/4 and 4/4 are there as well but are way down the list so should I resend the whole patch set instead? Cheers Aaryaman On Sat, Apr 30, 2016 at 4:54 PM, Aaryaman Vasishta < jem456.vasishta(a)gmail.com> wrote: > Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> > --- > dlls/d3drm/d3drm.c | 37 ++++++++++++++++++++--------- > dlls/d3drm/tests/d3drm.c | 61 > ++++++++++++++++++++++++++++++++++++++++++++---- > dlls/d3drm/texture.c | 2 +- > 3 files changed, 83 insertions(+), 17 deletions(-) > > diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c > index 2b428ef..6c6007d 100644 > --- a/dlls/d3drm/d3drm.c > +++ b/dlls/d3drm/d3drm.c > @@ -195,17 +195,19 @@ static HRESULT WINAPI > d3drm1_CreateAnimationSet(IDirect3DRM *iface, IDirect3DRMA > static HRESULT WINAPI d3drm1_CreateTexture(IDirect3DRM *iface, > D3DRMIMAGE *image, IDirect3DRMTexture **texture) > { > - struct d3drm_texture *object; > + struct d3drm *d3drm = impl_from_IDirect3DRM(iface); > + IDirect3DRMTexture3 *texture3; > HRESULT hr; > > - FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, > texture); > + TRACE("iface %p, image %p, texture %p.\n", iface, image, texture); > > - if (FAILED(hr = d3drm_texture_create(&object))) > + if (FAILED(hr = > IDirect3DRM3_CreateTexture(&d3drm->IDirect3DRM3_iface, image, &texture3))) > return hr; > > - *texture = &object->IDirect3DRMTexture_iface; > + hr = IDirect3DRMTexture3_QueryInterface(texture3, > &IID_IDirect3DRMTexture, (void **)texture); > + IDirect3DRMTexture3_Release(texture3); > > - return D3DRM_OK; > + return hr; > } > > static HRESULT WINAPI d3drm1_CreateLight(IDirect3DRM *iface, > @@ -661,17 +663,19 @@ static HRESULT WINAPI > d3drm2_CreateAnimationSet(IDirect3DRM2 *iface, IDirect3DRM > static HRESULT WINAPI d3drm2_CreateTexture(IDirect3DRM2 *iface, > D3DRMIMAGE *image, IDirect3DRMTexture2 **texture) > { > - struct d3drm_texture *object; > + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); > + IDirect3DRMTexture3 *texture3; > HRESULT hr; > > - FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, > texture); > + TRACE("iface %p, image %p, texture %p.\n", iface, image, texture); > > - if (FAILED(hr = d3drm_texture_create(&object))) > + if (FAILED(hr = > IDirect3DRM3_CreateTexture(&d3drm->IDirect3DRM3_iface, image, &texture3))) > return hr; > > - *texture = &object->IDirect3DRMTexture2_iface; > + hr = IDirect3DRMTexture3_QueryInterface(texture3, > &IID_IDirect3DRMTexture2, (void **)texture); > + IDirect3DRMTexture3_Release(texture3); > > - return D3DRM_OK; > + return hr; > } > > static HRESULT WINAPI d3drm2_CreateLight(IDirect3DRM2 *iface, > @@ -1152,13 +1156,24 @@ static HRESULT WINAPI > d3drm3_CreateAnimationSet(IDirect3DRM3 *iface, IDirect3DRM > static HRESULT WINAPI d3drm3_CreateTexture(IDirect3DRM3 *iface, > D3DRMIMAGE *image, IDirect3DRMTexture3 **texture) > { > + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); > struct d3drm_texture *object; > HRESULT hr; > > - FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, > texture); > + TRACE("iface %p, image %p, texture %p.\n", iface, image, texture); > + > + if (!d3drm_validate_image(image)) > + return D3DRMERR_BADVALUE; > > if (FAILED(hr = d3drm_texture_create(&object))) > return hr; > + object->d3drm = &d3drm->IDirect3DRM_iface; > + > + if (FAILED(hr = > IDirect3DRMTexture3_InitFromImage(&object->IDirect3DRMTexture3_iface, > image))) > + { > + d3drm_texture_destroy(object); > + return hr; > + } > > *texture = &object->IDirect3DRMTexture3_iface; > > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index 2a70ca4..3a32e6d 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -1725,11 +1725,62 @@ static void test_Texture(void) > hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void > **)&d3drm3); > ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", > hr); > > + /* Tests for validation of D3DRMIMAGE struct */ > + hr = IDirect3DRM_CreateTexture(d3drm1, &testimg, &texture1); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = > %x)\n", hr); > + hr = IDirect3DRM2_CreateTexture(d3drm2, &testimg, &texture2); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = > %x)\n", hr); > + hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg, &texture3); > + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = > %x)\n", hr); > + IDirect3DRMTexture_Release(texture1); > + IDirect3DRMTexture2_Release(texture2); > + IDirect3DRMTexture3_Release(texture3); > + > + initimg.rgb = 0; > + hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + initimg.rgb = 1; > + initimg.red_mask = 0; > + hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + initimg.red_mask = 0x000000ff; > + initimg.green_mask = 0; > + hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + initimg.green_mask = 0x0000ff00; > + initimg.blue_mask = 0; > + hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + initimg.blue_mask = 0x00ff0000; > + initimg.buffer1 = NULL; > + hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + > initimg.buffer1 = &pixel; > hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1); > ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = > %x)\n", hr); > ref2 = get_refcount((IUnknown *)d3drm1); > - todo_wine ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 > = %u.\n", ref1, ref2); > + ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", > ref1, ref2); > ref3 = get_refcount((IUnknown *)d3drm2); > ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = > %u.\n", ref1, ref3); > ref4 = get_refcount((IUnknown *)d3drm3); > @@ -1737,7 +1788,7 @@ static void test_Texture(void) > hr = IDirect3DRM2_CreateTexture(d3drm2, &initimg, &texture2); > ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = > %x)\n", hr); > ref2 = get_refcount((IUnknown *)d3drm1); > - todo_wine ok(ref2 > ref1 + 1, "expected ref2 > ref1, got ref1 = %u , > ref2 = %u.\n", ref1, ref2); > + ok(ref2 > ref1 + 1, "expected ref2 > (ref1 + 1), got ref1 = %u , ref2 > = %u.\n", ref1, ref2); > ref3 = get_refcount((IUnknown *)d3drm2); > ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = > %u.\n", ref1, ref3); > ref4 = get_refcount((IUnknown *)d3drm3); > @@ -1745,7 +1796,7 @@ static void test_Texture(void) > hr = IDirect3DRM3_CreateTexture(d3drm3, &initimg, &texture3); > ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = > %x)\n", hr); > ref2 = get_refcount((IUnknown *)d3drm1); > - todo_wine ok(ref2 > ref1 + 2, "expected ref2 > ref1, got ref1 = %u , > ref2 = %u.\n", ref1, ref2); > + ok(ref2 > ref1 + 2, "expected ref2 > (ref1 + 2), got ref1 = %u , ref2 > = %u.\n", ref1, ref2); > ref3 = get_refcount((IUnknown *)d3drm2); > ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u , ref3 = > %u.\n", ref1, ref3); > ref4 = get_refcount((IUnknown *)d3drm3); > @@ -1803,7 +1854,7 @@ static void test_Texture(void) > > IDirect3DRMTexture_Release(texture1); > ref2 = get_refcount((IUnknown *)d3drm1); > - todo_wine ok(ref2 - 2 == ref1, "expected ref2 == ref1, got ref1 = %u, > ref2 = %u.\n", ref1, ref2); > + ok(ref2 - 2 == ref1, "expected (ref2 - 2) == ref1, got ref1 = %u, > ref2 = %u.\n", ref1, ref2); > ref3 = get_refcount((IUnknown *)d3drm2); > ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = > %u.\n", ref1, ref3); > ref4 = get_refcount((IUnknown *)d3drm3); > @@ -1827,7 +1878,7 @@ static void test_Texture(void) > > IDirect3DRMTexture2_Release(texture2); > ref2 = get_refcount((IUnknown *)d3drm1); > - todo_wine ok(ref2 - 1 == ref1, "expected ref2 == ref1, got ref1 = %u, > ref2 = %u.\n", ref1, ref2); > + ok(ref2 - 1 == ref1, "expected (ref2 - 1) == ref1, got ref1 = %u, > ref2 = %u.\n", ref1, ref2); > ref3 = get_refcount((IUnknown *)d3drm2); > ok(ref3 == ref1, "expected ref3 == ref1, got ref1 = %u, ref3 = > %u.\n", ref1, ref3); > ref4 = get_refcount((IUnknown *)d3drm3); > diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c > index 7db3ecd..883be82 100644 > --- a/dlls/d3drm/texture.c > +++ b/dlls/d3drm/texture.c > @@ -46,7 +46,7 @@ static inline struct d3drm_texture > *impl_from_IDirect3DRMTexture3(IDirect3DRMTex > > void d3drm_texture_destroy(struct d3drm_texture *texture) > { > - if (texture->d3drm && texture->initialized) > + if (texture->initialized) > IDirect3DRM_Release(texture->d3drm); > HeapFree(GetProcessHeap(), 0, texture); > } > -- > 2.3.2 (Apple Git-55) > >

1 0

Re: mode: add stub exe
by Nikolay Sivov May 3, 2016

May 3, 2016

> +MODULE = mode.exe I don't know how important that is, but on Win7 it's called mode.com, just what bug title says. > @@ -3472,6 +3472,7 @@ WINE_CONFIG_PROGRAM(iexplore,,[install]) > WINE_CONFIG_PROGRAM(ipconfig,,[clean,install]) > WINE_CONFIG_PROGRAM(lodctr,,[install]) > WINE_CONFIG_PROGRAM(mofcomp,,[install]) > +WINE_CONFIG_PROGRAM(mode,,[install]) > WINE_CONFIG_PROGRAM(mshta,,[install]) > WINE_CONFIG_PROGRAM(msiexec,,[install,installbin,manpage]) > WINE_CONFIG_PROGRAM(net,,[clean,install]) This is not sorted.

2 1

Re: [1/2] kernel32/tests: Add more tests for GetConsoleFontInfo. (v4)
by Marvin May 3, 2016

May 3, 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=22804 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 1301662830 console.c:1445: Test failed: [15] Expected output count to be 0, got 1301662830 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 1301662830 console.c:1689: Test failed: [13] Expected output count to be 0, got 1301662830 console.c:1689: Test failed: [15] Expected output count to be 0, got 1301662830 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 1301662830 === w864 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 3495556664 console.c:1445: Test failed: [15] Expected output count to be 0, got 3495556664 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 3495556664 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 3495556664 console.c:1689: Test failed: [15] Expected output count to be 0, got 3495556664 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 3495556664 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 4206877851 console.c:1445: Test failed: [15] Expected output count to be 0, got 4206877851 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 4206877851 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 4206877851 console.c:1689: Test failed: [15] Expected output count to be 0, got 4206877851 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 4206877851 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w864 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

2 1

Re: [2/2] kernel32/tests: Add tests for SetConsoleFont. (resend)
by Marvin May 3, 2016

May 3, 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=22805 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 3667173890 console.c:1445: Test failed: [15] Expected output count to be 0, got 3667173890 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 3667173890 console.c:1689: Test failed: [13] Expected output count to be 0, got 3667173890 console.c:1689: Test failed: [15] Expected output count to be 0, got 3667173890 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 3667173890 === w864 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 125638792 console.c:1445: Test failed: [15] Expected output count to be 0, got 125638792 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 125638792 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 125638792 console.c:1689: Test failed: [15] Expected output count to be 0, got 125638792 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 125638792 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 62984337 console.c:1445: Test failed: [15] Expected output count to be 0, got 62984337 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 62984337 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 62984337 console.c:1689: Test failed: [15] Expected output count to be 0, got 62984337 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 62984337 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w864 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

1 0

ntdll: Store the directory identity and search mask in the directory cache
by Piotr Caban May 2, 2016

May 2, 2016

The patch breaks compilation on mac: directory.c:1973:42: error: expected identifier if (!has_wildcard( dir_data->->mask )) break; ^ directory.c:2164:34: error: use of undeclared identifier 'dir_data' const UNICODE_STRING *mask = dir_data->mask; ^ directory.c:2216:61: error: use of undeclared identifier 'dir_data' union file_directory_info *info = append_entry( dir_data, bu... Thanks, Piotr

1 1

Re: [PATCH] comctl32/tooltips: Cut tooltip text at first tab char unless TTS_NOPREFIX is used
by Dmitry Timoshkov May 2, 2016

May 2, 2016

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > @@ -316,49 +318,40 @@ static void test_gettext(void) > toolinfoA.lParam = 0xdeadbeef; > GetClientRect(hwnd, &toolinfoA.rect); > r = SendMessageA(hwnd, TTM_ADDTOOLA, 0, (LPARAM)&toolinfoA); > - if (r) > - { > - toolinfoA.hwnd = NULL; > - toolinfoA.uId = 0x1234ABCD; > - toolinfoA.lpszText = bufA; > - SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); > - ok(strcmp(toolinfoA.lpszText, "") == 0, "lpszText should be an empty string\n"); > > - toolinfoA.lpszText = bufA; > - SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); > - ok(toolinfoA.lpszText == NULL, > - "expected NULL, got %p\n", toolinfoA.lpszText); 'r' is assigned but not used. Perhaps it would be a good idea to test return value of every SendMessage() call. -- Dmitry.

1 0

Re: dwmapi: Return S_OK in DwmSetWindowAttribute stub.
by Nikolay Sivov May 2, 2016

May 2, 2016

On 02.05.2016 16:06, Sebastian Lackner wrote: > From: Michael Müller <michael(a)fds-team.de> > > Signed-off-by: Michael Müller <michael(a)fds-team.de> > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > dlls/dwmapi/dwmapi_main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c > index 155d7d3..8c3472a 100644 > --- a/dlls/dwmapi/dwmapi_main.c > +++ b/dlls/dwmapi/dwmapi_main.c > @@ -126,7 +126,7 @@ HRESULT WINAPI DwmSetWindowAttribute(HWND hwnd, DWORD attributenum, LPCVOID attr > > if (!once++) FIXME("(%p, %x, %p, %x) stub\n", hwnd, attributenum, attribute, size); > > - return E_NOTIMPL; > + return S_OK; > } > > /********************************************************************** > What application is that for?

2 1

Re: [PATCH 2/2 v2] mshtml: Make it possible to clear timer and interval with any of clearTimeout and clearInterval functions
by Marvin May 2, 2016

May 2, 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=22785 Your paranoid android. === wxppro (32 bit events) === events.c:1388: timeout The test timed out === w2003std (32 bit events) === events.c:1388: timeout The test timed out === wvistau64 (32 bit events) === events.c:1388: timeout The test timed out === w2008s64 (32 bit events) === events.c:1388: timeout === w7u (32 bit events) === events.c:1388: timeout === w7pro64 (32 bit events) === events.c:1388: timeout === w8 (32 bit events) === events.c:1388: timeout === w864 (32 bit events) === events.c:1388: timeout events.c:1388: timeout === w1064 (32 bit events) === events.c:1388: timeout events.c:1388: timeout === wvistau64 (64 bit events) === events.c:1388: timeout === w2008s64 (64 bit events) === events.c:1388: timeout === w7pro64 (64 bit events) === events.c:1388: timeout === w864 (64 bit events) === events.c:1388: timeout events.c:1388: timeout === w1064 (64 bit events) === events.c:1388: timeout events.c:1388: timeout

1 0

Re: [PATCH 1/2 v2] mshtml: Fix HTMLWindow3_setInterval behavior on 0 msec intervals
by Marvin May 2, 2016

May 2, 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=22784 Your paranoid android. === wxppro (32 bit events) === events.c:1388: timeout === w2003std (32 bit events) === events.c:1388: timeout === wvistau64 (32 bit events) === events.c:1388: timeout === w2008s64 (32 bit events) === events.c:1388: timeout === w7u (32 bit events) === events.c:1388: timeout === w7pro64 (32 bit events) === events.c:1388: timeout === w8 (32 bit events) === events.c:1388: timeout === w864 (32 bit events) === events.c:1388: timeout events.c:1388: timeout === w1064 (32 bit events) === events.c:1388: timeout events.c:1388: timeout === wvistau64 (64 bit events) === events.c:1388: timeout === w2008s64 (64 bit events) === events.c:1388: timeout === w7pro64 (64 bit events) === events.c:1388: timeout === w864 (64 bit events) === events.c:1388: timeout events.c:1388: timeout === w1064 (64 bit events) === events.c:1388: timeout events.c:1388: timeout

1 0

Re: [PATCH] po: update Norwegian translation
by Nikolay Sivov May 2, 2016

May 2, 2016

On 30.04.2016 17:18, Kim Malmo wrote: > I have added missing translations and fixed up the fuzzy ones. I've also > fixed some minor typos and spelling errors in the old translation. > > The undertaking that might stand out here however, is I've tried to make > it more consistent with itself, and more consistent with the original > english text. One thing I want to point out is the (former) usage of > « and » signs. First of all the are no longer present on Norwegian > keyboards, second and perhaps most importantly, they look hideous with > whatever is the default Wine font. For consistency what I've done is the > following: > > * For %1 (or similar) in the english text I have used %1 or '%1' depending > on context. In some cases it makes sense to wrap handles or operations > in Norwegian. > > * For '%1' (or similar) in the english text I have used '%1' > > * All cases of «%1» (or similar) has been changed to %1 or '%1' depending > on context. > > For parts of the translation I have tried to make the context and meaning > more clear. There are also quite a few changes to make it more conformant > with Microsoft's Norwegian Bokmål Style Guide. Hi, thank you for this major update. Regarding quotation marks, it's really up to target language to use one of several styles of quotation marks and quotation formatting. Original English text is only a reference, not something to follow. User guide you mentioned, mostly tells to omit quotation marks (p. 58), and use straight double quotes if they are necessary. The fact that '«' and '»' are missing from default keyboard layout is unfortunate but can't alone be a reason not to use them, if traditional typographical rules tell so. What about default Wine font problems with them? I see no such thing when testing in clean prefix, but it could certainly depend on dpi/font size (Wine's Tahoma is simplistic) and actual font you're using. > > Signed-off-by: Kim Malmo <berencamlost(a)msn.com>

3 3

Re: [v2 1/2] d3dx9: Add 'exp' preshader opcode.
by Matteo Bruni May 1, 2016

May 1, 2016

2016-04-25 10:52 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > + op_step = 2 + (args_count + 1) * 3; You could instead calculate that in the caller and pass it in place of args_count. Or, probably better, you could pass the entire op_tests[] table entry to the function, you're currently passing all the fields one by one anyway. > + for (i = 0; i < 4; ++i) > + todo_wine_if(todo && todo[i]) > + ok(compare_float(v[i], ((float *)expected_result)[i], ulps), > + "Operation %s, component %u, expected %#x (%g), got %#x (%g).\n", op_mnem, > + i, expected_result[i], ((float *)expected_result)[i], ((unsigned int *)v)[i], v[i]); todo currently can never be NULL. > + for (i = 0; i < ARRAY_SIZE(op_tests); ++i) > + test_preshader_op(device, test_effect_preshader_effect_blob, sizeof test_effect_preshader_effect_blob, > + blob_position[op_tests[i].args_count].pos, blob_position[op_tests[i].args_count].result_index, > + op_tests[i].mnem, op_tests[i].opcode, op_tests[i].args_count, > + op_tests[i].expected_result, &op_tests[i].fvect1, &op_tests[i].fvect2, > + op_tests[i].ulps, op_tests[i].todo); Parenthesis around sizeof operand, please.

1 0

Re: [PATCH 1/2] d3dx9: Add 'exp' preshader opcode.
by Matteo Bruni May 1, 2016

May 1, 2016

2016-04-21 10:56 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > @@ -43,6 +43,7 @@ enum pres_ops > PRESHADER_OP_SIN, > PRESHADER_OP_COS, > PRESHADER_OP_RSQ, > + PRESHADER_OP_EXP, > }; > #define PRES_OPCODE_MASK 0x7ff00000 > #define PRES_OPCODE_SHIFT 20 > @@ -119,6 +121,7 @@ static const struct op_info pres_op_info[] = > {0x108, "sin", 1, 0, pres_sin}, /* PRESHADER_OP_SIN */ > {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ > {0x107, "rsq", 1, 0, pres_rsq}, /* PRESHADER_OP_RSQ */ > + {0x105, "exp", 1, 0, pres_exp}, /* PRESHADER_OP_EXP */ > }; It might make sense to keep the array sorted by opcode (which requires either adding the enum into the table or, most likely, reordering the enum too). That way you can binary search into it in the future, if necessary. No particular hurry for that though. > +static void test_preshader_op(IDirect3DDevice9 *device, const char *op_mnem, > + unsigned int opcode, unsigned int args_count, unsigned int *expected_result, > + D3DXVECTOR4 *fvect1, D3DXVECTOR4 *fvect2, unsigned int ulps, BOOL *todo) > +{ > + DWORD test_effect_blob[ARRAY_SIZE(test_effect_preshader_effect_blob)]; It's not a huge array but it seems better to avoid putting it on the stack nonetheless - i.e. please allocate it dynamically with HeapAlloc(). > + HRESULT hr; > + ID3DXEffect *effect; > + D3DLIGHT9 light; > + unsigned int i, npasses; passes_count? > + float *v; > + unsigned int op_pos, op_step, result_index; > + D3DXHANDLE param; > + > + if (args_count == 1) > + { > + op_pos = TEST_EFFECT_PRESHADER_OP0_POS; > + op_step = TEST_EFFECT_PRESHADER_OP0_INS_SIZE; > + result_index = 0; > + } > + else if (args_count == 2) > + { > + op_pos = TEST_EFFECT_PRESHADER_OPMUL_POS; > + op_step = TEST_EFFECT_PRESHADER_OPMUL_INS_SIZE; > + result_index = 2; > + } > + else > + { > + return; > + } That doesn't seem particularly nice, especially WRT extending this test later on. It seems better to have the "original" bytecode and these variables you compute here passed in from the caller (maybe stored in a struct together with the opcode parameters). test_effect_preshader_ops() should probably be table-based. At that point the *_POS and *_SIZE defines might become unnecessary; if they stay they should probably be named after the argument count (which is the actually interesting part, the original operation is going to change for the test and can be figured out from the light index) instead. > + memcpy(test_effect_blob, test_effect_preshader_effect_blob, sizeof test_effect_blob); > + for (i = 0; i < 4; i++) ++i, for consistency.

2 2

Re: [PATCH 3/4] d3drm: Implement IDirect3DRM*_CreateTexture.
by Stefan Dösinger May 1, 2016

May 1, 2016

> Am 28.04.2016 um 20:17 schrieb Aaryaman Vasishta <jem456.vasishta(a)gmail.com>: > > @@ -198,13 +198,24 @@ static HRESULT WINAPI d3drm1_CreateTexture(IDirect3DRM *iface, > struct d3drm_texture *object; > HRESULT hr; > > - FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, texture); > + TRACE("iface %p, image %p, texture %p.\n", iface, image, texture); > + > + if (!d3drm_validate_image(image)) > + return D3DRMERR_BADVALUE; > > if (FAILED(hr = d3drm_texture_create(&object))) > + { > + d3drm_texture_destroy(object); > return hr; > + } > + object->d3drm = iface; > + object->initialized = TRUE; > + object->image = image; > > *texture = &object->IDirect3DRMTexture_iface; > > + IDirect3DRM_AddRef(iface); > + > return D3DRM_OK; > } > Is there anything wrong with calling Texture3::InitFromImage here, or even calling IDirect3DRM3::CreateTexture? in D3DRM1::CreateTexture and D3DRM2::CreateTexture?

2 3

Re: comdlg32: check for overflow before dereferencing (resend)
by Sebastian Lackner May 1, 2016

May 1, 2016

On 01.05.2016 17:30, Pierre Schweitzer wrote: > - while ((lpstrEdit[nStrCharCount]!='"') && (nStrCharCount <= nStrLen)) > + while ((nStrCharCount <= nStrLen) && (lpstrEdit[nStrCharCount]!='"')) The change looks correct, but while you are just it, you might also want to fix the operator here. It probably should be <, otherwise the loop will also copy the terminating \0 character. Same for the comparison a couple of lines above.

2 1

Fw: [PATCH 2/2] kernel32/tests: Add tests for SetConsoleFont
by Hugh McMaster May 1, 2016

May 1, 2016

On Sunday, 1 May 2016 10:19 PM, Marvin wrote: > 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=22777 > > Your paranoid android. > > === w8 (32 bit console) === > console.c:1445: Test failed: [13] Expected output count to be 0, got 4115832529 > console.c:1445: Test failed: [15] Expected output count to be 0, got 4115832529 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 4115832529 > console.c:1689: Test failed: [13] Expected output count to be 0, got 4115832529 > console.c:1689: Test failed: [15] Expected output count to be 0, got 4115832529 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 4115832529 > > === w864 (32 bit console) === > console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 > console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed > console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [13] Expected output count to be 0, got 3160603465 > console.c:1445: Test failed: [15] Expected output count to be 0, got 3160603465 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 3160603465 > console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [13] Expected output count to be 0, got 3160603465 > console.c:1689: Test failed: [15] Expected output count to be 0, got 3160603465 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 3160603465 > console.c:2148: Test failed: [7] Expected count to be 0, got 1 > console.c:2214: Test failed: [7] Expected count to be 0, got 1 > console.c:2280: Test failed: [7] Expected count to be 0, got 1 > > === w1064 (32 bit console) === > console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 > console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed > console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [13] Expected output count to be 0, got 2978365710 > console.c:1445: Test failed: [15] Expected output count to be 0, got 2978365710 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2978365710 > console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [13] Expected output count to be 0, got 2978365710 > console.c:1689: Test failed: [15] Expected output count to be 0, got 2978365710 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2978365710 > console.c:2148: Test failed: [7] Expected count to be 0, got 1 > console.c:2214: Test failed: [7] Expected count to be 0, got 1 > console.c:2280: Test failed: [7] Expected count to be 0, got 1 > > === w864 (64 bit console) === > console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 > console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed > console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 > console.c:2148: Test failed: [7] Expected count to be 0, got 1 > console.c:2214: Test failed: [7] Expected count to be 0, got 1 > console.c:2280: Test failed: [7] Expected count to be 0, got 1 > > === w1064 (64 bit console) === > console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 > console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed > console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 > console.c:2148: Test failed: [7] Expected count to be 0, got 1 > console.c:2214: Test failed: [7] Expected count to be 0, got 1 > console.c:2280: Test failed: [7] Expected count to be 0, got 1 These are existing failures.

1 0

Fw: [PATCH 1/2] kernel32/tests: Add more tests for GetConsoleFontInfo (v3)
by Hugh McMaster May 1, 2016

May 1, 2016

On Sunday, 1 May 2016 10:09 PM, Marvin wrote: > 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=22776 > > Your paranoid android. > > === w8 (32 bit console) === > console.c:1445: Test failed: [13] Expected output count to be 0, got 3531622039 > console.c:1445: Test failed: [15] Expected output count to be 0, got 3531622039 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 3531622039 > console.c:1689: Test failed: [13] Expected output count to be 0, got 3531622039 > console.c:1689: Test failed: [15] Expected output count to be 0, got 3531622039 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 3531622039 > > === w864 (32 bit console) === > console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 > console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed > console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [13] Expected output count to be 0, got 1438038684 > console.c:1445: Test failed: [15] Expected output count to be 0, got 1438038684 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 1438038684 > console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [13] Expected output count to be 0, got 1438038684 > console.c:1689: Test failed: [15] Expected output count to be 0, got 1438038684 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 1438038684 > console.c:2148: Test failed: [7] Expected count to be 0, got 1 > console.c:2214: Test failed: [7] Expected count to be 0, got 1 > console.c:2280: Test failed: [7] Expected count to be 0, got 1 > > === w1064 (32 bit console) === > console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 > console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed > console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [13] Expected output count to be 0, got 1797978764 > console.c:1445: Test failed: [15] Expected output count to be 0, got 1797978764 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 1797978764 > console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [13] Expected output count to be 0, got 1797978764 > console.c:1689: Test failed: [15] Expected output count to be 0, got 1797978764 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 1797978764 > console.c:2148: Test failed: [7] Expected count to be 0, got 1 > console.c:2214: Test failed: [7] Expected count to be 0, got 1 > console.c:2280: Test failed: [7] Expected count to be 0, got 1 > > === w864 (64 bit console) === > console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 > console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed > console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 > console.c:2148: Test failed: [7] Expected count to be 0, got 1 > console.c:2214: Test failed: [7] Expected count to be 0, got 1 > console.c:2280: Test failed: [7] Expected count to be 0, got 1 > > === w1064 (64 bit console) === > console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 > console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 > console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed > console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 > console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 > console.c:2148: Test failed: [7] Expected count to be 0, got 1 > console.c:2214: Test failed: [7] Expected count to be 0, got 1 > console.c:2280: Test failed: [7] Expected count to be 0, got 1 These are existing failures.

1 0

Re: [PATCH 2/2] kernel32/tests: Add tests for SetConsoleFont
by Marvin May 1, 2016

May 1, 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=22777 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 4115832529 console.c:1445: Test failed: [15] Expected output count to be 0, got 4115832529 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 4115832529 console.c:1689: Test failed: [13] Expected output count to be 0, got 4115832529 console.c:1689: Test failed: [15] Expected output count to be 0, got 4115832529 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 4115832529 === w864 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 3160603465 console.c:1445: Test failed: [15] Expected output count to be 0, got 3160603465 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 3160603465 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 3160603465 console.c:1689: Test failed: [15] Expected output count to be 0, got 3160603465 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 3160603465 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 2978365710 console.c:1445: Test failed: [15] Expected output count to be 0, got 2978365710 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2978365710 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 2978365710 console.c:1689: Test failed: [15] Expected output count to be 0, got 2978365710 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2978365710 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w864 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

1 0

Re: [PATCH 1/2] kernel32/tests: Add more tests for GetConsoleFontInfo (v3)
by Marvin May 1, 2016

May 1, 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=22776 Your paranoid android. === w8 (32 bit console) === console.c:1445: Test failed: [13] Expected output count to be 0, got 3531622039 console.c:1445: Test failed: [15] Expected output count to be 0, got 3531622039 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 3531622039 console.c:1689: Test failed: [13] Expected output count to be 0, got 3531622039 console.c:1689: Test failed: [15] Expected output count to be 0, got 3531622039 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 3531622039 === w864 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 1438038684 console.c:1445: Test failed: [15] Expected output count to be 0, got 1438038684 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 1438038684 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 1438038684 console.c:1689: Test failed: [15] Expected output count to be 0, got 1438038684 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 1438038684 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (32 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [13] Expected output count to be 0, got 1797978764 console.c:1445: Test failed: [15] Expected output count to be 0, got 1797978764 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 1797978764 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [13] Expected output count to be 0, got 1797978764 console.c:1689: Test failed: [15] Expected output count to be 0, got 1797978764 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 1797978764 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w864 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1 === w1064 (64 bit console) === console.c:2567: Test failed: expected ERROR_INVALID_HANDLE, got 1 console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1270: Test failed: expected VerifyConsoleIoHandle to succeed console.c:1445: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [3] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [11] Expected output count to be 3735928559, got 0 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 0 console.c:2148: Test failed: [7] Expected count to be 0, got 1 console.c:2214: Test failed: [7] Expected count to be 0, got 1 console.c:2280: Test failed: [7] Expected count to be 0, got 1

1 0

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

May 1, 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=22774 Your paranoid android. === w1064 (32 bit crypt) === crypt.c:1024: Test failed: Expected 00010000, got ffffffff crypt.c:1024: Test failed: Expected 00010001, got ffffffff === w1064 (64 bit crypt) === crypt.c:1024: Test failed: Expected 00010000, got ffffffff crypt.c:1024: Test failed: Expected 00010001, got ffffffff

1 0

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

May 1, 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=22771 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