March 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

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

Re: [PATCH 5/5] wined3d: Alpha test emulation for core profile contexts.
by Henri Verbeet April 6, 2016

April 6, 2016

On 31 March 2016 at 19:51, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + shader_addline(buffer, "if (alpha_test)\n"); > + if (alpha_func != WINED3D_CMP_NEVER) > + shader_addline(buffer, " if (!(%s[0].a %s alpha_ref))\n", > + get_fragment_output(gl_info), comparison_operator[alpha_func - WINED3D_CMP_NEVER]); > + shader_addline(buffer, " discard;\n"); Is there really an advantage to having the "alpha_test" uniform instead of just mapping disabled alpha test to WINED3D_CMP_ALWAYS? > @@ -973,6 +981,7 @@ struct ps_compile_args { > WORD texcoords_initialized; /* MAX_TEXTURES, 8 */ > BOOL pointsprite; > BOOL flatshading; > + enum wined3d_cmp_func alpha_func; > }; > > enum fog_src_type { > @@ -2022,6 +2031,7 @@ struct ffp_frag_settings > unsigned char pointsprite : 1; > unsigned char flatshading : 1; > unsigned char padding : 5; > + enum wined3d_cmp_func alpha_func; "alpha_func" only needs 4 bits (3 if you just mask the 4th bit), so would still fit in the padding. That applies somewhat to struct ps_compile_args as well, although we may care less there.

2 3

Re: ntoskrnl.exe: Make IoAllocateIrp not crash on negative values. (try 2)
by Sebastian Lackner April 2, 2016

April 2, 2016

On 29.03.2016 22:13, Bernhard Übelacker wrote: > https://bugs.winehq.org/show_bug.cgi?id=39734 > > This patch should avoid crash in acedrv11.sys. > IoAllocateIrp is called with a stack_size of -128. > Therefore ExAllocatePool gets a negative size value. > > Tested against Windows XP. > (See the test based on wine-staging "driver testing framework" attached to the bug.) > ( https://newtestbot.winehq.org/JobDetails.pl?Key=21722 testrun by Sebastian Lackner.) > > Try 1: https://www.winehq.org/pipermail/wine-patches/2016-March/148587.html > Review 1: https://www.winehq.org/pipermail/wine-devel/2016-March/112476.html > > Changes since try 1: > - Fix usage of wrong variable. > - Use a better name for variable. > - Simplify if statement. > > Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> > --- > dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) Thanks for the updated version. Could you maybe also add a couple of additional tests with charge_quota = TRUE? Since you are changing both versions, I'm fearing a bit that your changes could break other situations. If there are no unexpected test failures it looks good to me.

2 1

Re: [v8 1/6] d3dx9: Implement preshader parsing.
by Matteo Bruni March 31, 2016

March 31, 2016

2016-03-29 17:22 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > +enum pres_reg_tables > +{ > + PRES_REGTAB_IMMED, /* immediate double constants from CLIT */ I don't quite recall, I might be contradicting my own earlier comments here but at this point this comment doesn't seem to add much. General (and late) note, we usually tend to be more verbose with variable or type names and avoid too cryptic abbreviations. I don't think it's worth changing everything now though. > +struct d3dx_preshader > +{ > + struct d3dx_regstore regs; > + > + unsigned int ins_count; > + struct d3dx_pres_ins *ins; > + > + struct d3dx_const_tab inputs; > +}; > + > + > +struct d3dx_param_eval That double empty line seems unnecessary. > -HRESULT d3dx_create_param_eval(struct d3dx9_base_effect *base_effect, void *byte_code, unsigned int byte_code_size, > +enum pres_ops > +{ > + PRESHADER_OP_NOP, > + PRESHADER_OP_MOV, > + PRESHADER_OP_MAX_ENUM > +}; Maybe rename _MAX_ENUM to _UNKNOWN? At least for this patch series you don't really need that enum value though (see below). > +static HRESULT regstore_alloc_table(struct d3dx_regstore *rs, unsigned int table) > +{ > + unsigned int size; > + > + size = rs->table_sizes[table] * table_info[table].reg_component_count * table_info[table].component_size; > + if (size) > + { > + rs->tables[table] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); > + rs->table_value_set[table] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, > + sizeof(*rs->table_value_set[table]) * > + ((rs->table_sizes[table] + PRES_BITMASK_BLOCK_SIZE - 1) / PRES_BITMASK_BLOCK_SIZE)); Indentation. > +static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, void *data, > + unsigned int start_offset, unsigned int count) > +{ > + unsigned int block_idx, start, end, start_block, end_block; > + > + if (!count) > + return; > + > + memcpy((BYTE *)rs->tables[table] + start_offset * table_info[table].component_size, > + data, count * table_info[table].component_size); Indentation. > + for (i = 0; i < PRESHADER_OP_MAX_ENUM; ++i) > + if (ins_code == pres_op_info[i].opcode) > + break; > + if (i == PRESHADER_OP_MAX_ENUM) > + { > + FIXME("Unknown opcode %#x, raw %#x.\n", ins_code, ins_raw); > + return NULL; > + } I'd use ARRAY_SIZE(pres_op_info) instead of PRESHADER_OP_MAX_ENUM. > + cdesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*cdesc) * desc.Constants); > + inputs_param = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*inputs_param) * desc.Constants); AFAICS neither really needs HEAP_ZERO_MEMORY. You should also check those allocations and bail out if either one fails. > +static void update_table_sizes_consts(unsigned int *table_sizes, struct d3dx_const_tab *ctab) > +{ > + unsigned int i, table, max_register; > + > + for (i = 0; i < ctab->input_count; ++i) > + { > + max_register = ctab->inputs[i].RegisterIndex + ctab->inputs[i].RegisterCount; > + table = ctab->regset2table[ctab->inputs[i].RegisterSet]; > + if (table < PRES_REGTAB_COUNT) > + table_sizes[table] = max(table_sizes[table], max_register); > + } > +} > + > +static void update_table_size(unsigned int *table_sizes, unsigned int table, unsigned int offset) > +{ > + table_sizes[table] = max(table_sizes[table], get_reg_offset(table, offset) + 1); > +} Why not use it also in update_table_sizes_consts()? The "table < PRES_REGTAB_COUNT" check should then go into the update_table_size() helper. > + if (const_count > UINT_MAX / sizeof(double)) > + { > + WARN("Invalid immediate constants count %u.\n", const_count); > + return NULL; > + } > + if (p - ptr + const_count * (sizeof(double) / sizeof(unsigned int)) >= count) > + { > + WARN("Byte code buffer ends unexpectedly.\n"); > + return NULL; > + } The first check seems unnecessary, if the idea was to avoid integer overflows in the second check you can rewrite that one instead (e.g. by dividing by sizeof(unsigned int) both sides of the inequality). That second check can probably be improved by verifying that the constants fit into the CLIT comment instead (see below). BTW, the function return type is HRESULT, those returns generate warnings for me. > + pres->ins = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pres->ins) * pres->ins_count); You should probably check this allocation too. > + for (i = 0; i < pres->ins_count; ++i) > + { > + unsigned int *ptr_next; > + > + ptr_next = parse_pres_ins(p, count, &pres->ins[i]); > + if (!ptr_next) > + return D3DXERR_INVALIDDATA; > + count -= ptr_next - p; > + p = ptr_next; > + } > + > + if (!count) > + { > + WARN("Byte code buffer ends unexpectedly.\n"); > + return D3DXERR_INVALIDDATA; > + } These kinds of size checks probably work but they are somewhat hard to follow. You could instead check the size of each comment section (making sure that it doesn't overflow the whole bytecode buffer) and then check that you don't go outside of each comment while parsing it. find_bytecode_comment() could do the first check before returning and, for example, also return the comment size so that the caller can use it to validate the relevant accesses. Hopefully what I mean is clear enough, otherwise as usual feel free to ask. > +err_out: > + FIXME("Error creating parameter evaluator.\n"); > + d3dx_free_param_eval(peval); > *peval_out = NULL; > - return E_NOTIMPL; > + return; > +} That return is now unnecessary.

1 0

Re: [PATCH 2/2] d3dx10: Add D3DX10UnsetAllDeviceObjects stub
by Matteo Bruni March 31, 2016

March 31, 2016

2016-03-29 9:07 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Reference: https://bugs.winehq.org/show_bug.cgi?id=27035 > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Applying: d3dx10: Add D3DX10UnsetAllDeviceObjects stub .git/rebase-apply/patch:35: new blank line at EOF. + .git/rebase-apply/patch:52: new blank line at EOF. + warning: 2 lines add whitespace errors. Looks okay otherwise.

1 0

Re: [PATCH v2 1/5] ddraw/tests: Add a test for color varyings clamping.
by Marvin March 31, 2016

March 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=21816 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}. === 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

wine-1.8.2-rc1 Available
by Michael Stefaniuc March 31, 2016

March 31, 2016

Hello guys, sorry for the delay in preparing the next Stable release. Too much stuff going on and I couldn't focus on Wine. I have pushed today an informal wine-1.8.2-rc1 to https://github.com/mstefani/wine-stable https://static-winehq.rhcloud.com/stable/ 1.8.2-rc1 is fairly complete(*) from my point of view. The plan is to give the interested developers about a week time to look at the proposed 1.8.2. On Wednesday next week I plan to hand over the "final" to Alexandre, with a probable release on Friday next week. Depending on the feedback / outcry I might do another release candidate before Wednesday. (*) I wanted to include: Bug 39092 - Regression introduced with xaudio2_8 too. It is a beast to cherry-pick due to the dependencies and dependencies of dependencies... 1.8.2-rc1 is already big enough: - I have included this time interesting commits I have found interesting, mostly based on the additional information in the patch submission. - 32 bugs fixed (of which 6 are regressions). - 86 patches (of which 7 are tests only). - With test file changes filtered out: 95 files changed, 1873 insertions(+), 770 deletions(-) - The biggest "offender" for those changes is Bug 25086 - Multiple games and applications need kernel32.GetLogicalProcessorInformationEx implementation - I have attached the filtered diffstat While I have added a (lightweight) tag to it, I didn't bother with the rest of the release stuff. I have included that info in this email though. ---------------------------------------------------------------- Bugs fixed in 1.8.2-rc1 (total 32) [12652] Tom Clancy's Rainbow Six: Vegas 2 fails to launch (number of quality levels for D3DMULTISAMPLE_NONMASKABLE multiple-sample type must not exceed 8) [13683] Ultima IX: Mouse pointer missing when reading books, under inventory [14617] Multiple Visual Basic 5/6 applications using ActiveX components depend on Standard OLE Types Typelib which is missing from 'olepro32.dll' [15473] Adobe After Effects 4 crashes on startup [25086] Multiple games and applications need kernel32.GetLogicalProcessorInformationEx implementation (CPU-Z 1.72, Splinter Cell: Blacklist, Adobe CC 2015, Kontakt 5) [30687] Powerpoint 2003/2007: embedded video play/pause on click no longer works [32827] Legrand XlPro 3 (MFC app) crashes on startup (failure to load registry-free COM servers via app hook, 'OleCreate' must ignore HRESULT of 'IOleObject::GetMiscStatus') [33787] IE8 crashes on new tab [33988] Star Wars: The Force Unleashed II - Crashes with a page fault [34174] MinGW installer 0.5-beta-20120426-1 fails to process log files (sharing violation on temp file used for piped output) [34318] Multiple games and applications need ntdll.dll.EtwRegisterTraceGuidsW (Process Hacker 2.x, Far Cry 4) [35187] Jade Empire Special Edition configuration tool always resetting video settings [36013] bleem! 1.4 (PlayStation emulator) fails on startup, complaining with 'Not enough memory to load program!' [37115] Calling ReadFile from WINBASEAPI (WinBase.h) with zero read length causes hang [37288] Not implemented feature System.Drawing.Pen.ResetTransform() [37536] Native MSVCP120.dll override requires implementation of msvcr120.dll._W_Gettnames (Desura client) [37556] CompareStringW should abort on the first nonmatching character to avoid invalid memory access. [38314] Mouse Wheel doesn't work for Jagged Alliance 2 version 1.13 (it uses MOUSEHOOKSTRUCTEX) [39591] Crimzon Clover: Page fault on launch [39838] Wreckfest Server: Crashes at startup, unimplemented function KERNEL32.dll.GetConsoleScreenBufferInfoEx & SetConsoleScreenBufferInfoEx [39866] XIIZeal (steam) immediately exits on start [39875] Starcraft can't see Direct Cable Connection games hosted on another computer [39878] Diablo II does not start on 64bit system with more than 2GB VRAM cards [39908] SuperTux 0.3.5a crashes on startup, needs msvcr120.dll.strtof [40021] IDEA v1.7 fails to start [40053] Romance of the Three Kingdoms 13 (三國志13) fails to start [40083] Heroes of the Storm Freezes/Crashes after its recent updates [40129] MSI Reading and Writing Behaves differently than Windows [40147] Assertion 'm->state == STATE_PASSIVE' failed at pulse/mainloop.c:827 on starting Skype 7.18.0.112 [40201] EccoPro only works on Wine 1.6.2 [40204] Steam client fails to start with UmePlus font installed, when running in dwrite mode [40222] IMalloc(Spy)::Free nullptr ---------------------------------------------------------------- Changes since 1.8.1: Alex Henrie (1): ntdll: Finish serial reads of size 0 immediately. Alexandre Julliard (3): make_unicode: Fix typo in Indic syllable table generation. server: Implement serial port read interval timeouts. advapi32: Fix null termination in RegQueryInfoKeyA. Alistair Leslie-Hughes (7): user32: Don't crash in DrawTextEx when tab length is zero. olepro32: Add typelib resource. include: Add GdipGetPenTransform, GdipSetPenTransform declarations. gdiplus/tests: Add Pen Transform tests. gdiplus: Implement GdipGetPenTransform. gdiplus: Implement GdipSetPenTransform. gdiplus: Implement GdipResetPenTransform. Andrew Eikum (5): oleaut32: Don't clear BSTR size. mciqtz: Implement MCI_RESUME. xaudio2: Handle openal source allocation failure. winepulse.drv: Check that the server connection actually succeeded. ntdll: Implement SystemLogicalProcessorInformationEx. André Hentschel (2): winemaker: Markup fixes in German translation. ntdll: Set TPIDRURW also on ARMv8-A. Anton Baskanov (1): quartz: Set the result to 1.0 in FilterGraph::GetRate. Aric Stewart (1): winejoystick.drv: Initialize unhandled dwPOV to JOY_POVCENTERED. Austin English (1): kernel32: Add GetConsoleScreenBufferInfoEx/SetConsoleScreenBufferInfoEx stubs. Bernhard Übelacker (2): include: Implement todo_wine_if for usage in wine tests. msvcr120: Implement strtof and _strtof_l. Charles Davis (3): winex11.drv: Actually query the swap method attribute. dwrite: Fix typos, and fix definition of Mac LangCodes for Welsh and up. configure: Check for __builtin_ms_va_list on all x86_64 platforms. Christopher Thielen (1): user32: A window may be notified with WM_CAPTURECHANGED about itself if SetCapture() is called twice. Dmitry Timoshkov (1): kernel32: CompareStringW should abort on the first nonmatching character to avoid an invalid memory access. Frédéric Delanoy (1): winemaker: Markup fixes in French translation. Hans Leidekker (2): msiexec: Fix manpage markup for repair and logging modifiers. msi: Fix the CHAR column type. Henri Verbeet (1): ntdll: Add special handling for int $0x2d exceptions. Hugh McMaster (1): reg: Remove stub output from the 'add' and 'delete' functions. Huw D. M. Davies (1): ole32: The type of the size of IMalloc'ed blocks is SIZE_T. Jacek Caban (4): ntdll: Pass SYNCHRONIZE flag in NtOpenFile and NtCreateFile calls. ntdll: Don't call NtOpenKeyEx directly from NtOpenKey. kernel32: Don't set unconditionally SECTION_QUERY flag in OpenFileMapping. ntdll: Moved RegisterTraceGuids[AW] implementation to ntdll. Jens Reyer (2): loader: Fix macro-not-defined error from man. winemaker: Fix macro-not-defined errors from man. Józef Kucia (3): wined3d: Validate render state in wined3d_device_set_render_state(). wined3d: Limit amount of video memory for older Windows versions. wined3d: Allow to query if surface format supports gamma correction. Kira Backes (1): user32: Add MOUSEHOOKSTRUCTEX for mouse wheel support. Marcus Meissner (1): manpages: Markup fixes. Matteo Bruni (2): wined3d: Limit the number of WINED3D_MULTISAMPLE_NON_MASKABLE quality levels reported. wined3d: Add WINED3DFMT_FLAG_RENDERTARGET to WINED3DFMT_B5G5R5X1_UNORM. Michael Müller (6): msvideo.dll16: Translate 16 bit address in lparam for MCIWNDM_SETTIMEFORMATA message. include: Add definitions for Win8 pseudo handles. server: Add support for Win8 pseudo handles. advapi32/tests: Add tests for Win8 pseudo handles. kernel32: Allow to pass NULL as old protection in VirtualProtect for Win9x compatibility. user32: Preserve beginning of extra data for MDI windows. Miklós Máté (2): winex11: Add 1280x960 resolution. wined3d: Warn only once about unsupported wrap state. Nikolay Sivov (12): ole2disp: Implement SafeArrayGetDim(). ole2disp: Implement SafeArrayGetElemsize(). ole2disp: Implement SafeArrayLock()/SafeArrayUnlock(). ole2disp: Implement SafeArrayAccessData()/SafeArrayUnaccessData(). include: Fix IsBad* prototypes. ctl3d32: Claim success in Ctl3dRegister(). ole32: Ignore GetMiscStatus() returned value in OleCreate(). dwrite: Handle font data initialization failure when building collections. ntdll/tests: Some tests for NtQuerySystemInformationEx(). ntdll: Add NtQuerySystemInformationEx() stub. kernel32: Forward GetLogicalProcessorInformationEx() to ntdll. ole32: Don't call spy on IMalloc::Free(NULL). Paul Gofman (1): d3dx9: Fix D3DXIntersectTri function. Piotr Caban (5): msxml3: Update xmlNode reference count when nodes are merged in node_insert_before. msxml3: Store information about ignorrable whitespace nodes in xmlNode._private variable. msxml3: Reimplement node_get_text helper so it uses information about ignorred white space nodes. msxml3: Add support for CDATA nodes in node_get_text. msvcr110: Add _W_Gettnames implementation. Sebastian Lackner (13): vcomp/tests: Reenable architecture dependent tests. vcomp: Implement 64-bit atomic instructions. ntdll: Implement RtlInterlockedPushListSListEx and fix calling convention of RtlInterlockedPushListSList. kernel32/tests: Clean up interlocked SList tests. kernel32: Forward InterlockedPushListSList[Ex] to ntdll. cmd: Fix sharing permissions of piped output files. vmm.vxd: Fix protection flags passed to VirtualAlloc. ntdll: Mimic Windows behaviour when calling debug service. ntdll: Implement handling of int $0x2d for x86_64. ntdll/tests: Add more tests for calling int $0x2d on x86 and x86_64. ntdll/tests: Add additional tests for instruction pointer in debug service tests. ntdll/tests: Add separate tests for exception handling of int $0x3. ntdll: Fix up instruction pointer in context for EXCEPTION_BREAKPOINT on x86_64. bye michael

1 0

Re: [PATCH 1/2] d3dx10: Add D3D10CreateEffectPoolFromMemory stub
by Józef Kucia March 31, 2016

March 31, 2016

On Tue, Mar 29, 2016 at 9:07 AM, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > dlls/d3d10/d3d10.spec | 2 +- > dlls/d3d10/d3d10_main.c | 9 +++++++++ > dlls/d3d10_1/d3d10_1.spec | 2 +- > include/d3d10effect.h | 2 ++ The subject prefix should be "d3d10:". > +HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UINT fx_flags, > + ID3D10Device *device, ID3D10EffectPool **effectpool) > +{ Please use "effect_pool" instead of "effectpool", mainly for consistency (snake_case). > + FIXME("data %p, data_size %lu, fx_flags %#x, device %p, effectpool %p.\n", > + data, data_size, fx_flags, device, effectpool); The FIXME() message should end with "stub!" or "stub.". > + return E_NOTIMPL; > +} > + I think you can remove this additional empty line. > diff --git a/include/d3d10effect.h b/include/d3d10effect.h > index 1494894..5dafdae 100644 > --- a/include/d3d10effect.h > +++ b/include/d3d10effect.h > @@ -832,6 +832,8 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const > ID3D10Blob **effect, ID3D10Blob **errors); > HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags, > ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect); > +HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UINT fx_flags, > + ID3D10Device *device, ID3D10EffectPool **effectpool); It should be "effect_pool" instead of "effectpool".

1 0

Re: [PATCH (try2)] setupapi: Fix spec entries for handle parameters
by Sebastian Lackner March 31, 2016

March 31, 2016

On 30.03.2016 17:00, Andrew Eikum wrote: > Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> > --- > > try2: Turns out there's a whole bunch more of these. I think I got > most/all of them. > > dlls/setupapi/setupapi.spec | 118 ++++++++++++++++++++++---------------------- > 1 file changed, 59 insertions(+), 59 deletions(-) Is there any specific reason why you want to change that? Using "long" for handles is usually perfectly fine and it depends on the exact implementation details if its a pointer or just an index into a handle table.

3 2

Re: [PATCH] msvcr120: Add scalbn
by Piotr Caban March 31, 2016

March 31, 2016

On 03/31/16 08:45, Daniel Lehman wrote: @ cdecl scalbn(double long) MSVCRT__scalb It will not compile in case of i386 wine. MSVCRT__scalb is defined inside ifdef. Thanks, Piotr

1 0

Need some advice on shell32
by Mathy Vanvoorden March 31, 2016

March 31, 2016

Hello, In an effort to get myself acquainted with the code I searched for some bugs I might be able to solve in Bugzilla. I found this one: https://bugs.winehq.org/show_bug.cgi?id=32079 Basically it says that an open file dialog in for example notepad or notepad++ doesn't show hidden files when the "Show hidden files" option is set in winecfg. I have traced this back to the fact that the ShowDotFiles option is only checked in the NT functions in ntdll, but notepad (and notepad++) use the comdlg32 open dialog which does not use those NT functions but the shell32 ones. It seems to me that the comdlg32 open dialog should check if ShowDotFiles is active and if so, to pass the SHCONTF_INCLUDEHIDDEN flag to the shell32 objects. But I might (probably?) be wrong. Can someone verify that this is the way to go before I start writing a patch? -- Met vriendelijke groeten, Best regards, Mathy Vanvoorden

3 7

Re: [PATCH 4/4] mshtml: Added IHTMLElement::outerText tests.
by Marvin March 30, 2016

March 30, 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=21790 Your paranoid android. === wxppro (32 bit dom) === dom.c:6968: Test failed: put_outerText failed: 00000000 dom.c:6971: Test failed: expected len = 2, got 1 === wvistau64 (32 bit dom) === dom.c:6968: Test failed: put_outerText failed: 00000000 dom.c:6971: Test failed: expected len = 2, got 1 === w7u (32 bit dom) === dom.c:6968: Test failed: put_outerText failed: 00000000 dom.c:6971: Test failed: expected len = 2, got 1 === w7pro64 (32 bit dom) === dom.c:6968: Test failed: put_outerText failed: 00000000 dom.c:6971: Test failed: expected len = 2, got 1 === w8 (32 bit dom) === dom.c:6968: Test failed: put_outerText failed: 00000000 dom.c:6971: Test failed: expected len = 2, got 1 === w864 (32 bit dom) === dom.c:6968: Test failed: put_outerText failed: 00000000 dom.c:6971: Test failed: expected len = 2, got 1 === w1064 (32 bit dom) === dom.c:6968: Test failed: put_outerText failed: 00000000 dom.c:6971: Test failed: expected len = 2, got 1 === wvistau64 (64 bit dom) === dom.c:6968: Test failed: put_outerText failed: 00000000 dom.c:6971: Test failed: expected len = 2, got 1 === w7pro64 (64 bit dom) === dom.c:6968: Test failed: put_outerText failed: 00000000 dom.c:6971: Test failed: expected len = 2, got 1 === w864 (64 bit dom) === dom.c:6968: Test failed: put_outerText failed: 00000000 dom.c:6971: Test failed: expected len = 2, got 1 === w1064 (64 bit dom) === dom.c:6968: Test failed: put_outerText failed: 00000000 dom.c:6971: Test failed: expected len = 2, got 1

2 1

Re: [PATCH] t2embed: Implement TTGetEmbeddingType()
by Marvin March 30, 2016

March 30, 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=21774 Your paranoid android. === build (build) === Make failed

2 1

Re: ntoskrnl.exe: Make IoAllocateIrp not crash on negative values.
by Sebastian Lackner March 29, 2016

March 29, 2016

On 27.03.2016 20:27, Bernhard Übelacker wrote: > https://bugs.winehq.org/show_bug.cgi?id=39734 > > Changes should avoid crash in acedrv11.sys. > IoAllocateIrp is called with a stack_size of -128. > > Tested against Windows XP. > (See the test based on wine-staging "driver testing framework".) For reference, here a testbot run which confirms that the change is correct (for XP/2003): https://newtestbot.winehq.org/JobDetails.pl?Key=21722 > > Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> > --- > dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c > index 36488a7..f2ccc61 100644 > --- a/dlls/ntoskrnl.exe/ntoskrnl.c > +++ b/dlls/ntoskrnl.exe/ntoskrnl.c > @@ -592,15 +592,20 @@ PIRP WINAPI IoAllocateIrp( CCHAR stack_size, BOOLEAN charge_quota ) > { > SIZE_T size; > PIRP irp; > + CCHAR _stack_size = stack_size; > > TRACE( "%d, %d\n", stack_size, charge_quota ); > > - size = sizeof(IRP) + stack_size * sizeof(IO_STACK_LOCATION); > + if (_stack_size <= 0 || (_stack_size > 1 && stack_size < 8)) > + _stack_size = 8; I would suggest to use a different variable, its very easy to mix up "stack_size" and "_stack_size". You even mixed it up yourself in the if() condition above. ;) If you want, you can also simplify the condition to (stack_size < 8 && stack_size != 1). > + > + size = sizeof(IRP) + _stack_size * sizeof(IO_STACK_LOCATION); > irp = ExAllocatePool( NonPagedPool, size ); > if (irp == NULL) > return NULL; > IoInitializeIrp( irp, size, stack_size ); > - irp->AllocationFlags = IRP_ALLOCATED_FIXED_SIZE; > + if (stack_size >= 1 && stack_size <= 8) > + irp->AllocationFlags = IRP_ALLOCATED_FIXED_SIZE; > if (charge_quota) > irp->AllocationFlags |= IRP_LOOKASIDE_ALLOCATION; > return irp; >

2 1

Re: [PATCH] d3drm: Partially Implement IDirect3DRM*::LoadTexture(v3).
by Henri Verbeet March 29, 2016

March 29, 2016

On 28 March 2016 at 20:02, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > v3: Add bitmap verification, use InitFromFile and other minor improvements. > Implementing InitFromFile() should be a separate patch from implementing LoadTexture(). > if (FAILED(hr = d3drm_texture_create(&object))) > return hr; > > + if (FAILED(hr = IDirect3DRMTexture_InitFromFile(&object->IDirect3DRMTexture_iface, filename))) > + { > + d3drm_texture_destroy(object); > + return hr; > + } > + > + object->d3drm = iface; > + IDirect3DRM_AddRef(iface); It would be good to back this up with tests. It would seem more natural to pass the IDirect3DRM interface to d3drm_texture_create(). If that's how it's supposed to work, you can make that change in a separate patch. > @@ -39,6 +40,9 @@ struct d3drm_texture > IDirect3DRMTexture IDirect3DRMTexture_iface; > IDirect3DRMTexture2 IDirect3DRMTexture2_iface; > IDirect3DRMTexture3 IDirect3DRMTexture3_iface; > + IDirect3DRM *d3drm; > + D3DRMIMAGE *image; > + BOOL internal_image_created; You don't really need internal_image_created, you can probably just add a destroy callback. > +HRESULT d3drm_texture_load(struct d3drm_texture *texture, IDirect3DRM *d3drm, const char *path, > + BOOL load_upside_down) DECLSPEC_HIDDEN; > + > +D3DRMIMAGE *d3drm_create_image(unsigned char *buffer, BITMAPINFO *info, BOOL palette, BOOL upside_down) DECLSPEC_HIDDEN; These are internal helper functions now. > @@ -4109,36 +4111,94 @@ 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); > + ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); > + > + hr = IDirect3DRMTexture_InitFromFile(texture1, filename); > + ok(hr == D3DRMERR_BADOBJECT, "Test %u: Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", i, hr); > + /* It's odd, but InitFromFile seems to AddRef IDirect3DRM even if it fails. */ So a test for the refcounts would be appropriate here. > +HRESULT d3drm_texture_load(struct d3drm_texture *texture, IDirect3DRM *d3drm, const char *path, BOOL load_upside_down) > +{ This is an internal helper function now and should be static. You never use "d3drm". > +D3DRMIMAGE *d3drm_create_image(unsigned char *buffer, BITMAPINFO *info, BOOL palette, BOOL upside_down) > +{ > + D3DRMPALETTEENTRY *colors; > + D3DRMIMAGE *image; > + BOOL black_used = FALSE; > + LONG w = info->bmiHeader.biWidth; > + LONG h = abs(info->bmiHeader.biHeight); > + int i, j, k; > + unsigned int idx, buffer1_idx; > + unsigned char *buffer1; > + int bpp = info->bmiHeader.biBitCount == 24 ? 32 : info->bmiHeader.biBitCount; > + int bpl = palette ? w : ((w + 3) & ~3) * bpp / 8; > + int num_colors = 0; There's not reason to use signed types for any of these. > + struct colors_24bpp > + { > + BYTE red; > + BYTE green; > + BYTE blue; > + } *color; > + color = (struct colors_24bpp *)buffer; > + > + if (bpl * h > UINT_MAX) > + { > + return NULL; > + } This doesn't work. If "bpl * h" would be larger than UINT_MAX it would overflow before the comparison. In fact, strictly speaking things become implementation defined above INT_MAX already, since you're using signed types for "bpl" and "h". What you'd typically do is something like "if (h > UINT_MAX / bpl)". Note that the calculation of "bpl" itself can overflow as well. So you'd need something like "if (align(w, 4) > UINT_MAX / (bpp / 8))" there as well. > + if (!(colors = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 256 * sizeof(*colors)))) > + { > + WARN("Not enough memory to allocate palette, returning NULL.\n"); > + return NULL; > + } > + > + > + if (!(image = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*image)))) > + { > + WARN("Not enough memory to allocate image struct, returning NULL.\n"); > + return NULL; > + } You probably don't need HEAP_ZERO_MEMORY for either of these. You certainly don't for "colors", and you should probably just initialise the few fields in "image" that you don't already. You also leak "colors" if the allocation for "image" fails. The indentation for the WARN is wrong. > + if (!(image->buffer1 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bpl * h))) > + { > + WARN("Not enough memory to allocate image buffer, returning NULL.\n"); > + return NULL; > + } You don't need HEAP_ZERO_MEMORY here if you're going to memset() it again below. You leak "colors" and "image" on failure. > + buffer1 = image->buffer1; > + memset(buffer1, 255, sizeof(unsigned char) * bpl * h); I think 0xff is clearer than 255. The "sizeof(unsigned char)" doesn't add much. > + if (!(image->palette = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, num_colors * sizeof(*image->palette)))) > + { > + WARN("Not enough memory to allocate image palette, returning NULL.\n"); > + return NULL; > + } Like above, you use HEAP_ZERO_MEMORY here, but immediately memcpy() over it. You leak on error. > + if (!(image->palette = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 256 * sizeof(*image->palette)))) > + { > + WARN("Not enough memory to allocate image palette, returning NULL.\n"); > + return NULL; > + } Leak on error. > 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 *object = impl_from_IDirect3DRMTexture(iface); I'd suggest "texture" instead of "object". > + if (object->d3drm) > + { > + /* InitFromFile seems to AddRef IDirect3DRM even if it fails. */ > + IDirect3DRM_AddRef(object->d3drm); > + } This is very suspicious, since you always assign "object->d3drm" after calling InitFromFile(). It's not backed up by tests either.

2 4

Re: [v7 2/7] d3dx9: Implement preshader parsing.
by Matteo Bruni March 29, 2016

March 29, 2016

2016-03-28 9:20 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> > --- > Changes > - Changed opcode function to take double arguments and return double Good catch. > +static struct op_info pres_op_info[] = > +{ > + {0x000, "nop", 0, 0, NULL }, /* PRESHADER_OP_NOP */ > + {0x100, "mov", 1, 0, pres_mov}, /* PRESHADER_OP_MOV */ > +}; I think this can be const. > +struct d3dx_pres_ins > +{ > + enum pres_ops op; > + /* first input argument is scalar, > + scalar component is propagated */ > + BOOL scalar_op; > + unsigned int component_count; > + struct d3dx_pres_operand inputs[3]; The maximum number of input operands could use a #define. Not a huge deal though. > +static void regstore_free_tables(struct d3dx_regstore *rs) > +{ > + unsigned int i; > + > + for (i = PRES_REGTAB_FIRST; i <= PRES_REGTAB_LAST; ++i) > + { > + if (rs->tables[i]) > + HeapFree(GetProcessHeap(), 0, rs->tables[i]); > + if (rs->table_value_set[i]) > + HeapFree(GetProcessHeap(), 0, rs->table_value_set[i]); > + } > +} You don't need to check for non-NULL, HeapFree() handles NULL arguments just fine. > +static unsigned int *find_bytecode_comment(unsigned int *ptr, unsigned int fourcc) > +{ > + while ((*ptr & 0xffff) == 0xfffe) > + { > + if (*(ptr + 1) == fourcc) > + return ptr + 2; > + ptr += 1 + (*ptr >> 16); > + } > + return NULL; > +} This is probably paranoid but in theory a broken or malicious effect could send you rummaging outside of the bytecode buffer so all the offsets should be checked. I don't think it's critical in practice i.e. I'll probably sleep just fine if you decide to ignore this issue... > +static unsigned int *parse_pres_arg(unsigned int *ptr, struct d3dx_pres_operand *opr) > +{ > + static const enum pres_reg_tables reg_table[8] = > + { > + PRES_REGTAB_COUNT, PRES_REGTAB_IMMED, PRES_REGTAB_CONST, PRES_REGTAB_COUNT, > + PRES_REGTAB_OCONST, PRES_REGTAB_OBCONST, PRES_REGTAB_OICONST, PRES_REGTAB_REG Matter of taste, so feel free to ignore this, but PRES_REGTAB_REG sounds a bit vague to me. I'd go with something like PRES_REGTAB_TEMP. > + if (input_count != pres_op_info[i].input_count) > + { > + FIXME("Actual input args %u, expected %u, instruction %s.\n", input_count, > + pres_op_info[i].input_count, pres_op_info[i].mnem); > + return NULL; > + } > + for (i = 0; i < input_count; ++i) > + { > + ptr = parse_pres_arg(ptr, &ins->inputs[i]); > + if (!ptr) > + return NULL; > + } Another pretty paranoid potential check, here you could verify that input_count is < ARRAY_SIZE(ins->inputs). Of course that could only fail if we encounter some instruction with more than 3 components AND we update pres_op_info BUT we forget to update struct d3dx_pres_ins, but I don't think it would hurt to be safe... > + for (i = 0; i < pres->ins_count; ++i) > + { > + unsigned int table; > + > + for (j = 0; j < pres_op_info[pres->ins[i].op].input_count; ++j) > + { > + table = pres->ins[i].inputs[j].table; > + max_offset = get_reg_offset(table, pres->ins[i].inputs[j].offset + pres->ins[i].component_count - 1); > + pres->regs.table_sizes[table] = max(pres->regs.table_sizes[table], max_offset + 1); > + } > + table = pres->ins[i].output.table; > + max_offset = get_reg_offset(table, pres->ins[i].output.offset + pres->ins[i].component_count - 1); > + pres->regs.table_sizes[table] = max(pres->regs.table_sizes[table], max_offset + 1); > + } > + update_table_sizes_consts(pres->regs.table_sizes, &pres->inputs); It probably makes sense to add a small update_table_size() helper (or similar), the "same" 3 lines are repeated in the loop for the input operands, for the output operand and in update_table_sizes_consts(). > + for (i = PRES_REGTAB_IMMED + 1; i <= PRES_REGTAB_LAST; ++i) It depends on what is coming up next but maybe it would make sense to add an enum for "PRES_REGTAB_IMMED + 1" (incidentally, PRES_REGTAB_FIRST is never used in this patch series). > + { > + TRACE("table_sizes[%u] %u.\n", i, peval->pres.regs.table_sizes[i]); That trace looks a bit like a debugging leftover. > + if (FAILED(regstore_alloc_table(&peval->pres.regs, i))) > + { > + hr = E_OUTOFMEMORY; > + goto err_out; > + } > + } > + > + if (TRACE_ON(d3dx)) > + dump_bytecode(byte_code, byte_code_size); > + > + *peval_out = peval; > + TRACE("retval %u, *peval_out %p.\n", D3D_OK, *peval_out); Same with this. This one in particular doesn't seem worth keeping. > + return D3D_OK; > + > +err_out: > + FIXME("Error creating parameter evaluator.\n"); > + d3dx_free_param_eval(peval); > *peval_out = NULL; > - return E_NOTIMPL; > + TRACE("retval %u, *peval_out %p.\n", hr, *peval_out); > + return hr; > +} You could print the HRESULT in the FIXME (e.g. FIXME("Error creating parameter evaluator, returning %#x.\n", hr)). Tracing the value of *peval_out doesn't seem particularly worthwhile. > +static void d3dx_free_const_tab(struct d3dx_const_tab *ctab) > +{ > + if (ctab->inputs) > + HeapFree(GetProcessHeap(), 0, ctab->inputs); > + if (ctab->inputs_param) > + HeapFree(GetProcessHeap(), 0, ctab->inputs_param); > + if (ctab->ctab) > + ID3DXConstantTable_Release(ctab->ctab); > +} > + > +static void d3dx_free_preshader(struct d3dx_preshader *pres) > +{ > + if (pres->ins) > + HeapFree(GetProcessHeap(), 0, pres->ins); > + > + regstore_free_tables(&pres->regs); > + d3dx_free_const_tab(&pres->inputs); > } You can drop all those ifs (I think there are a few more of them in the middle of the patch I haven't specifically mentioned).

2 5

Re: [v2 PATCH 2/3] d2d1/tests: Basic test for ID2D1DCRenderTarget creation
by Henri Verbeet March 29, 2016

March 29, 2016

On 29 March 2016 at 01:21, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > + static D2D1_PIXEL_FORMAT invalid_formats[] = > + { > + { DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_PREMULTIPLIED }, > + { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_UNKNOWN }, > + { DXGI_FORMAT_R8G8B8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED }, > + }; I should have noticed before, but this should be const.

2 1

Re: [PATCH 2/5] ddraw/tests: Add a test for color varyings clamping.
by Henri Verbeet March 29, 2016

March 29, 2016

On 28 March 2016 at 23:03, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); > + ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); I suppose this is borrowed from test_shademode() where it's used to create the vertex buffers, but you're not using "d3d" anywhere here.

1 0

Re: [PATCH] msvcr120/tests: Add critical section test.
by Piotr Caban March 29, 2016

March 29, 2016

Hi YongHao, On 03/18/16 17:24, YongHao Hu wrote: > dlls/msvcr120/tests/msvcr120.c | 300 > +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 300 insertions(+) I don't think this is a good approach for adding tests of critical_section class. Executing tons of enter/leave calls is not really testing much. Your test_critical_section_lock tests will probably pass if you comment all critical section related calls out (it passed on my computer in 10 consecutive runs, never failed, probably it's because the code was optimized during compilation). Testing 5s/6s timeouts is also not a good idea. Because of it the tests are running much longer. It would be much better if you test following things: - just check some basic functionality of enter/leave: enter cs in main thread, start new thread that tries to enter it as well, wait for 100ms and check that it was not able to enter the cs, then leave cs in main thread and wait for thread to enter cs and finish - check some basic functionality of try_lock: use it to lock the cs, check if it fails on locked cs Also the tests failed on testbot, I was not checking why. Thanks, Piotr

3 3