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

H. Verbeet : wined3d: Remove GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT from debug_fbostatus ().
by Alexandre Julliard April 19, 2007

April 19, 2007

Module: wine Branch: master Commit: a7638ac5a29d57832c4b26f5c1ed425adb658dcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7638ac5a29d57832c4b26f5c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Apr 18 22:00:21 2007 +0200 wined3d: Remove GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT from debug_fbostatus(). --- dlls/wined3d/utils.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a9eb3ea..8817fd0 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -702,7 +702,6 @@ const char *debug_fbostatus(GLenum status) { FBOSTATUS_TO_STR(GL_FRAMEBUFFER_COMPLETE_EXT); FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT); FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT); - FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT); FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT); FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT); FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT);

1 0

Hans Leidekker : shell32: Add a stub implementation for OpenAs_RunDLL.
by Alexandre Julliard April 19, 2007

April 19, 2007

Module: wine Branch: master Commit: 395ba3b945f7e09b7c964e6e437fe23570c82afd URL: http://source.winehq.org/git/wine.git/?a=commit;h=395ba3b945f7e09b7c964e6e4… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Apr 18 21:33:13 2007 +0200 shell32: Add a stub implementation for OpenAs_RunDLL. --- dlls/shell32/shell32.spec | 6 +++--- dlls/shell32/shlexec.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 23004ce..415fe95 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -299,9 +299,9 @@ @ stub InternalExtractIconListA @ stub InternalExtractIconListW @ stub OCInstall -@ stub OpenAs_RunDLL -@ stub OpenAs_RunDLLA -@ stub OpenAs_RunDLLW +@ stdcall OpenAs_RunDLL(long long str long) OpenAs_RunDLLA +@ stdcall OpenAs_RunDLLA(long long str long) +@ stdcall OpenAs_RunDLLW(long long wstr long) @ stub PrintersGetCommand_RunDLL @ stub PrintersGetCommand_RunDLLA @ stub PrintersGetCommand_RunDLLW diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index debef31..6e38dbd 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1762,3 +1762,19 @@ HINSTANCE WINAPI ShellExecuteW(HWND hwnd, LPCWSTR lpOperation, LPCWSTR lpFile, SHELL_execute( &sei, SHELL_ExecuteW ); return sei.hInstApp; } + +/************************************************************************* + * OpenAs_RunDLLA [SHELL32.@] + */ +void WINAPI OpenAs_RunDLLA(HWND hwnd, HINSTANCE hinst, LPCSTR cmdline, int cmdshow) +{ + FIXME("%p, %p, %s, %d\n", hwnd, hinst, debugstr_a(cmdline), cmdshow); +} + +/************************************************************************* + * OpenAs_RunDLLW [SHELL32.@] + */ +void WINAPI OpenAs_RunDLLW(HWND hwnd, HINSTANCE hinst, LPCWSTR cmdline, int cmdshow) +{ + FIXME("%p, %p, %s, %d\n", hwnd, hinst, debugstr_w(cmdline), cmdshow); +}

1 0

Hans Leidekker : msvcrt: Correct the spec file entry for _makepath.
by Alexandre Julliard April 19, 2007

April 19, 2007

Module: wine Branch: master Commit: 480faefe612eca6c98def3b70a92ef7611986c61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=480faefe612eca6c98def3b70… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Apr 18 21:33:25 2007 +0200 msvcrt: Correct the spec file entry for _makepath. --- dlls/msvcrt/msvcrt.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3ea7803..66f2ede 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -335,7 +335,7 @@ @ cdecl -ret64 _lseeki64(long double long) @ cdecl _ltoa(long ptr long) ntdll._ltoa @ cdecl _ltow(long ptr long) ntdll._ltow -@ cdecl _makepath(str str str str str) +@ cdecl _makepath(ptr str str str str) @ cdecl _matherr(ptr) MSVCRT__matherr @ cdecl _mbbtombc(long) @ cdecl _mbbtype(long long)

1 0

Hans Leidekker : iphlpapi: Only call res_init() once per process.
by Alexandre Julliard April 19, 2007

April 19, 2007

Module: wine Branch: master Commit: dfebf1b91d29898731af7976fcc23ff4ac683b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfebf1b91d29898731af7976f… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Apr 18 20:39:33 2007 +0200 iphlpapi: Only call res_init() once per process. --- dlls/dnsapi/query.c | 15 +++++++++++++-- dlls/iphlpapi/iphlpapi_main.c | 14 +++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 38f8801..5d9d6db 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -65,6 +65,17 @@ static CRITICAL_SECTION resolver_cs = { &resolver_cs_debug, -1, 0, 0, 0, 0 }; #define LOCK_RESOLVER() do { EnterCriticalSection( &resolver_cs ); } while (0) #define UNLOCK_RESOLVER() do { LeaveCriticalSection( &resolver_cs ); } while (0) +static int resolver_initialised; + +/* call res_init() just once because of a bug in Mac OSX 10.4 */ +static void initialise_resolver( void ) +{ + if (!resolver_initialised) + { + res_init(); + resolver_initialised = 1; + } +} static const char *dns_section_to_str( ns_sect section ) { @@ -699,7 +710,7 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PIP4_ARRA LOCK_RESOLVER(); - res_init(); + initialise_resolver(); _res.options |= dns_map_options( options ); if (servers && (ret = dns_set_serverlist( servers ))) @@ -817,7 +828,7 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PWSTR adap #ifdef HAVE_RESOLV LOCK_RESOLVER(); - res_init(); + initialise_resolver(); ret = dns_get_serverlist( buffer, len ); UNLOCK_RESOLVER(); diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index e408547..c80e1e0 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -50,6 +50,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); #define INADDR_NONE ~0UL #endif +static int resolver_initialised; + +/* call res_init() just once because of a bug in Mac OSX 10.4 */ +static void initialise_resolver(void) +{ + if (!resolver_initialised) + { + res_init(); + resolver_initialised = 1; + } +} + BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch (fdwReason) { @@ -1340,7 +1352,7 @@ DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen) if (!pOutBufLen) return ERROR_INVALID_PARAMETER; - res_init(); + initialise_resolver(); size = sizeof(FIXED_INFO) + (_res.nscount > 0 ? (_res.nscount - 1) * sizeof(IP_ADDR_STRING) : 0); if (!pFixedInfo || *pOutBufLen < size) {

1 0

Andrew Talbot : dbghelp: Constify some variables.
by Alexandre Julliard April 19, 2007

April 19, 2007

Module: wine Branch: master Commit: 645d76f8890a9624621798decfb1723204464dc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=645d76f8890a9624621798dec… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Apr 18 22:24:27 2007 +0100 dbghelp: Constify some variables. --- dlls/dbghelp/msc.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index dcd24e9..6b99ed4 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -321,7 +321,7 @@ struct codeview_type_parse DWORD num; }; -static inline const void* codeview_jump_to_type(struct codeview_type_parse* ctp, DWORD idx) +static inline const void* codeview_jump_to_type(const struct codeview_type_parse* ctp, DWORD idx) { if (idx < FIRST_DEFINABLE_TYPE) return NULL; idx -= FIRST_DEFINABLE_TYPE; @@ -1926,7 +1926,7 @@ static HANDLE open_pdb_file(const struct process* pcs, } static void pdb_process_types(const struct msc_debug_info* msc_dbg, - const char* image, struct pdb_lookup* pdb_lookup) + const char* image, const struct pdb_lookup* pdb_lookup) { BYTE* types_image = NULL; @@ -2098,9 +2098,10 @@ static BOOL pdb_process_internal(const struct process* pcs, static void pdb_process_symbol_imports(const struct process* pcs, const struct msc_debug_info* msc_dbg, - PDB_SYMBOLS* symbols, + const PDB_SYMBOLS* symbols, const void* symbols_image, - char* image, struct pdb_lookup* pdb_lookup, + const char* image, + const struct pdb_lookup* pdb_lookup, unsigned module_index) { if (module_index == -1 && symbols && symbols->pdbimport_size)

1 0

Alexandre Julliard : server: Allow specifying the status code to return on file descriptors that don' t have a Unix fd.
by Alexandre Julliard April 19, 2007

April 19, 2007

Module: wine Branch: master Commit: f3fbae4546597916cb4ebacc54597766f5894b08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3fbae4546597916cb4ebacc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 18 16:05:59 2007 +0200 server: Allow specifying the status code to return on file descriptors that don't have a Unix fd. --- server/fd.c | 50 +++++++++++++++++++++----------------------------- server/file.h | 1 + 2 files changed, 22 insertions(+), 29 deletions(-) diff --git a/server/fd.c b/server/fd.c index d24eedc..6372f43 100644 --- a/server/fd.c +++ b/server/fd.c @@ -170,9 +170,9 @@ struct fd unsigned int options; /* file options (FILE_DELETE_ON_CLOSE, FILE_SYNCHRONOUS...) */ unsigned int sharing; /* file sharing mode */ int unix_fd; /* unix file descriptor */ + unsigned int no_fd_status;/* status to return when unix_fd is -1 */ int signaled :1; /* is the fd signaled? */ int fs_locks :1; /* can we use filesystem locks for this fd? */ - int unmounted :1;/* has the device been unmounted? */ int poll_index; /* index of fd in poll array */ struct async_queue *read_q; /* async readers of this fd */ struct async_queue *write_q; /* async writers of this fd */ @@ -1368,7 +1368,7 @@ static inline void unmount_fd( struct fd *fd ) if (fd->unix_fd != -1) close( fd->unix_fd ); fd->unix_fd = -1; - fd->unmounted = 1; + fd->no_fd_status = STATUS_VOLUME_DISMOUNTED; fd->closed->unix_fd = -1; fd->closed->unlink[0] = 0; @@ -1393,7 +1393,6 @@ static struct fd *alloc_fd_object(void) fd->unix_fd = -1; fd->signaled = 1; fd->fs_locks = 1; - fd->unmounted = 0; fd->poll_index = -1; fd->read_q = NULL; fd->write_q = NULL; @@ -1425,16 +1424,22 @@ struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *use fd->unix_fd = -1; fd->signaled = 0; fd->fs_locks = 0; - fd->unmounted = 0; fd->poll_index = -1; fd->read_q = NULL; fd->write_q = NULL; fd->wait_q = NULL; + fd->no_fd_status = STATUS_BAD_DEVICE_TYPE; list_init( &fd->inode_entry ); list_init( &fd->locks ); return fd; } +/* set the status to return when the fd has no associated unix fd */ +void set_no_fd_status( struct fd *fd, unsigned int status ) +{ + fd->no_fd_status = status; +} + /* check if the desired access is possible without violating */ /* the sharing mode of other opens of the same file */ static int check_sharing( struct fd *fd, unsigned int access, unsigned int sharing ) @@ -1632,11 +1637,7 @@ unsigned int get_fd_options( struct fd *fd ) /* retrieve the unix fd for an object */ int get_unix_fd( struct fd *fd ) { - if (fd->unix_fd == -1) - { - if (fd->unmounted) set_error( STATUS_VOLUME_DISMOUNTED ); - else set_error( STATUS_BAD_DEVICE_TYPE ); - } + if (fd->unix_fd == -1) set_error( fd->no_fd_status ); return fd->unix_fd; } @@ -1932,19 +1933,15 @@ DECL_HANDLER(get_handle_fd) if ((fd = get_handle_fd_obj( current->process, req->handle, 0 ))) { - reply->type = fd->fd_ops->get_fd_type( fd ); - if (reply->type != FD_TYPE_INVALID) + int unix_fd = get_unix_fd( fd ); + if (unix_fd != -1) { - int unix_fd = get_unix_fd( fd ); - if (unix_fd != -1) - { - send_client_fd( current->process, unix_fd, req->handle ); - reply->removable = is_fd_removable(fd); - reply->options = fd->options; - reply->access = get_handle_access( current->process, req->handle ); - } + send_client_fd( current->process, unix_fd, req->handle ); + reply->type = fd->fd_ops->get_fd_type( fd ); + reply->removable = is_fd_removable(fd); + reply->options = fd->options; + reply->access = get_handle_access( current->process, req->handle ); } - else set_error( STATUS_OBJECT_TYPE_MISMATCH ); release_object( fd ); } } @@ -1983,7 +1980,7 @@ DECL_HANDLER(register_async) if ((fd = get_handle_fd_obj( current->process, req->handle, access ))) { - fd->fd_ops->queue_async( fd, &req->async, req->type, req->count ); + if (get_unix_fd( fd ) != -1) fd->fd_ops->queue_async( fd, &req->async, req->type, req->count ); release_object( fd ); } } @@ -1992,15 +1989,10 @@ DECL_HANDLER(register_async) DECL_HANDLER(cancel_async) { struct fd *fd = get_handle_fd_obj( current->process, req->handle, 0 ); + if (fd) { - /* Note: we don't kill the queued APC_ASYNC_IO on this thread because - * NtCancelIoFile() will force the pending APC to be run. Since, - * Windows only guarantees that the current thread will have no async - * operation on the current fd when NtCancelIoFile returns, this shall - * do the work. - */ - fd->fd_ops->cancel_async( fd ); + if (get_unix_fd( fd ) != -1) fd->fd_ops->cancel_async( fd ); release_object( fd ); - } + } } diff --git a/server/file.h b/server/file.h index 262a011..09c90c3 100644 --- a/server/file.h +++ b/server/file.h @@ -53,6 +53,7 @@ struct fd_ops /* file descriptor functions */ extern struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *user ); +extern void set_no_fd_status( struct fd *fd, unsigned int status ); extern struct fd *open_fd( const char *name, int flags, mode_t *mode, unsigned int access, unsigned int sharing, unsigned int options ); extern struct fd *create_anonymous_fd( const struct fd_ops *fd_user_ops,

1 0

Alexandre Julliard : server: Don't give out read/ write access to the named pipe device.
by Alexandre Julliard April 19, 2007

April 19, 2007

Module: wine Branch: master Commit: bf5b6c9b34b0b57f1f26556011bd516b14fe65f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf5b6c9b34b0b57f1f2655601… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 18 16:32:31 2007 +0200 server: Don't give out read/write access to the named pipe device. --- server/named_pipe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 4894576..f2c7947 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -228,7 +228,7 @@ static const struct object_ops named_pipe_device_ops = no_satisfied, /* satisfied */ no_signal, /* signal */ named_pipe_device_get_fd, /* get_fd */ - pipe_map_access, /* map_access */ + no_map_access, /* map_access */ named_pipe_device_lookup_name, /* lookup_name */ named_pipe_device_open_file, /* open_file */ fd_close_handle, /* close_handle */

1 0

Alexandre Julliard : server: Use the standard file descriptor wait queue for named pipe server async waits .
by Alexandre Julliard April 19, 2007

April 19, 2007

Module: wine Branch: master Commit: c18e8d6a697c246a5776f44c8685bed22a881a22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c18e8d6a697c246a5776f44c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 18 16:28:01 2007 +0200 server: Use the standard file descriptor wait queue for named pipe server async waits. --- server/fd.c | 4 ++-- server/named_pipe.c | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/server/fd.c b/server/fd.c index 6372f43..656042f 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1738,12 +1738,12 @@ struct async *fd_queue_async( struct fd *fd, const async_data_t *data, int type, assert(0); } - if ((async = create_async( current, queue, data ))) + if ((async = create_async( current, queue, data )) && type != ASYNC_TYPE_WAIT) { if (!fd->inode) set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); else /* regular files are always ready for read and write */ - if (type != ASYNC_TYPE_WAIT) async_wake_up( queue, STATUS_ALERTED ); + async_wake_up( queue, STATUS_ALERTED ); } return async; } diff --git a/server/named_pipe.c b/server/named_pipe.c index 9db5a58..4894576 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -76,7 +76,6 @@ struct pipe_server struct named_pipe *pipe; struct timeout_user *flush_poll; struct event *event; - struct async_queue *wait_q; /* only a single one can be queued */ unsigned int options; /* pipe options */ }; @@ -385,8 +384,6 @@ static void pipe_server_destroy( struct object *obj) server->client = NULL; } - free_async_queue( server->wait_q ); - assert( server->pipe->instances ); server->pipe->instances--; @@ -587,7 +584,7 @@ static void pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const async_dat case ps_idle_server: case ps_wait_connect: set_server_state( server, ps_wait_open ); - if ((async = create_async( current, server->wait_q, async_data ))) + if ((async = fd_queue_async( server->ioctl_fd, async_data, ASYNC_TYPE_WAIT, 0 ))) { if (server->pipe->waiters) async_wake_up( server->pipe->waiters, STATUS_SUCCESS ); release_object( async ); @@ -709,7 +706,6 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned server->client = NULL; server->flush_poll = NULL; server->options = options; - server->wait_q = create_async_queue( NULL ); list_add_head( &pipe->servers, &server->entry ); grab_object( pipe ); @@ -791,7 +787,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc if (client->fd && server->fd) { if (server->state == ps_wait_open) - async_wake_up( server->wait_q, STATUS_SUCCESS ); + fd_async_wake_up( server->ioctl_fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); set_server_state( server, ps_connected_server ); server->client = client; client->server = server;

1 0

Aric Stewart : shell32: SHGFI_EXETYPE flag should have the files returning 0 if they are DLL images .
by Alexandre Julliard April 19, 2007

April 19, 2007

Module: wine Branch: master Commit: dac19db358a3b77b1c5a2fd3253bf7700f61bbc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dac19db358a3b77b1c5a2fd32… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 18 13:11:47 2007 -0500 shell32: SHGFI_EXETYPE flag should have the files returning 0 if they are DLL images. --- dlls/shell32/shell32_main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 70db342..ea4b510 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -275,6 +275,9 @@ static DWORD shgfi_get_exe_type(LPCWSTR szFullPath) SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET ); ReadFile( hfile, &nt, sizeof(nt), &len, NULL ); CloseHandle( hfile ); + /* DLL files are not executable and should return 0 */ + if (nt.FileHeader.Characteristics & IMAGE_FILE_DLL) + return 0; if (nt.OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) { return IMAGE_NT_SIGNATURE |

1 0

Alexandre Julliard : server: Moved the FSCTL_PIPE_LISTEN implementation to the server.
by Alexandre Julliard April 19, 2007

April 19, 2007

Module: wine Branch: master Commit: 6105a93be6f4c79e045a23b6efcd8ad3dd182b1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6105a93be6f4c79e045a23b6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 18 16:26:37 2007 +0200 server: Moved the FSCTL_PIPE_LISTEN implementation to the server. --- dlls/ntdll/file.c | 39 ----------- include/wine/server_protocol.h | 17 +----- server/named_pipe.c | 146 +++++++++++++++++++++------------------- server/protocol.def | 6 -- server/request.h | 2 - server/trace.c | 11 +--- 6 files changed, 78 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6105a93be6f4c79e045a2…

1 0