wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Dmitry Timoshkov : ole32: Fallback to parsing the Presentation streams ff parsing of the "CONTENTS" stream fails.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 421b3ca3eb16a3ca254b615f6c7dfc1619c973e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=421b3ca3eb16a3ca254b615f6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 23 18:32:22 2015 +0800 ole32: Fallback to parsing the Presentation streams ff parsing of the "CONTENTS" stream fails. I have an application that tries to load an existing object from the file using OleLoad() and fails because the "CONTENTS" stream has clsid set to "Microsoft Photo Editor 3.0 Picture". I've dumped the contents of the OLE storage to disk for investigation, and under Windows (where Microsoft Photo Editor is not installed, and registry has no traces of its class guids) OleLoad() is able to load objects from this storage, and after that OleDraw() successfully paints the object contents on the screen. I've written an application to play with the dumped storage, and under Windows the "CONTENTS" stream also can't be loaded, but the storage also contains the "OlePres000" stream which contains an object in CF_METAFILEPICT format, and this one can be loaded and painted. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index caabd10..9284410 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1368,7 +1368,8 @@ static HRESULT WINAPI DataCache_Load( IPersistStorage *iface, IStorage *pStg ) hr = parse_contents_stream( This, pStg, stm ); IStream_Release( stm ); } - else + + if (FAILED(hr)) hr = parse_pres_streams( This, pStg ); if (SUCCEEDED( hr ))

1 0

Alexandre Julliard : makefiles: Generate rules for installing symlinks.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 356e46a1ef9f866f4a548674b4811a98d1b1847c URL: http://source.winehq.org/git/wine.git/?a=commit;h=356e46a1ef9f866f4a548674b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 18:06:35 2015 +0900 makefiles: Generate rules for installing symlinks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 23 ++++++++++++++++++++++- tools/winegcc/Makefile.in | 21 +++------------------ 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index ffd286f..30bbc3e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1831,6 +1831,9 @@ static void output_install_rules( struct makefile *make, struct strarray files, output( "\t%s $(INSTALL_SCRIPT_FLAGS) %s $(DESTDIR)%s\n", install_sh, src_dir_path( make, file ), dest + 1 ); break; + case 'y': /* symlink */ + output( "\t$(RM) $(DESTDIR)%s && $(LN_S) %s $(DESTDIR)%s\n", dest + 1, file, dest + 1 ); + break; default: assert(0); } @@ -1853,7 +1856,7 @@ static void output_install_rules( struct makefile *make, struct strarray files, static struct strarray output_sources( struct makefile *make, struct strarray *testlist_files ) { struct incl_file *source; - unsigned int i; + unsigned int i, j; struct strarray object_files = empty_strarray; struct strarray crossobj_files = empty_strarray; struct strarray res_files = empty_strarray; @@ -2018,6 +2021,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t { if (strendswith( obj, ".man" ) && source->file->args) { + struct strarray symlinks; char *dir, *dest = replace_extension( obj, ".man", "" ); char *lang = strchr( dest, '.' ); char *section = source->file->args; @@ -2028,6 +2032,10 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t } else dir = strmake( "$(mandir)/man%s", section ); add_install_rule( make, dest, xstrdup(obj), strmake( "d%s/%s.%s", dir, dest, section )); + symlinks = get_expanded_make_var_array( make, file_local_var( dest, "SYMLINKS" )); + for (j = 0; j < symlinks.count; j++) + add_install_rule( make, symlinks.str[j], strmake( "%s.%s", dest, section ), + strmake( "y%s/%s.%s", dir, symlinks.str[j], section )); free( dest ); free( dir ); strarray_add( &all_targets, xstrdup(obj) ); @@ -2447,6 +2455,8 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t struct strarray all_libs = empty_strarray; struct strarray objs = get_expanded_make_var_array( make, file_local_var( make->programs.str[i], "OBJS" )); + struct strarray symlinks = get_expanded_make_var_array( make, + file_local_var( make->programs.str[i], "SYMLINKS" )); if (!objs.count) objs = object_files; output( "%s:", obj_dir_path( make, program ) ); @@ -2485,8 +2495,19 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t output( "\n" ); strarray_add( &all_targets, program ); + if (symlinks.count) + { + output_filenames_obj_dir( make, symlinks ); + output( ": %s\n", obj_dir_path( make, program )); + output( "\t$(RM) $@ && $(LN_S) %s $@\n", obj_dir_path( make, program )); + strarray_addall( &all_targets, symlinks ); + } + add_install_rule( make, program, program_installed ? program_installed : program, strmake( "p$(bindir)/%s", program )); + for (j = 0; j < symlinks.count; j++) + add_install_rule( make, symlinks.str[j], program, + strmake( "y$(bindir)/%s%s", symlinks.str[j], exe_ext )); } for (i = 0; i < make->scripts.count; i++) diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index 1a3b2a7..daeb91b 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -2,6 +2,8 @@ PROGRAMS = winegcc MANPAGES = winegcc.man.in +winegcc_SYMLINKS = winecpp wineg++ + C_SRCS = \ utils.c \ winegcc.c @@ -16,21 +18,4 @@ winegcc_EXTRADEFS = \ -DLD="\"$(LD)\"" \ -DPRELINK="\"$(PRELINK)\"" -INSTALL_DEV = $(PROGRAMS) - -EXTRA_TARGETS = winecpp$(EXEEXT) wineg++$(EXEEXT) - -all: $(EXTRA_TARGETS) - -winecpp$(EXEEXT) wineg++$(EXEEXT): winegcc$(EXEEXT) - $(RM) $@ && $(LN_S) winegcc$(EXEEXT) $@ - -install install-dev:: - cd $(DESTDIR)$(bindir) && $(RM) wineg++$(EXEEXT) && $(LN_S) winegcc$(EXEEXT) wineg++$(EXEEXT) - cd $(DESTDIR)$(bindir) && $(RM) winecpp$(EXEEXT) && $(LN_S) winegcc$(EXEEXT) winecpp$(EXEEXT) - cd $(DESTDIR)$(mandir)/man$(prog_manext) && $(RM) wineg++.$(prog_manext) && $(LN_S) winegcc.$(prog_manext) wineg++.$(prog_manext) - cd $(DESTDIR)$(mandir)/man$(prog_manext) && $(RM) winecpp.$(prog_manext) && $(LN_S) winegcc.$(prog_manext) winecpp.$(prog_manext) - -uninstall:: - $(RM) $(DESTDIR)$(bindir)/wineg++$(EXEEXT) $(DESTDIR)$(bindir)/winecpp$(EXEEXT) - $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/wineg++.$(prog_manext) $(DESTDIR)$(mandir)/man$(prog_manext)/winecpp.$(prog_manext) +INSTALL_DEV = $(PROGRAMS) $(winegcc_SYMLINKS)

1 0

Alexandre Julliard : makefiles: Generate rules for installing scripts.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 5cd3395975f687ba8390fddda38bd110d98b30ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cd3395975f687ba8390fddda… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 14:43:54 2015 +0900 makefiles: Generate rules for installing scripts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 6 ++++++ tools/winedump/Makefile.in | 9 ++------- tools/winemaker/Makefile.in | 10 +++------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9a21397..ffd286f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -150,6 +150,7 @@ struct makefile struct strarray include_args; struct strarray define_args; struct strarray programs; + struct strarray scripts; struct strarray appmode; struct strarray imports; struct strarray delayimports; @@ -2488,6 +2489,10 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t strmake( "p$(bindir)/%s", program )); } + for (i = 0; i < make->scripts.count; i++) + add_install_rule( make, make->scripts.str[i], make->scripts.str[i], + strmake( "S$(bindir)/%s", make->scripts.str[i] )); + if (all_targets.count) { output( "all:" ); @@ -2775,6 +2780,7 @@ static void update_makefile( const char *path ) make->importlib = get_expanded_make_variable( make, "IMPORTLIB" ); make->programs = get_expanded_make_var_array( make, "PROGRAMS" ); + make->scripts = get_expanded_make_var_array( make, "SCRIPTS" ); make->appmode = get_expanded_make_var_array( make, "APPMODE" ); make->imports = get_expanded_make_var_array( make, "IMPORTS" ); make->delayimports = get_expanded_make_var_array( make, "DELAYIMPORTS" ); diff --git a/tools/winedump/Makefile.in b/tools/winedump/Makefile.in index a93f078..b55ac72 100644 --- a/tools/winedump/Makefile.in +++ b/tools/winedump/Makefile.in @@ -1,5 +1,6 @@ PROGRAMS = winedump MANPAGES = winedump.man.in +SCRIPTS = function_grep.pl C_SRCS = \ debug.c \ @@ -23,10 +24,4 @@ C_SRCS = \ symbol.c \ tlb.c -INSTALL_DEV = $(PROGRAMS) - -install install-dev:: - $(INSTALL_SCRIPT) $(srcdir)/function_grep.pl $(DESTDIR)$(bindir)/function_grep.pl - -uninstall:: - $(RM) $(DESTDIR)$(bindir)/function_grep.pl +INSTALL_DEV = $(PROGRAMS) $(SCRIPTS) diff --git a/tools/winemaker/Makefile.in b/tools/winemaker/Makefile.in index 6afa016..37e345d 100644 --- a/tools/winemaker/Makefile.in +++ b/tools/winemaker/Makefile.in @@ -1,12 +1,8 @@ +SCRIPTS = winemaker + MANPAGES = \ winemaker.de.UTF-8.man.in \ winemaker.fr.UTF-8.man.in \ winemaker.man.in -INSTALL_DEV = winemaker - -install install-dev:: - $(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker - -uninstall:: - $(RM) $(DESTDIR)$(bindir)/winemaker +INSTALL_DEV = $(SCRIPTS)

1 0

Alexandre Julliard : makefiles: Generate rules for installing programs.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: da340169d6518cf42f1cbe169fbf120383202bdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=da340169d6518cf42f1cbe169… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 14:32:45 2015 +0900 makefiles: Generate rules for installing programs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 15 +---- configure.ac | 15 +---- server/Makefile.in | 8 +-- tools/make_makefiles | 5 ++ tools/makedep.c | 135 ++++++++++++++++++++++++++++++++++++-------- tools/widl/Makefile.in | 8 +-- tools/winebuild/Makefile.in | 8 +-- tools/winedump/Makefile.in | 7 +-- tools/winegcc/Makefile.in | 9 ++- tools/winemaker/Makefile.in | 4 +- tools/wmc/Makefile.in | 8 +-- tools/wrc/Makefile.in | 8 +-- 12 files changed, 133 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da340169d6518cf42f1cb…

1 0

Gerald Pfeifer : gdiplus: Avoid shift overflow in get_gif_background_color.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 8f5b50d46ba09e2699e044fc48ee586f6b1f4ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f5b50d46ba09e2699e044fc4… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Oct 19 22:06:42 2015 +0200 gdiplus: Avoid shift overflow in get_gif_background_color. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 53ace05..f803efa 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3838,7 +3838,7 @@ static DWORD get_gif_background_color(GpBitmap *bitmap) if(bitmap->prop_item[i].id == PropertyTagGlobalPalette) { if(bitmap->prop_item[i].length/3 > bgcolor_idx) { BYTE *color = ((BYTE*)bitmap->prop_item[i].value)+bgcolor_idx*3; - return color[2] + (color[1]<<8) + (color[0]<<16) + (0xff<<24); + return color[2] + (color[1]<<8) + (color[0]<<16) + (0xffu<<24); } break; }

1 0

Michael Stefaniuc : ddraw/tests: Use the proper type for a return value ( PVS-Studio).
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: ad4057803dd23be219f7e1406780e7a6adb937d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad4057803dd23be219f7e1406… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 29 01:01:28 2015 +0100 ddraw/tests: Use the proper type for a return value (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddrawmodes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 13e2732..f5b0666 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -932,8 +932,8 @@ static void testcooperativelevels_exclusive(void) /* rect_before_create is assumed to hold the screen rect */ GetClientRect(hwnd, &window_rect); - rc = EqualRect(&rect_before_create, &window_rect); - ok(rc, "Fullscreen window has wrong size.\n"); + success = EqualRect(&rect_before_create, &window_rect); + ok(success, "Fullscreen window has wrong size.\n"); /* Set the focus window. Should fail */ rc = IDirectDraw_SetCooperativeLevel(lpDD,

1 0

Sebastian Lackner : server: Remove unused device manager argument from set_irp_result call.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 408b7ea6b3607217152a0af34ea9d700d8573c28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=408b7ea6b3607217152a0af34… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 28 23:18:49 2015 +0100 server: Remove unused device manager argument from set_irp_result call. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 -- include/wine/server_protocol.h | 6 ++---- server/device.c | 6 ------ server/protocol.def | 3 +-- server/request.h | 9 ++++----- server/trace.c | 5 ++--- 6 files changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 96af772..31f0b15 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1271,13 +1271,11 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) handle = (HANDLE)irp->UserIosb; if (handle) { - HANDLE manager = get_device_manager(); void *out_buff = irp->UserBuffer; FILE_OBJECT *file = irp->Tail.Overlay.OriginalFileObject; SERVER_START_REQ( set_irp_result ) { - req->manager = wine_server_obj_handle( manager ); req->handle = wine_server_obj_handle( handle ); req->status = irp->IoStatus.u.Status; req->file_ptr = wine_server_client_ptr( file ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 2ba71e8..105273d 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3228,13 +3228,11 @@ struct ioctl_reply struct set_irp_result_request { struct request_header __header; - obj_handle_t manager; obj_handle_t handle; unsigned int status; - client_ptr_t file_ptr; data_size_t size; + client_ptr_t file_ptr; /* VARARG(data,bytes); */ - char __pad_36[4]; }; struct set_irp_result_reply { @@ -6149,6 +6147,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 487 +#define SERVER_PROTOCOL_VERSION 488 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/device.c b/server/device.c index 9ef587c..fb91c02 100644 --- a/server/device.c +++ b/server/device.c @@ -807,11 +807,6 @@ DECL_HANDLER(get_next_device_request) DECL_HANDLER(set_irp_result) { struct irp_call *irp; - struct device_manager *manager; - - if (!(manager = (struct device_manager *)get_handle_obj( current->process, req->manager, - 0, &device_manager_ops ))) - return; if ((irp = (struct irp_call *)get_handle_obj( current->process, req->handle, 0, &irp_call_ops ))) { @@ -820,7 +815,6 @@ DECL_HANDLER(set_irp_result) close_handle( current->process, req->handle ); /* avoid an extra round-trip for close */ release_object( irp ); } - release_object( manager ); } diff --git a/server/protocol.def b/server/protocol.def index c313006..5b45078 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2345,11 +2345,10 @@ enum message_type /* Store results of an async irp */ @REQ(set_irp_result) - obj_handle_t manager; /* handle to the device manager */ obj_handle_t handle; /* handle to the irp */ unsigned int status; /* status of the irp */ - client_ptr_t file_ptr; /* opaque pointer to the file object */ data_size_t size; /* result size (input or output depending on the operation) */ + client_ptr_t file_ptr; /* opaque pointer to the file object */ VARARG(data,bytes); /* output data of the irp */ @END diff --git a/server/request.h b/server/request.h index 9405179..fefabaa 100644 --- a/server/request.h +++ b/server/request.h @@ -1563,12 +1563,11 @@ C_ASSERT( sizeof(struct ioctl_request) == 64 ); C_ASSERT( FIELD_OFFSET(struct ioctl_reply, wait) == 8 ); C_ASSERT( FIELD_OFFSET(struct ioctl_reply, options) == 12 ); C_ASSERT( sizeof(struct ioctl_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, manager) == 12 ); -C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, handle) == 16 ); -C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, status) == 20 ); +C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, status) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, size) == 20 ); C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, file_ptr) == 24 ); -C_ASSERT( FIELD_OFFSET(struct set_irp_result_request, size) == 32 ); -C_ASSERT( sizeof(struct set_irp_result_request) == 40 ); +C_ASSERT( sizeof(struct set_irp_result_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_irp_result_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_irp_result_request, user_arg) == 16 ); C_ASSERT( sizeof(struct get_irp_result_request) == 24 ); diff --git a/server/trace.c b/server/trace.c index 07aee80..62867c2 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2834,11 +2834,10 @@ static void dump_ioctl_reply( const struct ioctl_reply *req ) static void dump_set_irp_result_request( const struct set_irp_result_request *req ) { - fprintf( stderr, " manager=%04x", req->manager ); - fprintf( stderr, ", handle=%04x", req->handle ); + fprintf( stderr, " handle=%04x", req->handle ); fprintf( stderr, ", status=%08x", req->status ); - dump_uint64( ", file_ptr=", &req->file_ptr ); fprintf( stderr, ", size=%u", req->size ); + dump_uint64( ", file_ptr=", &req->file_ptr ); dump_varargs_bytes( ", data=", cur_size ); }

1 0

Sebastian Lackner : server: Unconditionally close APC handle in get_apc_result call.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 23cdc7e529c616e6a26adbd8875e36ad992ea683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23cdc7e529c616e6a26adbd88… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 29 02:34:02 2015 +0100 server: Unconditionally close APC handle in get_apc_result call. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 1 - server/thread.c | 13 ++++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index f6457db..356d631 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -677,7 +677,6 @@ unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, a SERVER_END_REQ; if (!ret && result->type == APC_NONE) continue; /* APC didn't run, try again */ - if (ret) NtClose( handle ); } return ret; } diff --git a/server/thread.c b/server/thread.c index 6383000..d65ea89 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1602,13 +1602,12 @@ DECL_HANDLER(get_apc_result) if (!(apc = (struct thread_apc *)get_handle_obj( current->process, req->handle, 0, &thread_apc_ops ))) return; - if (!apc->executed) set_error( STATUS_PENDING ); - else - { - reply->result = apc->result; - /* close the handle directly to avoid an extra round-trip */ - close_handle( current->process, req->handle ); - } + + if (apc->executed) reply->result = apc->result; + else set_error( STATUS_PENDING ); + + /* close the handle directly to avoid an extra round-trip */ + close_handle( current->process, req->handle ); release_object( apc ); }

1 0

Sebastian Lackner : server: Remove a wrong release_object in write_console_input.
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 51d17bfd2f47ff65cd48a02d5bfc476a96c1f23f URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d17bfd2f47ff65cd48a02d5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 29 01:32:25 2015 +0100 server: Remove a wrong release_object in write_console_input. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 1 - 1 file changed, 1 deletion(-) diff --git a/server/console.c b/server/console.c index 10b1350..78e91d6 100644 --- a/server/console.c +++ b/server/console.c @@ -632,7 +632,6 @@ static int write_console_input( struct console_input* console, int count, (console->recnum + count) * sizeof(INPUT_RECORD) ))) { set_error( STATUS_NO_MEMORY ); - release_object( console ); return -1; } console->records = new_rec;

1 0

Ken Thomases : winemac: Add another workaround for bad side effects of CGWarpMouseCursorPosition( ).
by Alexandre Julliard 29 Oct '15

29 Oct '15

Module: wine Branch: master Commit: 9d6a14305a42b1595344429ac04d5122bc1cab5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6a14305a42b1595344429ac… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 28 17:01:54 2015 -0500 winemac: Add another workaround for bad side effects of CGWarpMouseCursorPosition(). Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 8e1f318..7f6ca23 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1307,20 +1307,27 @@ int macdrv_err_on; } else { + // Annoyingly, CGWarpMouseCursorPosition() effectively disassociates + // the mouse from the cursor position for 0.25 seconds. This means + // that mouse movement during that interval doesn't move the cursor + // and events carry a constant location (the warped-to position) + // even though they have delta values. For apps which warp the + // cursor frequently (like after every mouse move), this makes + // cursor movement horribly laggy and jerky, as only a fraction of + // mouse move events have any effect. + // + // On some versions of OS X, it's sufficient to forcibly reassociate + // the mouse and cursor position. On others, it's necessary to set + // the local events suppression interval to 0 for the warp. That's + // deprecated, but I'm not aware of any other way. For good + // measure, we do both. + CGSetLocalEventsSuppressionInterval(0); ret = (CGWarpMouseCursorPosition(pos) == kCGErrorSuccess); + CGSetLocalEventsSuppressionInterval(0.25); if (ret) { lastSetCursorPositionTime = [[NSProcessInfo processInfo] systemUptime]; - // Annoyingly, CGWarpMouseCursorPosition() effectively disassociates - // the mouse from the cursor position for 0.25 seconds. This means - // that mouse movement during that interval doesn't move the cursor - // and events carry a constant location (the warped-to position) - // even though they have delta values. This screws us up because - // the accumulated deltas we send to Wine don't match any eventual - // absolute position we send (like with a button press). We can - // work around this by simply forcibly reassociating the mouse and - // cursor position. CGAssociateMouseAndMouseCursorPosition(true); } }

1 0

← Newer
1
2
3
4
5
6
7
8
...
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