August 2011 - Wine-commits - list.winehq.org

Hans Leidekker : winhttp: Verify parameter types in IWinHttpRequest:: SetProxy.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: cfe4c56624c2c853d5ccdd226f6a12df60abf579 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfe4c56624c2c853d5ccdd226… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 2 09:23:50 2011 +0200 winhttp: Verify parameter types in IWinHttpRequest::SetProxy. --- dlls/winhttp/request.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 2a70a87..97d10a3 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2414,8 +2414,8 @@ static HRESULT WINAPI winhttp_request_SetProxy( case HTTPREQUEST_PROXYSETTING_PROXY: request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; - request->proxy.lpszProxy = strdupW( V_BSTR( &proxy_server ) ); - request->proxy.lpszProxyBypass = strdupW( V_BSTR( &bypass_list ) ); + if (V_VT( &proxy_server ) == VT_BSTR) request->proxy.lpszProxy = strdupW( V_BSTR( &proxy_server ) ); + if (V_VT( &bypass_list ) == VT_BSTR) request->proxy.lpszProxyBypass = strdupW( V_BSTR( &bypass_list ) ); break; default:

1 0

Hans Leidekker : msi: Avoid a crash in ControlEvent_SetTargetPath.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: cf4aec0cbd7333dc0662055bb394f4f24c77c627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf4aec0cbd7333dc0662055bb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 2 09:24:05 2011 +0200 msi: Avoid a crash in ControlEvent_SetTargetPath. --- dlls/msi/events.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/msi/events.c b/dlls/msi/events.c index 3047d1d..2c0431d 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -215,18 +215,19 @@ static UINT ControlEvent_AddSource( MSIPACKAGE *package, LPCWSTR argument, msi_d static UINT ControlEvent_SetTargetPath(MSIPACKAGE* package, LPCWSTR argument, msi_dialog* dialog) { + static const WCHAR szSelectionPath[] = {'S','e','l','e','c','t','i','o','n','P','a','t','h',0}; LPWSTR path = msi_dup_property( package->db, argument ); MSIRECORD *rec = MSI_CreateRecord( 1 ); - UINT r; - - static const WCHAR szSelectionPath[] = {'S','e','l','e','c','t','i','o','n','P','a','t','h',0}; + UINT r = ERROR_SUCCESS; MSI_RecordSetStringW( rec, 1, path ); ControlEvent_FireSubscribedEvent( package, szSelectionPath, rec ); - - /* failure to set the path halts the executing of control events */ - r = MSI_SetTargetPathW(package, argument, path); - msi_free(path); + if (path) + { + /* failure to set the path halts the executing of control events */ + r = MSI_SetTargetPathW(package, argument, path); + msi_free(path); + } msi_free(&rec->hdr); return r; }

1 0

Alexandre Julliard : widl: Add helper functions for outputting resource files.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 36e73eb3fb689bce0de79c022a417d4e52e229a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36e73eb3fb689bce0de79c022… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 1 21:29:35 2011 +0200 widl: Add helper functions for outputting resource files. --- tools/widl/register.c | 48 +------------------------ tools/widl/utils.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/widl/utils.h | 2 + 3 files changed, 98 insertions(+), 46 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index f18e810..ec573be 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -208,17 +208,6 @@ static void write_progids( const statement_list_t *stmts ) } } -/* put a string into the resource file */ -static inline void put_string( const char *str ) -{ - while (*str) - { - unsigned char ch = *str++; - put_word( toupper(ch) ); - } - put_word( 0 ); -} - void write_regscript( const statement_list_t *stmts ) { const type_t *ps_factory; @@ -247,41 +236,8 @@ void write_regscript( const statement_list_t *stmts ) if (strendswith( regscript_name, ".res" )) /* create a binary resource file */ { - unsigned char *data = output_buffer; - size_t data_size = output_buffer_pos; - size_t header_size = 5 * sizeof(unsigned int) + 2 * sizeof(unsigned short); - - header_size += (strlen(regscript_token) + strlen("WINE_REGISTRY") + 2) * sizeof(unsigned short); - - init_output_buffer(); - - put_dword( 0 ); /* ResSize */ - put_dword( 32 ); /* HeaderSize */ - put_word( 0xffff ); /* ResType */ - put_word( 0x0000 ); - put_word( 0xffff ); /* ResName */ - put_word( 0x0000 ); - put_dword( 0 ); /* DataVersion */ - put_word( 0 ); /* Memory options */ - put_word( 0 ); /* Language */ - put_dword( 0 ); /* Version */ - put_dword( 0 ); /* Characteristics */ - - put_dword( data_size ); /* ResSize */ - put_dword( (header_size + 3) & ~3 ); /* HeaderSize */ - put_string( "WINE_REGISTRY" ); /* ResType */ - put_string( regscript_token ); /* ResName */ - align_output( 4 ); - put_dword( 0 ); /* DataVersion */ - put_word( 0 ); /* Memory options */ - put_word( 0 ); /* Language */ - put_dword( 0 ); /* Version */ - put_dword( 0 ); /* Characteristics */ - - put_data( data, data_size ); - free( data ); - align_output( 4 ); - flush_output_buffer( regscript_name ); + add_output_to_resources( "WINE_REGISTRY", regscript_token ); + flush_output_resources( regscript_name ); } else { diff --git a/tools/widl/utils.c b/tools/widl/utils.c index b025c9a..dc77ae8 100644 --- a/tools/widl/utils.c +++ b/tools/widl/utils.c @@ -253,6 +253,13 @@ unsigned char *output_buffer; size_t output_buffer_pos; size_t output_buffer_size; +static struct resource +{ + unsigned char *data; + size_t size; +} resources[16]; +static unsigned int nb_resources; + static void check_output_buffer_space( size_t size ) { if (output_buffer_pos + size >= output_buffer_size) @@ -279,6 +286,93 @@ void flush_output_buffer( const char *name ) free( output_buffer ); } +static inline void put_resource_id( const char *str ) +{ + if (str[0] != '#') + { + while (*str) + { + unsigned char ch = *str++; + put_word( toupper(ch) ); + } + put_word( 0 ); + } + else + { + put_word( 0xffff ); + put_word( atoi( str + 1 )); + } +} + +void add_output_to_resources( const char *type, const char *name ) +{ + size_t data_size = output_buffer_pos; + size_t header_size = 5 * sizeof(unsigned int) + 2 * sizeof(unsigned short); + + assert( nb_resources < sizeof(resources)/sizeof(resources[0]) ); + + if (type[0] != '#') header_size += (strlen( type ) + 1) * sizeof(unsigned short); + else header_size += 2 * sizeof(unsigned short); + if (name[0] != '#') header_size += (strlen( name ) + 1) * sizeof(unsigned short); + else header_size += 2 * sizeof(unsigned short); + + header_size = (header_size + 3) & ~3; + align_output( 4 ); + check_output_buffer_space( header_size ); + resources[nb_resources].size = header_size + output_buffer_pos; + memmove( output_buffer + header_size, output_buffer, output_buffer_pos ); + + output_buffer_pos = 0; + put_dword( data_size ); /* ResSize */ + put_dword( header_size ); /* HeaderSize */ + put_resource_id( type ); /* ResType */ + put_resource_id( name ); /* ResName */ + align_output( 4 ); + put_dword( 0 ); /* DataVersion */ + put_word( 0 ); /* Memory options */ + put_word( 0 ); /* Language */ + put_dword( 0 ); /* Version */ + put_dword( 0 ); /* Characteristics */ + + resources[nb_resources++].data = output_buffer; + init_output_buffer(); +} + +void flush_output_resources( const char *name ) +{ + int fd; + unsigned int i; + + /* all output must have been saved with add_output_to_resources() first */ + assert( !output_buffer_pos ); + + put_dword( 0 ); /* ResSize */ + put_dword( 32 ); /* HeaderSize */ + put_word( 0xffff ); /* ResType */ + put_word( 0x0000 ); + put_word( 0xffff ); /* ResName */ + put_word( 0x0000 ); + put_dword( 0 ); /* DataVersion */ + put_word( 0 ); /* Memory options */ + put_word( 0 ); /* Language */ + put_dword( 0 ); /* Version */ + put_dword( 0 ); /* Characteristics */ + + fd = open( name, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666 ); + if (fd == -1) error( "Error creating %s\n", name ); + if (write( fd, output_buffer, output_buffer_pos ) != output_buffer_pos) + error( "Error writing to %s\n", name ); + for (i = 0; i < nb_resources; i++) + { + if (write( fd, resources[i].data, resources[i].size ) != resources[i].size) + error( "Error writing to %s\n", name ); + free( resources[i].data ); + } + close( fd ); + nb_resources = 0; + free( output_buffer ); +} + void put_data( const void *data, size_t size ) { check_output_buffer_space( size ); diff --git a/tools/widl/utils.h b/tools/widl/utils.h index 5b44aac..ec02fc7 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -58,6 +58,8 @@ extern size_t output_buffer_size; extern void init_output_buffer(void); extern void flush_output_buffer( const char *name ); +extern void add_output_to_resources( const char *type, const char *name ); +extern void flush_output_resources( const char *name ); extern void put_data( const void *data, size_t size ); extern void put_byte( unsigned char val ); extern void put_word( unsigned short val );

1 0

Alexandre Julliard : widl: Add support for generating typelibs directly in resource format.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: b568287eef4a5cceaf27568bab4b2576749489ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=b568287eef4a5cceaf27568ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 1 21:38:56 2011 +0200 widl: Add support for generating typelibs directly in resource format. --- tools/widl/parser.y | 1 - tools/widl/typelib.c | 2 -- tools/widl/widl.man.in | 4 +++- tools/widl/widltypes.h | 1 - tools/widl/write_msft.c | 8 +++++++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d4852d1..5286977 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1725,7 +1725,6 @@ static typelib_t *make_library(const char *name, const attr_list_t *attrs) { typelib_t *typelib = xmalloc(sizeof(*typelib)); typelib->name = xstrdup(name); - typelib->filename = NULL; typelib->attrs = attrs; list_init( &typelib->importlibs ); return typelib; diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 9c24f15..e3fc0b9 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -255,9 +255,7 @@ unsigned short get_type_vt(type_t *t) void start_typelib(typelib_t *typelib_type) { if (!do_typelib) return; - typelib = typelib_type; - typelib->filename = xstrdup(typelib_name); } void end_typelib(void) diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 4988ee9..f74328b 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -48,7 +48,9 @@ Use old naming conventions. .PP .B Type library options: .IP \fB-t\fR -Generate a type library. The default output filename is \fIinfile\fB.tlb\fR. +Generate a type library. The default output filename is +\fIinfile\fB.tlb\fR. If the output file name ends in \fB.res\fR, a +binary resource file containing the type library is generated instead. .IP "\fB-m32, -m64\fR" Generate a Win32, respectively Win64, type library. .PP diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 64c94e5..d1066bd 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -494,7 +494,6 @@ struct _importlib_t { struct _typelib_t { char *name; - char *filename; const attr_list_t *attrs; struct list importlibs; statement_list_t *stmts; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 33b99e7..66da286 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2542,7 +2542,13 @@ static void save_all_changes(msft_typelib_t *typelib) ctl2_write_segment( typelib, MSFT_SEG_CUSTDATAGUID ); ctl2_write_typeinfos(typelib); - flush_output_buffer( typelib->typelib->filename ); + + if (strendswith( typelib_name, ".res" )) /* create a binary resource file */ + { + add_output_to_resources( "TYPELIB", "#1" ); + flush_output_resources( typelib_name ); + } + else flush_output_buffer( typelib_name ); } int create_msft_typelib(typelib_t *typelib)

1 0

Alexandre Julliard : makefiles: Generate resource files for typelibs.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 729afa6adc0e4de43354871f804d9518046c7abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=729afa6adc0e4de43354871f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 1 22:14:36 2011 +0200 makefiles: Generate resource files for typelibs. --- .gitignore | 18 ------------------ Make.rules.in | 9 ++++++--- dlls/Makedll.rules.in | 1 + dlls/gameux/rsrc.rc | 3 --- dlls/hhctrl.ocx/hhctrl.rc | 3 --- dlls/ieframe/ieframe.rc | 3 --- dlls/jscript/jscript.rc | 3 --- dlls/mshtml.tlb/Makefile.in | 1 - dlls/mshtml.tlb/rsrc.rc | 24 ------------------------ dlls/msi/msi.rc | 3 --- dlls/msxml/rsrc.rc | 3 --- dlls/msxml2/Makefile.in | 2 -- dlls/msxml2/rsrc.rc | 22 ---------------------- dlls/msxml3/version.rc | 3 --- dlls/msxml4/rsrc.rc | 3 --- dlls/msxml6/rsrc.rc | 3 --- dlls/pstorec/Makefile.in | 2 -- dlls/pstorec/rsrc.rc | 29 ----------------------------- dlls/shdocvw/shdocvw.rc | 3 --- dlls/shell32/shell32.rc | 3 --- dlls/stdole2.tlb/rsrc.rc | 3 --- dlls/stdole32.tlb/rsrc.rc | 3 --- dlls/winhttp/version.rc | 3 --- dlls/wuapi/Makefile.in | 2 -- dlls/wuapi/rsrc.rc | 22 ---------------------- tools/make_makefiles | 1 + tools/makedep.c | 2 +- 27 files changed, 9 insertions(+), 168 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=729afa6adc0e4de433548…

1 0

Andrew Eikum : winmm: Fix looping handling.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 5512c2482f1ddceffb298cbff06949373bab3efa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5512c2482f1ddceffb298cbff… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 1 13:11:59 2011 -0500 winmm: Fix looping handling. --- dlls/winmm/waveform.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 1b18037..8801900 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1263,7 +1263,7 @@ static WAVEHDR *WOD_MarkDoneHeaders(WINMM_Device *device) HRESULT hr; WAVEHDR *queue, *first = device->first; UINT64 clock_freq, clock_pos, clock_frames; - UINT32 nloops, queue_frames; + UINT32 nloops, queue_frames = 0; hr = IAudioClock_GetFrequency(device->clock, &clock_freq); if(FAILED(hr)){ @@ -1282,19 +1282,21 @@ static WAVEHDR *WOD_MarkDoneHeaders(WINMM_Device *device) first = queue = device->first; nloops = device->loop_counter; while(queue && - (queue_frames = WINMM_HeaderLenFrames(device, queue)) <= + (queue_frames += WINMM_HeaderLenFrames(device, queue)) <= clock_frames - device->last_clock_pos){ - WAVEHDR *next = queue->lpNext; if(!nloops){ device->first->dwFlags &= ~WHDR_INQUEUE; device->first->dwFlags |= WHDR_DONE; device->last_clock_pos += queue_frames; - queue = device->first = next; + queue_frames = 0; + queue = device->first = queue->lpNext; }else{ - if(queue->dwFlags & WHDR_BEGINLOOP) - queue = next; - - if(queue->dwFlags & WHDR_ENDLOOP){ + if(queue->dwFlags & WHDR_BEGINLOOP){ + if(queue->dwFlags & WHDR_ENDLOOP) + --nloops; + else + queue = queue->lpNext; + }else if(queue->dwFlags & WHDR_ENDLOOP){ queue = device->loop_start; --nloops; } @@ -2476,8 +2478,13 @@ UINT WINAPI waveOutWrite(HWAVEOUT hWaveOut, WAVEHDR *header, UINT uSize) device->last = header; if(!device->playing) device->playing = header; - }else + }else{ device->playing = device->first = device->last = header; + if(header->dwFlags & WHDR_BEGINLOOP){ + device->loop_counter = header->dwLoops; + device->loop_start = header; + } + } header->lpNext = NULL; header->dwFlags &= ~WHDR_DONE;

1 0

Henri Verbeet : wined3d: Resolve source and destination rectangles in wined3d_surface_blt().
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: ace241ad595d1da0f0fc384a7065683fa00cac45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ace241ad595d1da0f0fc384a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 1 21:35:41 2011 +0200 wined3d: Resolve source and destination rectangles in wined3d_surface_blt(). --- dlls/wined3d/surface.c | 56 ++++++++++++++++++++++++------------------------ 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7c5b6d9..cd4770d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1281,15 +1281,15 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, co } /* Do not call while under the GL lock. */ -static HRESULT surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect_in, - struct wined3d_surface *src_surface, const RECT *src_rect_in, DWORD flags, +static HRESULT surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, + struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const WINEDDBLTFX *fx, WINED3DTEXTUREFILTERTYPE filter) { struct wined3d_device *device = dst_surface->resource.device; DWORD src_ds_flags, dst_ds_flags; TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n", - dst_surface, wine_dbgstr_rect(dst_rect_in), src_surface, wine_dbgstr_rect(src_rect_in), + dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx, debug_d3dtexturefiltertype(filter)); TRACE("Usage is %s.\n", debug_d3dusage(dst_surface->resource.usage)); @@ -1310,22 +1310,17 @@ static HRESULT surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_ if (flags & WINEDDBLT_DEPTHFILL) { float depth; - RECT rect; TRACE("Depth fill.\n"); - surface_get_rect(dst_surface, dst_rect_in, &rect); - if (!surface_convert_depth_to_float(dst_surface, fx->u5.dwFillDepth, &depth)) return WINED3DERR_INVALIDCALL; - if (SUCCEEDED(wined3d_surface_depth_fill(dst_surface, &rect, depth))) + if (SUCCEEDED(wined3d_surface_depth_fill(dst_surface, dst_rect, depth))) return WINED3D_OK; } else { - RECT src_rect, dst_rect; - /* Accessing depth / stencil surfaces is supposed to fail while in * a scene, except for fills, which seem to work. */ if (device->inScene) @@ -1340,21 +1335,21 @@ static HRESULT surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_ return WINED3DERR_INVALIDCALL; } - if (src_rect_in && (src_rect_in->top || src_rect_in->left - || src_rect_in->bottom != src_surface->resource.height - || src_rect_in->right != src_surface->resource.width)) + if (src_rect->top || src_rect->left + || src_rect->bottom != src_surface->resource.height + || src_rect->right != src_surface->resource.width) { WARN("Rejecting depth / stencil blit with invalid source rect %s.\n", - wine_dbgstr_rect(src_rect_in)); + wine_dbgstr_rect(src_rect)); return WINED3DERR_INVALIDCALL; } - if (dst_rect_in && (dst_rect_in->top || dst_rect_in->left - || dst_rect_in->bottom != dst_surface->resource.height - || dst_rect_in->right != dst_surface->resource.width)) + if (dst_rect->top || dst_rect->left + || dst_rect->bottom != dst_surface->resource.height + || dst_rect->right != dst_surface->resource.width) { WARN("Rejecting depth / stencil blit with invalid destination rect %s.\n", - wine_dbgstr_rect(src_rect_in)); + wine_dbgstr_rect(src_rect)); return WINED3DERR_INVALIDCALL; } @@ -1365,10 +1360,7 @@ static HRESULT surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_ return WINED3DERR_INVALIDCALL; } - surface_get_rect(src_surface, src_rect_in, &src_rect); - surface_get_rect(dst_surface, dst_rect_in, &dst_rect); - - if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, &src_rect, dst_surface, &dst_rect))) + if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, src_rect, dst_surface, dst_rect))) return WINED3D_OK; } } @@ -1377,15 +1369,15 @@ static HRESULT surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_ if ((dst_surface->resource.usage & WINED3DUSAGE_RENDERTARGET) || (src_surface && (src_surface->resource.usage & WINED3DUSAGE_RENDERTARGET))) { - if (SUCCEEDED(IWineD3DSurfaceImpl_BltOverride(dst_surface, dst_rect_in, - src_surface, src_rect_in, flags, fx, filter))) + if (SUCCEEDED(IWineD3DSurfaceImpl_BltOverride(dst_surface, dst_rect, + src_surface, src_rect, flags, fx, filter))) return WINED3D_OK; } /* For the rest call the X11 surface implementation. For render targets * this should be implemented OpenGL accelerated in BltOverride, other * blits are rather rare. */ - return surface_cpu_blt(dst_surface, dst_rect_in, src_surface, src_rect_in, flags, fx, filter); + return surface_cpu_blt(dst_surface, dst_rect, src_surface, src_rect, flags, fx, filter); } /* Do not call while under the GL lock. */ @@ -3410,16 +3402,24 @@ do { \ } /* Do not call while under the GL lock. */ -HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, - struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, +HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect_in, + struct wined3d_surface *src_surface, const RECT *src_rect_in, DWORD flags, const WINEDDBLTFX *fx, WINED3DTEXTUREFILTERTYPE filter) { + RECT src_rect, dst_rect; + TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n", - dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), + dst_surface, wine_dbgstr_rect(dst_rect_in), src_surface, wine_dbgstr_rect(src_rect_in), flags, fx, debug_d3dtexturefiltertype(filter)); + surface_get_rect(dst_surface, dst_rect_in, &dst_rect); + if (src_surface) + surface_get_rect(src_surface, src_rect_in, &src_rect); + else + memset(&src_rect, 0, sizeof(src_rect)); + return dst_surface->surface_ops->surface_blt(dst_surface, - dst_rect, src_surface, src_rect, flags, fx, filter); + &dst_rect, src_surface, &src_rect, flags, fx, filter); } /* Do not call while under the GL lock. */

1 0

Henri Verbeet : wined3d: IWineD3DSurfaceImpl_BltOverride() is always passed valid source and destination rectangles.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 50d883c37e56c6999bcddb56cba5126efc6e5fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50d883c37e56c6999bcddb56c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 1 21:35:42 2011 +0200 wined3d: IWineD3DSurfaceImpl_BltOverride() is always passed valid source and destination rectangles. So no need to call surface_get_rect() anymore. --- dlls/wined3d/surface.c | 84 +++++++++++++++++++++++------------------------- 1 files changed, 40 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50d883c37e56c6999bcdd…

1 0

Henri Verbeet : wined3d: Check for locked surfaces in wined3d_surface_blt() .
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 4bdd4ef45ba59e7add4f611ca67ab5995d7bf85b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bdd4ef45ba59e7add4f611ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 1 21:35:43 2011 +0200 wined3d: Check for locked surfaces in wined3d_surface_blt(). --- dlls/wined3d/surface.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 617704e..beafa3a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1293,12 +1293,6 @@ static HRESULT surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_ flags, fx, debug_d3dtexturefiltertype(filter)); TRACE("Usage is %s.\n", debug_d3dusage(dst_surface->resource.usage)); - if ((dst_surface->flags & SFLAG_LOCKED) || (src_surface && (src_surface->flags & SFLAG_LOCKED))) - { - WARN(" Surface is busy, returning DDERR_SURFACEBUSY\n"); - return WINEDDERR_SURFACEBUSY; - } - dst_ds_flags = dst_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); if (src_surface) src_ds_flags = src_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); @@ -3412,6 +3406,12 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC dst_surface, wine_dbgstr_rect(dst_rect_in), src_surface, wine_dbgstr_rect(src_rect_in), flags, fx, debug_d3dtexturefiltertype(filter)); + if ((dst_surface->flags & SFLAG_LOCKED) || (src_surface && (src_surface->flags & SFLAG_LOCKED))) + { + WARN("Surface is busy, returning WINEDDERR_SURFACEBUSY.\n"); + return WINEDDERR_SURFACEBUSY; + } + surface_get_rect(dst_surface, dst_rect_in, &dst_rect); if (src_surface) surface_get_rect(src_surface, src_rect_in, &src_rect); @@ -6439,12 +6439,6 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx, debug_d3dtexturefiltertype(filter)); - if ((dst_surface->flags & SFLAG_LOCKED) || (src_surface && (src_surface->flags & SFLAG_LOCKED))) - { - WARN("Surface is busy, returning WINEDDERR_SURFACEBUSY\n"); - return WINEDDERR_SURFACEBUSY; - } - /* First check for the validity of source / destination rectangles. * This was verified using a test application and by MSDN. */ if (src_rect)

1 0

Henri Verbeet : wined3d: Go straight to the fallbacks for complex blits in surface_blt().
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 7539cc8faab96a2612cea43ab9e444e10db015ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=7539cc8faab96a2612cea43ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 1 21:35:44 2011 +0200 wined3d: Go straight to the fallbacks for complex blits in surface_blt(). At the moment this is only marginally useful, since it just avoids silly things like color keyed depth fills that are probably invalid anyway. However, the idea is to gradually move normal color fill and blit handling out of IWineD3DSurfaceImpl_BltOverride() and surface_cpu_blt(), and eventually make those functions go away completely. --- dlls/wined3d/surface.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index beafa3a..6167bde 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1287,12 +1287,23 @@ static HRESULT surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_ { struct wined3d_device *device = dst_surface->resource.device; DWORD src_ds_flags, dst_ds_flags; + static const DWORD simple_blit = WINEDDBLT_ASYNC + | WINEDDBLT_COLORFILL + | WINEDDBLT_WAIT + | WINEDDBLT_DEPTHFILL + | WINEDDBLT_DONOTWAIT; TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n", dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx, debug_d3dtexturefiltertype(filter)); TRACE("Usage is %s.\n", debug_d3dusage(dst_surface->resource.usage)); + if (flags & ~simple_blit) + { + WARN("Using fallback for complex blit (%#x).\n", flags); + goto fallback; + } + dst_ds_flags = dst_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); if (src_surface) src_ds_flags = src_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); @@ -1359,6 +1370,8 @@ static HRESULT surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_ } } +fallback: + /* Special cases for render targets. */ if ((dst_surface->resource.usage & WINED3DUSAGE_RENDERTARGET) || (src_surface && (src_surface->resource.usage & WINED3DUSAGE_RENDERTARGET)))

1 0