October 2013 - Wine-devel - list.winehq.org

Re: d3d9: update locked_rect only if wined3d_surface_map succeeded
by Henri Verbeet 04 Oct '13

04 Oct '13

On 3 October 2013 21:16, Lasse Rasinen <lrasinen(a)iki.fi> wrote: > According to debugging output, Artemis Spaceship Bridge Simulator 2.0 > calls LockRect twice on the same texture (for whatever reason) and crashes. > > http://bugs.winehq.org/show_bug.cgi?id=34271 > > This change prevents the locked_rect being overwritten with garbage in > that case, and the game no longer crashes. > I think this patch makes sense, but could you please add a test case as well? Ideally we'd also have similar tests for other resources (i.e., textures, volumes, vertex buffers, index buffers) and D3D versions (ddraw, d3d8), but that's not a strict requirement. > + if (hr == WINED3D_OK) { > + locked_rect->Pitch = map_desc.row_pitch; > + locked_rect->pBits = map_desc.data; > + } > Minor style issue, this should be: if (SUCCEEDED(hr)) { ... }

3 2

Re: [PATCH 2/2] advapi32: Don't cache HKCR if WOW64 redirection flags are set
by Marvin 04 Oct '13

04 Oct '13

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://newtestbot.winehq.org/JobDetails.pl?Key=2624 Your paranoid android. === wxppro (32 bit registry) === Timeout

1 0

Re: [PATCH 1/5] wined3d: Don't bother about client storage in wined3d_surface_set_mem.
by Henri Verbeet 04 Oct '13

04 Oct '13

On 4 October 2013 00:03, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > @@ -2883,10 +2886,6 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem > /* Now the surface memory is most up do date. Invalidate drawable and texture. */ > surface_validate_location(surface, SFLAG_INSYSMEM); > surface_invalidate_location(surface, ~SFLAG_INSYSMEM); > - > - /* For client textures OpenGL has to be notified. */ > - if (surface->flags & SFLAG_CLIENT) > - surface_release_client_storage(surface); > } > else if (surface->flags & SFLAG_USERPTR) > { > @@ -2899,9 +2898,6 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem > surface->resource.allocatedMemory = NULL; > surface->flags &= ~(SFLAG_USERPTR | SFLAG_INSYSMEM); > > - if (surface->flags & SFLAG_CLIENT) > - surface_release_client_storage(surface); > - > surface_prepare_system_memory(surface); > } > What makes this safe, and why is it needed?

1 0

Re: [PATCH 3/3] winemac: Tell Wine when Cocoa has brought a window to the front.
by Ken Thomases 04 Oct '13

04 Oct '13

On Oct 4, 2013, at 12:17 AM, Ken Thomases wrote: > --- > dlls/winemac.drv/cocoa_app.m | 8 ++++++-- > dlls/winemac.drv/cocoa_window.h | 1 + > dlls/winemac.drv/cocoa_window.m | 16 +++++++++++++--- > dlls/winemac.drv/event.c | 5 +++++ > dlls/winemac.drv/macdrv.h | 1 + > dlls/winemac.drv/macdrv_cocoa.h | 1 + > dlls/winemac.drv/window.c | 12 ++++++++++++ > 7 files changed, 39 insertions(+), 5 deletions(-) > > <0003-winemac-Tell-Wine-when-Cocoa-has-brought-a-window-to.patch> Don't commit this one. It has caused some strange behavior on Mavericks. The other two in the series are OK and useful independently of this one. -Ken

1 0

Re: [PATCH 1/5] wined3d: Store valid locations in the resource.
by Henri Verbeet 03 Oct '13

03 Oct '13

On 3 October 2013 13:08, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > --- > dlls/wined3d/volume.c | 46 +++++++++++++++++++++--------------------- > dlls/wined3d/wined3d_private.h | 6 ++++-- > 2 files changed, 27 insertions(+), 25 deletions(-) > What about surfaces and buffers?

2 5

Re: kernel32: Add tests for job objects (try 4)
by Alexandre Julliard 03 Oct '13

03 Oct '13

Andrew Cook <ariscop(a)gmail.com> writes: > + sprintf(buffer, "\"%s\" tests/process.c ignored \"%s\"", selfname, "wait"); > + > + IOPort = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 1); > + ok(IOPort != INVALID_HANDLE_VALUE, "CreateIoCompletionPort (%d)", GetLastError()); > + > + JobObject = pCreateJobObjectW(NULL, NULL); > + ok(JobObject != INVALID_HANDLE_VALUE, "CreateJobObject (%d)\n", GetLastError()); These functions don't return INVALID_HANDLE_VALUE. -- Alexandre Julliard julliard(a)winehq.org

1 0

Looking for an icon for the Mac driver: generic program running under Wine
by Ken Thomases 03 Oct '13

03 Oct '13

Hi, I have a need for a new icon in Wine and I'm hoping somebody with some graphics-design skills might be able to create it. The Mac driver attempts to extract an icon from the executable to use for the Dock icon of its process. This is also the icon that appears in the Command-Tab application switcher. This often works, but not always. When it doesn't, the Dock just uses the generic "Unix executable" icon from Mac OS X. You can see that here: <http://i.imgur.com/b1JrMDJ.png>. It's not very nice. I would prefer to have a Wine-specific generic program icon. Any graphic designer care to take on the task of creating such an icon? I'm told Wine has been using the Tango icons as the template for its. Tango provides application-x-executable.svg at <http://cgit.freedesktop.org/tango/tango-icon-theme/tree/svg> that might be suitable. That could be badged with the Wine glass logo to produce an icon for a program running under Wine. On the other hand, if this icon were to be used only by the Mac driver, it might be more appropriate to use a Mac-themed icon. Some time back, Jeremiah posted an archive of icons. <http://www.winehq.org/pipermail/wine-devel/2013-February/098783.html> That included one which had a miniature Mac window badged with the Wine glass logo. I'm not sure of the copyright/licensing situation with that icon. It's bitmap-only, not vector, but that might be fine for a Mac-only icon. It does have some issues with rough edges around the window, rather than a smooth alpha-blended edge. Although Mac app icons can go up to 1024x1024 pixels (512x512 "points" at 2x resolution for Retina displays), this icon would only appear in the Dock and the application switcher. So, it needn't be larger than 256x256 pixels (128x128(a)2x). Thanks, Ken

2 1

Re: rpcss: Convert to a service
by Andrew Cook 03 Oct '13

03 Oct '13

Ignore this, for some reason this randomly forks a huge number of rpcss instances, and decided to not do so while i was testing it On 03/10/13 14:00, Andrew Cook wrote: > --- > dlls/rpcrt4/rpc_epmap.c | 40 ++++++++----------- > programs/rpcss/Makefile.in | 2 +- > programs/rpcss/rpcss_main.c | 97 > +++++++++++++++++++++++++++++++++++---------- > tools/wine.inf.in | 11 +++++ > 4 files changed, 104 insertions(+), 46 deletions(-) > >

1 0

Re: server: Set the unix file write mode bit also for FILE_APPEND_DATA access.
by Dmitry Timoshkov 03 Oct '13

03 Oct '13

Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > diff --git a/server/file.c b/server/file.c > index 2ecf97c..94d3060 100644 > --- a/server/file.c > +++ b/server/file.c > @@ -459,7 +459,7 @@ static mode_t file_access_to_mode( unsigned int access ) > > access = generic_file_map_access( access ); > if (access & FILE_READ_DATA) mode |= 4; > - if (access & FILE_WRITE_DATA) mode |= 2; > + if (access & (FILE_WRITE_DATA|FILE_APPEND_DATA)) mode |= 2; > if (access & FILE_EXECUTE) mode |= 1; > return mode; > } I don't think that this patch should be in 'superseded' state. -- Dmitry.

1 0

Re: [5/5] ws2_32: Always return the source address from WSAAccept.
by Marvin 02 Oct '13

02 Oct '13

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://newtestbot.winehq.org/JobDetails.pl?Key=2610 Your paranoid android. === wxppro (32 bit sock) === sock.c:519: Test failed: oob_server (c8): unexpectedly at the OOB mark: 0 === w2008s64 (32 bit sock) === sock.c:519: Test failed: oob_server (618): unexpectedly at the OOB mark: 0 sock: unhandled exception c0000005 at 74AA9799 === w2008s64 (64 bit sock) === sock.c:519: Test failed: oob_server (600): unexpectedly at the OOB mark: 0 sock: unhandled exception c0000005 at 0000000000000000

1 0