April 2011 - Wine-Devel - list.winehq.org

Re: d3d8: Attempting to set a NULL rt is legal in d3d8
by Henri Verbeet April 22, 2011

April 22, 2011

Tests, please. Also, at least with the current code this is still going to fail because wined3d disallows setting RT0 to NULL.

2 2

Instrumenting wined3d library
by Emanuele Oriani April 22, 2011

April 22, 2011

Hi guys, I'd like to instrument wined3d in order to get to the bottom of the two issues with StarCraft II: - low FPS when we don't set affinity of all threads on one core - low FPS when shader level is > MEDIUM Which kind of function should I instrument? I've instrumented all the non static in 'context.c', 'buffer.c' and 'device.c', but I guess that I should instrument all the static function IWineD3DDeviceImpl_* in 'device.c', right? What kind of functions should I instrument? Cheers, Ema

2 1

Creating tests for rasapi32.dll
by Gerold Jens Wucherpfennig April 22, 2011

April 22, 2011

Hi, I want to try to create some tests for rasapi32.dll. May I just create some tests and do the implementation later? For the time being that will mean that RASAPI32 tests will fail, because of missing code in rasapi.c. Is that OK? I haven't created DLL-tests yet... Regards Gerold

3 2

Re: [PATCH 5/5] ddraw: Destroy the ddraw surface after the wined3d texture is destroyed.
by Stefan Dösinger April 21, 2011

April 21, 2011

Hi, I guess the obvious next step is to let wined3d manage the surface creation by getting rid of the CreateAdditionalSurface mess and let IWineD3DDeviceParent::CreateSurface handle this. I guess we should also get rid of the complex_array attachment list and handle those attachment by querying the wined3d container for the backbuffer or mipmap sublevel list. And while AddAttachedSurface mostly serves the function of SetDepthStencilSurface I'm afraid we won't be able to get rid of the manual attachment list - but we should probably replace it with a wine list(*) Anyway, thanks for cleaning up this mess. I feel guilty because I should have done this long ago :-/ Cheers, Stefan (*) I think I did that at some point, maybe is was another case of written but never finished patches. Or maybe I did this with some other surface list... On Wednesday 20 April 2011 22:09:27 Henri Verbeet wrote: > --- > dlls/ddraw/surface.c | 34 ++++++++++++++++++++++++++-------- > 1 files changed, 26 insertions(+), 8 deletions(-) > > diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c > index 16b831a..84082c5 100644 > --- a/dlls/ddraw/surface.c > +++ b/dlls/ddraw/surface.c > @@ -180,10 +180,13 @@ static ULONG WINAPI > ddraw_surface7_AddRef(IDirectDrawSurface7 *iface) > > TRACE("%p increasing refcount to %u.\n", This, refCount); > > - if (refCount == 1 && This->WineD3DSurface) > + if (refCount == 1) > { > EnterCriticalSection(&ddraw_cs); > - IWineD3DSurface_AddRef(This->WineD3DSurface); > + if (This->WineD3DSurface) > + IWineD3DSurface_AddRef(This->WineD3DSurface); > + if (This->wined3d_texture) > + wined3d_texture_incref(This->wined3d_texture); > LeaveCriticalSection(&ddraw_cs); > } > > @@ -256,9 +259,7 @@ static void > ddraw_surface_cleanup(IDirectDrawSurfaceImpl *surface) > > TRACE("surface %p.\n", surface); > > - if (surface->wined3d_texture) /* If it's a texture, destroy the > wined3d texture. */ - > wined3d_texture_decref(surface->wined3d_texture); > - else if (surface->wined3d_swapchain) > + if (surface->wined3d_swapchain) > { > IDirectDrawImpl *ddraw = surface->ddraw; > > @@ -388,7 +389,10 @@ static ULONG WINAPI > ddraw_surface7_Release(IDirectDrawSurface7 *iface) > LeaveCriticalSection(&ddraw_cs); > return ref; > } > - ddraw_surface_cleanup(This); > + if (This->wined3d_texture) /* If it's a texture, destroy the > wined3d texture. */ + > wined3d_texture_decref(This->wined3d_texture); > + else > + ddraw_surface_cleanup(This); > LeaveCriticalSection(&ddraw_cs); > } > > @@ -3491,6 +3495,20 @@ const struct wined3d_parent_ops > ddraw_surface_wined3d_parent_ops = ddraw_surface_wined3d_object_destroyed, > }; > > +static void STDMETHODCALLTYPE ddraw_texture_wined3d_object_destroyed(void > *parent) +{ > + IDirectDrawSurfaceImpl *surface = parent; > + > + TRACE("surface %p.\n", surface); > + > + ddraw_surface_cleanup(surface); > +} > + > +static const struct wined3d_parent_ops ddraw_texture_wined3d_parent_ops = > +{ > + ddraw_texture_wined3d_object_destroyed, > +}; > + > HRESULT ddraw_surface_create_texture(IDirectDrawSurfaceImpl *surface) > { > const DDSURFACEDESC2 *desc = &surface->surface_desc; > @@ -3513,10 +3531,10 @@ HRESULT > ddraw_surface_create_texture(IDirectDrawSurfaceImpl *surface) format = > PixelFormat_DD2WineD3D(&surface->surface_desc.u4.ddpfPixelFormat); if > (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) > return > IWineD3DDevice_CreateCubeTexture(surface->ddraw->wineD3DDevice, > desc->dwWidth, - levels, 0, format, pool, surface, > &ddraw_null_wined3d_parent_ops, &surface->wined3d_texture); + > levels, 0, format, pool, surface, &ddraw_texture_wined3d_parent_ops, > &surface->wined3d_texture); else > return IWineD3DDevice_CreateTexture(surface->ddraw->wineD3DDevice, > desc->dwWidth, desc->dwHeight, - levels, 0, format, pool, > surface, &ddraw_null_wined3d_parent_ops, &surface->wined3d_texture); + > levels, 0, format, pool, surface, > &ddraw_texture_wined3d_parent_ops, &surface->wined3d_texture); } > > HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, > IDirectDrawImpl *ddraw,

1 0

Re: [PATCH 1/2] mountmgr: Populate HKLM\HARDWARE\DEVICEMAP\Scsi here instead of in kernel32.
by Alexandre Julliard April 21, 2011

April 21, 2011

Charles Davis <cdavis(a)mymail.mines.edu> writes: > --- > dlls/kernel32/Makefile.in | 1 - > dlls/kernel32/oldconfig.c | 404 ------------------------------------------ > dlls/kernel32/process.c | 3 - > dlls/mountmgr.sys/hal.c | 116 ++++++++++++ > dlls/mountmgr.sys/mountmgr.c | 138 ++++++++++++++ > dlls/mountmgr.sys/mountmgr.h | 3 + > 6 files changed, 257 insertions(+), 408 deletions(-) > delete mode 100644 dlls/kernel32/oldconfig.c It doesn't seem to work here, I don't get any devices. -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: winex11.drv: Ignore the zero-size owners used by Delphi apps when deciding whether to add NET_WM_STATE_SKIP_TASKBAR.
by Alexandre Julliard April 21, 2011

April 21, 2011

Dmitry Timoshkov <dmitry(a)codeweavers.com> writes: > This patch reverts a part of 61e50e15ba45ad54655f98619f5ef33917033165 and > fixes the regression reported in the bug 26670. This will cause spurious task bar entries in many apps. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/4] msvcp90: Added basic_string<char>::append(size_t, char) implementation.
by Piotr Caban April 21, 2011

April 21, 2011

Hi, On 04/18/11 23:53, Vincas Miliūnas wrote: > My remark: (The method is implemented by reusing existing code) this->size+count<this->size is the same as count< 0 and throwing a "string too long" exception in that case is not semantic. count is an unsigned variable so it cannot be smaller then 0. My intention was to make sure there's no overflow. This check is not needed because MSVCP_basic_string_char_npos-this->size <= count already makes sure this->size+count has small enough value. +basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_len_wchar( + basic_string_wchar *this, size_t count, wchar_t c) +{ + TRACE("%p %lu %lc\n", this, (unsigned long)count, c); It's probably not allowed to use %lc format. Cheers, Piotr

2 1

Re: d3dxof/tests: Make expected value in string and comparison match.
by Marvin April 20, 2011

April 20, 2011

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 http://testbot.winehq.org/JobDetails.pl?Key=10525 Your paranoid android. === WVISTAADM (32 bit d3dxof) === Failure running script in VM: The specified guest user must be logged in interactively to perform this operation

1 0

Re: msvcrt: Added _resetstkoflw implementation
by Alexandre Julliard April 20, 2011

April 20, 2011

Piotr Caban <piotr(a)codeweavers.com> writes: > +/********************************************************************* > + * _resetstkoflw (MSVCRT.@) > + */ > +int CDECL _resetstkoflw(void) > +{ > + MEMORY_BASIC_INFORMATION mbi; > + SYSTEM_INFO info; > + DWORD prot; > + void *alloc; > + > + GetSystemInfo(&info); > + if(!VirtualQuery(&mbi, &mbi, sizeof(mbi))) > + return 0; > + > + alloc = VirtualAlloc((char*)mbi.BaseAddress, info.dwPageSize, MEM_COMMIT, PAGE_READWRITE); > + if(!alloc) > + return 0; > + > + return VirtualProtect(alloc, info.dwPageSize, PAGE_GUARD|PAGE_READWRITE, &prot); This doesn't make sense to me, why do you need a VirtualAlloc in there? And what about the limits in the TEB? -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 03/10] msvcrt: Use callback based printf in fprintf functions family (try2)
by Alexandre Julliard April 19, 2011

April 19, 2011

Piotr Caban <piotr(a)codeweavers.com> writes: > --- > dlls/msvcrt/file.c | 118 > ++++++++++------------------------------------------ > 1 files changed, 22 insertions(+), 96 deletions(-) This one is causing console apps to output null characters. You'll have to spend more time on this patch series, it doesn't seem quite ready. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: include: Add rmxftmpl.h with contents generated from rmxftmpl.x.
by Alexandre Julliard April 19, 2011

April 19, 2011

Dylan Smith <dylan.ah.smith(a)gmail.com> writes: > +#ifndef __WINE_RMXFTMPL_H > +#define __WINE_RMXFTMPL_H > + > +/* sizeof(D3DRM_XTEMPLATES) */ > +#define D3DRM_XTEMPLATE_BYTES 3278 > + > +/* Contents of D3DRM_XTEMPLATES generated using: > + * ../tools/binencxftmpl rmxftmpl.x | xxd -i > + */ You should generate the whole file, it shouldn't need to be updated by hand. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: serial: Fix race for IOCTL_SERIAL_WAIT_ON_MASK
by Alexandre Julliard April 19, 2011

April 19, 2011

Wolfgang Walter <wolfgang.walter(a)stwm.de> writes: > set status field of piosb to STATUS_PENDING before calling wait_on(). If wait_on > returns with STATUS_PENDING don't touch piosb. > > Reason: if wait_on returns with STATUS_PENDING it started a thread which > itself modifies the status field. In general the iosb is not modified until the operation completes. -- Alexandre Julliard julliard(a)winehq.org

2 3

Cairo Graphics
by Jaime Rave April 19, 2011

April 19, 2011

Hey Guys, On some of the bugs that i have reported to freedesktop, i have been asked about why Wine is making calls like XDrawSegmentand not using Cairo to handle the 2d drawing which always provides consistent behavior regardless of drivers[1]. I have also read that cairo support "X Window System, Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends includeOpenGL <http://www.cairographics.org/OpenGL/>, XCB, BeOS, OS/2, and DirectFB"[2]. So it will also works with Wayland when this is ready :D. So i think this is a good way to make Wine more graphic driver agnostic and improve the behavior on MacOS without having to write a complete new driver just for Quartz. So i would like to know your thoughts, if Cairo could improve some stuff or if is not related or useless to the project Greetings Jaime Rave [1] https://bugs.freedesktop.org/show_bug.cgi?id=22770#c14 [2] http://www.cairographics.org/

2 1

Re: [PATCH 06/10] msvcrt: Added sprintf_p_l implementation (try2)
by Alexandre Julliard April 19, 2011

April 19, 2011

Piotr Caban <piotr(a)codeweavers.com> writes: > @@ -552,6 +552,74 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API > return written; > } > > +#ifndef PRINTF_WIDE > +/* This functions stores sizes of arguments. It uses args[0] > + * internally (in the following way): > + * 0x1 - using positional parameters > + * 0x2 - not using positional parameters > + * 0x4 - error occurred > + */ > +static printf_arg arg_clbk_size(void *ctx, int pos, int type, __ms_va_list *valist) > +{ > + static const printf_arg ret; > + printf_arg *args = ctx; > + > + if(pos == -1) { > + args[0].get_int |= 1; > + return ret; > + } else > + args[0].get_int |= 2; > + > + if(pos<1 || pos>MSVCRT__ARGMAX || (args[pos].get_int && args[pos].get_int!=type)) > + args[0].get_int |= 4; > + else > + args[pos].get_int = type; > + return ret; > +} Using magic values like this is ugly, please add proper defines. Also you probably want to fix the name of the function and the comments. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] Fix SystemProcessorPerformanceInformation to include DPC and Interrupt times
by Alexandre Julliard April 19, 2011

April 19, 2011

"Ray Hinchliffe (RH)" <ray(a)rh-software.com> writes: > 1) When possible report DPC and Interrupt times > > 2) Fix _APPLE_ to return times in 100ns units and zero the unset members > > 3) Change the failure code to return 100ns values > > 4) Expunge unnecessary use of RtlAllocateHeap() etc.. Separate changes should be separate patches. > @@ -1241,8 +1241,9 @@ typedef struct _SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION { > LARGE_INTEGER IdleTime; > LARGE_INTEGER KernelTime; > LARGE_INTEGER UserTime; > - LARGE_INTEGER Reserved1[2]; > - ULONG Reserved2; > + LARGE_INTEGER DpcTime; > + LARGE_INTEGER IntTime; > + ULONG IntCount; You can't change the public definition. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: psapi: Forward EmptyWorkingSet implementation to kernel32
by Dmitry Timoshkov April 19, 2011

April 19, 2011

Jacek Caban <jacek(a)codeweavers.com> wrote: > +BOOL WINAPI K32EmptyWorkingSet(HANDLE hProcess) > +{ > + return SetProcessWorkingSetSize(hProcess, (SIZE_T)-1, (SIZE_T)-1); > +} You need to export it from kernel32. Also using ~0 instead of casting -1 would be better IMHO. -- Dmitry.

2 1

re: Cairo Graphics
by Dan Kegel April 19, 2011

April 19, 2011

Wrappers like Cairo Graphics, Phonon, and OpenAL sound nice, but can get in the way of reliably reproducing win32 behavior.

1 0

Re: Patch to fix GetThreadTimes() to work for all threads - fixes Bug 20230
by Vitaliy Margolen April 19, 2011

April 19, 2011

On 04/18/2011 12:45 AM, Ray Hinchliffe (RH) wrote: > The patch works by reading from /proc/<pid>/task/<tid>/stat. If this in not > possible it will report the fix messages as before. > Given that SystemProcessorPerformanceInformation uses /proc/stat I expect this Thanks for the patch, however there are several issues with it: - Don't attach changes to automatically generated files (server/trace.c, server/request.h, etc). Only server/protocol.def should be included, which you didn't even modify. - Keep formatting of the original file you modifying. No whitespace only changes, no funky new formatting styles. - Please use Windows types instead of system types for integers (ULONG instead of unsigned long) > + sprintf( buf, "/proc/%u/task/%u/stat", reply->unix_pid, reply->unix_tid ); Please don't call any functions in the server call context. Also you not using this buffer if server call fails, or if the thread is the same. Vitaliy.

1 0

How to debug steam based games
by Brock York April 18, 2011

April 18, 2011

Hey I was wondering how/what is the best approach to debug steam games under wine. If I launch the actual exe file in the steam folders of the game it just just opens and runs steam then killing the process I launched then actually launching the game. The only way I've found to get any useful output is to launch steam itself from the command line with the debugging options enabled there. Is this the only way to get debugging information from steam games without cracking them? Thanks Regards Brock

2 1

Re: ntdll: Add Windows XP x64
by Alexandre Julliard April 18, 2011

April 18, 2011

Ken Sharp <kennybobs(a)o2.co.uk> writes: > Windows XP x64 has an updated kernel to XP, so just setting XP in > winecfg will still cause apps to fail. IE8 for XP x64 is an example. This should most likely be done automatically on 64-bit. -- Alexandre Julliard julliard(a)winehq.org

3 4

Re: wintrust: Implement IsCatalogFile
by Austin English April 18, 2011

April 18, 2011

On Sat, Apr 16, 2011 at 12:34, Juan Lang <juan.lang(a)gmail.com> wrote: > Since I didn't see an updated patch from Austin, here's what I think > should suffice. Without knowing the app that depends on it, I can't > be certain. Sorry, I had a busy weekend, thanks for fixing it. It works great here! -- -Austin

1 0

Re: serial: improve handling of usb2serial adapters
by Austin English April 18, 2011

April 18, 2011

2011/4/18 Wolfgang Walter <wolfgang.walter(a)stwm.de>: Please, one patch per email. Thanks for helping Wine! -- -Austin

1 0

Can someone ban tiaotiao (tiaotiao213@hotmail.com -- link spammer) <EOM>
by Reece Dunn April 18, 2011

April 18, 2011

1 0

DEC Alpha Support
by André Hentschel April 18, 2011

April 18, 2011

Hi all, i would like to remove the remaining Alpha support code, because of all our ports Alpha is the most incomplete and it seems it has no chance to get some love. Further Alpha chips aren't produced anymore since years AFAIK. Any Objections? -- Best Regards, André Hentschel

1 0

Re: ntdll: Remove more path trailing chars. (try 2)
by Alexandre Julliard April 18, 2011

April 18, 2011

Vincent Pelletier <plr.vincent(a)gmail.com> writes: > Add tests via FindFirstFileA. You need tests for the low-level ntdll functions. -- Alexandre Julliard julliard(a)winehq.org

1 0