October 2015 - Wine-commits

Sebastian Lackner : ntdll: Do not check if object was signaled after user APC in server_select.
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: 8a33dd43f60c1ad97f9d5fe47d5e303b1c5f329c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a33dd43f60c1ad97f9d5fe47… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 23 04:16:08 2015 +0200 ntdll: Do not check if object was signaled after user APC in server_select. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 4 ---- dlls/ntdll/server.c | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 173793c..1065d5e 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2317,20 +2317,16 @@ static DWORD WINAPI alertable_wait_thread(void *param) ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForMultipleObjectsEx(1, &semaphores[1], TRUE, 1000, TRUE); - todo_wine ok(result == WAIT_IO_COMPLETION, "expected WAIT_IO_COMPLETION, got %u\n", result); result = WaitForMultipleObjectsEx(1, &semaphores[1], TRUE, 200, TRUE); - todo_wine ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); ReleaseSemaphore(semaphores[0], 1, NULL); timeout.QuadPart = -10000000; status = pNtWaitForMultipleObjects(1, &semaphores[1], FALSE, TRUE, &timeout); - todo_wine ok(status == STATUS_USER_APC, "expected STATUS_USER_APC, got %08x\n", status); timeout.QuadPart = -2000000; status = pNtWaitForMultipleObjects(1, &semaphores[1], FALSE, TRUE, &timeout); - todo_wine ok(status == STATUS_WAIT_0, "expected STATUS_WAIT_0, got %08x\n", status); ReleaseSemaphore(semaphores[0], 1, NULL); diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 95111ad..f6457db 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -614,10 +614,11 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT if (ret != STATUS_USER_APC) break; if (invoke_apc( &call, &result )) { - /* if we ran a user apc we have to check once more if an object got signaled, + /* if we ran a user apc we have to check once more if additional apcs are queued, * but we don't want to wait */ abs_timeout = 0; user_apc = TRUE; + size = 0; } /* don't signal multiple times */

1 0

Alexandre Julliard : makefiles: Read variable definitions from the top makefile instead of using Make.vars.in.
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: ef557a8a8a47100a3a0eb0662c93e38634afed89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef557a8a8a47100a3a0eb0662… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 23 14:49:36 2015 +0900 makefiles: Read variable definitions from the top makefile instead of using Make.vars.in. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Make.vars.in | 77 --------------------------------------------------------- Makefile.in | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ aclocal.m4 | 6 ++--- configure | 12 ++++----- configure.ac | 4 +-- tools/makedep.c | 33 ++++++++++++++++++++----- 6 files changed, 114 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef557a8a8a47100a3a0eb…

1 0

Alexandre Julliard : makefiles: Get rid of the support for updating a makefile in place.
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: 6222e49c37c1fa9120bd3eff6fc48dc902f2d312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6222e49c37c1fa9120bd3eff6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 23 15:03:11 2015 +0900 makefiles: Get rid of the support for updating a makefile in place. We always regenerate the makefile first nowadays. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 49 ++++++++++++++++--------------------------------- 1 file changed, 16 insertions(+), 33 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 119294b..104711e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -172,7 +172,6 @@ struct makefile static struct makefile *top_makefile; static const char *makefile_name = "Makefile"; -static const char *Separator = "### Dependencies"; static const char *input_file_name; static const char *output_file_name; static const char *temp_file_name; @@ -185,8 +184,7 @@ static const char Usage[] = "Usage: makedep [options] directories\n" "Options:\n" " -R from to Compute the relative path between two directories\n" - " -fxxx Store output in file 'xxx' (default: Makefile)\n" - " -sxxx Use 'xxx' as separator (default: \"### Dependencies\")\n"; + " -fxxx Store output in file 'xxx' (default: Makefile)\n"; #ifndef __GNUC__ @@ -2534,38 +2532,27 @@ static void output_top_variables( struct makefile *make ) /******************************************************************* * output_dependencies */ -static void output_dependencies( struct makefile *make, const char *path ) +static void output_dependencies( struct makefile *make ) { struct strarray targets, testlist_files = empty_strarray, ignore_files = empty_strarray; + char buffer[1024]; FILE *src_file; - if (Separator && ((src_file = fopen( path, "r" )))) - { - char buffer[1024]; - int found = 0; + output_file_name = base_dir_path( make, makefile_name ); + output_file = create_temp_file( output_file_name ); + output_top_variables( make ); - output_file = create_temp_file( path ); - output_top_variables( make ); - while (fgets( buffer, sizeof(buffer), src_file ) && !found) - { - if (fwrite( buffer, 1, strlen(buffer), output_file ) != strlen(buffer)) fatal_perror( "write" ); - found = !strncmp( buffer, Separator, strlen(Separator) ); - } - if (fclose( src_file )) fatal_perror( "close" ); - if (!found) output( "\n%s\n", Separator ); - } - else - { - if (!(output_file = fopen( path, Separator ? "a" : "w" ))) - fatal_perror( "%s", path ); - output_top_variables( make ); - } + /* copy the contents of the source makefile */ + if (!(src_file = fopen( output_file_name, "r" ))) fatal_perror( "open" ); + while (fgets( buffer, sizeof(buffer), src_file )) + if (fwrite( buffer, 1, strlen(buffer), output_file ) != strlen(buffer)) fatal_perror( "write" ); + if (fclose( src_file )) fatal_perror( "close" ); targets = output_sources( make, &testlist_files ); fclose( output_file ); output_file = NULL; - if (temp_file_name) rename_temp_file( path ); + rename_temp_file( output_file_name ); strarray_add( &ignore_files, ".gitignore" ); strarray_add( &ignore_files, "Makefile" ); @@ -2576,6 +2563,8 @@ static void output_dependencies( struct makefile *make, const char *path ) output_testlist( base_dir_path( make, "testlist.c" ), testlist_files ); if (!make->src_dir && make->base_dir) output_gitignore( base_dir_path( make, ".gitignore" ), ignore_files ); + + output_file_name = NULL; } @@ -2606,7 +2595,7 @@ static void update_makefile( const char *path ) struct incl_file *file; struct makefile *make; - make = parse_makefile( path, Separator ); + make = parse_makefile( path, NULL ); if (root_src_dir) { @@ -2671,9 +2660,7 @@ static void update_makefile( const char *path ) LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 ); - output_file_name = base_dir_path( make, makefile_name ); - output_dependencies( make, output_file_name ); - output_file_name = NULL; + output_dependencies( make ); } @@ -2718,10 +2705,6 @@ static int parse_option( const char *opt ) case 'R': relative_dir_mode = 1; break; - case 's': - if (opt[2]) Separator = opt + 2; - else Separator = NULL; - break; default: fprintf( stderr, "Unknown option '%s'\n%s", opt, Usage ); exit(1);

1 0

Alexandre Julliard : makefiles: Avoid running config.status when not necessary.
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: e0b1e8154dccd8a238a7cf6afb8e96520248ebd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b1e8154dccd8a238a7cf6af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 23 17:42:44 2015 +0900 makefiles: Avoid running config.status when not necessary. If it doesn't contain substitutions, we can use Makefile.in directly. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 17 ++++++++++++++--- configure | 23 +++++++++++++++++------ configure.ac | 6 +++--- tools/make_makefiles | 4 ++++ tools/makedep.c | 48 +++++++++++++++++++++++++++++++++++++++--------- 5 files changed, 77 insertions(+), 21 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 13bab9b..e236c92 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -225,13 +225,24 @@ wine_fn_has_flag () wine_fn_depend_rules () { - wine_fn_append_rule \ + if wine_fn_has_flag config + then + wine_fn_append_rule \ "$ac_dir/Makefile: $srcdir/$ac_dir/Makefile.in Makefile config.status \$(MAKEDEP) - @./config.status --file $ac_dir/Makefile && \$(MAKEDEP) $ac_dir + @./config.status --file $ac_dir/Makefile && \$(MAKEDEP) -iMakefile $ac_dir depend: $ac_dir/depend .PHONY: $ac_dir/depend $ac_dir/depend: \$(MAKEDEP) dummy - @./config.status --file $ac_dir/Makefile && \$(MAKEDEP) $ac_dir" + @./config.status --file $ac_dir/Makefile && \$(MAKEDEP) -iMakefile $ac_dir" + else + wine_fn_append_rule \ +"$ac_dir/Makefile: $srcdir/$ac_dir/Makefile.in Makefile \$(MAKEDEP) + \$(MAKEDEP) $ac_dir +depend: $ac_dir/depend +.PHONY: $ac_dir/depend +$ac_dir/depend: \$(MAKEDEP) dummy + \$(MAKEDEP) $ac_dir" + fi } wine_fn_pot_rules () diff --git a/configure b/configure index 38c3c6c..8d17086 100755 --- a/configure +++ b/configure @@ -7389,13 +7389,24 @@ wine_fn_has_flag () wine_fn_depend_rules () { - wine_fn_append_rule \ + if wine_fn_has_flag config + then + wine_fn_append_rule \ "$ac_dir/Makefile: $srcdir/$ac_dir/Makefile.in Makefile config.status \$(MAKEDEP) - @./config.status --file $ac_dir/Makefile && \$(MAKEDEP) $ac_dir + @./config.status --file $ac_dir/Makefile && \$(MAKEDEP) -iMakefile $ac_dir depend: $ac_dir/depend .PHONY: $ac_dir/depend $ac_dir/depend: \$(MAKEDEP) dummy - @./config.status --file $ac_dir/Makefile && \$(MAKEDEP) $ac_dir" + @./config.status --file $ac_dir/Makefile && \$(MAKEDEP) -iMakefile $ac_dir" + else + wine_fn_append_rule \ +"$ac_dir/Makefile: $srcdir/$ac_dir/Makefile.in Makefile \$(MAKEDEP) + \$(MAKEDEP) $ac_dir +depend: $ac_dir/depend +.PHONY: $ac_dir/depend +$ac_dir/depend: \$(MAKEDEP) dummy + \$(MAKEDEP) $ac_dir" + fi } wine_fn_pot_rules () @@ -18010,9 +18021,9 @@ wine_fn_config_makefile documentation enable_documentation clean wine_fn_config_makefile fonts enable_fonts clean,install-lib wine_fn_config_makefile include enable_include clean,install-dev wine_fn_config_makefile libs/port enable_libs_port -wine_fn_config_makefile libs/wine enable_libs_wine clean,install-dev,install-lib +wine_fn_config_makefile libs/wine enable_libs_wine clean,config,install-dev,install-lib wine_fn_config_makefile libs/wpp enable_libs_wpp -wine_fn_config_makefile loader enable_loader clean,install-lib,manpage +wine_fn_config_makefile loader enable_loader clean,config,install-lib,manpage wine_fn_config_program arp enable_arp install wine_fn_config_program aspnet_regiis enable_aspnet_regiis install wine_fn_config_program attrib enable_attrib install,po @@ -18090,7 +18101,7 @@ wine_fn_config_program winemenubuilder enable_winemenubuilder install wine_fn_config_program winemine enable_winemine install,installbin,manpage,po wine_fn_config_program winemsibuilder enable_winemsibuilder install wine_fn_config_program winepath enable_winepath install,installbin,manpage -wine_fn_config_program winetest enable_winetest clean +wine_fn_config_program winetest enable_winetest clean,config wine_fn_config_program winevdm enable_win16 install wine_fn_config_program winhelp.exe16 enable_win16 install wine_fn_config_program winhlp32 enable_winhlp32 install,po diff --git a/configure.ac b/configure.ac index 88efdc9..bfcf319 100644 --- a/configure.ac +++ b/configure.ac @@ -3494,9 +3494,9 @@ WINE_CONFIG_MAKEFILE([documentation],,[clean]) WINE_CONFIG_MAKEFILE([fonts],,[clean,install-lib]) WINE_CONFIG_MAKEFILE([include],,[clean,install-dev]) WINE_CONFIG_MAKEFILE([libs/port]) -WINE_CONFIG_MAKEFILE([libs/wine],,[clean,install-dev,install-lib]) +WINE_CONFIG_MAKEFILE([libs/wine],,[clean,config,install-dev,install-lib]) WINE_CONFIG_MAKEFILE([libs/wpp]) -WINE_CONFIG_MAKEFILE([loader],,[clean,install-lib,manpage]) +WINE_CONFIG_MAKEFILE([loader],,[clean,config,install-lib,manpage]) WINE_CONFIG_PROGRAM(arp,,[install]) WINE_CONFIG_PROGRAM(aspnet_regiis,,[install]) WINE_CONFIG_PROGRAM(attrib,,[install,po]) @@ -3574,7 +3574,7 @@ WINE_CONFIG_PROGRAM(winemenubuilder,,[install]) WINE_CONFIG_PROGRAM(winemine,,[install,installbin,manpage,po]) WINE_CONFIG_PROGRAM(winemsibuilder,,[install]) WINE_CONFIG_PROGRAM(winepath,,[install,installbin,manpage]) -WINE_CONFIG_PROGRAM(winetest,,[clean]) +WINE_CONFIG_PROGRAM(winetest,,[clean,config]) WINE_CONFIG_PROGRAM(winevdm,enable_win16,[install]) WINE_CONFIG_PROGRAM(winhelp.exe16,enable_win16,[install]) WINE_CONFIG_PROGRAM(winhlp32,,[install,po]) diff --git a/tools/make_makefiles b/tools/make_makefiles index f0b40c0..266f33a 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -282,6 +282,10 @@ sub parse_makefile($) { die "Variable $1 in $file.in is obsolete"; } + if (/\@[A-Z_]+\@/) # config.status substitution variable + { + ${$make{"=flags"}}{"config"} = 1; + } } if ($file =~ /^programs\/([^\/]+)\/Makefile/) diff --git a/tools/makedep.c b/tools/makedep.c index 104711e..c81a57e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -171,7 +171,8 @@ struct makefile static struct makefile *top_makefile; -static const char *makefile_name = "Makefile"; +static const char *output_makefile_name = "Makefile"; +static const char *input_makefile_name; static const char *input_file_name; static const char *output_file_name; static const char *temp_file_name; @@ -184,7 +185,8 @@ static const char Usage[] = "Usage: makedep [options] directories\n" "Options:\n" " -R from to Compute the relative path between two directories\n" - " -fxxx Store output in file 'xxx' (default: Makefile)\n"; + " -fxxx Store output in file 'xxx' (default: Makefile)\n" + " -ixxx Read input from file 'xxx' (default: Makefile.in)\n"; #ifndef __GNUC__ @@ -1460,6 +1462,28 @@ static struct incl_file *add_src_file( struct makefile *make, const char *name ) /******************************************************************* + * open_input_makefile + */ +static FILE *open_input_makefile( struct makefile *make ) +{ + FILE *ret; + + if (make->base_dir) + input_file_name = base_dir_path( make, input_makefile_name ); + else + input_file_name = output_makefile_name; /* always use output name for main Makefile */ + + input_line = 0; + if (!(ret = fopen( input_file_name, "r" ))) + { + input_file_name = root_dir_path( input_file_name ); + if (!(ret = fopen( input_file_name, "r" ))) fatal_perror( "open" ); + } + return ret; +} + + +/******************************************************************* * get_make_variable */ static char *get_make_variable( struct makefile *make, const char *name ) @@ -1578,10 +1602,7 @@ static struct makefile *parse_makefile( const char *path, const char *separator if (!strcmp( make->base_dir, "." )) make->base_dir = NULL; } - input_file_name = base_dir_path( make, makefile_name ); - if (!(file = fopen( input_file_name, "r" ))) fatal_perror( "open" ); - - input_line = 0; + file = open_input_makefile( make ); while ((buffer = get_line( file ))) { if (separator && !strncmp( buffer, separator, strlen(separator) )) break; @@ -2538,15 +2559,16 @@ static void output_dependencies( struct makefile *make ) char buffer[1024]; FILE *src_file; - output_file_name = base_dir_path( make, makefile_name ); + output_file_name = base_dir_path( make, output_makefile_name ); output_file = create_temp_file( output_file_name ); output_top_variables( make ); /* copy the contents of the source makefile */ - if (!(src_file = fopen( output_file_name, "r" ))) fatal_perror( "open" ); + src_file = open_input_makefile( make ); while (fgets( buffer, sizeof(buffer), src_file )) if (fwrite( buffer, 1, strlen(buffer), output_file ) != strlen(buffer)) fatal_perror( "write" ); if (fclose( src_file )) fatal_perror( "close" ); + input_file_name = NULL; targets = output_sources( make, &testlist_files ); @@ -2640,6 +2662,9 @@ static void update_makefile( const char *path ) list_init( &make->sources ); list_init( &make->includes ); + /* FIXME: target dir has to exist to allow locating srcdir-relative include files */ + if (make->base_dir) create_dir( make->base_dir ); + for (var = source_vars; *var; var++) { value = get_expanded_make_var_array( make, *var ); @@ -2700,7 +2725,10 @@ static int parse_option( const char *opt ) switch(opt[1]) { case 'f': - if (opt[2]) makefile_name = opt + 2; + if (opt[2]) output_makefile_name = opt + 2; + break; + case 'i': + if (opt[2]) input_makefile_name = opt + 2; break; case 'R': relative_dir_mode = 1; @@ -2762,6 +2790,8 @@ int main( int argc, char *argv[] ) for (i = 0; i < HASH_SIZE; i++) list_init( &files[i] ); + if (!input_makefile_name) input_makefile_name = strmake( "%s.in", output_makefile_name ); + top_makefile = parse_makefile( NULL, "# End of common header" ); linguas = get_expanded_make_var_array( top_makefile, "LINGUAS" );

1 0

Stefan Dösinger : wined3d: Only set GL_DEPTH_TEXTURE_MODE_ARB if ARB_depth_texture is supported.
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: d05736d2d981d87eb3c6162fbd58dbeee3b22bf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05736d2d981d87eb3c6162fb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 22 17:37:50 2015 +0200 wined3d: Only set GL_DEPTH_TEXTURE_MODE_ARB if ARB_depth_texture is supported. Fixes a GL error on r200. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 02cb9b9..a6d26ef 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -254,8 +254,11 @@ void wined3d_texture_bind(struct wined3d_texture *texture, gl_tex->sampler_desc.mip_filter = WINED3D_TEXF_NONE; } - if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && gl_info->supported[ARB_DEPTH_TEXTURE]) + { gl_info->gl_ops.gl.p_glTexParameteri(target, GL_DEPTH_TEXTURE_MODE_ARB, GL_INTENSITY); + checkGLcall("glTexParameteri(GL_DEPTH_TEXTURE_MODE_ARB, GL_INTENSITY)"); + } } /* Context activation is done by the caller. */

1 0

Riccardo Bortolato : d3d9: Replace wined3d_surface_get_render_target_data with wined3d_texture_blt in d3d9_device_GetRenderTargetData.
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: 3b02ae89a8bee74e6166bd9c020f276d034316f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b02ae89a8bee74e6166bd9c0… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Thu Oct 22 12:01:09 2015 +0200 d3d9: Replace wined3d_surface_get_render_target_data with wined3d_texture_blt in d3d9_device_GetRenderTargetData. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 12 +++++++++++- dlls/wined3d/surface.c | 13 ------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 2 -- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4af6ffb..16b27e5 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1265,12 +1265,22 @@ static HRESULT WINAPI d3d9_device_GetRenderTargetData(IDirect3DDevice9Ex *iface, { struct d3d9_surface *rt_impl = unsafe_impl_from_IDirect3DSurface9(render_target); struct d3d9_surface *dst_impl = unsafe_impl_from_IDirect3DSurface9(dst_surface); + struct wined3d_resource_desc wined3d_desc; + struct wined3d_resource *sub_resource; HRESULT hr; TRACE("iface %p, render_target %p, dst_surface %p.\n", iface, render_target, dst_surface); wined3d_mutex_lock(); - hr = wined3d_surface_get_render_target_data(dst_impl->wined3d_surface, rt_impl->wined3d_surface); + sub_resource = wined3d_texture_get_sub_resource(rt_impl->wined3d_texture, rt_impl->sub_resource_idx); + wined3d_resource_get_desc(sub_resource, &wined3d_desc); + + /* TODO: Check surface sizes, pools, etc. */ + if (wined3d_desc.multisample_type) + hr = D3DERR_INVALIDCALL; + else + hr = wined3d_texture_blt(dst_impl->wined3d_texture, dst_impl->sub_resource_idx, NULL, + rt_impl->wined3d_texture, rt_impl->sub_resource_idx, NULL, 0, NULL, WINED3D_TEXF_POINT); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d08259d..d0b70f3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1100,19 +1100,6 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DW return WINED3D_OK; } -HRESULT CDECL wined3d_surface_get_render_target_data(struct wined3d_surface *surface, - struct wined3d_surface *render_target) -{ - TRACE("surface %p, render_target %p.\n", surface, render_target); - - /* TODO: Check surface sizes, pools, etc. */ - - if (render_target->resource.multisample_type) - return WINED3DERR_INVALIDCALL; - - return wined3d_surface_blt(surface, NULL, render_target, NULL, 0, NULL, WINED3D_TEXF_POINT); -} - /* Context activation is done by the caller. */ static void surface_remove_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 9a266c9..6720350 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -225,7 +225,6 @@ @ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr) @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) -@ cdecl wined3d_surface_get_render_target_data(ptr ptr) @ cdecl wined3d_surface_get_resource(ptr) @ cdecl wined3d_surface_getdc(ptr ptr) @ cdecl wined3d_surface_incref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6f98c34..82ad493 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2478,8 +2478,6 @@ struct wined3d_surface * __cdecl wined3d_surface_from_resource(struct wined3d_re HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surface *surface, LONG *x, LONG *y); void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface); -HRESULT __cdecl wined3d_surface_get_render_target_data(struct wined3d_surface *surface, - struct wined3d_surface *render_target); struct wined3d_resource * __cdecl wined3d_surface_get_resource(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc); ULONG __cdecl wined3d_surface_incref(struct wined3d_surface *surface);

1 0

Józef Kucia : d3d11: Do not store ID3D11Device pointer in d3d11_immediate_context.
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: 186113109069bd9381093f9f9f5048437ac0e1b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=186113109069bd9381093f9f9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 23 02:38:14 2015 +0200 d3d11: Do not store ID3D11Device pointer in d3d11_immediate_context. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 1 - dlls/d3d11/device.c | 13 +++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index b8df609..b8d1340 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -370,7 +370,6 @@ struct d3d11_immediate_context { ID3D11DeviceContext ID3D11DeviceContext_iface; LONG refcount; - ID3D11Device *device; }; /* ID3D11Device, ID3D10Device1 */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e031e24..5650e1d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -67,13 +67,14 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_QueryInterface(ID3D11De static ULONG STDMETHODCALLTYPE d3d11_immediate_context_AddRef(ID3D11DeviceContext *iface) { struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); ULONG refcount = InterlockedIncrement(&context->refcount); TRACE("%p increasing refcount to %u.\n", context, refcount); if (refcount == 1) { - ID3D11Device_AddRef(context->device); + ID3D11Device_AddRef(&device->ID3D11Device_iface); } return refcount; @@ -82,13 +83,14 @@ static ULONG STDMETHODCALLTYPE d3d11_immediate_context_AddRef(ID3D11DeviceContex static ULONG STDMETHODCALLTYPE d3d11_immediate_context_Release(ID3D11DeviceContext *iface) { struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext(iface); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); ULONG refcount = InterlockedDecrement(&context->refcount); TRACE("%p decreasing refcount to %u.\n", context, refcount); if (!refcount) { - ID3D11Device_Release(context->device); + ID3D11Device_Release(&device->ID3D11Device_iface); } return refcount; @@ -96,11 +98,11 @@ static ULONG STDMETHODCALLTYPE d3d11_immediate_context_Release(ID3D11DeviceConte static void STDMETHODCALLTYPE d3d11_immediate_context_GetDevice(ID3D11DeviceContext *iface, ID3D11Device **device) { - struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext(iface); + struct d3d_device *device_object = device_from_immediate_ID3D11DeviceContext(iface); TRACE("iface %p, device %p.\n", iface, device); - *device = context->device; + *device = &device_object->ID3D11Device_iface; ID3D11Device_AddRef(*device); } @@ -1057,8 +1059,7 @@ static HRESULT d3d11_immediate_context_init(struct d3d11_immediate_context *cont context->ID3D11DeviceContext_iface.lpVtbl = &d3d11_immediate_context_vtbl; context->refcount = 1; - context->device = &device->ID3D11Device_iface; - ID3D11Device_AddRef(context->device); + ID3D11Device_AddRef(&device->ID3D11Device_iface); return S_OK; }

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_GSSetShader().
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: 1960ca5de8d005e2b28890fb92815f9fd9f16255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1960ca5de8d005e2b28890fb9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 23 02:38:15 2015 +0200 d3d11: Implement d3d11_immediate_context_GSSetShader(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 12 +++++++++++- dlls/d3d11/shader.c | 9 +++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index b8d1340..e8f66e3 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -257,6 +257,7 @@ struct d3d_geometry_shader HRESULT d3d_geometry_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, struct d3d_geometry_shader **shader) DECLSPEC_HIDDEN; +struct d3d_geometry_shader *unsafe_impl_from_ID3D11GeometryShader(ID3D11GeometryShader *iface) DECLSPEC_HIDDEN; struct d3d_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) DECLSPEC_HIDDEN; /* ID3D11PixelShader, ID3D10PixelShader */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5650e1d..337b42a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -284,8 +284,18 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetShader(ID3D11DeviceContext *iface, ID3D11GeometryShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - FIXME("iface %p, shader %p, class_instances %p, class_instance_count %u stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d_geometry_shader *gs = unsafe_impl_from_ID3D11GeometryShader(shader); + + TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", iface, shader, class_instances, class_instance_count); + + if (class_instances) + FIXME("Dynamic linking is not implemented yet.\n"); + + wined3d_mutex_lock(); + wined3d_device_set_geometry_shader(device->wined3d_device, gs ? gs->wined3d_shader : NULL); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_IASetPrimitiveTopology(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 37ca7aa..c645b0b 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -749,6 +749,15 @@ HRESULT d3d_geometry_shader_create(struct d3d_device *device, const void *byte_c return S_OK; } +struct d3d_geometry_shader *unsafe_impl_from_ID3D11GeometryShader(ID3D11GeometryShader *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_geometry_shader_vtbl); + + return impl_from_ID3D11GeometryShader(iface); +} + struct d3d_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) { if (!iface)

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_IASetVertexBuffers().
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: 5b225953c9a67be1b76dec2e3b6ca7add7c33f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b225953c9a67be1b76dec2e3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 23 02:38:16 2015 +0200 d3d11: Implement d3d11_immediate_context_IASetVertexBuffers(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 337b42a..370b4f6 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -237,8 +237,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_IASetInputLayout(ID3D11Dev static void STDMETHODCALLTYPE d3d11_immediate_context_IASetVertexBuffers(ID3D11DeviceContext *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers, const UINT *strides, const UINT *offsets) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p.\n", iface, start_slot, buffer_count, buffers, strides, offsets); + + wined3d_mutex_lock(); + for (i = 0; i < buffer_count; ++i) + { + struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); + + wined3d_device_set_stream_source(device->wined3d_device, start_slot + i, + buffer ? buffer->wined3d_buffer : NULL, offsets[i], strides[i]); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_IASetIndexBuffer(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_CopyResource().
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: 3f280dd20c76ac3f5679358b2cf2a339325ed4b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f280dd20c76ac3f5679358b2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Oct 23 02:38:17 2015 +0200 d3d11: Implement d3d11_immediate_context_CopyResource(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 370b4f6..380769d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -478,7 +478,16 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion(ID3D static void STDMETHODCALLTYPE d3d11_immediate_context_CopyResource(ID3D11DeviceContext *iface, ID3D11Resource *dst_resource, ID3D11Resource *src_resource) { - FIXME("iface %p, dst_resource %p, src_resource %p stub!\n", iface, dst_resource, src_resource); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct wined3d_resource *wined3d_dst_resource, *wined3d_src_resource; + + TRACE("iface %p, dst_resource %p, src_resource %p.\n", iface, dst_resource, src_resource); + + wined3d_dst_resource = wined3d_resource_from_d3d11_resource(dst_resource); + wined3d_src_resource = wined3d_resource_from_d3d11_resource(src_resource); + wined3d_mutex_lock(); + wined3d_device_copy_resource(device->wined3d_device, wined3d_dst_resource, wined3d_src_resource); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource(ID3D11DeviceContext *iface,

1 0