June 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

Re: [PATCH signed-off] secur32 : add and fix some algids
by Jacek Caban July 3, 2016

July 3, 2016

Hi Max, On 27.06.2016 05:29, Max Qian wrote: > Signed-off-by: Max Qian <public(a)maxqia.com> > --- > dlls/secur32/schannel_gnutls.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c > index bcadd47..9d6af60 100644 > --- a/dlls/secur32/schannel_gnutls.c > +++ b/dlls/secur32/schannel_gnutls.c > @@ -316,10 +316,11 @@ static ALG_ID schannel_get_mac_algid(gnutls_mac_algorithm_t mac) > case GNUTLS_MAC_UNKNOWN: > case GNUTLS_MAC_NULL: return 0; > case GNUTLS_MAC_MD5: return CALG_MD5; > - case GNUTLS_MAC_SHA1: > - case GNUTLS_MAC_SHA256: > - case GNUTLS_MAC_SHA384: > - case GNUTLS_MAC_SHA512: return CALG_SHA; > + case GNUTLS_MAC_SHA1: return CALG_SHA1; > + case GNUTLS_MAC_MD2: return CALG_MD2; > + case GNUTLS_MAC_SHA256: return CALG_SHA_256; > + case GNUTLS_MAC_SHA384: return CALG_SHA_384; > + case GNUTLS_MAC_SHA512: return CALG_SHA_512; > default: > FIXME("unknown algorithm %d\n", mac); > return 0; > @@ -331,8 +332,12 @@ static ALG_ID schannel_get_kx_algid(gnutls_kx_algorithm_t kx) > switch (kx) > { > case GNUTLS_KX_RSA: return CALG_RSA_KEYX; > + case GNUTLS_KX_DHE_PSK: > case GNUTLS_KX_DHE_DSS: > case GNUTLS_KX_DHE_RSA: return CALG_DH_EPHEM; > + case GNUTLS_KX_ECDHE_RSA: > + case GNUTLS_KX_ECDHE_PSK: return CALG_ECDH; MSDN mentions CALG_ECDH_EPHEM, which would fit better, but it seems to be missing in headers. Returning CALG_ECDH is fine with me, but please add a comment about CALG_ECDH_EPHEM. > + case GNUTLS_KX_ECDHE_ECDSA: return CALG_ECDSA; You're mixing tabs and spaces. Please avoid using tabs. Thanks, Jacek

3 2

Re: [PATCH] xaudio2: Always set current OpenAL context before making AL calls
by Chris Robinson June 30, 2016

June 30, 2016

On 06/30/2016 12:07 PM, Andrew Eikum wrote: > if(!alcIsExtensionPresent(NULL, "ALC_SOFT_loopback") || > !(palcLoopbackOpenDeviceSOFT = alcGetProcAddress(NULL, "alcLoopbackOpenDeviceSOFT")) || > - !(palcRenderSamplesSOFT = alcGetProcAddress(NULL, "alcRenderSamplesSOFT"))){ > + !(palcRenderSamplesSOFT = alcGetProcAddress(NULL, "alcRenderSamplesSOFT")) || > + !(palcSetThreadContext = alcGetProcAddress(NULL, "alcSetThreadContext"))){ > ERR("XAudio2 requires the ALC_SOFT_loopback extension (OpenAL-Soft >= 1.14)\n"); > return FALSE; > } alcSetThreadContext isn't part of the ALC_SOFT_loopback extension, you should check for ALC_EXT_thread_local_context instead. > +static void context_lock(ALCcontext *ctx) > +{ > + EnterCriticalSection(&al_lock); > + alcMakeContextCurrent(ctx); > +} > + > +static void context_unlock(void) > +{ > + LeaveCriticalSection(&al_lock); > +} Since you're relying on ALC_EXT_thread_local_context anyway, it would probably be better to use alcSetThreadContext in context_lock, which would allow you to get rid of the global lock for normal calls (another thread can't change the current thread context on you, and unlike OpenGL, the same context can be current on multiple threads at the same time).

2 1

Re: [PATCH] wined3d/resource: Performance improvement
by Chris Robinson June 30, 2016

June 30, 2016

On 06/30/2016 10:20 AM, Patrick Rudolph wrote: > Tests on Windows showed that mapping a buffer with flags WINED3D_MAP_DISCARD > and WINED3D_MAP_NOOVERWRITE is valid combination. Writing reliable tests > is difficult as the driver is free to choose when using discard. > > Unigine Heavon maps a lot of buffers with both flags, but run on about > 85% GPU-load, as WINE removes both hints and the game has to wait for > the buffer to be mapped. It makes logical sense to me that mapping a buffer with both DISCARD and NOOVERWRITE would effectively ignore NOOVERWRITE. I've noticed that at least some engines will map a part of a buffer with NOOVERWRITE and draw with that part, map the next part of the buffer with NOOVERWRITE and draw with that part, etc, then after the last part of the buffer it maps with DISCARD to get new memory and keep going while the previous buffer memory is handled asynchronously by the driver or card. I notice that wined3d has some parts where it ignores/removes DISCARD, so it may not be a good idea to leave both DISCARD and NOOVERWRITE set. In such a case, the driver will get NOOVERWRITE for a part of the buffer that's still in use. It would probably be better to remove NOOVERWRITE when both DISCARD and NOOVERWRITE are set.

1 0

Re: [PATCH 6/7] d3drm: Implement IDirect3DRMViewport*::Init. (v3)
by Aaryaman Vasishta June 30, 2016

June 30, 2016

On Tue, Jun 28, 2016 at 3:24 AM, Aaryaman Vasishta < jem456.vasishta(a)gmail.com> wrote: > > + if (viewport->d3d_viewport) > + return D3DRMERR_BADOBJECT; > + > + IDirect3DRM_AddRef(viewport->d3drm); > + > FWIW, I didn't put the intentional d3drm, camera leaks here because it seems that the device controls the leaked references via some sort of destroy callback on the device. (See the todo_wine tests in this patch). > + todo_wine ok(ref4 > frame_ref2, "Expected ref4 > frame_ref2, got > frame_ref2 = %u, ref4 = %u.\n", frame_ref2, ref4); > + > + IDirect3DRMDevice3_Release(device3); > + IDirect3DRMDevice_Release(device1); > I tried to release d3drm explicitly myself, like how I did with the texture tests. But the tests would then crash here, at IDirect3DRMDevice_Release, where the device gets destroyed. Which probably indicates that the device stores a list of leaked references and releases them on getting destroyed. For now I've decided to avoid the leak, thus avoiding the use of a destroy callback, and implementing this as a separate later on if an application demands it, unless it's safer to get this done on priority. Cheers, Aaryaman

1 0

Re: [PATCH 5/7] d3drm: Fix device not assigning width and height after creation.
by Henri Verbeet June 30, 2016

June 30, 2016

On 24 June 2016 at 23:49, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > HRESULT d3drm_device_set_ddraw_device_d3d(struct d3drm_device *device, IDirect3DRM *d3drm, IDirect3D *d3d, IDirect3DDevice *d3d_device) > { > + IDirectDrawSurface *surface; > + IDirect3DDevice2 *d3d_device2; > + DDSURFACEDESC desc; > + HRESULT hr; > + > device->d3drm = d3drm; > IDirect3DRM_AddRef(d3drm); > device->device = d3d_device; > IDirect3DDevice_AddRef(d3d_device); > > + /* Fetch render target and get width/height from there */ > + if (FAILED(hr = IDirect3DDevice_QueryInterface(d3d_device, &IID_IDirectDrawSurface, (void **)&surface))) > + { > + if (FAILED(hr = IDirect3DDevice_QueryInterface(d3d_device, &IID_IDirect3DDevice2, (void **)&d3d_device2))) > + return hr; > + hr = IDirect3DDevice2_GetRenderTarget(d3d_device2, &surface); > + IDirect3DDevice2_Release(d3d_device2); > + if (FAILED(hr)) > + return hr; > + } > + > + desc.dwSize = sizeof(desc); > + if (FAILED(hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc))) > + { > + IDirectDrawSurface_Release(surface); > + return hr; > + } > + > + device->width = desc.dwWidth; > + device->height = desc.dwHeight; > + IDirectDrawSurface_Release(surface); > + > return IDirect3D_QueryInterface(d3d, &IID_IDirectDraw, (void **)&device->ddraw); > } > This leaks some references (IDirect3DRM, IDirect3DDevice) on error paths, are those on purpose?

2 5

Re: [PATCH 4/5] inetcomm: Support LPSTR to LPWSTR conversion in GetProp
by Nikolay Sivov June 30, 2016

June 30, 2016

Is it possible to use PropVariantChangeType() for such conversion?

1 0

Re: [PATCH 1/5] inetcomm: Implement IMimeBody DeleteProp
by Nikolay Sivov June 30, 2016

June 30, 2016

On 06/30/2016 11:58 AM, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/inetcomm/mimeole.c | 23 +++++++++++++++++-- > dlls/inetcomm/tests/mimeole.c | 53 +++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 74 insertions(+), 2 deletions(-) > > diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c > index 766503d..cff95a1 100644 > --- a/dlls/inetcomm/mimeole.c > +++ b/dlls/inetcomm/mimeole.c > @@ -898,8 +898,27 @@ static HRESULT WINAPI MimeBody_DeleteProp( > LPCSTR pszName) > { > MimeBody *This = impl_from_IMimeBody(iface); > - FIXME("(%p)->(%s) stub\n", This, debugstr_a(pszName)); > - return E_NOTIMPL; > + header_t *cursor, *cursor2; > + BOOL found = FALSE; You don't need to initialize 'found'. > + > + TRACE("(%p)->(%s) stub\n", This, debugstr_a(pszName)); 'stub' should be removed, unless it's still too stubby. > + > + LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &This->headers, header_t, entry) > + { > + if(ISPIDSTR(pszName)) > + found = STRTOPID(pszName) == cursor->prop->id; > + else > + found = !lstrcmpiA(pszName, cursor->prop->name); > + > + if(found) > + { > + list_remove(&cursor->entry); > + HeapFree(GetProcessHeap(), 0, cursor); > + return S_OK; > + } > + } > + > + return MIME_E_NOT_FOUND; > } The way you use it, there's no need for _SAFE() list iteration. > static HRESULT WINAPI MimeBody_CopyProps( > diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c > index 8063b86..46fd1d5 100644 > --- a/dlls/inetcomm/tests/mimeole.c > +++ b/dlls/inetcomm/tests/mimeole.c > @@ -604,6 +604,58 @@ static void test_BindToObject(void) > IMimeMessage_Release(msg); > } > > +static void test_BodyDeleteProp(void) > +{ > + static const char topic[] = "wine topic"; > + HRESULT hr; > + IMimeMessage *msg; > + IMimeBody *body; > + PROPVARIANT prop; > + > + hr = MimeOleCreateMessage(NULL, &msg); > + ok(hr == S_OK, "ret %08x\n", hr); > + > + PropVariantInit(&prop); > + > + hr = IMimeMessage_BindToObject(msg, HBODY_ROOT, &IID_IMimeBody, (void**)&body); > + ok(hr == S_OK, "ret %08x\n", hr); > + > + hr = IMimeBody_DeleteProp(body, "Subject"); > + ok(hr == MIME_E_NOT_FOUND, "ret %08x\n", hr); > + > + hr = IMimeBody_DeleteProp(body, PIDTOSTR(PID_HDR_SUBJECT)); > + ok(hr == MIME_E_NOT_FOUND, "ret %08x\n", hr); > + > + prop.vt = VT_LPSTR; > + prop.u.pszVal = CoTaskMemAlloc(strlen(topic)+1); > + strcpy(prop.u.pszVal, topic); > + hr = IMimeBody_SetProp(body, "Subject", 0, &prop); > + ok(hr == S_OK, "ret %08x\n", hr); > + PropVariantClear(&prop); > + > + hr = IMimeBody_DeleteProp(body, "Subject"); > + ok(hr == S_OK, "ret %08x\n", hr); > + > + hr = IMimeBody_GetProp(body, "Subject", 0, &prop); > + ok(hr == MIME_E_NOT_FOUND, "ret %08x\n", hr); > + > + prop.vt = VT_LPSTR; > + prop.u.pszVal = CoTaskMemAlloc(strlen(topic)+1); > + strcpy(prop.u.pszVal, topic); > + hr = IMimeBody_SetProp(body, PIDTOSTR(PID_HDR_SUBJECT), 0, &prop); > + ok(hr == S_OK, "ret %08x\n", hr); > + PropVariantClear(&prop); > + > + hr = IMimeBody_DeleteProp(body, PIDTOSTR(PID_HDR_SUBJECT)); > + ok(hr == S_OK, "ret %08x\n", hr); > + > + hr = IMimeBody_GetProp(body, PIDTOSTR(PID_HDR_SUBJECT), 0, &prop); > + ok(hr == MIME_E_NOT_FOUND, "ret %08x\n", hr); > + > + IMimeBody_Release(body); > + IMimeMessage_Release(msg); > +} > + > static void test_MimeOleGetPropertySchema(void) > { > HRESULT hr; > @@ -627,6 +679,7 @@ START_TEST(mimeole) > test_MessageGetPropInfo(); > test_MessageOptions(); > test_BindToObject(); > + test_BodyDeleteProp(); > test_MimeOleGetPropertySchema(); > OleUninitialize(); > }

1 0

Re: [v2 1/3] dinput: Print location ID in debugstr_device on the Mac
by Dmitry Timoshkov June 30, 2016

June 30, 2016

David Lawrie <david.dljunk(a)gmail.com> wrote: > +static Boolean get_device_property_long(IOHIDDeviceRef in_device, CFStringRef in_key, long * out_value) > +{ > + Boolean result = FALSE; > + CFTypeRef type; > + > + if (in_device) > + { > + assert(IOHIDDeviceGetTypeID() == CFGetTypeID(in_device)); > + > + type = IOHIDDeviceGetProperty(in_device, in_key); > + > + if (type) > + { > + if (CFNumberGetTypeID() == CFGetTypeID(type)) > + result = CFNumberGetValue((CFNumberRef)type, kCFNumberLongType, out_value); > + } > + } > + return result; > +} > + > +long get_device_location_ID(IOHIDDeviceRef device) > +{ > + long result = 0; > + get_device_property_long(device, CFSTR(kIOHIDLocationIDKey), &result); > + return result; > +} The helper should be 'static'. Also, probably you should return value from the helper directly since you don't check for the boolean result anyway. Same comment applies for a similar winejoystick.drv patch. -- Dmitry.

2 1

Re: [PATCH] ddraw/tests: P8 color keying does not work on WARP (v2).
by Marvin June 29, 2016

June 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=23888 Your paranoid android. === w1064 (32 bit ddraw4) === ddraw4.c:2540: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw4) === ddraw4.c:2540: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (32 bit ddraw1) === ddraw1.c:2204: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw1) === ddraw1.c:2204: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (32 bit ddraw7) === ddraw7.c:2270: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw7) === ddraw7.c:2270: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (32 bit ddraw2) === ddraw2.c:2355: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw2) === ddraw2.c:2355: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768).

1 0

Re: [PATCH] d3dx9: Avoid overflowing debug channel buffer when tracing ASCII effect errors.
by Alistair Leslie-Hughes June 29, 2016

June 29, 2016

Hi Matteo, On 29/06/16 03:06, Matteo Bruni wrote: > Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> > --- > Inspired by a patch by Alistair Leslie-Hughes. > > dlls/d3dx9_36/effect.c | 17 ++++++++++++++++- > 1 file changed, 16 insertions(+), 1 deletion(-) > > diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c trace:d3dx:d3dx9_base_effect_init "Shaders/commonVertexLight.fx(53,7): warning X3205: conversion from larger type t" trace:d3dx:d3dx9_base_effect_init "o smaller, possible loss of data" trace:d3dx:d3dx9_base_effect_init "Shaders/commonVertexLight.fx(55,9): warning X3205: conversion from larger type t" trace:d3dx:d3dx9_base_effect_init "o smaller, possible loss of data" trace:d3dx:d3dx9_base_effect_init "StaticMesh.fx(484,39): warning X3206: implicit truncation of vector type" Hers is the output from your patch. The first too lines are warnings are split across trace statement. Should we use a larger number to attempt to have each error/warning on one line. Best Regards Alistair Leslie-Hughes

2 1

Re: [v1 2/2] dinput/joystick_osx.c: sorts devices by location ID
by Ken Thomases June 29, 2016

June 29, 2016

On Jun 24, 2016, at 8:33 PM, David Lawrie <david.dljunk(a)gmail.com> wrote: > > Fixes https://bugs.winehq.org/show_bug.cgi?id=38997 > for dinput joysticks > > Note: if multiple virtual joysticks have the same location ID, they will > still be unordered > > Tested on OS X 10.10.5. > > Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> > --- > dlls/dinput/joystick_osx.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) Similar comments as for the corresponding winejoystick.drv patch, of which this is a subset. -Ken

2 1

Re: [v1 2/2] winejoystick.drv/joystick_osx.c: sorts devices by location ID
by Ken Thomases June 29, 2016

June 29, 2016

On Jun 24, 2016, at 8:33 PM, David Lawrie <david.dljunk(a)gmail.com> wrote: > > Fixes https://bugs.winehq.org/show_bug.cgi?id=38997 > for winmm joysticks This should probably be a note and go below the "---" line, below. Also, please adjust the subjects of these patches. Take a look at how Alexandre changed the subjects of your previous commits. Try to save him the effort. The prefix should generally be just the DLL name without the name of the specific file (although changes to tests can have "/tests"). The first word after the colon should be capitalized. The verb should be in the imperative mood ("Sort" vs. "Sorts"). If you want to include the information that this patch is for the Mac which is lost by removing the file name, add that to the subject (e.g. "Sort devices by location ID on the Mac"). > @@ -321,6 +321,34 @@ static CFIndex find_top_level(IOHIDDeviceRef hid_device, CFMutableArrayRef main_ > /************************************************************************** > * find_osx_devices > */ You've separated the function header comment above from the function it goes with. > + > +/* > + * Helper to sort array by location ID since they are consistent across boots & launches > + */ Use the function header comment format used elsewhere in the file. > +static CFComparisonResult CFDeviceArrayComparatorFunction(const void *val1, const void *val2, void *context) As with the previous patches, don't start your function names with "CF" which is for Core Foundation functions. There's no reason to include "Function" in the name of a function. Use lowercase-and-underscores. Also, it should mention what it's comparing by or for. For example, "device_location_comparator" similar to button_usage_comparator() elsewhere in this file. > +{ > +#pragma unused(context) Don't bother with that. > + CFComparisonResult result = kCFCompareEqualTo; > + > + long loc1 = IOHIDDevice_GetLocationID((IOHIDDeviceRef)val1); > + long loc2 = IOHIDDevice_GetLocationID((IOHIDDeviceRef)val2); There's no need to cast void pointers to other pointer types. > + if (loc1 < loc2) { > + result = kCFCompareLessThan; > + } else if (loc1 > loc2) { > + result = kCFCompareGreaterThan; > + } If you're going to use braces around these blocks (which isn't necessary), put the braces on separate lines. > +/* > + * Helper to copy the CFSet to a CFArray > + */ > +static void CFSetApplierFunctionCopyToCFArray(const void *value, void *context) I know this name was copied from dinput, but it's still terrible. ;) > +{ > + CFArrayAppendValue((CFMutableArrayRef)context, value); Unneeded cast. > @@ -363,20 +391,16 @@ static int find_osx_devices(void) > if (devset) > { > CFIndex num_devices, num_main_elements; > - const void** refs; > - CFArrayRef devices; > + CFMutableArrayRef devices; > > num_devices = CFSetGetCount(devset); > - refs = HeapAlloc(GetProcessHeap(), 0, num_devices * sizeof(*refs)); > - if (!refs) > - { > - CFRelease(devset); > - goto fail; > - } > > - CFSetGetValues(devset, refs); > - devices = CFArrayCreate(NULL, refs, num_devices, &kCFTypeArrayCallBacks); > - HeapFree(GetProcessHeap(), 0, refs); > + devices = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); As a minor optimization, you can specify a capacity to the above call. > + /* copy devices from (unordered) set to array */ > + CFSetApplyFunction(devset, CFSetApplierFunctionCopyToCFArray, (void *)devices); Unneeded cast. > + /* now sort the array by location ID's */ Again, these comments don't add much and better names for the functions would make the code more self-explanatory. It might be worthwhile to put a comment here or in the function header about _why_ you're sorting by location ID (i.e. to provide a stable order across runs). That's a good general rule: comments shouldn't narrate what the code is doing, they should explain why it's doing it, or why it's doing it in a particular way, if that's non-obvious. > + CFArraySortValues(devices, CFRangeMake(0, num_devices), CFDeviceArrayComparatorFunction, NULL); > + -Ken

1 0

Re: [v1 1/2] winejoystick.drv/joystick_osx.c: debugstr_device prints location ID
by Ken Thomases June 29, 2016

June 29, 2016

On Jun 24, 2016, at 8:33 PM, David Lawrie <david.dljunk(a)gmail.com> wrote: > > Tested on OS X 10.10.5. > > Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> > --- > dlls/winejoystick.drv/joystick_osx.c | 32 ++++++++++++++++++++++++++++++-- > 1 file changed, 30 insertions(+), 2 deletions(-) Same issues as the corresponding dinput patch. -Ken

1 0

Re: [v1 1/2] dinput/joystick_osx.c: debugstr_device prints location ID
by Ken Thomases June 29, 2016

June 29, 2016

On Jun 24, 2016, at 8:33 PM, David Lawrie <david.dljunk(a)gmail.com> wrote: > > +static Boolean IOHIDDevice_GetLongProperty(IOHIDDeviceRef inIOHIDDeviceRef, CFStringRef inKey, long * outValue) Don't name your functions as though they were Apple's. Apple "owns" the namespace of identifiers starting with "IOHIDDevice". In general, just use simple lowercase-and-underscores names unless there's a strong reason not to. Something like "get_device_property_long". Same goes for the parameters: "key" and "out_value" or the like. > +{ > + Boolean result = FALSE; > + CFTypeRef tCFTypeRef; Don't use this naming convention either (is that Hungarian notation?). Why is the type repeated in the variable name? What does the "t" prefix signify. Just call this "value" or something. > + > + if (inIOHIDDeviceRef) { > + assert(IOHIDDeviceGetTypeID() == CFGetTypeID(inIOHIDDeviceRef)); > + > + tCFTypeRef = IOHIDDeviceGetProperty(inIOHIDDeviceRef, inKey); > + > + if ( tCFTypeRef ) { > + /* if this is a number */ > + if (CFNumberGetTypeID() == CFGetTypeID(tCFTypeRef)) { > + /* get it's value */ What do these comments add? > + result = CFNumberGetValue((CFNumberRef)tCFTypeRef, kCFNumberSInt32Type, outValue); "long" and "SInt32" don't match reliably. Why not kCFNumberLongType? > +long IOHIDDevice_GetLocationID(IOHIDDeviceRef inIOHIDDeviceRef) Naming conventions here, too. > +{ > + long result = 0; > + (void)IOHIDDevice_GetLongProperty(inIOHIDDeviceRef, CFSTR(kIOHIDLocationIDKey), &result); I don't think we generally use the cast-to-void thing for unused return values in Wine. -Ken

1 0

Re: shell32/tests: Avoid casts from a COM object to an iface.
by Marvin June 29, 2016

June 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=23879 Your paranoid android. === w1064 (32 bit shlfolder) === shlfolder.c:1591: Test failed: IShellFolder_GetDisplayNameOf(NULL) failed! hr = 80070057 === w1064 (64 bit shlfolder) === shlfolder.c:1591: Test failed: IShellFolder_GetDisplayNameOf(NULL) failed! hr = 80070057

2 1

Re: [PATCH] winex11: fix destroying of top-level windows
by Alexandre Julliard June 28, 2016

June 28, 2016

Miklós Máté <mtmkls(a)gmail.com> writes: > Fixes https://bugs.winehq.org/show_bug.cgi?id=40767 > > Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> > --- > dlls/winex11.drv/opengl.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c > index d89a193..27ddd79 100644 > --- a/dlls/winex11.drv/opengl.c > +++ b/dlls/winex11.drv/opengl.c > @@ -1314,6 +1314,9 @@ static void free_gl_drawable( struct gl_drawable *gl ) > { > switch (gl->type) > { > + case DC_GL_WINDOW: > + pglXDestroyWindow( gdi_display, gl->drawable ); > + break; Actually this one has some issues too: ../../../tools/runtest -q -P wine -T ../../.. -M d3d9.dll -p d3d9_test.exe.so device && touch device.ok device.c:2250: Tests skipped: could not create device, IDirect3D9_CreateDevice returned 0x8876086c device.c:6312: Tests skipped: This GPU supports SM3, skipping unsupported shader test. device.c:6724: Tests skipped: D3DFMT_A32B32G32R32F supports filtering, skipping tests. device.c:7747: Tests skipped: Failed to create cube texture for format R8G8B8 (hr 0x8876086c), skipping tests. device.c:8450: Tests skipped: Dynamic D3DFMT_YUY2 textures not supported, skipping mipmap test. device.c:8450: Tests skipped: Dynamic D3DFMT_UYVY textures not supported, skipping mipmap test. X Error of failed request: GLXBadWindow Major opcode of failed request: 155 (GLX) Minor opcode of failed request: 32 (X_GLXDestroyWindow) Serial number of failed request: 8900 Current serial number in output stream: 8901 Makefile:208: recipe for target 'device.ok' failed -- Alexandre Julliard julliard(a)winehq.org

4 6

Re: d3dx10: Implement D3DX10CompileFromMemory.
by Matteo Bruni June 28, 2016

June 28, 2016

2016-06-27 21:49 GMT+02:00 Andrey Gusev <andrey.goosev(a)gmail.com>: > + TRACE("data %s, data_size %lu, filename %s, defines %p, include %p, entry_point %s, target %s, " > + "sflags %#x, eflage %#x, pump %p, shader %p, error_messages %p, hresult %p.\n", "eflage" typo. > diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c > index 0c1ff80..fe56ee0 100644 > --- a/dlls/d3dx10_43/d3dx10_43_main.c > +++ b/dlls/d3dx10_43/d3dx10_43_main.c > @@ -37,6 +37,8 @@ > #include "d3dx10core.h" > #include "d3dx10tex.h" > > +#include "wine/debug.h" That is already included a few lines above. Looks good otherwise.

1 0

Re: [d3dcompiler] - add missing fields to d3dcompiler_shader_reflection
by Matteo Bruni June 28, 2016

June 28, 2016

2016-06-23 1:45 GMT+02:00 Vijay Kiran Kamuju <infyquest(a)gmail.com>: > [d3dcompiler] - add missing fields to d3dcompiler_shader_reflection > > This add missing fields to the d3dcompiler_shader_reflection based on > http://timjones.tw/blog/archive/2015/09/02/parsing-direct3d-shader-bytecode > https://msdn.microsoft.com/en-us/library/windows/desktop/ff476590(v=vs.85).… > https://msdn.microsoft.com/en-us/library/windows/desktop/bb694550(v=vs.85).… > https://msdn.microsoft.com/en-us/library/windows/desktop/bb172432(v=vs.85).… > https://msdn.microsoft.com/en-us/library/windows/desktop/ff476209(v=vs.85).… Thank you for the links, that saved me some time to have to look them up. > + UINT sample_frequency_shader; As far as I understand, that would be better served by a BOOL. > UINT dcl_count; > + UINT def_count; Nitpick but def_count is right before dcl_count in both D3D11_SHADER_DESC and in the shader bytecode, it would be nice to have the same order everywhere. We have tests for this in d3dcompiler_43/tests/reflection.c. Can you please add some tests for those new fields too? Notice that you don't necessarily need n separate new tests for each of the n new features. The patch subject should be something like "d3dcompiler: Add d3d11 fields to struct d3dcompiler_shader_reflection." i.e. no square brackets for the dll prefix and put a colon after it. Also, while not strictly required, it's encouraged to use git send-email, it will inline the patch without wrapping and generally take care of most of the formatting details, assuming git is configured correctly.

1 0

Re: [v2 PATCH] d3dx9_36: Stop crash when displaying effect errors
by Matteo Bruni June 28, 2016

June 28, 2016

2016-06-22 13:10 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > if (temp_errors) > - TRACE("%s\n", (char *)ID3D10Blob_GetBufferPointer(temp_errors)); > + { > + const char *p = ID3D10Blob_GetBufferPointer(temp_errors); > + SIZE_T size = ID3D10Blob_GetBufferSize(temp_errors); > + const char *end = p + size; > + const char *line = p; > + > + while (p != end) > + { > + if (*p == '\n') > + { > + UINT len = p - line; > + if (len && *(p - 1) == '\r') --len; > + TRACE("%s\n", debugstr_an(line, len)); > + line = ++p; > + } > + else ++p; > + } > + if (line != p) > + TRACE("%s\n", debugstr_an(line, p - line)); > + } This only breaks at '\n', which might still be too much if the lines are particularly long. I also wrote a patch for this a few days ago. I'm going to send it to wine-patches in a bit, I'd appreciate if you can test if it works for you or point out any issue with it.

1 0

Re: include: Add missing interface declaration.
by Nikolay Sivov June 28, 2016

June 28, 2016

> interface IWbemContext; > interface IWbemServices; > +interface IWbemLocator; > interface IWbemStatusCodeText; > interface IWbemCallResult; > interface IWbemObjectSink; Why do you need this? IWbemLocator is fully defined later in this file.

1 0

Re: [PATCH 6/7] d3drm: Implement IDirect3DRMViewport*::Init.
by Stefan Dösinger June 27, 2016

June 27, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-06-24 um 22:49 schrieb Aaryaman Vasishta: > + if (FAILED(hr = IDirect3DRMDevice_QueryInterface(device, &IID_IDirect3DRMDevice3, (void **)&device3))) > + return hr; > + > + if (FAILED(hr = IDirect3DRMFrame_QueryInterface(camera, &IID_IDirect3DRMFrame3, (void **)&camera3))) > + { > + IDirect3DRMDevice3_Release(device3); > + return hr; > + } > + IDirect3DRMDevice_Release(device); > + IDirect3DRMFrame_Release(camera); > + > + return d3drm_viewport2_Init(&viewport->IDirect3DRMViewport2_iface, device3, camera3, x, y, width, height); This has the same problem as the first version of your frame thunks: You get "device3", but then you release "device", to which you don't hold a reference. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXcFfoAAoJEN0/YqbEcdMweH8P/RBg+lEvXxGES0C1Uo5aN6Ht E0TOftji/AaGrVcaoHLWMsl30/GUpmh+iRdM19ZHwL0vey3yKKdTmFlt4tMrG5aP LLHLlxRqcJt1h+MREvMYb7JJjCAMcR/2Bn63nxWZpZ+PncQo1H90ZsBHCrd4Y707 JukrA3QfPm9cyXiX/ER8cj7QgpnNsk5y8ZXgbdtDDGOzShf2OSoslU5ivQQsmZ4W 2fiJWOeWdpi3P9Fh6EUTDOwUf5Rnj7mBYb3KFASc9o0VZXHuI/f35LGG9AdNkSxs lf6RbPDcXxPQqUxlz0VnmS/31/oGb0pDczESx+alDU9n29tWPANY+yBGUmDStyJ0 /RHl2qpZJMs/lQpk9UQ/RpvuVdZfLVxgftqyZuoWT4EfW5iseOlCytmsJEG1AVpd BKAMFRbueGhPYfUcuLAH1GL4keRg7P3QUd36MlR0wWVdYGtMWrbQL+6SrHT6r75C QmXU9mTJMTleA/Yzskenm71Tz9/wbwavYjUMaEQp3+7OKrG0Zqnt4foh2GpNUT+6 M7jxfSSng4+irWvxf3ZKdpjfGNHRn1ZhRKrEpxKQptiGlFvYSMDy7tHtyybK2MbB h8CO19YAzcVjfFHj5sRSYtZIHdVm5aG5FJLfVm9UPBA7xT2l9b6EgqXEhLTVLYC6 /TSyEFgT5j+DkKf6DCm+ =0tcs -----END PGP SIGNATURE-----

2 3

OSSCOM 2016 Conference - Dec, 2016 (Call for Papers)
by 2nd International Conference on Open Source Software Computing June 27, 2016

June 27, 2016

OSSCOM 2016 Call for Proposals/ Papers OSSCOM 2016 The 2nd International Conference on Open Source Software Computing 1st - 3rd December 2016 Lebanese University, Beirut - Lebanon http://mailer.tagorg.com/lists/lt.php?id=bB0DBlQZUAJSTlQNAFIEAA Partially funded by EC - Tempus and technically sponsored by IEEE Objectives To promote opportunities for cooperation towards enabling OSS key technologies, building cross-cutting sciences, and driving disruptive innovations; to disseminate research on technology and applications of open source software computing; and to expand the framework of effective participation of universities in developing OSS industry through incubators and business accelerators. Structure - Keynotes - Panel and roundtable discussions - Presentation sessions - Industry and technology discussions - Consultation meetings, focus groups, and roundtables - Best practice showcases and practical demonstration - Workshops Submission Deadline 1st September, 2016 (Manuscripts) 1st October, 2016 (Proposals) Topics of Interest Track 1: Systems Software - Operating systems: Linux Kernel, Server and Desktop Linux: RedHat, Debian, Slackware, Caldera, SuSe, Fedora - Distributed Operating systems: Open source platforms and software for the cloud platform as a service (PaaS), software as a service (SaaS), and infrastructure as a service (IaaS). Open stack, Open-source software in scientific computing including clouds, grids and HPCs - Embedded and Realtime Operating systems - Ubiquitous mobile computing and technologies: middleware, operating system (e.g. Android), new I/O and user interfaces, mobile protocols Track 2: Applications and Services - Open-source software services and applications in energy, environment, education, health, climate, water, agriculture, biology, economy, medicine and other pressing global issues and problems - Open-source software for e-Services, including e-Government, e-Libraries, e-Learning and any e-* - Open-source software for Smart Education, Smart Cities, Smart Power Grids, Smart Transportation - Open Source applications for mobile and tablets Track 3: Networking and Security - Open source network simulation/emulations tools - Open source platforms for network security deployment, testing and verification - Network and security open source management software Track 4: Open Source Development and Support - Perspectives on open-source software development and services, including challenges, operation, sustainability, funding, governance, business models, and security - National, regional and international organizations and their role in funding and supporting open-source software applications in research and education - Collaborative projects and initiatives in research and education at national, regional and global levels - Research and education challenges and open access paradigm - Business models for open-source software development and services Track 5: Software Engineering This track will bring together researchers, students and industry experts from diverse areas associated with software engineering who are utilizing, developing or even improving open source software systems during their research and experiments. Software Engineering influences all aspects of computer science research and touches every software researchers and practitioners. There are diverse Free and open-source software that could be utilized in many fields under the umbrella of Software Engineering such as but not limited to: - Software Process Models - Software Process Improvement - Software Architecture - Component-Based Software Engineering - Software Verification and Validation - Model Checking - Software Impact Analysis - Design Patterns and Frameworks - Model Driven Architecture - Modeling with UML - Reusable Software and Metrics - Reverse Engineering, Re-engineering - Adaptive Software - Software Define Network - Data Mining and Machine Learning - Safety and Security in Critical Software Conference Venue Lebanese University, Beirut - Lebanon Submit a Participation <http://mailer.tagorg.com/lists/lt.php?id=bB0DB1EZUAJSTlQNAFIEAA> Language English Registration Fees OSSCOM members 50 Euro OSSCOM non-members 100 Euro Authors and Speakers 50 Euro Students Free All papers will be peer-reviewed and selected papers will be published in the conference proceedings and submitted to IEEE Explore. Partners and Organisers - Hochschule Bonn-Rhein-Sieg University of Applied Sciences, Germany - German Jordanian University, Jordan - Lebanese University, Lebanon - Brunel University, United Kingdom - Yarmouk University, Jordan - Notre Dame University, Lebanon - University of Castilla-La Mancha, Spain - Tarent AG, Germany - Talal Abu-Ghazaleh Information Technology International, Jordan - Information Management Ltd, Lebanon - Le Cnam Liban Important Dates 1st Sept, 2016 Manuscript Submission Deadline 1st Oct, 2016 Acceptance Notification 15th Nov 2016 Registration Deadline 1st – 3rd Dec 2016 OSSCOM 2016 Conference For more information and paper submission, please contact Paper Submission: - Please submit your manuscript or proposal at: http://mailer.tagorg.com/lists/lt.php?id=bB0DBVQZUAJSTlQNAFIEAA Registration: - Please register for OSSCOM 2016 conference at: http://mailer.tagorg.com/lists/lt.php?id=bB0DBlYZUAJSTlQNAFIEAA Publicity: - Dr. Yaser Jararweh, yijararweh(a)just.edu.jo <mailto:yijararweh(a)just.edu.jo> - Dr. Muhannad Quwaider, mqquwaider(a)just.edu.jo <mailto:mqquwaider(a)just.edu.jo> More Information: - Please contact us through our email: office(a)osscom.org <mailto:office(a)osscom.org> All information is available at: http://mailer.tagorg.com/lists/lt.php?id=bB0DBlcZUAJSTlQNAFIEAA -- This message was sent to wine-devel(a)winehq.org by Office(a)osscom.org To forward this message, please do not use the forward button of your email application, because this message was made specifically for you only. Instead use the forward page <http://mailer.tagorg.com/lists/lt.php?id=bB0DBVcZUAJSTlQNAFIEAA> in our newsletter system. To change your details and to choose which lists to be subscribed to, visit your personal preferences page <http://mailer.tagorg.com/lists/lt.php?id=bB0DS1dUUE9WClYGBlc> Or you can opt-out completely <http://mailer.tagorg.com/lists/lt.php?id=bB0CS1dUUE9WClYGBlc> from all future mailings. -- powered by phpList, www.phplist.com --

1 0

Host_Quit implementation in wscript
by Thiago Barbato June 27, 2016

June 27, 2016

I tried running a .js with a WScript.Quit() call and noticed it isn't implemented yet in programs/wscript/host.c. Would a simple ExitProcess( ExitCode ) do the job or are there cases where this would be the wrong thing to do?

2 1

Re: [PATCH 4/4] rpcrt4: Added RpcServerRegisterAuthInfoW failure test.
by Marvin June 27, 2016

June 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=23875 Your paranoid android. === w864 (32 bit rpc) === rpc.c:815: Test failed: GUID does not appear to contain a MAC address: {6eb1cf99-3c79-11e6-be78-e71666c2e04a} === w864 (64 bit rpc) === rpc.c:815: Test failed: GUID does not appear to contain a MAC address: {f4f8b15d-3c7a-11e6-be78-e71666c2e04a}

1 0

Re: wordpad: Avoid buffer overrun in registry_set_filelist.
by Huw Davies June 27, 2016

June 27, 2016

On Sun, Jun 26, 2016 at 11:42:31AM +0200, Thomas Faber wrote: > From e80a75cfe223a82eea4c55874975e54de4981282 Mon Sep 17 00:00:00 2001 > From: Thomas Faber <thomas.faber(a)reactos.org> > Date: Sun, 26 Jun 2016 10:59:08 +0200 > Subject: wordpad: Avoid buffer overrun in registry_set_filelist. > > Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> > --- > programs/wordpad/registry.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c > index bf2af5b..e047f37 100644 > --- a/programs/wordpad/registry.c > +++ b/programs/wordpad/registry.c > @@ -298,7 +298,7 @@ void registry_set_filelist(LPCWSTR newFile, HWND hMainWnd) > if(!lstrcmpiW(pFiles[i], newFile)) > { > int j; > - for(j = 0; pFiles[j] && j < i; j++) > + for(j = 0; j < i && pFiles[j]; j++) > { > pFiles[i-j] = pFiles[i-j-1]; > } This looks odd to me. I don't see how this could avoid an overflow; pFiles[i] is valid at this point and so pFiles[j] will be ok if j == i. More confusingly though, is why pFiles[j] is in the test at all. Huw.

2 1

Re: d3d9/tests: Use SetRect() instead of open coding it.
by Marvin June 27, 2016

June 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=23872 Your paranoid android. === w1064 (64 bit device) === device.c:4348: Test failed: cw is 0xf60, expected 0x7f. device.c:4357: Test failed: Callback cw is 0xf60, expected 0x7f.

2 1

Re: [PATCH 7/7] d3drm: Implement IDirect3DRM*::CreateViewport.
by Stefan Dösinger June 27, 2016

June 27, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-06-24 um 22:49 schrieb Aaryaman Vasishta: > + hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom + 1, &viewport2); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); > + if (FAILED(hr)) > + { > + hr = IDirect3DRM3_CreateViewport(d3drm3, device3, frame3, rc.left, rc.top, rc.right, rc.bottom, NULL); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); > + } Afaics the if (FAILED(hr)) isn't necessary here. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXcFm2AAoJEN0/YqbEcdMwbewP/11c9oFcbQjek33cW30miUka fO/BIk3qk6xpsz/CMF/DRmwQvqPObSnG5zsAXn4j1hsJM2y3EBRjLeZx1/CqyR9s uQ9JyN85zB2rEDkSpLFNaOIW0hnX7bFFnOmZlIlZPYRH1cqQSJcg5gcAq8EnLeIl ioWW0qK3ZREeRDZXEe0YxuwGqWE+HouUNzS/En9OrlZ9b76zfuRcH2rrGSw+2BPo Az8PzllV8v3Df/HxqYyeG9JxgjWElk2aQGfHP5BPUE/JF5+Ky2xEb6RvHVGJQ64P G/HKJGlKZT/VgQGCbJx6s5bNazBiJSyD4a6dj5IbEbWmnySJIbwW2DNXrcxKT9MO oz0NNyjMQAVkJx45QVvtxm+5QsJIbO6V/38h+zsPW0F6dGrYoqBXXSFbsbp4ge2G S2EC+bJVHsUwc2en52BaqJCRDYLSgxNaD2kL8ovZjLYBVi3jlfTP/OcIXYjam2I7 67b8VEeV7xBILU2uvhFxwpwLIgtVJ1b2QUyH3TjrKfClGu5lbe/VbASsrDjBaJV1 ZZMqcmn1JU/P24wQVWb2gfqN12ktvhEnnYznwz8zw7OKdpOUoKlOXr/06tlrMmei YfuGMZmJyxMJQSsfIVtoFH1HmqlZuk5QUjnjyShYDDf4TlKWZAtn4o4JJbt4n1J0 bOobnKLPsEGKSNhoZbnm =xbZw -----END PGP SIGNATURE-----

2 1

Vacation
by Alexandre Julliard June 25, 2016

June 25, 2016

Folks, I'll be out on vacation next week, so there won't be any commits. Feel free to keep sending patches, I'll try to catch up when I get back, and make the next release on schedule two weeks from now. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/3] comdlg32: Optimize FILEDLG95_FILENAME_FillFromSelection.
by Henri Verbeet June 25, 2016

June 25, 2016

On 23 June 2016 at 13:29, Lauri Kenttä <lauri.kentta(a)gmail.com> wrote: > This trades some memory for speed, but since currently selecting > 1000 files takes over a minute but the required memory for those > 1000 filenames is only 262 kB (worst case), this seems a reasonable > trade-off. > That's probably fine, but is there any reason this can't use the standard approach of just doubling the buffer size when you run out of space? If this is performance critical code, the multiple copies of the string related to GetName() probably don't help either.

2 1

Re: [PATCH 7/9] d3d11: Implement ID3D11UnorderedAccessView interface.
by Henri Verbeet June 24, 2016

June 24, 2016

On 24 June 2016 at 11:46, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + switch (desc->ViewDimension) > + { > + case D3D11_UAV_DIMENSION_TEXTURE1DARRAY: > + if (desc->u.Texture1DArray.ArraySize == -1 && desc->u.Texture1DArray.FirstArraySlice < layer_count) I noticed too late for the other normalisation functions, but "ArraySize" is unsigned.

2 2

Re: [PATCH 3/9] d3d11: Implement d3d11_immediate_context_OMGetBlendState().
by Henri Verbeet June 24, 2016

June 24, 2016

On 24 June 2016 at 11:45, Józef Kucia <jkucia(a)codeweavers.com> wrote: > @@ -4044,16 +4053,17 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetBlendState(ID3D10Device1 *iface, > ID3D10BlendState **blend_state, FLOAT blend_factor[4], UINT *sample_mask) > { > struct d3d_device *device = impl_from_ID3D10Device(iface); > + ID3D11BlendState *d3d11_blend_state; > + struct d3d_blend_state *object; > > TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask %p.\n", > iface, blend_state, blend_factor, sample_mask); > > - if ((*blend_state = device->blend_state ? (ID3D10BlendState *)&device->blend_state->ID3D10BlendState1_iface : NULL)) > - ID3D10BlendState_AddRef(*blend_state); > - wined3d_mutex_lock(); > - memcpy(blend_factor, device->blend_factor, 4 * sizeof(*blend_factor)); > - *sample_mask = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEMASK); > - wined3d_mutex_unlock(); > + d3d11_immediate_context_OMGetBlendState(&device->immediate_context.ID3D11DeviceContext_iface, > + &d3d11_blend_state, blend_factor, sample_mask); > + > + object = unsafe_impl_from_ID3D11BlendState(d3d11_blend_state); Why not just impl_from_ID3D11BlendState() here?

2 4

Re: Andrey Gusev : msvcp120/tests: Fix a typo in ok() message.
by Ken Thomases June 23, 2016

June 23, 2016

On Jun 23, 2016, at 11:15 AM, Alexandre Julliard <julliard(a)winehq.org> wrote: > > diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c > index 7c94906..354b2d3 100644 > --- a/dlls/msvcp120/tests/msvcp120.c > +++ b/dlls/msvcp120/tests/msvcp120.c > @@ -592,7 +592,7 @@ static void test_xtime_get(void) > diff = p__Xtime_diff_to_millis2(&after, &before); > > ok(diff >= tests[i], > - "xtime_get() not functioning correctly, test: %d, expect: ge %d, got: %d\n", > + "xtime_get() not functioning correctly, test: %d, expect: %d, got: %d\n", > i, tests[i], diff); > } Too late on this one, but I think the "ge" was supposed to mean "greater than or equal to", given the actual test being performed. Probably best to replace it with ">=". -Ken

1 0

Re: kernel32/tests: Fix a typo in skip() message.
by Marvin June 23, 2016

June 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=23833 Your paranoid android. === w1064 (32 bit locale) === locale.c:2370: Test failed: LCMapStringEx should fail with bad locale name locale.c:2371: Test failed: unexpected error code -559038737 locale.c:2462: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4192: Test failed: IsValidLocaleName should have failed locale.c:4194: Test failed: IsValidLocaleName should have failed locale.c:4577: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4579: Test failed: For id 7, Expected IVC, got '' === w1064 (64 bit locale) === locale.c:2370: Test failed: LCMapStringEx should fail with bad locale name locale.c:2371: Test failed: unexpected error code -559038737 locale.c:2462: Test failed: Expected lcid == 0, got got 00001000, error -559038737 locale.c:4192: Test failed: IsValidLocaleName should have failed locale.c:4194: Test failed: IsValidLocaleName should have failed locale.c:4577: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4579: Test failed: For id 7, Expected IVC, got ''

1 0

Re: mshtml/tests: Fix a typo in ok() message.
by Michael Stefaniuc June 23, 2016

June 23, 2016

On 06/23/2016 11:56 AM, Andrey Gusev wrote: > > mshtml-tests-Fix-a-typo-in-ok-message.txt > > > From d30dec56bc2f7f716ab786516ee6080c9cdea67f Mon Sep 17 00:00:00 2001 > Message-Id: <d30dec56bc2f7f716ab786516ee6080c9cdea67f.1466675739.git.andrey.goosev(a)gma…> > From: Andrey Gusev <andrey.goosev(a)gmail.com> > Date: Thu, 23 Jun 2016 12:55:21 +0300 > Subject: [PATCH] mshtml/tests: Fix a typo in ok() message. > > Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> > --- > dlls/mshtml/tests/dom.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c > index dce65d5..5c4261e 100644 > --- a/dlls/mshtml/tests/dom.c > +++ b/dlls/mshtml/tests/dom.c > @@ -7497,7 +7497,7 @@ static void test_table_elem(IHTMLElement *elem) > VariantClear(&v); > hres = IHTMLTable_get_width(table, &v); > ok(hres == S_OK, "get_width = %08x\n", hres); > - ok(!strcmp_wa(V_BSTR(&v), "40.2%"), "Expected 40.2%%, got %s\n", wine_dbgstr_w(V_BSTR(&v))); > + ok(!strcmp_wa(V_BSTR(&v), "40.2%"), "Expected 40.2%, got %s\n", wine_dbgstr_w(V_BSTR(&v))); That is not a typo, one of this commands would have told you that: - man 3 printf - make bye michael

1 0

Re: mshtml/tests: Allow ParseUrl to clear buffer on Win10
by Marvin June 22, 2016

June 22, 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=23818 Your paranoid android. === w1064 (32 bit protocol) === protocol.c:723: Test failed: buf changed === w1064 (64 bit protocol) === protocol.c:723: Test failed: buf changed

1 0

Re: [2/2] advapi32/tests: Allow Win8+ flags for Admins ACE
by Marvin June 22, 2016

June 22, 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=23817 Your paranoid android. === w1064 (32 bit security) === security.c:4011: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:4015: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:4024: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0) === w1064 (64 bit security) === security.c:4011: Test failed: Builtin Users ACE has unexpected flags (0x2 != 0xa) security.c:4015: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:4024: Test failed: Builtin Admins ACE has unexpected flags (0x2 != 0x0)

1 0

Re: [1/2] advapi32/tests: Allow MACHINE\Software to be owned by local system
by Marvin June 22, 2016

June 22, 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=23816 Your paranoid android. === w864 (32 bit security) === security.c:4024: Test failed: Builtin Admins ACE has unexpected flags (0xa != 0x0) === w1064 (32 bit security) === security.c:4011: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:4015: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:4024: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0) === w1064 (64 bit security) === security.c:4011: Test failed: Builtin Users ACE has unexpected flags (0x2 != 0xa) security.c:4015: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:4024: Test failed: Builtin Admins ACE has unexpected flags (0x2 != 0x0)

1 0

Re: kernel32/tests: Fix a typo
by Marvin June 22, 2016

June 22, 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=23815 Your paranoid android. === w1064 (32 bit locale) === locale.c:2370: Test failed: LCMapStringEx should fail with bad locale name locale.c:2371: Test failed: unexpected error code -559038737 locale.c:2462: Test failed: Expected lcid == 0, got 00001000, error -559038737 locale.c:4192: Test failed: IsValidLocaleName should have failed locale.c:4194: Test failed: IsValidLocaleName should have failed locale.c:4577: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4579: Test failed: For id 7, Expected IVC, got '' === w1064 (64 bit locale) === locale.c:2370: Test failed: LCMapStringEx should fail with bad locale name locale.c:2371: Test failed: unexpected error code -559038737 locale.c:2462: Test failed: Expected lcid == 0, got 00001000, error -559038737 locale.c:4192: Test failed: IsValidLocaleName should have failed locale.c:4194: Test failed: IsValidLocaleName should have failed locale.c:4577: Test failed: For id 7, expected ret == 4, got 1, error 87 locale.c:4579: Test failed: For id 7, Expected IVC, got ''

1 0

Re: apphelp: add SdbGetAppPatchDir stub (try 2)
by Sebastian Lackner June 22, 2016

June 22, 2016

On 22.06.2016 09:23, Austin English wrote: > Using WCHAR * > > Previous try dropped without comment. Fixes > https://bugs.winehq.org/show_bug.cgi?id=35892 > > -- -Austin GPG: 14FB D7EA A041 937B > > > 0001-apphelp-add-SdbGetAppPatchDir-stub.patch > > > From 12b43f471b437309d80bf8625cdc4d518a225c72 Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Wed, 22 Jun 2016 02:17:19 -0500 > Subject: [PATCH] apphelp: add SdbGetAppPatchDir stub > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > dlls/apphelp/apphelp.c | 5 +++++ > dlls/apphelp/apphelp.spec | 2 +- > 2 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c > index 64dcd87..122642c 100644 > --- a/dlls/apphelp/apphelp.c > +++ b/dlls/apphelp/apphelp.c > @@ -111,3 +111,8 @@ void WINAPI SdbCloseDatabase(PDB pdb) > { > FIXME("stub: %p\n", pdb); > } > + > +void WINAPI SdbGetAppPatchDir(HSDB hsdb, WCHAR *path, DWORD size) > +{ > + FIXME("stub: %p %s %d\n", hsdb, debugstr_w(path), size); Path is an output buffer, it does not make sense to use debugstr_w here. Also, MSDN says "If the function fails, this parameter is set to the empty string ("").". It would probably make sense to implement that, too. > +} > diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec > index a658e5c..0119a48 100644 > --- a/dlls/apphelp/apphelp.spec > +++ b/dlls/apphelp/apphelp.spec > @@ -49,7 +49,7 @@ > @ stub SdbFreeFileInfo > @ stub SdbFreeFlagInfo > @ stub SdbGetAppCompatDataSize > -@ stub SdbGetAppPatchDir > +@ stdcall SdbGetAppPatchDir(ptr wstr long) HSDB is a handle, so "long" is more appropriate. > @ stub SdbGetBinaryTagData > @ stub SdbGetDatabaseID > @ stub SdbGetDatabaseInformation > -- 2.8.1 > > >

1 0

Re: [PATCH 1/2] include: add wmium.h (try 2) (resend)
by Sebastian Lackner June 22, 2016

June 22, 2016

On 22.06.2016 00:18, Austin English wrote: On the first sight, your patch still contains the same errors I pointed out in my earlier review: https://www.winehq.org/pipermail/wine-devel/2016-June/113414.html Is this really the latest version? Regards, Sebastian

1 0

Re: [v2 PATCH] inetcomm: Implement IMimeBody GetPropInfo
by Alexandre Julliard June 22, 2016

June 22, 2016

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > + memset(&info, 0, sizeof(info)); > + hr = IMimeBody_GetPropInfo(body, "Subject", &info); > + ok(hr == S_OK, "ret %08x\n", hr); > + if(hr == S_OK) > + { > + ok(info.dwMask == 0, "Invalid mask 0x%08x\n", info.dwFlags); > + ok(info.dwFlags == 0, "Invalid flags 0x%08x\n", info.dwFlags); > + ok(info.ietEncoding == 0, "Invalid encoding %d\n", info.ietEncoding); > + ok(info.dwPropId == 0, "Invalid propid %d\n", info.dwPropId); > + } > + > + memset(&info, 0, sizeof(info)); > + info.dwPropId = 1024; > + info.ietEncoding = 99; > + hr = IMimeBody_GetPropInfo(body, "Subject", &info); > + ok(hr == S_OK, "ret %08x\n", hr); > + if(hr == S_OK) > + { > + ok(info.dwMask == 0, "Invalid mask 0x%08x\n", info.dwFlags); > + ok(info.dwFlags == 0, "Invalid flags 0x%08x\n", info.dwFlags); > + ok(info.ietEncoding == 99, "Invalid encoding %d\n", info.ietEncoding); > + ok(info.dwPropId == 1024, "Invalid propid %d\n", info.dwPropId); > + } I still think it would be better to memset with a non-zero value so you can reliably see what has been set. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v2 4/7] msvcirt: Implement ostream::operator<< for floats
by Piotr Caban June 22, 2016

June 22, 2016

On 06/22/16 11:53, Iván Matellanes wrote: > + str_length += _scprintf(sprintf_fmt, prec, d); /* number representation */ > + if (str_length > 24) { > + /* too long to output */ > + ostream_writepad(ostr, "", ""); Could you please add a test for it? Also a comment saying that this is expected behavior would be useful. > + float param_float[] = {1.0f, 0.0f, 4.25f, 3.999f, 12.0005f, 15.33582f, 15.0f, 15.22f, 21.123f, 0.1f, > + 13.14159f, 0.00013f, 0.000013f, 1.0f / 0.0f, -1.0f / 0.0f, 0.0f / 0.0f}; Please do something similar as in dlls/msvcrt/tests/misc.c to define INFINITY/NAN in tests. Thanks, Piotr

2 2

Re: user32/tests: Avoid using CopyRect().
by Marvin June 22, 2016

June 22, 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=23786 Your paranoid android. === w864 (64 bit win) === win.c:8733: Test failed: msg.message = 320

2 1

Re: [v2 1/7] msvcirt: Implement ostream::operator<< for characters
by Piotr Caban June 22, 2016

June 22, 2016

On 06/22/16 11:53, Iván Matellanes wrote: > + enum { CHAR } type; It's better to avoid using enum values identical as Windows types. It will make it impossible to use CHAR type. Thanks, Piotr

1 0

Re: [v2 3/7] msvcirt: Implement ostream::operator<< for integers
by Piotr Caban June 22, 2016

June 22, 2016

On 06/22/16 11:53, Iván Matellanes wrote: > int param_int[] = {0, 7, 10, 24 ,55, 1024, 1023, 65536, 2147483647, 2147483648, 4294967295, -20}; It causes compilation warning: ../../../../wine_src/dlls/msvcirt/tests/msvcirt.c:3023:5: warning: this decimal constant is unsigned only in ISO C90 int param_int[] = {0, 7, 10, 24 ,55, 1024, 1023, 65536, 2147483647, 2147483648, 4294967295, -20}; ^ ../../../../wine_src/dlls/msvcirt/tests/msvcirt.c:3023:5: warning: this decimal constant is unsigned only in ISO C90 Thanks, Piotr

1 0

Re: [PATCH 5/5] wined3d: Send query destruction through the command stream.
by Henri Verbeet June 22, 2016

June 22, 2016

On 22 June 2016 at 10:39, Henri Verbeet <hverbeet(a)codeweavers.com> wrote: > Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> > --- > dlls/wined3d/palette.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > The subject should of course read "wined3d: Send palette destruction through the command stream."

1 0

Re: include: Add an inline version of CopyRect() too.
by Alexandre Julliard June 21, 2016

June 21, 2016

Michael Stefaniuc <mstefani(a)redhat.de> writes: > Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> > --- > Around 95 use cases. > No, I do *not* want to do change RECT struct assignments to CopyRect(). Good, but how about changing CopyRect to assignments? ;-) -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH] msvcrt: Implement _wperror (v2)
by Piotr Caban June 21, 2016

June 21, 2016

On 06/21/16 14:42, Hugh McMaster wrote: > + size = MSVCRT_wcstombs(NULL, str, 0) + 1; > + buffer = MSVCRT_malloc(size); > + if (!buffer) return; > + MSVCRT_wcstombs(buffer, str, size); Please handle MSVCRT_wcstombs failure. Thanks, Piotr

2 2

Re: [2/8] msvcirt: Implement ostream::operator<< for characters
by Piotr Caban June 21, 2016

June 21, 2016

On 06/21/16 11:54, Iván Matellanes wrote: > @@ -2608,8 +2615,7 @@ ostream* __thiscall ostream_print_char(ostream *this, char c) > DEFINE_THISCALL_WRAPPER(ostream_print_unsigned_char, 8) > ostream* __thiscall ostream_print_unsigned_char(ostream *this, unsigned char c) > { > - FIXME("(%p %c) stub\n", this, c); > - return this; > + return ostream_print_char(this, (char) c); > } The cast here is not needed. > + pssb = (strstreambuf*) call_func1(p_strstreambuf_ctor, &ssb); > + ok(pssb == &ssb, "wrong return, expected %p got %p\n", &ssb, pssb); > + pos = (ostream*) call_func3(p_ostream_sb_ctor, &os, (streambuf*) &ssb, TRUE); As well as this ones. Such casts can potentially hide problems otherwise visible during 64-bit compilation. > + pos = (ostream*) call_func2(p_ostream_print_char, &os, (int) tests[i].param.c); break; The cast here is also not needed. Thanks, Piotr

1 0

Re: [7/8] msvcirt: Implement ostream::operator<< for streambuf
by Marvin June 21, 2016

June 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=23764 Your paranoid android. === wxppro (32 bit msvcirt) === Found no trace of the test summary line or of a crash === w2003std (32 bit msvcirt) === Found no trace of the test summary line or of a crash

1 0

Re: [6/8] msvcirt: Implement ostream::operator<< for pointers
by Marvin June 21, 2016

June 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=23763 Your paranoid android. === wxppro (32 bit msvcirt) === Found no trace of the test summary line or of a crash === w2003std (32 bit msvcirt) === Found no trace of the test summary line or of a crash

1 0

Re: [2/8] msvcirt: Implement ostream::operator<< for characters
by Piotr Caban June 21, 2016

June 21, 2016

On 06/21/16 11:54, Iván Matellanes wrote: > + struct ostream_print_test { > + enum { CHAR } type; > + union { > + char c; > + } param; > + ios_io_state state; > + ios_flags flags; > + int precision; > + int fill; > + int width; > + const char *expected_text; > + ios_io_state expected_flags; > + } tests[] = { > + /* char */ > + {CHAR, {.c = 'a'}, IOSTATE_badbit, 0, 6, ' ', 0, "", IOSTATE_badbit|IOSTATE_failbit}, > + {CHAR, {.c = 'a'}, IOSTATE_eofbit, 0, 6, ' ', 0, "", IOSTATE_eofbit|IOSTATE_failbit}, > + {CHAR, {.c = 'a'}, IOSTATE_goodbit, 0, 6, ' ', 0, "a", IOSTATE_goodbit}, > + {CHAR, {.c = 'a'}, IOSTATE_goodbit, 0, 6, ' ', 4, " a", IOSTATE_goodbit}, > + {CHAR, {.c = 'a'}, IOSTATE_goodbit, 0, 6, 'x', 3, "xxa", IOSTATE_goodbit}, > + {CHAR, {.c = 'a'}, IOSTATE_goodbit, FLAGS_left, 6, ' ', 4, "a ", IOSTATE_goodbit}, > + {CHAR, {.c = 'a'}, IOSTATE_goodbit, FLAGS_left|FLAGS_internal, 6, ' ', 4, " a", IOSTATE_goodbit}, > + {CHAR, {.c = 'a'}, IOSTATE_goodbit, FLAGS_internal|FLAGS_hex|FLAGS_showbase, 6, ' ', 4, " a", IOSTATE_goodbit}, > + {CHAR, {.c = '9'}, IOSTATE_goodbit, FLAGS_oct|FLAGS_showbase|FLAGS_uppercase, 6, 'i', 2, "i9", IOSTATE_goodbit}, > + {CHAR, {.c = '9'}, IOSTATE_goodbit, FLAGS_showpos|FLAGS_scientific, 0, 'i', 2, "i9", IOSTATE_goodbit}, > + {CHAR, {.c = 'e'}, IOSTATE_goodbit, FLAGS_left|FLAGS_right|FLAGS_uppercase, 0, '*', 8, "e*******", IOSTATE_goodbit} > + }; This is not portable (the {.c = 'a'} part). Thanks, Piotr

1 0

Re: [5/8] msvcirt: Implement ostream::operator<< for floats
by Marvin June 21, 2016

June 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=23762 Your paranoid android. === wxppro (32 bit msvcirt) === Found no trace of the test summary line or of a crash === w2003std (32 bit msvcirt) === Found no trace of the test summary line or of a crash

1 0

Re: msvcrt: Implement _wperror
by Piotr Caban June 21, 2016

June 21, 2016

On 06/21/16 10:09, Hugh McMaster wrote: > dlls/msvcrt/msvcrt.spec | 2 +- > 2 files changed, 36 insertions(+), 1 deletion(-) Please also update other msvc*/ucrtbase spec files as well. > /********************************************************************* > + * _wperror (MSVCRT.@) > + */ > +void CDECL MSVCRT__wperror(const MSVCRT_wchar_t* str) > +{ > + int err, size, len; > + static const WCHAR colon_spaceW[] = {':',' ',0}; > + static const WCHAR newlineW[] = {'\n',0}; > + MSVCRT_wchar_t *buffer = NULL; > + > + err = *MSVCRT__errno(); > + if (err < 0 || err > MSVCRT__sys_nerr) err = MSVCRT__sys_nerr; > + > + size = MultiByteToWideChar(CP_ACP, 0, MSVCRT__sys_errlist[err], -1, NULL, 0) + 1 /* add \n */; > + > + if (str && *str) > + size += lstrlenW(str) + 2; /* add str length, colon and space */ > + > + buffer = MSVCRT_malloc(size * sizeof(MSVCRT_wchar_t)); > + if (!buffer) return; > + > + if (str && *str) > + { > + lstrcpyW(buffer, str); > + lstrcatW(buffer, colon_spaceW); > + } > + else buffer[0] = 0; > + > + len = lstrlenW(buffer); > + MultiByteToWideChar(CP_ACP, 0, MSVCRT__sys_errlist[err], -1, buffer + len, size - len); > + lstrcatW(buffer, newlineW); > + MSVCRT__write(2, buffer, lstrlenW(buffer) * sizeof(MSVCRT_wchar_t)); > + MSVCRT_free(buffer); > +} This is not how the function works. It shouldn't print wchar_t string to stderr. Probably the simplest implementation is to convert input parameter and call _perror (CP_ACP is not the correct encoding, you can use MSVCRT_wcstombs). Thanks, Piotr

2 3

Re: Fix overflow when left-shifting
by Dmitry Timoshkov June 21, 2016

June 21, 2016

Jarkko Korpi <jarkko_korpi(a)hotmail.com> wrote: > Subject: [PATCH] widi: Fix overflow when left-shifting The tool name is 'widl'. -- Dmitry.

1 0

Re: [PATCH v2] jscript: Properly handle arguments in Object constructor.
by Marvin June 20, 2016

June 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=23756 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: jscript: Properly handle arguments in Object constructor.
by Marvin June 20, 2016

June 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=23747 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/2] winex11: fix gl drawable type
by Alexandre Julliard June 20, 2016

June 20, 2016

Miklós Máté <mtmkls(a)gmail.com> writes: > @@ -1344,7 +1344,7 @@ static BOOL create_gl_drawable( HWND hwnd, struct gl_drawable *gl ) > > if (data) > { > - gl->type = DC_GL_WINDOW; > + gl->type = DC_GL_CHILD_WIN; This can't possibly work, top-level windows and child windows have to be treated differently. -- Alexandre Julliard julliard(a)winehq.org

2 2

Images in MyHeritage Family Tree Builder
by Stephen Davies June 20, 2016

June 20, 2016

I am running WINE 1.9.11 (Staging) under Fedora 22. I have been running the MyHeritage Family Tree Builder V7 product on this box for several years without issue but recently (last month perhaps), FTB is no longer able to display JPEG photographs. The JPEG files exist in the relevant directory but they all display as blank images. FTB has not changed but there have been numerous updates to F22 and to WINE suggesting that this may be the cause. Can anybody throw any light on what may have happened? Cheers and thanks, Stephen

3 4

Re: comctl32/tests: Use EqualRect() instead of memcmp() to compare RECTs.
by Marvin June 20, 2016

June 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=23734 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: d3d8/tests: Use wine_dbgstr_rect() to print RECTs.
by Marvin June 20, 2016

June 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=23732 Your paranoid android. === w8 (32 bit device) === device.c:1372: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1417: Test failed: Reset failed, hr 0x88760868. device.c:1419: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1423: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1430: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1431: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1432: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1433: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1434: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1435: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1440: Test failed: Screen width is 640, expected 800. device.c:1441: Test failed: Screen height is 480, expected 600. device.c:1447: Test failed: Back buffer width is 640, expected 800. device.c:1449: Test failed: Back buffer height is 480, expected 600. device.c:1479: Test failed: Screen width is 640, expected 1024. device.c:1480: Test failed: Screen height is 480, expected 768. device.c:2725: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2730: Test failed: The focus window is active. device.c:2738: Test failed: Got unexpected hr 0x88760869. device.c:2742: Test failed: Got unexpect screen size 800x600. device.c:2757: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2766: Test failed: Got unexpect screen size 800x600. device.c:2779: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2787: Test failed: Got unexpect width 640. device.c:2788: Test failed: Got unexpect height 480. === w864 (32 bit device) === device.c:7573: Test failed: Got unexpected hr 0. device.c:7575: Test failed: Got unexpected hr 0. === w1064 (32 bit device) === device.c:2725: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2730: Test failed: The focus window is active. device.c:2738: Test failed: Got unexpected hr 0x88760869. device.c:2742: Test failed: Got unexpect screen size 800x600. device.c:2757: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2766: Test failed: Got unexpect screen size 800x600. device.c:2779: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2787: Test failed: Got unexpect width 640. device.c:2788: Test failed: Got unexpect height 480.

1 0

Re: [PATCH 2/5] d3drm: Add stubs for IDirect3DRMFrame interface. (v5)
by Henri Verbeet June 20, 2016

June 20, 2016

On 19 June 2016 at 00:29, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > +static HRESULT WINAPI d3drm_frame1_AddChild(IDirect3DRMFrame *iface, IDirect3DRMFrame *child) > +{ > + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); > + struct d3drm_frame *child_frame = unsafe_impl_from_IDirect3DRMFrame(child); > + > + TRACE("iface %p, child %p.\n", iface, child); > + > + if (!child_frame) > + return D3DRMERR_BADOBJECT; That's redundant, d3drm_frame3_AddChild() already takes care of that.

2 6

Re: [PATCH] msi: allocate correct buffer size (Coverity)
by Hans Leidekker June 20, 2016

June 20, 2016

On Sat, 2016-06-18 at 10:02 +0200, Marcus Meissner wrote: > 713180 Out-of-bounds access > 713179 Out-of-bounds access > > We pass in a size of 1 character more to MBtoWC than we allocated earlier. No, Coverity doesn't see that MsiEnumComponentsExW and MsiEnumProductsExW return size excluding the terminating null.

1 0

Re: ws2_32: Ensure default route IP addresses are returned first in gethostbyname
by Marvin June 19, 2016

June 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=23725 Your paranoid android. === w7pro64 (64 bit sock) === sock.c:7738: Test failed: bytesReturned isn't supposed to be 1 sock.c:7784: Test failed: Waiting for timeout failed with 0 + errno 997

1 0

Re: [PATCH 5/5] d3drm/tests: Modify all QI tests to compare vtables. (resend)
by Henri Verbeet June 19, 2016

June 19, 2016

On 19 June 2016 at 00:29, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > + { &IID_IUnknown, &IID_IUnknown, NULL, S_OK }, Is the NULL "vtable_iid" here intentional?

2 2

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

Re: [PATCH 4/5] d3drm: Fix viewport object creation. (resend)
by Henri Verbeet June 19, 2016

June 19, 2016

On 19 June 2016 at 00:29, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > @@ -861,10 +863,19 @@ static HRESULT WINAPI d3drm2_CreateShadow(IDirect3DRM2 *iface, IDirect3DRMVisual > FIXME("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p partial stub!\n", > - iface, device, camera, x, y, width, height, viewport); > + iface, device, camera, x, y, width, height, viewport); I thought that was fine the way it was. > -HRESULT Direct3DRMViewport_create(REFIID riid, IUnknown **out) > +HRESULT d3drm_viewport_create(struct d3drm_viewport **viewport, IDirect3DRM *d3drm) > { > struct d3drm_viewport *object; > > - TRACE("riid %s, out %p.\n", debugstr_guid(riid), out); > + TRACE("out %p, d3drm %p.\n", viewport, d3drm); "viewport"

1 0

Re: [PATCH 3/5] d3drm: Fix frame object creation method. (v3 resend)
by Henri Verbeet June 19, 2016

June 19, 2016

On 19 June 2016 at 00:29, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h > index 817accf..1f4094b 100644 > --- a/dlls/d3drm/d3drm_private.h > +++ b/dlls/d3drm/d3drm_private.h > @@ -44,6 +44,27 @@ struct d3drm_texture > D3DRMIMAGE *image; > }; > > +struct d3drm_frame > +{ > + IDirect3DRMFrame IDirect3DRMFrame_iface; > + IDirect3DRMFrame2 IDirect3DRMFrame2_iface; > + IDirect3DRMFrame3 IDirect3DRMFrame3_iface; > + IDirect3DRM *d3drm; > + LONG ref; > + struct d3drm_frame *parent; > + ULONG nb_children; > + ULONG children_capacity; > + IDirect3DRMFrame3** children; > + ULONG nb_visuals; > + ULONG visuals_capacity; > + IDirect3DRMVisual** visuals; > + ULONG nb_lights; > + ULONG lights_capacity; > + IDirect3DRMLight** lights; > + D3DRMMATRIX4D transform; > + D3DCOLOR scenebackground; > +}; "IDirect3DRMFrame3 **children", "IDirect3DRMVisual **visuals" and "IDirect3DRMLight **lights". > @@ -51,11 +72,11 @@ void d3drm_object_cleanup(IDirect3DRMObject *iface, struct d3drm_object *object) > > HRESULT d3drm_device_create(struct d3drm_device **out) DECLSPEC_HIDDEN; > HRESULT d3drm_texture_create(struct d3drm_texture **texture, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; > +HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown* parent_frame, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; "IUnknown *parent_frame". > -HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown *parent, IUnknown **out) > +HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown* parent_frame, IDirect3DRM *d3drm) Like above. > { > struct d3drm_frame *object; > - HRESULT hr; > + HRESULT hr = D3DRM_OK; > > - TRACE("riid %s, parent %p, out %p.\n", debugstr_guid(riid), parent, out); > + TRACE("out %p, parent_frame %p, d3drm %p.\n", frame, parent_frame, d3drm); "frame" instead of "out". > + if (parent_frame) > { > IDirect3DRMFrame3 *p; > > - hr = IDirect3DRMFrame_QueryInterface(parent, &IID_IDirect3DRMFrame3, (void**)&p); > + hr = IDirect3DRMFrame_QueryInterface(parent_frame, &IID_IDirect3DRMFrame3, (void**)&p); > if (hr != S_OK) "if (FAILED(hr = ...))" and "(void **)".

1 0

Re: [PATCH 1/4] d3drm: Add stubs for IDirect3DRMFrame interface. (v4)
by Henri Verbeet June 17, 2016

June 17, 2016

On 17 June 2016 at 09:38, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > v4: Replaced GetVisuals, GetParent and GetTransform with thunks to version 2. > > v3: Added version 1->3 thunks for only those frame1 methods that have tests (see test_Frame). The rest will be stubs returning E_NOTIMPL. Also avoid the use of QI in Add/DeleteChild. > Doesn't that potentially break currently working applications? And while having tests is great, I'm not sure I agree with the premise that it's better to return E_NOTIMPL than to forward to an implementation that may have subtle differences but probably doesn't in most cases. > +static HRESULT WINAPI d3drm_frame1_QueryInterface(IDirect3DRMFrame *iface, REFIID riid, void **out) > +{ > + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); > + > + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); > + > + return IDirect3DRMFrame3_QueryInterface(&frame->IDirect3DRMFrame3_iface, riid, out); > +} This may have come up before, but any reason you can't call d3drm_frame3_QueryInterface() directly here?

3 5

Re: [PATCH] msscript: Implement FindConnectionPoint()
by Jacek Caban June 17, 2016

June 17, 2016

Hi Nikolay, On 06/16/2016 09:20 PM, Nikolay Sivov wrote: > +struct ConnectionPoint { > + IConnectionPoint IConnectionPoint_iface; > + ScriptControl *control; > + IConnectionPointContainer *container; Do you need to store IConnectionPointContainer here if you also store ScriptControl? Other than that the patch looks good to me. Thanks, Jacek

1 0

Re: [PATCH 3/5] d3drm/tests: Add refcount tests for IDirect3DRMFrame*. (v2)
by Stefan Dösinger June 17, 2016

June 17, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-06-16 um 00:23 schrieb Aaryaman Vasishta: > This might be a stupid question, but by the full blown QI + > refcounting tests, did you mean what test_frame_qi does? Because > those tests are already present upstream. Yeah, this test is perfectly fine for testing frame refcount links. You can just drop patch 3/5. (I've re-CCed wine-devel) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXYxntAAoJEN0/YqbEcdMw9HMP/0kwOc2M6z3bchxsxYJQAF77 ao8uYZvOjkz2Kzp3XGaRMuja2H55qpvNFe0JGmi3pHnGaNQ5SY2s4nqmYFjgUB3u +PNXAXGspalI/1Hx2dFuFYpjZ0FxUA3kaqQeyloBn3zjycb+XtRohQbyv0LOnrDb hRck+jyPpszjDbQruHBRh7Q1VnFMPQXjayfbrY6VhQnxvVKt2aY7mA/fmqRltfwF 9XKOMekT5zoNufjb1ll6+558Nl/+cek37sDr2d09WOO/hlfeovEKKqnYJfucV/bS ZNKN31JFx94KAFaG/JsIiLwS+lJq2bU92ZHWpkQc6CbcRcm8nOFMtZQ9EPh3iRqW ou2i00/UMBXwhoNMOq6yAI6FG6CvUyf7HKqEKhWyJHtaiJ85/ZPgtT+xqOvNSld8 9O54r1JbaDJ5SIQaDiIGc/XmyMot0hLjGMu5l9r/bIF+XTfsP8Bjge+hHe28yaL+ h7qwKWMes52DWxW1BHv6NTFRm1GAuSFaTz5QCyp1zNWegOqS05tmEWjISQ79871g urJg0XcEiKvftx7irWDUOM8gPAOKgSfxfFsVc0zMTJcFRUm6h5tFXld6nDYG7oMy KXU7guPKOdaW2KBM2mqYBUy6yXmAZ5fJXRRvl0Ai/fatvqoH+6RdNwVhEe1DL+BH 4zWH/+UP6vfFOXvAVHpk =hG2j -----END PGP SIGNATURE-----

2 1

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] mshtml: Added IHTMLButtonElement::form property implementation.
by Marvin June 16, 2016

June 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=23683 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 4/5] mshtml: Added IHTMLButtonElement::value property implementation.
by Marvin June 16, 2016

June 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=23682 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/5] mshtml: Added IHTMLButtonElement::get_type implementation.
by Marvin June 16, 2016

June 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=23681 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/5] mshtml: Added IElementSelector::querySelectorAll implementation.
by Marvin June 16, 2016

June 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=23680 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: user32/tests: Use wine_dbgstr_rect() to print RECTs.
by Marvin June 16, 2016

June 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=23661 Your paranoid android. === w1064 (32 bit msg) === msg.c:6482: Test failed: Update region shouldn't be empty msg.c:6715: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6717: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different === w864 (64 bit msg) === msg.c:6482: Test failed: Update region shouldn't be empty msg.c:6715: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6717: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different === w1064 (64 bit msg) === msg.c:6482: Test failed: Update region shouldn't be empty msg.c:6715: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6717: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different msg.c:7437: Test failed: destroy child on thread exit: 3: the msg sequence is not complete: expected 0000 - actual 001a === w1064 (32 bit monitor) === monitor.c:248: Test failed: Unexpected ChangeDisplaySettingsEx() return code for resolution[0]: -2 monitor.c:248: Test failed: Unexpected ChangeDisplaySettingsEx() return code for resolution[2]: -2 === w1064 (64 bit monitor) === monitor.c:248: Test failed: Unexpected ChangeDisplaySettingsEx() return code for resolution[0]: -2 monitor.c:248: Test failed: Unexpected ChangeDisplaySettingsEx() return code for resolution[2]: -2

2 1

Re: [PATCH] configure: Check for GnuTLS block size function
by Alexandre Julliard June 16, 2016

June 16, 2016

Michael Cronenworth <mike(a)cchtml.com> writes: > diff --git a/configure.ac b/configure.ac > index 7f234b2..6ae8dde 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1268,6 +1268,9 @@ then > WINE_CHECK_LIB_FUNCS(gnutls_hash,[$GNUTLS_LIBS],, > [WINE_NOTICE([libgnutls ${notice_platform}development files too old, no bcrypt hash support.])])])], > [GNUTLS_CFLAGS=""])]) > + WINE_PACKAGE_FLAGS(GNUTLS,[gnutls],,,, > + [WINE_CHECK_LIB_FUNCS(gnutls_cipher_get_block_size,[$GNUTLS_LIBS],, > + [WINE_NOTICE([libgnutls ${notice_platform}development files too old, no block size support.])])]) This won't have any effect, since you don't check the resulting define. In any case I don't think this needs a configure check, since we already have a fallback. You can simply declare the function pointer without using the MAKE_FUNCPTR macro. -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: [PATCH] tools: Use type BOOL where appropriate.
by Alexandre Julliard June 16, 2016

June 16, 2016

Hadrien Boizard <h.boizard(a)gmail.com> writes: > Signed-off-by: Hadrien Boizard <h.boizard(a)gmail.com> > --- > tools/wrc/parser.y | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) In general, tools don't use the Windows API, so BOOL is not necessarily appropriate either. Technically it's not wrong, but IMO it's not worth changing the code for it. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: wininet: Include system headers before winsock2.h in http.c.
by Alexandre Julliard June 16, 2016

June 16, 2016

Jacek Caban <jacek(a)codeweavers.com> writes: > Fixes compilation on NetBSD, where zlib.h doesn't include stdlib.h. > > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > --- > dlls/wininet/http.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) This breaks the mingw build: In file included from ../../../wine/include/winsock2.h:47:0, from ../../../wine/dlls/wininet/http.c:42: ../../../wine/include/winsock.h:445:19: error: redefinition of ‘struct timeval’ ../../../wine/include/winsock.h:136:19: note: in definition of macro ‘WS’ In file included from /usr/share/mingw-w64/include/time.h:246:0, from ../../../wine/dlls/wininet/http.c:39: /usr/share/mingw-w64/include/_timeval.h:10:8: note: originally defined here Makefile:296: recipe for target 'http.o' failed -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 04/10] d3dx9_30: Share the source with d3dx9_36
by Matteo Bruni June 15, 2016

June 15, 2016

2016-06-15 8:35 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > @@ -75,3 +75,21 @@ D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL enable) > FIXME("%i - stub\n", enable); > return D3DX_NOT_OPTIMIZED; > } It's probably better to move the D3DXCpuOptimizations() implementation to d3dx9_36 in this patch so you can then drop the forwards from <= d3dx9_29.dll in the following patches.

1 0

Re: [PATCH 01/10] d3dx9_33: Share the source with d3dx9_36
by Matteo Bruni June 15, 2016

June 15, 2016

2016-06-15 8:35 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > -@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap ... > +@ stub D3DXComputeNormalMap(ptr ptr ptr long long float) Nicely spotted (also for D3DXFrameFind), that should probably be applied to all the DLLs and separately from this patch though. I'm sending a patch for it. > +@ stdcall D3DXGetShaderConstantTableEx(ptr long ptr) This function shouldn't be exported by d3dx9_33.dll. WRT D3DXDebugMute() and D3DXGetDriverLevel(), I would move the implementation to util.c or some other file and avoid duplicating the code in every d3dx9_xx_main.c.

1 0

Re: [PATCH 3/5] d3drm/tests: Add refcount tests for IDirect3DRMFrame*. (v2)
by Stefan Dösinger June 15, 2016

June 15, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-06-15 um 10:35 schrieb Aaryaman Vasishta: > + ok(ref1 == ref2, "Expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2); > + ok(ref2 == ref3, "Expected ref2 == ref3, got ref2 = %u, ref3 = %u.\n", ref2, ref3); > + ok(ref1 == ref3, "Expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3); I think you can assume basic logic still applies to d3drm :-) . There's no need to test ref1 == ref3 after you made sure (ref1 == ref2 && ref2 == ref3) . More importantly though, patch 5 somewhat suggests that you're planning to have a full-blown QI and refcounting test for frames too. If that's the case there's no need to add this patch. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXYcYrAAoJEN0/YqbEcdMwudEP/1BMGtCEhuN9i8BbphtECIuF otKTT8qBR1LFP0QocHWntJtCteJ69vq70dfxp764++wqt7UWuGrZhPdKG+6Qjb1u 9kBU6PppQNX4V0tybDgCMIEOv4HcY00FuCN4ahPu5bfBFOskXwOhzs2ne3bYHX1v iDR2NIATu2wwTkA/s/ttj5ZYuKflSl5EUC8wELFwy6IjonaICfuubvgZCVEDBc+R POeJbGbbvn/7v9Q+mfTLNDFvTdDANgTCFkIFmBxrPu2b4erFtRJQV47DVhaLGmZg BwOxV8AYnq7yEltiOkpWKgUtIC4q6U1pf7tW2uUm/4kPMM3+RviiFbX2fNKTFP6f 5rW/5xIP68ymv+Z4su24BbbMcYJPBXkHNkyk1bdARmXtTtzRQbSchdVCLCaOs81k Vmwbl7A4ZqqshTqv40DTRAQq5NWYFcvTbXdUkWZav9EtO9a0hs8PMO9GqG+RBgOu lGk9GrW/jvoWXx/knMtSuoHpkLnpPy4RuJefzVyw1NaawBfakTuUElD0/nnC2f+j 528Ft8FKM9wmJLf3v8fl4IB0vsnExkjOrbKRdWJAuvpxuZJp0rkSdXE0JrEEum44 BlgKzwWvFDl46BX/OC0pzvGlZ6417c/5JgaaPCXus9nGBPBaJx44d2QJWD/UELMS jN9KRUNfGyfcNYS4yVH1 =2nxr -----END PGP SIGNATURE-----

1 0

Re: [PATCH 1/5] d3drm: Add stubs for IDirect3DRMFrame interface. (v3)
by Stefan Dösinger June 15, 2016

June 15, 2016

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 2016-06-15 um 10:35 schrieb Aaryaman Vasishta: > +static HRESULT WINAPI d3drm_frame1_GetVisuals(IDirect3DRMFrame *iface, IDirect3DRMVisualArray **visuals) > +{ > + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); > + struct d3drm_visual_array *array; > + > + TRACE("iface %p, visuals %p.\n", iface, visuals); > + > + if (!visuals) > + return D3DRMERR_BADVALUE; > + > + if (!(array = d3drm_visual_array_create(frame->nb_visuals, frame->visuals))) > + return E_OUTOFMEMORY; > + > + *visuals = &array->IDirect3DRMVisualArray_iface; > + > + return D3DRM_OK; > +} This is a reimplementation instead of a thunk. Intentional? The same applies to d3drm_frame1_GetTransform. > +static HRESULT WINAPI d3drm_frame1_GetSceneBackgroundDepth(IDirect3DRMFrame *iface, > + IDirectDrawSurface **surface) The indentation here is different. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXYcT1AAoJEN0/YqbEcdMwUHcQAIAfKv2BAfasnwRACZsGBcK9 VAftr2zuIgmlMKtQaplsZuv2ZqcyUnydOgzuXQusFfBldeKeD1ukycLx/sONpuZI ggt7AbXcslw9T0wlprTnfl+1Pna/CSbRQWhVAjeB9dCCWblBslipsj9SLr3hTOwH ppQYvk+BtoXb7A+tvVI2ch/Q8HhwWh/Q9SvVg6tUV7gQLrPG0sj4NEjG50I7VN0c PjLgZHlT7JzVDxlGoefhTPXZdL+1muSIIuxVXho+oNx6qFqiyC0+7xxlJEVR2Eyo VBzdczdYd0UcLRb0GOqyJpRcGTpYE06zahKeDyODIXeorFB0NlYFqSTD2H32RVNU M2a+xKgFLqm4zu+cabfRIvFk9wGkIRykwfm8KUY4LyZCZmlQZ21nPCAIsuolRqV6 DrmQAParbMg/fAb6L9/uB0rb/CBPGIhm3mtv00TewBG8VG16uV4vLbvtoiIJJtD4 Z6iY6x948K+jjVVkhGDRfdEJn+nQRDTKIkgsRKic9S5x/nOEyfreVutjq4vULnGk l5hRAzyzOxjP/JTMHhvYtHYbLtqjgXPi3pwhjrfGMWLKAmeRPk3A2FdsUl9A1I3I INR8LmGAo3P7a1GZ21loc5A2iftn29vcAB0mDzcotczOEsinfx7Sc4oF5fIUDZla miBufY1gPaDENTTiRcz5 =hvk0 -----END PGP SIGNATURE-----

1 0

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

June 15, 2016

Anything wrong with this patch? On Sun, 29 May 2016, Francois Gouget wrote: > Signed-off-by: Francois Gouget <fgouget(a)free.fr> > --- > dlls/ddraw/tests/d3d.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c > index d877020..0e9a43b 100644 > --- a/dlls/ddraw/tests/d3d.c > +++ b/dlls/ddraw/tests/d3d.c > @@ -1155,7 +1155,7 @@ static void Direct3D1Test(void) > /* Interface consistency check. */ > hr = IDirect3DDevice_GetDirect3D(Direct3DDevice1, &Direct3D_alt); > ok(hr == D3D_OK, "IDirect3DDevice_GetDirect3D failed: %08x\n", hr); > - ok(Direct3D_alt == Direct3D1, "Direct3D1 struct pointer missmatch: %p != %p\n", Direct3D_alt, Direct3D1); > + ok(Direct3D_alt == Direct3D1, "Direct3D1 struct pointer mismatch: %p != %p\n", Direct3D_alt, Direct3D1); > IDirect3D_Release(Direct3D_alt); > > memset(&desc, 0, sizeof(desc)); > -- > 2.8.1 > > > > -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Indifference will certainly be the downfall of mankind, but who cares?

3 4

Re: [PATCH 5/5] d3dx9: Turn an ERR into a WARN.
by Matteo Bruni June 15, 2016

June 15, 2016

2016-06-15 9:51 GMT+02:00 Paul Gofman <gofmanp(a)gmail.com>: > Hello Matteo, > > I am afraid that if application passes effect data broken an > arbitrary way then probably almost every ERR and FIXME should be changed > to WARN (at least in my code, but probably in the rest of effect > framework either). E. g., we have FIXME on not yet supported relative > addressing, but it can also happen if the application passes broken > effect code. Or do you see any difference for this case with parameter > name? I do not yet, as actually preshader and effect are compiled > together, and it is no way to get such a situation (at least if there is > some feature in fxc compiler which I am not aware of) other than > modifying effect bytecode. > > Regards, > Paul. The general idea is that FIXME refers to something that isn't (completely / correctly) implemented in Wine, so e.g. FIXME is the right choice for relative addressing. ERR is the correct choice for "internal errors" in Wine (i.e. something that shouldn't happen unless there is a bug in Wine - the ERR("Unexpected register set %u.\n", ...) is a good example of that) and WARN should be used when the application can trigger the problematic condition by misusing the API or similar. Specifically WRT this patch I just happened to notice that ERR while looking through the code and it seems to me that WARN fits better. It's not a big deal either way.

1 0

Re: [PATCH] wined3d: Implement icb dcl support in GLSL.
by Józef Kucia June 15, 2016

June 15, 2016

This implementation has some issues, e.g. a generated GLSL shader will produce a compilation error when the immediate constant buffer contains an unsigned integer which represents NaN. Morever, from testing a similar implementation, it seems that some drivers don't handle shaders with huge arrays very well and such shaders perform poorly. My current impression is that we should implement immediate constant buffers using a uniform variable. Also, a test would be nice. On Mon, Jun 13, 2016 at 6:41 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> > --- > dlls/wined3d/glsl_shader.c | 15 ++++++++++++++- > 1 file changed, 14 insertions(+), 1 deletion(-) > > diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c > index 55affc1..def224c 100644 > --- a/dlls/wined3d/glsl_shader.c > +++ b/dlls/wined3d/glsl_shader.c > @@ -1886,6 +1886,19 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont > if (shader->limits->constant_bool > 0 && reg_maps->boolean_constants) > shader_addline(buffer, "uniform bool %s_b[%u];\n", prefix, shader->limits->constant_bool); > > + if (reg_maps->icb) > + { > + shader_addline(buffer, "const vec4 %s_icb[%u] = vec4[%u](\n", > + prefix, reg_maps->icb->element_count / 4, reg_maps->icb->element_count / 4); > + for (i = 0; i < reg_maps->icb->element_count / 4; i++) { > + shader_glsl_append_imm_vec4(buffer, (float *)&reg_maps->icb->data[4 * i]); > + if (i != reg_maps->icb->element_count / 4 - 1) > + shader_addline(buffer, ","); > + shader_addline(buffer, "\n"); > + } > + shader_addline(buffer, ");\n"); > + } I think it would be better to store the number of vectors instead of the element count in "reg_maps->icb". Not that it matters much, but this block of code would certainly look nicer. > + > for (i = 0; i < WINED3D_MAX_CBS; ++i) > { > if (reg_maps->cb_sizes[i]) > @@ -8561,7 +8574,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB > /* WINED3DSIH_DCL_GLOBAL_FLAGS */ shader_glsl_nop, > /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ NULL, > /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ NULL, > - /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, > + /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ shader_glsl_nop, > /* WINED3DSIH_DCL_INPUT */ shader_glsl_nop, > /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ NULL, > /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_glsl_nop, > -- > 2.7.4 > > >

2 5

Re: [PATCH] wined3d: Properly handle immediate NaN and Inf in GLSL backend.
by Józef Kucia June 15, 2016

June 15, 2016

In my opinion, we do not want to solve the issue with immediate constant buffers this way. However, this patch might still be useful. Some games (Magicka 2) use shaders which contain NaN values in immediate constants. This patch represents a one way to solve the issue with NaN values in immediate constants. If we decide that we want to apply this change we should be more careful though. We probably want to use this for SM4+ shaders only, or use it only when GL_ARB_shader_bit_encoding is available. On a side note, "uintBitsToFloat" cannot be used as a constant expression (at least in GLSL 1.30), so to make this work with the immediate constant buffers patch you would have to drop "const". On Mon, Jun 13, 2016 at 9:30 PM, Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> > --- > dlls/wined3d/glsl_shader.c | 36 +++++++++++++++++++++++++----------- > 1 file changed, 25 insertions(+), 11 deletions(-) > > diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c > index def224c..fde4c5e 100644 > --- a/dlls/wined3d/glsl_shader.c > +++ b/dlls/wined3d/glsl_shader.c > @@ -34,6 +34,8 @@ > > #include <limits.h> > #include <stdio.h> > +#include <stdint.h> > +#include <inttypes.h> We avoid C99 in Wine. unsigned int and %#xu should be good enough. > #ifdef HAVE_FLOAT_H > # include <float.h> > #endif > @@ -321,14 +323,26 @@ static const char *shader_glsl_get_version(const struct wined3d_gl_info *gl_info > return "#version 120"; > } > > +/* Allow raw NaN and Inf in GLSL code. */ > +void wined3d_glsl_ftoa(float value, char *s) The function should be static. > +{ > + if (!isfinite(value)) > + { > + /* We need a buffer of at least 28 characters. */ > + snprintf(s, 28, "uintBitsToFloat(%"PRIu32"u)", *(uint32_t *)&value); It seems that 29 bytes are needed at least (including the null character). > + } > + else > + wined3d_ftoa(value, s); > +} In wined3d, generally, if one block in if-else statement needs curly braces we use curly braces for all blocks in this statement. else { wined3d_ftoa(value, s); } > + > static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, const float *values) > { > - char str[4][17]; > + char str[4][28]; > > - wined3d_ftoa(values[0], str[0]); > - wined3d_ftoa(values[1], str[1]); > - wined3d_ftoa(values[2], str[2]); > - wined3d_ftoa(values[3], str[3]); > + wined3d_glsl_ftoa(values[0], str[0]); > + wined3d_glsl_ftoa(values[1], str[1]); > + wined3d_glsl_ftoa(values[2], str[2]); > + wined3d_glsl_ftoa(values[3], str[3]); > shader_addline(buffer, "vec4(%s, %s, %s, %s)", str[0], str[1], str[2], str[3]); > } > > @@ -2299,7 +2313,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * > const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; > const char *prefix = shader_glsl_get_prefix(version->type); > struct glsl_src_param rel_param0, rel_param1; > - char imm_str[4][17]; > + char imm_str[4][28]; > > if (reg->idx[0].offset != ~0U && reg->idx[0].rel_addr) > shader_glsl_add_src_param(ins, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param0); > @@ -2513,7 +2527,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * > switch (reg->data_type) > { > case WINED3D_DATA_FLOAT: > - wined3d_ftoa(*(const float *)reg->immconst_data, register_name); > + wined3d_glsl_ftoa(*(const float *)reg->immconst_data, register_name); > break; > case WINED3D_DATA_INT: > sprintf(register_name, "%#x", reg->immconst_data[0]); > @@ -2533,10 +2547,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * > switch (reg->data_type) > { > case WINED3D_DATA_FLOAT: > - wined3d_ftoa(*(const float *)&reg->immconst_data[0], imm_str[0]); > - wined3d_ftoa(*(const float *)&reg->immconst_data[1], imm_str[1]); > - wined3d_ftoa(*(const float *)&reg->immconst_data[2], imm_str[2]); > - wined3d_ftoa(*(const float *)&reg->immconst_data[3], imm_str[3]); > + wined3d_glsl_ftoa(*(const float *)&reg->immconst_data[0], imm_str[0]); > + wined3d_glsl_ftoa(*(const float *)&reg->immconst_data[1], imm_str[1]); > + wined3d_glsl_ftoa(*(const float *)&reg->immconst_data[2], imm_str[2]); > + wined3d_glsl_ftoa(*(const float *)&reg->immconst_data[3], imm_str[3]); > sprintf(register_name, "vec4(%s, %s, %s, %s)", > imm_str[0], imm_str[1], imm_str[2], imm_str[3]); It looks like shader_glsl_append_imm_vec4() could be called there instead.

4 8

Re: [PATCH] wined3d: Correct memory size for Geforece 9600 GT (resend)
by Henri Verbeet June 15, 2016

June 15, 2016

On 15 June 2016 at 09:48, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/wined3d/directx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > This isn't necessarily wrong, but why is this needed/more correct?

2 2

Fwd: [v4 2/4] winejoystick.drv/joystick_osx.c: fixes Slider mapping
by DavidL June 15, 2016

June 15, 2016

Sorry, keep hitting reply instead of reply-all to make sure the list-serve has a copy. ---------- Forwarded message ---------- From: DavidL <david.dljunk(a)gmail.com> Date: Tue, Jun 14, 2016 at 12:05 AM Subject: Re: [v4 2/4] winejoystick.drv/joystick_osx.c: fixes Slider mapping To: Ken Thomases <ken(a)codeweavers.com> As far as I can tell, both. It both arbitrarily picks which is first for any given run (so yes I can definitely confirm that bug report's description) and the game seems to read input from both inputs regardless of which is first - although which is first does still affect the game. I created virtual joystick in Controllermate which I mapped my physical joystick to but mapping X to Y and Y to X, so that when I pulled back on the yoke it would give both an X reading and a Y reading at the same time if it were reading input from both the virtual and physical joystick. In game, that's what happened, even when the trace logs said it was only recording information from one joystick (and in one case, Red Baron, it was explicitly reading from both in the trace log). Which joystick was found first would affect behavior somewhat (hard to describe, basically how out of whack the motions became!), but regardless I could get it sometimes explicitly, sometimes implicitly to read multiple inputs. Maybe this is an anomaly with virtual joysticks. Not sure, shouldn't be. On Mon, Jun 13, 2016 at 11:41 PM, Ken Thomases <ken(a)codeweavers.com> wrote: > On Jun 14, 2016, at 1:23 AM, DavidL <david.dljunk(a)gmail.com> wrote: > > > On Mon, Jun 13, 2016 at 2:46 PM, Ken Thomases <ken(a)codeweavers.com> wrote: > >> Is there reason to expect that these elements (sliders, dials, wheels) >> will be listed after the "proper" axes (x, y, z, etc.) in the children >> array? Since the proper axes are specific and these elements should only >> be mapped to unused axes, I think they should be enumerated in a separate >> pass after everything else has had a shot. Note that >> collect_joystick_elements() is recursive, so it's not right to do it in a >> separate loop within collect_joystick_elements(). Probably, you'll want to >> call it twice from open_joystick(), with a flag to indicate which mode it >> should operate in. > > > This where the Microsoft source documentation get *really* fuzzy. There > are all sorts of possible mappings in the rare case where there is both a > HID/Dinput Z-axis and a slider/dial/wheel. Microsoft gave 4-5 different > variations of how it could go and in some of these mappings, the slider > would take precedence over the reported HID Z-axis when mapping to the > Winmm Z-axis such that slider -> WinmmZ is correct and the HID Z-axis is > then ignored. So I decided to follow the Linux Winmm version and simply > have whichever element is listed by the joystick first, wins. If it is the > axis, it's the axis, if it is the slider, it's the slider. This actually is > one of the ways Microsoft says to decide proper HID mappings to Winmm (and > it seems like that for the elements within a joystick, the elements are > always reported in the same order such that a user shouldn't experience the > axes mappings changing each time they start up Wine/reconnect a device*). > There is no 1 correct mapping for all cases. I guess ideally we would have > a way of allowing the user to remap the joystick axes in the registry > (maybe that would work even now? I don't know - I've seen some emails on > that already in the wine-devel list serve but I don't know what the status > of that kind of capability is) but even Microsoft states on of their pages > that this is a pretty rare corner case. > > > OK, fine by me. > > > *Note: in my testing this is *not* the same for OS X (I guess macOS now) > reporting back devices - which human interface device is reported first > seems to be random in my testing when I had both a virtual and physical > joystick setup. Historically Winmm games would only take input from the > first reported device - under Mac-Wine, I've noticed the games seem to be > taking input from both my physical and virtual joysticks (sometimes > regardless of what the game was saying it was doing!). This has both good > and bad potential and is not necessarily behavior we should spend effort > trying to get rid of. Not sure how the Linux version behaves in this > situation in terms of joystick order and input from multiple sources. > > > It was taking input from both joysticks in the same run? At the same > time? If so, can you figure out how that's happening? It really > shouldn't, as near as I can see. > > Or was it just arbitrarily picking which was first and therefore active > for any given run? If this, then it's < > https://bugs.winehq.org/show_bug.cgi?id=38997>, more or less. > > -Ken > >

2 4

Re: [v2 02/10] msvcirt: Implement ostream constructors/destructors
by Piotr Caban June 15, 2016

June 15, 2016

On 06/14/16 19:01, Iván Matellanes wrote: > On 14/06/16 16:20, Piotr Caban wrote: >> On 06/14/16 16:40, Iván Matellanes wrote: >>> /* ??_Dostream@@QAEXXZ */ >>> @@ -2287,23 +2341,48 @@ ostream* __thiscall ostream_assign(ostream >>> *this, const ostream *rhs) >>> DEFINE_THISCALL_WRAPPER(ostream_vbase_dtor, 4) >>> void __thiscall ostream_vbase_dtor(ostream *this) >>> { >>> - FIXME("(%p) stub\n", this); >>> + ios *base = ostream_to_ios(this); >>> + >>> + TRACE("(%p)\n", this); >>> + >>> + ostream_dtor(base); >>> + ios_dtor(base); >>> } >> The base should be computed using ostream_get_ios while calling ios_dtor: >> TRACE("(%p)\n", this); >> ostream_dtor(ostream_to_ios(this)); >> ios_dtor(ostream_get_ios(this)); > Do you mind explaining why is that required? I can't see the reason ostream_vbase_dtor can be used to destroy object that has virtual base in any position pointer by vbtable. ostream_get_ios computes it using object's vbtable. You can easily see it by overwriting ostream->vbtable with garbage, the application will crash then on Windows. On the other hand ostream_dtor is a virtual function that assumes "this" is at fixed offset from "base" that is passed to it. It's done this way because it has no access to vbtable. It's why you need to use ostream_to_ios in this case. There's no real need to call ostream_dtor here because it's an empty function (I don't know if it should be called here or if ostream_vbase_dtor should only destroy the vbase). Thanks, Piotr

2 2

Re: [PATCH] riched20: Remove duplicated condition and duplicated test
by Huw Davies June 15, 2016

June 15, 2016

On Tue, Jun 14, 2016 at 08:56:41PM +0300, Nikolay Sivov wrote: > diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c > index 1013e67..a2f23c9 100644 > --- a/dlls/riched20/richole.c > +++ b/dlls/riched20/richole.c > @@ -1976,7 +1976,7 @@ static HRESULT range_Collapse(LONG bStart, LONG *start, LONG *end) > if (*end == *start) > return S_FALSE; > > - if (bStart == tomEnd || bStart == tomFalse) > + if (bStart == tomEnd) > *start = *end; > else > *end = *start; > > diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c > index 6da3ce3..33043fd 100644 > --- a/dlls/riched20/tests/richole.c > +++ b/dlls/riched20/tests/richole.c > @@ -1361,18 +1361,6 @@ static void test_ITextRange_Collapse(void) > first = 4, lim = 8; > hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); > ok(hres == S_OK, "got 0x%08x\n", hres); > - hres = ITextRange_Collapse(txtRge, tomTrue); > - ok(hres == S_OK, "ITextRange_Collapse\n"); > - hres = ITextRange_GetStart(txtRge, &start); > - ok(hres == S_OK, "got 0x%08x\n", hres); > - ok(start == 4, "got wrong start value: %d\n", start); > - hres = ITextRange_GetEnd(txtRge, &end); > - ok(hres == S_OK, "got 0x%08x\n", hres); > - ok(end == 4, "got wrong end value: %d\n", end); > - ITextRange_Release(txtRge); > - > - hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); > - ok(hres == S_OK, "got 0x%08x\n", hres); > hres = ITextRange_Collapse(txtRge, tomStart); > ok(hres == S_OK, "ITextRange_Collapse\n"); > hres = ITextRange_GetStart(txtRge, &start); > @@ -1385,18 +1373,6 @@ static void test_ITextRange_Collapse(void) > > hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); > ok(hres == S_OK, "got 0x%08x\n", hres); > - hres = ITextRange_Collapse(txtRge, tomFalse); > - ok(hres == S_OK, "ITextRange_Collapse\n"); > - hres = ITextRange_GetStart(txtRge, &start); > - ok(hres == S_OK, "got 0x%08x\n", hres); > - ok(start == 8, "got wrong start value: %d\n", start); > - hres = ITextRange_GetEnd(txtRge, &end); > - ok(hres == S_OK, "got 0x%08x\n", hres); > - ok(end == 8, "got wrong end value: %d\n", end); > - ITextRange_Release(txtRge); > - > - hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); > - ok(hres == S_OK, "got 0x%08x\n", hres); > hres = ITextRange_Collapse(txtRge, tomEnd); > ok(hres == S_OK, "ITextRange_Collapse\n"); > hres = ITextRange_GetStart(txtRge, &start); I don't think we should remove the extra tests, especially as tomTrue != tomStart and it's documentented to work with either. Leaving the tomFalse tests in is fine too. Huw.

2 1

Re: [PATCH] kernel32: implement GetLargePageMinimum
by Sebastian Lackner June 15, 2016

June 15, 2016

On 14.06.2016 09:09, Marcus Meissner wrote: > From: Austin English <austinenglish(a)gmail.com> > > https://bugs.winehq.org/show_bug.cgi?id=18745 > > Report 2MB minimum page size on x86 32bit and 64bit on Linux. > > This assumes that all x86 processors and the 64/32bit emulation mode > have hugetable support and it is always enabled. > > Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> > Signed-off-by: Austin English <austinenglish(a)gmail.com> As pointed out on IRC, the order of the sign-offs is wrong here. Your own signoff should always be the last because you have to take responsibility when you send a patch. > --- > dlls/kernel32/cpu.c | 15 +++++++++++++++ > dlls/kernel32/kernel32.spec | 2 +- > dlls/kernel32/tests/process.c | 16 ++++++++++++++++ > 3 files changed, 32 insertions(+), 1 deletion(-) > > diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c > index f48fcf0..f8b2c3d 100644 > --- a/dlls/kernel32/cpu.c > +++ b/dlls/kernel32/cpu.c > @@ -291,3 +291,18 @@ err: > } > return TRUE; > } > + > +/*********************************************************************** > + * GetLargePageMinimum (KERNEL32.@) > + */ > +SIZE_T WINAPI GetLargePageMinimum(void) > +{ > +#ifdef linux I do not see any need for that #ifdef linux. Its more architecture specific than linux specific. Dmitry already mentioned the same concern on the mailing list. > +#if defined(__i386___) || defined(__x86_64__) > + /* Linux x86 hugepages are minimum 2 MB */ > + return 2*1024*1024; > +#endif > +#endif > + FIXME("stub: not implemented on your platform/architecture.\n"); > + return 0; > +} > diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec > index ec7155b6e..0fc4dcb 100644 > --- a/dlls/kernel32/kernel32.spec > +++ b/dlls/kernel32/kernel32.spec > @@ -696,7 +696,7 @@ > @ stdcall GetHandleInformation(long ptr) > @ stub -i386 GetLSCallbackTarget > @ stub -i386 GetLSCallbackTemplate > -# @ stub GetLargePageMinimum > +@ stdcall GetLargePageMinimum() > @ stdcall GetLargestConsoleWindowSize(long) > @ stdcall GetLastError() > @ stub GetLinguistLangSize > diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c > index 61dcdc2..e9acfd3 100644 > --- a/dlls/kernel32/tests/process.c > +++ b/dlls/kernel32/tests/process.c > @@ -88,6 +88,7 @@ static BOOL (WINAPI *pProcess32Next)(HANDLE, PROCESSENTRY32*); > static BOOL (WINAPI *pThread32First)(HANDLE, THREADENTRY32*); > static BOOL (WINAPI *pThread32Next)(HANDLE, THREADENTRY32*); > static BOOL (WINAPI *pGetLogicalProcessorInformationEx)(LOGICAL_PROCESSOR_RELATIONSHIP,SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*,DWORD*); > +static SIZE_T (WINAPI *pGetLargePageMinimum)(void); > > /* ############################### */ > static char base[MAX_PATH]; > @@ -252,6 +253,7 @@ static BOOL init(void) > pThread32First = (void *)GetProcAddress(hkernel32, "Thread32First"); > pThread32Next = (void *)GetProcAddress(hkernel32, "Thread32Next"); > pGetLogicalProcessorInformationEx = (void *)GetProcAddress(hkernel32, "GetLogicalProcessorInformationEx"); > + pGetLargePageMinimum = (void *)GetProcAddress(hkernel32, "GetLargePageMinimum"); > > return TRUE; > } > @@ -3138,6 +3140,19 @@ static void test_GetLogicalProcessorInformationEx(void) > HeapFree(GetProcessHeap(), 0, info); > } > > +static void test_largepages(void) > +{ > + SIZE_T size; > + > + if (!pGetLargePageMinimum) { > + skip("No GetLargePageMinimum support.\n"); > + return; > + } > + size = pGetLargePageMinimum(); > + > + ok((size == 0) || (size == 2*1024*1024) || (size == 4*1024*1024), "GetLargePageMinimum reports %ld size\n", size); > +} > + > START_TEST(process) > { > HANDLE job; > @@ -3210,6 +3225,7 @@ START_TEST(process) > test_GetNumaProcessorNode(); > test_session_info(); > test_GetLogicalProcessorInformationEx(); > + test_largepages(); > > /* things that can be tested: > * lookup: check the way program to be executed is searched >

3 3