wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

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

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

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: 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

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

Sebastian Lackner : kernel32/tests: Add test to show that multiple user APCs are processed at once.
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: 49dd5577eba8b270386e4b4187ba50a6ddc2725e URL: http://source.winehq.org/git/wine.git/?a=commit;h=49dd5577eba8b270386e4b418… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 23 04:15:52 2015 +0200 kernel32/tests: Add test to show that multiple user APCs are processed at once. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index e842bf3..173793c 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2333,6 +2333,13 @@ static DWORD WINAPI alertable_wait_thread(void *param) todo_wine ok(status == STATUS_WAIT_0, "expected STATUS_WAIT_0, got %08x\n", status); + ReleaseSemaphore(semaphores[0], 1, NULL); + timeout.QuadPart = -10000000; + status = pNtWaitForMultipleObjects(1, &semaphores[1], FALSE, TRUE, &timeout); + ok(status == STATUS_USER_APC, "expected STATUS_USER_APC, got %08x\n", status); + result = WaitForSingleObject(semaphores[0], 0); + ok(result == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %u\n", result); + return 0; } @@ -2342,12 +2349,21 @@ static void CALLBACK alertable_wait_apc(ULONG_PTR userdata) ReleaseSemaphore(semaphores[1], 1, NULL); } +static void CALLBACK alertable_wait_apc2(ULONG_PTR userdata) +{ + HANDLE *semaphores = (void *)userdata; + DWORD result; + + result = WaitForSingleObject(semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); +} + static void test_alertable_wait(void) { HANDLE thread, semaphores[2]; DWORD result; - semaphores[0] = CreateSemaphoreW(NULL, 0, 1, NULL); + semaphores[0] = CreateSemaphoreW(NULL, 0, 2, NULL); ok(semaphores[0] != NULL, "CreateSemaphore failed with %u\n", GetLastError()); semaphores[1] = CreateSemaphoreW(NULL, 0, 1, NULL); ok(semaphores[1] != NULL, "CreateSemaphore failed with %u\n", GetLastError()); @@ -2366,6 +2382,15 @@ static void test_alertable_wait(void) result = QueueUserAPC(alertable_wait_apc, thread, (ULONG_PTR)semaphores); ok(result != 0, "QueueUserAPC failed with %u\n", GetLastError()); + result = WaitForSingleObject(semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); + Sleep(100); /* ensure the thread is blocking in NtWaitForMultipleObjects */ + result = QueueUserAPC(alertable_wait_apc2, thread, (ULONG_PTR)semaphores); + ok(result != 0, "QueueUserAPC failed with %u\n", GetLastError()); + result = QueueUserAPC(alertable_wait_apc2, thread, (ULONG_PTR)semaphores); + ok(result != 0, "QueueUserAPC failed with %u\n", GetLastError()); + ReleaseSemaphore(semaphores[0], 2, NULL); + result = WaitForSingleObject(thread, 1000); ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); CloseHandle(thread);

1 0

Thomas Pointhuber : combase/tests: Add tests for WindowsSubstring.
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: ae8be1f84ceb106314fbb67a3914d9fc1b550b91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae8be1f84ceb106314fbb67a3… Author: Thomas Pointhuber <thomas.pointhuber(a)gmx.at> Date: Fri Oct 23 03:23:02 2015 +0200 combase/tests: Add tests for WindowsSubstring. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/tests/string.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index 72eaa84..a6b02c6 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -38,6 +38,7 @@ static BOOL (WINAPI *pWindowsIsStringEmpty)(HSTRING); static HRESULT (WINAPI *pWindowsPreallocateStringBuffer)(UINT32, WCHAR **, HSTRING_BUFFER *); static HRESULT (WINAPI *pWindowsPromoteStringBuffer)(HSTRING_BUFFER, HSTRING *); static HRESULT (WINAPI *pWindowsStringHasEmbeddedNull)(HSTRING, BOOL *); +static HRESULT (WINAPI *pWindowsSubstring)(HSTRING, UINT32, HSTRING *); #define SET(x) p##x = (void*)GetProcAddress(hmod, #x) @@ -60,6 +61,7 @@ static BOOL init_functions(void) SET(WindowsPreallocateStringBuffer); SET(WindowsPromoteStringBuffer); SET(WindowsStringHasEmbeddedNull); + SET(WindowsSubstring); return TRUE; } @@ -92,6 +94,7 @@ static void _check_string(int line, HSTRING str, LPCWSTR content, UINT32 length, static const WCHAR input_string[] = { 'a', 'b', 'c', 'd', 'e', 'f', '\0', '\0' }; static const WCHAR input_empty_string[] = { '\0' }; static const WCHAR input_embed_null[] = { 'a', '\0', 'c', '\0', 'e', 'f', '\0' }; +static const WCHAR output_substring[] = { 'c', 'd', 'e', 'f', '\0' }; static void test_create_delete(void) { @@ -236,6 +239,62 @@ static void test_string_buffer(void) ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); } +static void test_substring(void) +{ + HSTRING str, substr; + HSTRING_HEADER header; + + /* Test substring of string buffers */ + ok(pWindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n"); + ok(pWindowsSubstring(str, 2, &substr) == S_OK, "Failed to create substring\n"); + check_string(substr, output_substring, 4, FALSE); + ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n"); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + + /* Test duplication of string using substring */ + ok(pWindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n"); + ok(pWindowsSubstring(str, 0, &substr) == S_OK, "Failed to create substring\n"); + ok(str != substr, "Duplicated string didn't create new string\n"); + check_string(substr, input_string, 6, FALSE); + ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n"); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + + /* Test substring of string reference */ + ok(pWindowsCreateStringReference(input_string, 6, &header, &str) == S_OK, "Failed to create string ref\n"); + ok(pWindowsSubstring(str, 2, &substr) == S_OK, "Failed to create substring of string ref\n"); + check_string(substr, output_substring, 4, FALSE); + ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n"); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string ref\n"); + + /* Test duplication of string reference using substring */ + ok(pWindowsCreateStringReference(input_string, 6, &header, &str) == S_OK, "Failed to create string ref\n"); + ok(pWindowsSubstring(str, 0, &substr) == S_OK, "Failed to create substring of string ref\n"); + ok(str != substr, "Duplicated string ref didn't create new string\n"); + check_string(substr, input_string, 6, FALSE); + ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n"); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + + /* Test get substring of empty string */ + ok(pWindowsSubstring(NULL, 0, &substr) == S_OK, "Failed to duplicate NULL string\n"); + ok(substr == NULL, "Substring created new string\n"); + + /* Test get empty substring of string */ + ok(pWindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n"); + ok(pWindowsSubstring(str, 6, &substr) == S_OK, "Failed to create substring\n"); + ok(substr == NULL, "Substring created new string\n"); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + + /* Test handling of using too high start index */ + ok(pWindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n"); + ok(pWindowsSubstring(str, 7, &substr) == E_BOUNDS, "Incorrect error handling\n"); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); + + /* Test handling of a NULL string */ + ok(pWindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n"); + ok(pWindowsSubstring(str, 7, NULL) == E_INVALIDARG, "Incorrect error handling\n"); + ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); +} + START_TEST(string) { if (!init_functions()) @@ -244,4 +303,5 @@ START_TEST(string) test_duplicate(); test_access(); test_string_buffer(); + test_substring(); }

1 0

Thomas Pointhuber : combase: Implement WindowsSubstring.
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: 3ba2d995c855de5f3fb164ccdd2a1bdcdb1a3c95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba2d995c855de5f3fb164ccd… Author: Thomas Pointhuber <thomas.pointhuber(a)gmx.at> Date: Fri Oct 23 03:22:40 2015 +0200 combase: Implement WindowsSubstring. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-string-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/string.c | 19 +++++++++++++++++++ include/winerror.h | 1 + 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec b/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec index 2361a1d..825980d 100644 --- a/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec @@ -21,7 +21,7 @@ @ stdcall WindowsPromoteStringBuffer(ptr ptr) combase.WindowsPromoteStringBuffer @ stub WindowsReplaceString @ stdcall WindowsStringHasEmbeddedNull(ptr ptr) combase.WindowsStringHasEmbeddedNull -@ stub WindowsSubstring +@ stdcall WindowsSubstring(ptr long ptr) combase.WindowsSubstring @ stub WindowsSubstringWithSpecifiedLength @ stub WindowsTrimStringEnd @ stub WindowsTrimStringStart diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 90f6c9d..bf8607a 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -302,7 +302,7 @@ @ stdcall WindowsPromoteStringBuffer(ptr ptr) @ stub WindowsReplaceString @ stdcall WindowsStringHasEmbeddedNull(ptr ptr) -@ stub WindowsSubstring +@ stdcall WindowsSubstring(ptr long ptr) @ stub WindowsSubstringWithSpecifiedLength @ stub WindowsTrimStringEnd @ stub WindowsTrimStringStart diff --git a/dlls/combase/string.c b/dlls/combase/string.c index 7054af6..33e5100 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -255,6 +255,25 @@ HRESULT WINAPI WindowsStringHasEmbeddedNull(HSTRING str, BOOL *out) } /*********************************************************************** + * WindowsSubstring (combase.@) + */ +HRESULT WINAPI WindowsSubstring(HSTRING str, UINT32 start, HSTRING *out) +{ + struct hstring_private *priv = impl_from_HSTRING(str); + UINT32 len = WindowsGetStringLen(str); + if (out == NULL) + return E_INVALIDARG; + if (start > len) + return E_BOUNDS; + if (start == len) + { + *out = NULL; + return S_OK; + } + return WindowsCreateString(&priv->buffer[start], len - start, out); +} + +/*********************************************************************** * WindowsIsStringEmpty (combase.@) */ BOOL WINAPI WindowsIsStringEmpty(HSTRING str) diff --git a/include/winerror.h b/include/winerror.h index c524798..e9cc7be 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2092,6 +2092,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define S_FALSE _HRESULT_TYPEDEF_(1) #define E_PENDING _HRESULT_TYPEDEF_(0x8000000A) +#define E_BOUNDS _HRESULT_TYPEDEF_(0x8000000B) #define E_NOTIMPL _HRESULT_TYPEDEF_(0x80004001)

1 0

Bruno Jesus : msvfw32: When no fccHandler is specified return the first valid codec.
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: a90ed505a756fa7309717bc2095f54800f539e59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a90ed505a756fa7309717bc20… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 23 00:04:13 2015 +0800 msvfw32: When no fccHandler is specified return the first valid codec. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 25 +++++++++++++++++++++++-- dlls/msvfw32/tests/msvfw.c | 2 -- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index c48479d..4f1a2bf 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -436,6 +436,27 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode) TRACE("(%s,%s,0x%08x)\n", wine_dbgstr_fcc(fccType), wine_dbgstr_fcc(fccHandler), wMode); + if (!fccHandler) /* No specific handler, return the first valid for wMode */ + { + HIC local; + ICINFO info; + DWORD loop = 0; + info.dwSize = sizeof(info); + while(ICInfo(fccType, loop++, &info)) + { + /* Ensure fccHandler is not 0x0 because we will recurse on ICOpen */ + if(!info.fccHandler) + continue; + local = ICOpen(fccType, info.fccHandler, wMode); + if (local != 0) + { + TRACE("Returning %s as defult handler for %s\n", + wine_dbgstr_fcc(info.fccHandler), wine_dbgstr_fcc(fccType)); + return local; + } + } + } + /* Check if there is a registered driver that matches */ driver = reg_driver_list; while(driver) @@ -448,7 +469,7 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode) driver = driver->next; if (driver && driver->proc) - /* The driver has been registered at runtime with its driverproc */ + /* The driver has been registered at runtime with its driverproc */ return ICOpenFunction(fccType, fccHandler, wMode, driver->proc); /* Well, lParam2 is in fact a LPVIDEO_OPEN_PARMS, but it has the @@ -478,7 +499,7 @@ HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode) codecname[9] = '\0'; hdrv = OpenDriver(codecname, drv32W, (LPARAM)&icopen); - if (!hdrv) + if (!hdrv) return 0; } else { /* The driver has been registered at runtime with its name */ diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index a9c4053..95f28f3 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -31,7 +31,6 @@ static void test_OpenCase(void) ICINFO info; /* Check if default handler works */ h = ICOpen(mmioFOURCC('v','i','d','c'),0,ICMODE_DECOMPRESS); -todo_wine ok(0!=h,"ICOpen(vidc.0) failed\n"); if (h) { info.dwSize = sizeof(info); @@ -41,7 +40,6 @@ todo_wine ok(ICClose(h)==ICERR_OK,"ICClose failed\n"); } h = ICOpen(mmioFOURCC('v','i','d','c'),0,ICMODE_COMPRESS); -todo_wine ok(0!=h || broken(h == 0),"ICOpen(vidc.0) failed\n"); /* Not present in Win8 */ if (h) { info.dwSize = sizeof(info);

1 0

Nikolay Sivov : include: Fix a couple of logical processor info structures.
by Alexandre Julliard 23 Oct '15

23 Oct '15

Module: wine Branch: master Commit: 75286b0ac7e72d375e1edb2fe7f858699cd80b50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75286b0ac7e72d375e1edb2fe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 22 17:39:56 2015 +0300 include: Fix a couple of logical processor info structures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index ded01f6..c7874dd 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5822,12 +5822,12 @@ typedef struct _PROCESSOR_NUMBER typedef struct _PROCESSOR_RELATIONSHIP { BYTE Flags; - BYTE Reserved[21]; + BYTE EfficiencyClass; + BYTE Reserved[20]; WORD GroupCount; GROUP_AFFINITY GroupMask[ANYSIZE_ARRAY]; } PROCESSOR_RELATIONSHIP, *PPROCESSOR_RELATIONSHIP; - typedef struct _NUMA_NODE_RELATIONSHIP { DWORD NodeNumber; @@ -5840,6 +5840,7 @@ typedef struct _CACHE_RELATIONSHIP BYTE Level; BYTE Associativity; WORD LineSize; + DWORD CacheSize; PROCESSOR_CACHE_TYPE Type; BYTE Reserved[20]; GROUP_AFFINITY GroupMask;

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2015