May 2007 - Wine-Commits - list.winehq.org

Alexandre Julliard : server: Add support for generic device objects managed from the client side.
by Alexandre Julliard May 9, 2007

May 9, 2007

Module: wine Branch: master Commit: b43dc15c8ac9d3160b6b524c9cd48d58c4fa458a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b43dc15c8ac9d3160b6b524c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 8 20:28:37 2007 +0200 server: Add support for generic device objects managed from the client side. --- include/wine/server_protocol.h | 55 +++++++++- server/Makefile.in | 1 + server/device.c | 259 ++++++++++++++++++++++++++++++++++++++++ server/protocol.def | 28 +++++ server/request.h | 6 + server/trace.c | 41 +++++++ 6 files changed, 389 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b43dc15c8ac9d3160b6b5…

1 0

Alexandre Julliard : server: Add support for retrieving results of queued ioctls once they are done.
by Alexandre Julliard May 9, 2007

May 9, 2007

Module: wine Branch: master Commit: aafcfe766340201fb28cd047bb219d95de3ae13a URL: http://source.winehq.org/git/wine.git/?a=commit;h=aafcfe766340201fb28cd047b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 8 20:45:44 2007 +0200 server: Add support for retrieving results of queued ioctls once they are done. --- dlls/ntdll/file.c | 38 ++++++++++++++++++++++++++++++++++++-- include/wine/server_protocol.h | 19 ++++++++++++++++++- server/device.c | 40 ++++++++++++++++++++++++++++++++++++++++ server/protocol.def | 9 +++++++++ server/request.h | 2 ++ server/trace.c | 15 +++++++++++++++ 6 files changed, 120 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 6912350..4936bb2 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -918,10 +918,35 @@ done: } +struct async_ioctl +{ + HANDLE handle; /* handle to the device */ + void *buffer; /* buffer for output */ + ULONG size; /* size of buffer */ +}; + /* callback for ioctl async I/O completion */ static NTSTATUS ioctl_completion( void *arg, IO_STATUS_BLOCK *io, NTSTATUS status ) { - io->u.Status = status; + struct async_ioctl *async = arg; + + if (status == STATUS_ALERTED) + { + SERVER_START_REQ( get_ioctl_result ) + { + req->handle = async->handle; + req->user_arg = async; + wine_server_set_reply( req, async->buffer, async->size ); + if (!(status = wine_server_call( req ))) + io->Information = wine_server_reply_size( reply ); + } + SERVER_END_REQ; + } + if (status != STATUS_PENDING) + { + RtlFreeHeap( GetProcessHeap(), 0, async ); + io->u.Status = status; + } return status; } @@ -932,17 +957,24 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, PVOID in_buffer, ULONG in_size, PVOID out_buffer, ULONG out_size ) { + struct async_ioctl *async; NTSTATUS status; HANDLE wait_handle; ULONG options; + if (!(async = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*async) ))) + return STATUS_NO_MEMORY; + async->handle = handle; + async->buffer = out_buffer; + async->size = out_size; + SERVER_START_REQ( ioctl ) { req->handle = handle; req->code = code; req->async.callback = ioctl_completion; req->async.iosb = io; - req->async.arg = NULL; + req->async.arg = async; req->async.apc = apc; req->async.apc_arg = apc_context; req->async.event = event; @@ -959,6 +991,8 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n", code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); + if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, async ); + if (wait_handle) { NtWaitForSingleObject( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT), NULL ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e9bb098..99f9f82 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2684,6 +2684,20 @@ struct ioctl_reply +struct get_ioctl_result_request +{ + struct request_header __header; + obj_handle_t handle; + void* user_arg; +}; +struct get_ioctl_result_reply +{ + struct reply_header __header; + /* VARARG(out_data,bytes); */ +}; + + + struct create_named_pipe_request { struct request_header __header; @@ -4172,6 +4186,7 @@ enum request REQ_register_async, REQ_cancel_async, REQ_ioctl, + REQ_get_ioctl_result, REQ_create_named_pipe, REQ_get_named_pipe_info, REQ_create_window, @@ -4397,6 +4412,7 @@ union generic_request struct register_async_request register_async_request; struct cancel_async_request cancel_async_request; struct ioctl_request ioctl_request; + struct get_ioctl_result_request get_ioctl_result_request; struct create_named_pipe_request create_named_pipe_request; struct get_named_pipe_info_request get_named_pipe_info_request; struct create_window_request create_window_request; @@ -4620,6 +4636,7 @@ union generic_reply struct register_async_reply register_async_reply; struct cancel_async_reply cancel_async_reply; struct ioctl_reply ioctl_reply; + struct get_ioctl_result_reply get_ioctl_result_reply; struct create_named_pipe_reply create_named_pipe_reply; struct get_named_pipe_info_reply get_named_pipe_info_reply; struct create_window_reply create_window_reply; @@ -4705,6 +4722,6 @@ union generic_reply struct get_next_device_request_reply get_next_device_request_reply; }; -#define SERVER_PROTOCOL_VERSION 302 +#define SERVER_PROTOCOL_VERSION 303 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/device.c b/server/device.c index b811ff1..c52cd22 100644 --- a/server/device.c +++ b/server/device.c @@ -269,6 +269,18 @@ static enum server_fd_type device_get_fd_type( struct fd *fd ) return FD_TYPE_DEVICE; } +static struct ioctl_call *find_ioctl_call( struct device *device, struct thread *thread, + void *user_arg ) +{ + struct ioctl_call *ioctl; + + LIST_FOR_EACH_ENTRY( ioctl, &device->requests, struct ioctl_call, dev_entry ) + if (ioctl->thread == thread && ioctl->user_arg == user_arg) return ioctl; + + set_error( STATUS_INVALID_PARAMETER ); + return NULL; +} + static obj_handle_t device_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, const void *data, data_size_t size ) { @@ -488,3 +500,31 @@ DECL_HANDLER(get_next_device_request) release_object( manager ); } + + +/* retrieve results of an async ioctl */ +DECL_HANDLER(get_ioctl_result) +{ + struct device *device; + struct ioctl_call *ioctl; + + if (!(device = (struct device *)get_handle_obj( current->process, req->handle, 0, &device_ops ))) + return; + + if ((ioctl = find_ioctl_call( device, current, req->user_arg ))) + { + if (ioctl->out_data) + { + data_size_t size = min( ioctl->out_size, get_reply_max_size() ); + if (size) + { + set_reply_data_ptr( ioctl->out_data, size ); + ioctl->out_data = NULL; + } + } + set_error( ioctl->status ); + list_remove( &ioctl->dev_entry ); + release_object( ioctl ); /* no longer on the device queue */ + } + release_object( device ); +} diff --git a/server/protocol.def b/server/protocol.def index 55055a4..fb2d8cd 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1979,6 +1979,15 @@ enum message_type @END +/* Retrieve results of an async ioctl */ +(a)REQ(get_ioctl_result) + obj_handle_t handle; /* handle to the device */ + void* user_arg; /* user arg used to identify the request */ +(a)REPLY + VARARG(out_data,bytes); /* ioctl output data */ +(a)END + + /* Create a named pipe */ @REQ(create_named_pipe) unsigned int access; diff --git a/server/request.h b/server/request.h index 4f175a6..90a0c6c 100644 --- a/server/request.h +++ b/server/request.h @@ -245,6 +245,7 @@ DECL_HANDLER(set_serial_info); DECL_HANDLER(register_async); DECL_HANDLER(cancel_async); DECL_HANDLER(ioctl); +DECL_HANDLER(get_ioctl_result); DECL_HANDLER(create_named_pipe); DECL_HANDLER(get_named_pipe_info); DECL_HANDLER(create_window); @@ -469,6 +470,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_register_async, (req_handler)req_cancel_async, (req_handler)req_ioctl, + (req_handler)req_get_ioctl_result, (req_handler)req_create_named_pipe, (req_handler)req_get_named_pipe_info, (req_handler)req_create_window, diff --git a/server/trace.c b/server/trace.c index 7b8b7e4..8ae8d73 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2424,6 +2424,18 @@ static void dump_ioctl_reply( const struct ioctl_reply *req ) dump_varargs_bytes( cur_size ); } +static void dump_get_ioctl_result_request( const struct get_ioctl_result_request *req ) +{ + fprintf( stderr, " handle=%p,", req->handle ); + fprintf( stderr, " user_arg=%p", req->user_arg ); +} + +static void dump_get_ioctl_result_reply( const struct get_ioctl_result_reply *req ) +{ + fprintf( stderr, " out_data=" ); + dump_varargs_bytes( cur_size ); +} + static void dump_create_named_pipe_request( const struct create_named_pipe_request *req ) { fprintf( stderr, " access=%08x,", req->access ); @@ -3650,6 +3662,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_register_async_request, (dump_func)dump_cancel_async_request, (dump_func)dump_ioctl_request, + (dump_func)dump_get_ioctl_result_request, (dump_func)dump_create_named_pipe_request, (dump_func)dump_get_named_pipe_info_request, (dump_func)dump_create_window_request, @@ -3871,6 +3884,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)0, (dump_func)0, (dump_func)dump_ioctl_reply, + (dump_func)dump_get_ioctl_result_reply, (dump_func)dump_create_named_pipe_reply, (dump_func)dump_get_named_pipe_info_reply, (dump_func)dump_create_window_reply, @@ -4092,6 +4106,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "register_async", "cancel_async", "ioctl", + "get_ioctl_result", "create_named_pipe", "get_named_pipe_info", "create_window",

1 0

lostwages/templates/en download-deb.template
by Jeremy Newman May 8, 2007

May 8, 2007

ChangeSet ID: 31124 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/05/08 15:04:43 Modified files: templates/en : download-deb.template Log message: Scott Ritchie <scott(a)open-vote.org> Update download-deb page to mention 64 bit packages for Feisty Patch: http://cvs.winehq.org/patch.py?id=31124 Old revision New revision Changes Path 1.16 1.17 +7 -7 lostwages/templates/en/download-deb.template Index: lostwages/templates/en/download-deb.template diff -u -p lostwages/templates/en/download-deb.template:1.16 lostwages/templates/en/download-deb.template:1.17 --- lostwages/templates/en/download-deb.template:1.16 8 May 2007 20: 4:43 -0000 +++ lostwages/templates/en/download-deb.template 8 May 2007 20: 4:43 -0000 @@ -41,12 +41,13 @@ package information and then 'sudo ap <h2>64-bit Users:</h2> -Note that, at this time, the entries above are for i386 users only. Attempting to -use these repositories with a different architecture (eg amd64), will result in 404 errors -as APT will be looking for files not in the repository. +Packages for the 64 bit version of Ubuntu Feisty (7.04) are now available, however +for users of Debian and older Ubuntus the entries above are for i386 users only. +Attempting to use these repositories with a different architecture (eg amd64), will result +in 404 errors as APT will be looking for files not in the repository. -While there is currently no Wine package explicitly designed for the 64-bit version -of Ubuntu, there is an easy hack that can be used to install the 32-bit package +If you are using an older 64 bit distribution and would still like a working Wine package, +there is a relatively easy hack that can be used to install the 32-bit package into the 64-bit distribution and have it function normally. See <a href="http://wiki.winehq.org/UbuntuAMD64">this page on the Wine wiki</a> for more details. @@ -57,8 +58,7 @@ for more details. the packages are available at <a href=http://wine.budgetdedicated.com/archive/index.html>the WineHQ .deb packages archive</a>. -If you wish to use these packages, you'll have to install them by hand, -such as by using dpkg -i +If you wish to use these packages, you'll have to install them by hand, such as by double clicking them or using dpkg -i Very fast and reliable webhosting for the APT repository is graciously provided by <a href="http://www.budgetdedicated.com/">budgetdedicated.com</a>.

1 0

Paul Vriens : setupapi/tests: SetupQueryInfOriginalFileInformationA is not available on win98.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 299a358fdb761b2f47ae27f6f1cd6832f71d3f22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=299a358fdb761b2f47ae27f6f… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue May 8 19:19:45 2007 +0200 setupapi/tests: SetupQueryInfOriginalFileInformationA is not available on win98. --- dlls/setupapi/tests/misc.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 84b1ce1..1c193e1 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -44,7 +44,7 @@ static CHAR CURR_DIR[MAX_PATH]; static BOOL (WINAPI *pSetupGetFileCompressionInfoExA)(PCSTR, PSTR, DWORD, PDWORD, PDWORD, PDWORD, PUINT); static BOOL (WINAPI *pSetupCopyOEMInfA)(PCSTR, PCSTR, DWORD, DWORD, PSTR, DWORD, PDWORD, PSTR *); - +static BOOL (WINAPI *pSetupQueryInfOriginalFileInformationA)(PSP_INF_INFORMATION, UINT, PSP_ALTPLATFORM_INFO, PSP_ORIGINAL_FILE_INFO_A); static void append_str(char **str, const char *data) { @@ -111,6 +111,12 @@ static void test_original_file_name(LPCSTR original, LPCSTR dest) BOOL res; DWORD size; + if (!pSetupQueryInfOriginalFileInformationA) + { + skip("SetupQueryInfOriginalFileInformationA is not available\n"); + return; + } + hinf = SetupOpenInfFileA(dest, NULL, INF_STYLE_WIN4, NULL); ok(hinf != NULL, "SetupOpenInfFileA failed with error %d\n", GetLastError()); @@ -123,12 +129,12 @@ static void test_original_file_name(LPCSTR original, LPCSTR dest) ok(res, "SetupGetInfInformation failed with error %d\n", GetLastError()); spofi.cbSize = 0; - res = SetupQueryInfOriginalFileInformationA(pspii, 0, NULL, &spofi); + res = pSetupQueryInfOriginalFileInformationA(pspii, 0, NULL, &spofi); ok(!res && GetLastError() == ERROR_INVALID_USER_BUFFER, "SetupQueryInfOriginalFileInformationA should have failed with ERROR_INVALID_USER_BUFFER instead of %d\n", GetLastError()); spofi.cbSize = sizeof(spofi); - res = SetupQueryInfOriginalFileInformationA(pspii, 0, NULL, &spofi); + res = pSetupQueryInfOriginalFileInformationA(pspii, 0, NULL, &spofi); ok(res, "SetupQueryInfOriginalFileInformationA failed with error %d\n", GetLastError()); ok(!spofi.OriginalCatalogName[0], "spofi.OriginalCatalogName should have been \"\" instead of \"%s\"\n", spofi.OriginalCatalogName); todo_wine @@ -568,6 +574,7 @@ START_TEST(misc) pSetupGetFileCompressionInfoExA = (void*)GetProcAddress(hsetupapi, "SetupGetFileCompressionInfoExA"); pSetupCopyOEMInfA = (void*)GetProcAddress(hsetupapi, "SetupCopyOEMInfA"); + pSetupQueryInfOriginalFileInformationA = (void*)GetProcAddress(hsetupapi, "SetupQueryInfOriginalFileInformationA"); GetCurrentDirectoryA(MAX_PATH, CURR_DIR);

1 0

Stefan Dösinger : wined3d: Unset the StreamIsUP flag in ProcessVertices.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: f2e30a0a1c8cb65e1a93437200de3b191e81d526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2e30a0a1c8cb65e1a9343720… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 29 17:36:35 2007 +0200 wined3d: Unset the StreamIsUP flag in ProcessVertices. --- dlls/wined3d/device.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b581afb..1bf959f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3836,7 +3836,7 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, UINT SrcStartIndex, UINT DestIndex, UINT VertexCount, IWineD3DVertexBuffer* pDestBuffer, IWineD3DVertexDeclaration* pVertexDecl, DWORD Flags) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; WineDirect3DVertexStridedData strided; - BOOL vbo = FALSE; + BOOL vbo = FALSE, streamWasUP = This->stateBlock->streamIsUP; TRACE("(%p)->(%d,%d,%d,%p,%p,%d\n", This, SrcStartIndex, DestIndex, VertexCount, pDestBuffer, pVertexDecl, Flags); if(pVertexDecl) { @@ -3852,12 +3852,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, LEAVE_GL(); } + /* ProcessVertices reads from vertex buffers, which have to be assigned. DrawPrimitive and DrawPrimitiveUP + * control the streamIsUP flag, thus restore it afterwards. + */ + This->stateBlock->streamIsUP = FALSE; memset(&strided, 0, sizeof(strided)); if(This->stateBlock->vertexDecl) { primitiveDeclarationConvertToStridedData(iface, FALSE, &strided, &vbo); } else { primitiveConvertToStridedData(iface, &strided, &vbo); } + This->stateBlock->streamIsUP = streamWasUP; if(vbo || SrcStartIndex) { unsigned int i;

1 0

Alexandre Julliard : ntdll: Support setting the CPU context on the current thread without segment registers .
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: c5134b77c67ea158394bb70bed79de2b83e04f5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5134b77c67ea158394bb70be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 8 20:09:25 2007 +0200 ntdll: Support setting the CPU context on the current thread without segment registers. --- dlls/ntdll/signal_i386.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 69ae4dd..39f6f4b 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -758,10 +758,19 @@ void set_cpu_context( const CONTEXT *context ) } if (flags & CONTEXT_FULL) { - if ((flags & CONTEXT_FULL) != (CONTEXT_FULL & ~CONTEXT_i386)) + if (!(flags & CONTEXT_CONTROL)) FIXME( "setting partial context (%x) not supported\n", flags ); - else + else if (flags & CONTEXT_SEGMENTS) __wine_call_from_32_restore_regs( context ); + else + { + CONTEXT newcontext = *context; + newcontext.SegDs = wine_get_ds(); + newcontext.SegEs = wine_get_es(); + newcontext.SegFs = wine_get_fs(); + newcontext.SegGs = wine_get_gs(); + __wine_call_from_32_restore_regs( &newcontext ); + } } }

1 0

Stefan Dösinger : wined3d: Fix front buffer coords for gdi surfaces.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 7538f8d620e3da080c847e9a782d579fb59d67eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7538f8d620e3da080c847e9a7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 29 16:36:03 2007 +0200 wined3d: Fix front buffer coords for gdi surfaces. --- dlls/wined3d/surface_gdi.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 3c412db..7d277d4 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -68,6 +68,13 @@ x11_copy_to_screen(IWineD3DSurfaceImpl *This, TRACE(" copying rect (%d,%d)->(%d,%d), offset (%d,%d)\n", rc->left, rc->top, rc->right, rc->bottom, offset.x, offset.y); } + + /* Front buffer coordinates are screen coordinates. Map them to the destination + * window if not fullscreened + */ + if(!This->resource.wineD3DDevice->ddraw_fullscreen) { + ClientToScreen(hDisplayWnd, &offset); + } #if 0 /* FIXME: this doesn't work... if users really want to run * X in 8bpp, then we need to call directly into display.drv @@ -88,7 +95,7 @@ x11_copy_to_screen(IWineD3DSurfaceImpl *This, if (This->clipper) { RECT xrc; - HWND hwnd = This->clipper->hWnd; + HWND hwnd = ((IWineD3DClipperImpl *) This->clipper)->hWnd; if (hwnd && GetClientRect(hwnd,&xrc)) { OffsetRect(&xrc,offset.x,offset.y);

1 0

Stefan Dösinger : wined3d: Make the blit -> flip work for windowed rendering.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 0fb41a8845ff2d3fe111ee4ea394b5286ad24c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb41a8845ff2d3fe111ee4ea… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 29 12:48:34 2007 +0200 wined3d: Make the blit -> flip work for windowed rendering. --- dlls/ddraw/ddraw.c | 9 +++ dlls/ddraw/surface.c | 2 +- dlls/wined3d/surface.c | 129 ++++++++++++++++++++++++++++++++---------------- 3 files changed, 96 insertions(+), 44 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 953b5ea..36b3a95 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1445,6 +1445,7 @@ IDirectDrawImpl_RecreateSurfacesCallback(IDirectDrawSurface7 *surf, IWineD3DSurface *wineD3DSurface; HRESULT hr; void *tmp; + IWineD3DClipper *clipper = NULL; WINED3DSURFACE_DESC Desc; WINED3DFORMAT Format; @@ -1480,6 +1481,8 @@ IDirectDrawImpl_RecreateSurfacesCallback(IDirectDrawSurface7 *surf, IWineD3DSurface_Release(wineD3DSurface); } + /* get the clipper */ + IWineD3DSurface_GetClipper(wineD3DSurface, &clipper); /* Get the surface properties */ Desc.Format = &Format; @@ -1514,6 +1517,8 @@ IDirectDrawImpl_RecreateSurfacesCallback(IDirectDrawSurface7 *surf, if(hr != D3D_OK) return hr; + IWineD3DSurface_SetClipper(surfImpl->WineD3DSurface, clipper); + /* Update the IParent if it exists */ if(parImpl) { @@ -1530,6 +1535,10 @@ IDirectDrawImpl_RecreateSurfacesCallback(IDirectDrawSurface7 *surf, surfImpl->ImplType = This->ImplType; + if(clipper) + { + IWineD3DClipper_Release(clipper); + } return DDENUMRET_OK; } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 9cf0f0a..5f26526 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1966,7 +1966,7 @@ IDirectDrawSurfaceImpl_SetClipper(IDirectDrawSurface7 *iface, if(oldClipper) IDirectDrawClipper_Release(ICOM_INTERFACE(oldClipper, IDirectDrawClipper)); - return DD_OK; + return IWineD3DSurface_SetClipper(This->WineD3DSurface, This->clipper->wineD3DClipper); } /***************************************************************************** diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index df308fe..9a41f8f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2605,7 +2605,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; IWineD3DSwapChainImpl *srcSwapchain = NULL, *dstSwapchain = NULL; IWineD3DSurfaceImpl *Src = (IWineD3DSurfaceImpl *) SrcSurface; - BOOL SrcOK = TRUE; TRACE("(%p)->(%p,%p,%p,%08x,%p)\n", This, DestRect, SrcSurface, SrcRect, Flags, DDBltFx); @@ -2644,58 +2643,102 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * } /* The only case where both surfaces on a swapchain are supported is a back buffer -> front buffer blit on the same swapchain */ - if(dstSwapchain && dstSwapchain == srcSwapchain) { + if(dstSwapchain && dstSwapchain == srcSwapchain && dstSwapchain->backBuffer && + ((IWineD3DSurface *) This == dstSwapchain->frontBuffer) && SrcSurface == dstSwapchain->backBuffer[0]) { /* Half-life does a Blt from the back buffer to the front buffer, * Full surface size, no flags... Use present instead + * + * This path will only be entered for d3d7 and ddraw apps, because d3d8/9 offer no way to blit TO the front buffer */ /* Check rects - IWineD3DDevice_Present doesn't handle them */ - if( SrcRect ) { - if( (SrcRect->left == 0) && (SrcRect->top == 0) && - (SrcRect->right == Src->currentDesc.Width) && (SrcRect->bottom == Src->currentDesc.Height) ) { - SrcOK = TRUE; + while(1) + { + RECT mySrcRect; + TRACE("Looking if a Present can be done... "); + /* Source Rectangle must be full surface */ + if( SrcRect ) { + if(SrcRect->left != 0 || SrcRect->top != 0 || + SrcRect->right != Src->currentDesc.Width || SrcRect->bottom != Src->currentDesc.Height) { + TRACE("No, Source rectangle doesn't match\n"); + break; + } + } + mySrcRect.left = 0; + mySrcRect.top = 0; + mySrcRect.right = Src->currentDesc.Width; + mySrcRect.bottom = Src->currentDesc.Height; + + /* No stretching may occur */ + if(mySrcRect.right != rect.x2 - rect.x1 || + mySrcRect.bottom != rect.y2 - rect.y1) { + TRACE("No, stretching is done\n"); + break; } - } else { - SrcOK = TRUE; - } - - /* Check the Destination rect and the surface sizes */ - if(SrcOK && - (rect.x1 == 0) && (rect.y1 == 0) && - (rect.x2 == This->currentDesc.Width) && (rect.y2 == This->currentDesc.Height) && - (This->currentDesc.Width == Src->currentDesc.Width) && - (This->currentDesc.Height == Src->currentDesc.Height)) { - /* These flags are unimportant for the flag check, remove them */ - - if((Flags & ~(WINEDDBLT_DONOTWAIT | WINEDDBLT_WAIT)) == 0) { - if( dstSwapchain->backBuffer && ((IWineD3DSurface *) This == dstSwapchain->frontBuffer) && - SrcSurface == dstSwapchain->backBuffer[0] ) { - - WINED3DSWAPEFFECT orig_swap = dstSwapchain->presentParms.SwapEffect; - - /* The idea behind this is that a glReadPixels and a glDrawPixels call - * take very long, while a flip is fast. - * This applies to Half-Life, which does such Blts every time it finished - * a frame, and to Prince of Persia 3D, which uses this to draw at least the main - * menu. This is also used by all apps when they do windowed rendering - * - * The problem is that flipping is not really the same as copying. After a - * Blt the front buffer is a copy of the back buffer, and the back buffer is - * untouched. Therefore it's necessary to override the swap effect - * and to set it back after the flip. - */ - - dstSwapchain->presentParms.SwapEffect = WINED3DSWAPEFFECT_COPY; - TRACE("Full screen back buffer -> front buffer blt, performing a flip instead\n"); - IWineD3DDevice_Present((IWineD3DDevice *) This->resource.wineD3DDevice, - NULL, NULL, 0, NULL); + /* Destination must be full surface or match the clipping rectangle */ + if(This->clipper && ((IWineD3DClipperImpl *) This->clipper)->hWnd) + { + RECT cliprect; + POINT pos[2]; + GetClientRect(((IWineD3DClipperImpl *) This->clipper)->hWnd, &cliprect); + pos[0].x = rect.x1; + pos[0].y = rect.y1; + pos[1].x = rect.x2; + pos[1].y = rect.y2; + MapWindowPoints(GetDesktopWindow(), ((IWineD3DClipperImpl *) This->clipper)->hWnd, + pos, 2); + + if(pos[0].x != cliprect.left || pos[0].y != cliprect.top || + pos[1].x != cliprect.right || pos[1].y != cliprect.bottom) + { + TRACE("No, dest rectangle doesn't match(clipper)\n"); + TRACE("Clip rect at (%d,%d)-(%d,%d)\n", cliprect.left, cliprect.top, cliprect.right, cliprect.bottom); + TRACE("Blt dest: (%d,%d)-(%d,%d)\n", rect.x1, rect.y1, rect.x2, rect.y2); + break; + } + } + else + { + if(rect.x1 != 0 || rect.y1 != 0 || + rect.x2 != This->currentDesc.Width || rect.y2 != This->currentDesc.Height) { + TRACE("No, dest rectangle doesn't match(surface size)\n"); + break; + } + } - dstSwapchain->presentParms.SwapEffect = orig_swap; + TRACE("Yes\n"); - return WINED3D_OK; - } + /* These flags are unimportant for the flag check, remove them */ + if((Flags & ~(WINEDDBLT_DONOTWAIT | WINEDDBLT_WAIT)) == 0) { + WINED3DSWAPEFFECT orig_swap = dstSwapchain->presentParms.SwapEffect; + + /* The idea behind this is that a glReadPixels and a glDrawPixels call + * take very long, while a flip is fast. + * This applies to Half-Life, which does such Blts every time it finished + * a frame, and to Prince of Persia 3D, which uses this to draw at least the main + * menu. This is also used by all apps when they do windowed rendering + * + * The problem is that flipping is not really the same as copying. After a + * Blt the front buffer is a copy of the back buffer, and the back buffer is + * untouched. Therefore it's necessary to override the swap effect + * and to set it back after the flip. + * + * Windowed Direct3D < 7 apps do the same. The D3D7 sdk demso are nice + * testcases. + */ + + dstSwapchain->presentParms.SwapEffect = WINED3DSWAPEFFECT_COPY; + + TRACE("Full screen back buffer -> front buffer blt, performing a flip instead\n"); + IWineD3DDevice_Present((IWineD3DDevice *) This->resource.wineD3DDevice, + NULL, NULL, 0, NULL); + + dstSwapchain->presentParms.SwapEffect = orig_swap; + + return WINED3D_OK; } + break; } TRACE("Unsupported blit between buffers on the same swapchain\n");

1 0

Stefan Dösinger : wined3d: Handle DDPCAPS_ALPHA.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: c9bc4ee760f7434ef887e33bfe26e1fccfbc04b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9bc4ee760f7434ef887e33bf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 29 15:51:47 2007 +0200 wined3d: Handle DDPCAPS_ALPHA. --- dlls/wined3d/surface.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9a41f8f..9829f22 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1662,6 +1662,8 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN one often used by application to prevent the nice purple borders when bi-linear filtering is on */ table[i][3] = 0x00; + } else if(pal->Flags & WINEDDPCAPS_ALPHA) { + table[i][3] = pal->palents[i].peFlags; } else { table[i][3] = 0xFF; } @@ -1807,6 +1809,8 @@ static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES conve one often used by application to prevent the nice purple borders when bi-linear filtering is on */ table[i][3] = 0x00; + } else if(pal->Flags & WINEDDPCAPS_ALPHA) { + table[i][3] = pal->palents[i].peFlags; } else { table[i][3] = 0xFF; }

1 0

Stefan Dösinger : ddraw: Forward the mag filter correctly to wined3d.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 9b867f4d9198d19b2c86e3d76cfe01f9bd458b6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b867f4d9198d19b2c86e3d76… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 29 14:23:06 2007 +0200 ddraw: Forward the mag filter correctly to wined3d. Fixes the erros when using anisotropic mag filtering in the d3d7 filter demo. --- dlls/ddraw/device.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 42e44d8..63b06e8 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4032,12 +4032,28 @@ IDirect3DDeviceImpl_7_GetTextureStageState(IDirect3DDevice7 *iface, Stage, WINED3DSAMP_MINFILTER, State); - /* Same for MAGFILTER */ + /* Magfilter has slightly different values */ case D3DTSS_MAGFILTER: - return IWineD3DDevice_GetSamplerState(This->wineD3DDevice, - Stage, - WINED3DSAMP_MAGFILTER, - State); + { + HRESULT hr; + WINED3DTEXTUREFILTERTYPE wined3dfilter; + hr = IWineD3DDevice_GetSamplerState(This->wineD3DDevice, + Stage, + WINED3DSAMP_MAGFILTER, + &wined3dfilter); + switch(wined3dfilter) + { + case WINED3DTEXF_POINT: *State = D3DTFG_POINT; break; + case WINED3DTEXF_LINEAR: *State = D3DTFG_LINEAR; break; + case WINED3DTEXF_ANISOTROPIC: *State = D3DTFG_ANISOTROPIC; break; + case WINED3DTEXF_FLATCUBIC: *State = D3DTFG_FLATCUBIC; break; + case WINED3DTEXF_GAUSSIANCUBIC: *State = D3DTFG_GAUSSIANCUBIC; break; + default: + ERR("Unexpected wined3d mag filter value %d\n", wined3dfilter); + *State = D3DTFG_POINT; + } + return hr; + } case D3DTSS_ADDRESS: case D3DTSS_ADDRESSU: @@ -4126,12 +4142,26 @@ IDirect3DDeviceImpl_7_SetTextureStageState(IDirect3DDevice7 *iface, Stage, WINED3DSAMP_MINFILTER, State); - /* Same for MAGFILTER */ + /* Magfilter has slightly different values */ case D3DTSS_MAGFILTER: + { + WINED3DTEXTUREFILTERTYPE wined3dfilter; + switch((D3DTEXTUREMAGFILTER) State) + { + case D3DTFG_POINT: wined3dfilter = WINED3DTEXF_POINT; break; + case D3DTFG_LINEAR: wined3dfilter = WINED3DTEXF_LINEAR; break; + case D3DTFG_FLATCUBIC: wined3dfilter = WINED3DTEXF_FLATCUBIC; break; + case D3DTFG_GAUSSIANCUBIC: wined3dfilter = WINED3DTEXF_GAUSSIANCUBIC; break; + case D3DTFG_ANISOTROPIC: wined3dfilter = WINED3DTEXF_ANISOTROPIC; break; + default: + ERR("Unexpected d3d7 mag filter type %d\n", State); + wined3dfilter = WINED3DTEXF_POINT; + } return IWineD3DDevice_SetSamplerState(This->wineD3DDevice, Stage, WINED3DSAMP_MAGFILTER, - State); + wined3dfilter); + } case D3DTSS_ADDRESS: IWineD3DDevice_SetSamplerState(This->wineD3DDevice,

1 0