March 2015 - Wine-commits - list.winehq.org

Alexandre Julliard : msvcp60: Share misc functions implementation with msvcp90.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: 165f8734e85be74b31d08121b55b140e2deb408a URL: http://source.winehq.org/git/wine.git/?a=commit;h=165f8734e85be74b31d08121b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 12 17:25:45 2015 +0900 msvcp60: Share misc functions implementation with msvcp90. --- dlls/msvcp60/Makefile.in | 1 - dlls/msvcp60/main.c | 3 ++ dlls/msvcp60/misc.c | 90 ------------------------------------------------ dlls/msvcp90/misc.c | 12 +++++-- dlls/msvcp90/msvcp90.h | 4 +++ 5 files changed, 17 insertions(+), 93 deletions(-) diff --git a/dlls/msvcp60/Makefile.in b/dlls/msvcp60/Makefile.in index 2a3e726..fcd149b 100644 --- a/dlls/msvcp60/Makefile.in +++ b/dlls/msvcp60/Makefile.in @@ -3,7 +3,6 @@ IMPORTS = msvcrt EXTRADEFS = -D_MSVCP_VER=60 PARENTSRC = ../msvcp90 - C_SRCS = \ exception.c \ ios.c \ diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c index 3c5e36f..03473ae 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -59,6 +59,7 @@ const __int64 std_Fpz = 0; void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); void (__cdecl *MSVCRT_operator_delete)(void*); +void* (__cdecl *MSVCRT_set_new_handler)(void*); static void init_cxx_funcs(void) { @@ -68,11 +69,13 @@ static void init_cxx_funcs(void) { MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPEAX_K@Z"); MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPEAX@Z"); + MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AH_K(a)ZP6AH0@Z(a)Z"); } else { MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPAXI@Z"); MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPAX@Z"); + MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AHI(a)ZP6AHI@Z(a)Z"); } } diff --git a/dlls/msvcp60/misc.c b/dlls/msvcp60/misc.c deleted file mode 100644 index a54fd28..0000000 --- a/dlls/msvcp60/misc.c +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright 2010 Piotr Caban for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" - -#include <stdarg.h> -#include <limits.h> - -#include "msvcp.h" - -#include "windef.h" -#include "winbase.h" - - -static CRITICAL_SECTION lockit_cs; - -void init_lockit(void) { - InitializeCriticalSection(&lockit_cs); - lockit_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Lockit critical section"); -} - -void free_lockit(void) { - lockit_cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&lockit_cs); -} - -_Lockit* __thiscall _Lockit_ctor_locktype(_Lockit *this, int locktype) -{ - EnterCriticalSection(&lockit_cs); - return this; -} - -/* ??0_Lockit(a)std@@QAE(a)XZ */ -/* ??0_Lockit(a)std@@QEAA(a)XZ */ -DEFINE_THISCALL_WRAPPER(_Lockit_ctor, 4) -_Lockit* __thiscall _Lockit_ctor(_Lockit *this) -{ - return _Lockit_ctor_locktype(this, 0); -} - -/* ??1_Lockit(a)std@@QAE(a)XZ */ -/* ??1_Lockit(a)std@@QEAA(a)XZ */ -DEFINE_THISCALL_WRAPPER(_Lockit_dtor, 4) -void __thiscall _Lockit_dtor(_Lockit *this) -{ - LeaveCriticalSection(&lockit_cs); -} - -/* wctype */ -unsigned short __cdecl wctype(const char *property) -{ - static const struct { - const char *name; - unsigned short mask; - } properties[] = { - { "alnum", _DIGIT|_ALPHA }, - { "alpha", _ALPHA }, - { "cntrl", _CONTROL }, - { "digit", _DIGIT }, - { "graph", _DIGIT|_PUNCT|_ALPHA }, - { "lower", _LOWER }, - { "print", _DIGIT|_PUNCT|_BLANK|_ALPHA }, - { "punct", _PUNCT }, - { "space", _SPACE }, - { "upper", _UPPER }, - { "xdigit", _HEX } - }; - unsigned int i; - - for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) - if(!strcmp(property, properties[i].name)) - return properties[i].mask; - - return 0; -} diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index a030b01..db68f6d 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -125,6 +125,14 @@ void CDECL mutex_mutex_dtor(mutex *m) static CRITICAL_SECTION lockit_cs[_MAX_LOCK]; +#if _MSVCP_VER >= 70 +static inline int get_locktype( _Lockit *lockit ) { return lockit->locktype; } +static inline void set_locktype( _Lockit *lockit, int type ) { lockit->locktype = type; } +#else +static inline int get_locktype( _Lockit *lockit ) { return 0; } +static inline void set_locktype( _Lockit *lockit, int type ) { } +#endif + /* ?_Lockit_ctor(a)_Lockit@std@@SAXH(a)Z */ void __cdecl _Lockit_init(int locktype) { InitializeCriticalSection(&lockit_cs[locktype]); @@ -156,7 +164,7 @@ void free_lockit(void) { /* ?_Lockit_ctor(a)_Lockit@std@@CAXPEAV12(a)H@Z */ void __cdecl _Lockit__Lockit_ctor_locktype(_Lockit *lockit, int locktype) { - lockit->locktype = locktype; + set_locktype( lockit, locktype ); EnterCriticalSection(&lockit_cs[locktype]); } @@ -189,7 +197,7 @@ _Lockit* __thiscall _Lockit_ctor(_Lockit *this) /* ?_Lockit_dtor(a)_Lockit@std@@CAXPEAV12@@Z */ void __cdecl _Lockit__Lockit_dtor(_Lockit *lockit) { - LeaveCriticalSection(&lockit_cs[lockit->locktype]); + LeaveCriticalSection(&lockit_cs[get_locktype( lockit )]); } /* ??1_Lockit(a)std@@QAE(a)XZ */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 5e7b427..2eb07a3 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -250,7 +250,11 @@ ctype_wchar* ctype_short_use_facet(const locale*); /* class _Lockit */ typedef struct { +#if _MSVCP_VER >= 70 int locktype; +#else + char empty_struct; +#endif } _Lockit; #define _LOCK_LOCALE 0

1 0

Alexandre Julliard : msvcp60: Merge locale code with msvcp90 where possible to reduce the differences.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: bebc9794833b5e05433b21b2e45548e5fbaea6ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=bebc9794833b5e05433b21b2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 12 18:21:58 2015 +0900 msvcp60: Merge locale code with msvcp90 where possible to reduce the differences. --- dlls/msvcp60/locale.c | 477 +++++++++++++++++++++++++++++++------------------- 1 file changed, 297 insertions(+), 180 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bebc9794833b5e05433b2…

1 0

Alexandre Julliard : msvcp60: Add MSVCP prefix on exported string functions.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: 62ae503fa1fe557feac9929589269ac6c8ad2faf URL: http://source.winehq.org/git/wine.git/?a=commit;h=62ae503fa1fe557feac992958… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 12 19:06:35 2015 +0900 msvcp60: Add MSVCP prefix on exported string functions. --- dlls/msvcp60/exception.c | 18 ++++---- dlls/msvcp60/ios.c | 84 ++++++++++++++++++------------------ dlls/msvcp60/locale.c | 74 ++++++++++++++++---------------- dlls/msvcp60/msvcp.h | 38 ++++++++-------- dlls/msvcp60/msvcp60.spec | 72 +++++++++++++++---------------- dlls/msvcp60/string.c | 107 +++++++++++++++++++++++++++++----------------- 6 files changed, 210 insertions(+), 183 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=62ae503fa1fe557feac99…

1 0

Alexandre Julliard : msvcp60: Share exception functions implementation with msvcp90.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: 42500b0cfee729c812cdd14d5ba23355f6b18954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42500b0cfee729c812cdd14d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 12 22:07:09 2015 +0900 msvcp60: Share exception functions implementation with msvcp90. --- dlls/msvcp60/Makefile.in | 1 + dlls/msvcp60/cxx.h | 446 ------------------------------ dlls/msvcp60/exception.c | 682 ---------------------------------------------- dlls/msvcp60/msvcp60.spec | 24 +- dlls/msvcp90/exception.c | 283 +++++++++++++++---- dlls/msvcp90/msvcp90.h | 26 +- 6 files changed, 258 insertions(+), 1204 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42500b0cfee729c812cdd…

1 0

Alexandre Julliard : msvcp90: Remove functions that are not exported in native.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: f1e23aa6191c6ddac89273cf6f64b10a89b39095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1e23aa6191c6ddac89273cf6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 12 17:28:48 2015 +0900 msvcp90: Remove functions that are not exported in native. --- dlls/msvcp90/msvcp90.spec | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index d06e8b2..fbdc321 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -6556,12 +6556,3 @@ @ cdecl towctrans(long long) @ cdecl wctrans(str) @ cdecl wctype(str) - -#Functions not exported in native dll: -@ thiscall -arch=win32 ?_Tidy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AAEX_N(a)Z(ptr long) basic_string_char_tidy_built -@ cdecl -arch=win64 ?_Tidy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AEAAX_N(a)Z(ptr long) basic_string_char_tidy_built -@ extern ??_7facet(a)locale@std@@6B@ MSVCP_locale_facet_vtable -@ cdecl -arch=win32 ?facet_Register(a)facet@locale(a)std@@CAXPAV123@@Z(ptr) locale_facet_register -@ cdecl -arch=win64 ?facet_Register(a)facet@locale(a)std@@CAXPEAV123@@Z(ptr) locale_facet_register -@ thiscall -arch=win32 ?_Register(a)facet@locale(a)std@@QAEXXZ(ptr) locale_facet__Register -@ cdecl -arch=win64 ?_Register(a)facet@locale(a)std@@QEAAXXZ(ptr) locale_facet__Register

1 0

Frédéric Delanoy : French translation for release 1.7.38
by Jeremy Newman 12 Mar '15

12 Mar '15

Module: website Branch: master Commit: 6de1cfbbb4c796bd3de72479b5f835d461a7fed3 URL: http://source.winehq.org/git/website.git/?a=commit;h=6de1cfbbb4c796bd3de724… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Mar 11 10:39:59 2015 +0100 French translation for release 1.7.38 --- news/fr/2015030601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/fr/2015030601.xml b/news/fr/2015030601.xml new file mode 100644 index 0000000..82dcdf4 --- /dev/null +++ b/news/fr/2015030601.xml @@ -0,0 +1,17 @@ +<news> +<date>6 mars 2015</date> +<title>Sortie de Wine 1.7.38</title> +<body> + La version de développement 1.7.38 de Wine est disponible. + <a href="{$root}/announce/1.7.38">Nouveautés</a> de cette version : +<ul> + <li>Nouvelle version du moteur Gecko basée sur Firefox 36.</li> + <li>Prise en charge des barres de défilement utilisant un thème.</li> + <li>Mise à jour du moteur Mono.</li> + <li>Interface RPC plus compatible pour le contrôle des services.</li> + <li>Prise en charge de X Drag & Drop version 5.</li> + <li>Correctifs d'utilisation des threads dans la prise en charge des méthodes de saisie.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.38.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : server: Add a request to store the results of an ioctl asynchronously.
by Alexandre Julliard 11 Mar '15

11 Mar '15

Module: wine Branch: master Commit: ecf7ed66509b462b7a9cd6e23dbd1b2b43f515d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecf7ed66509b462b7a9cd6e23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 22:45:51 2015 +0900 server: Add a request to store the results of an ioctl asynchronously. --- include/wine/server_protocol.h | 20 +++++++++++++++++++- server/device.c | 20 ++++++++++++++++++++ server/protocol.def | 9 +++++++++ server/request.h | 6 ++++++ server/trace.c | 11 +++++++++++ 5 files changed, 65 insertions(+), 1 deletion(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 9d645d7..1b7831e 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3128,6 +3128,21 @@ struct ioctl_reply +struct set_ioctl_result_request +{ + struct request_header __header; + obj_handle_t manager; + obj_handle_t handle; + unsigned int status; + /* VARARG(data,bytes); */ +}; +struct set_ioctl_result_reply +{ + struct reply_header __header; +}; + + + struct get_ioctl_result_request { struct request_header __header; @@ -5211,6 +5226,7 @@ enum request REQ_register_async, REQ_cancel_async, REQ_ioctl, + REQ_set_ioctl_result, REQ_get_ioctl_result, REQ_create_named_pipe, REQ_get_named_pipe_info, @@ -5473,6 +5489,7 @@ union generic_request struct register_async_request register_async_request; struct cancel_async_request cancel_async_request; struct ioctl_request ioctl_request; + struct set_ioctl_result_request set_ioctl_result_request; struct get_ioctl_result_request get_ioctl_result_request; struct create_named_pipe_request create_named_pipe_request; struct get_named_pipe_info_request get_named_pipe_info_request; @@ -5733,6 +5750,7 @@ union generic_reply struct register_async_reply register_async_reply; struct cancel_async_reply cancel_async_reply; struct ioctl_reply ioctl_reply; + struct set_ioctl_result_reply set_ioctl_result_reply; struct get_ioctl_result_reply get_ioctl_result_reply; struct create_named_pipe_reply create_named_pipe_reply; struct get_named_pipe_info_reply get_named_pipe_info_reply; @@ -5848,6 +5866,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 459 +#define SERVER_PROTOCOL_VERSION 460 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/device.c b/server/device.c index c5e3107..9d1bf35 100644 --- a/server/device.c +++ b/server/device.c @@ -531,6 +531,26 @@ DECL_HANDLER(get_next_device_request) } +/* store results of an async ioctl */ +DECL_HANDLER(set_ioctl_result) +{ + struct ioctl_call *ioctl; + struct device_manager *manager; + + if (!(manager = (struct device_manager *)get_handle_obj( current->process, req->manager, + 0, &device_manager_ops ))) + return; + + if ((ioctl = (struct ioctl_call *)get_handle_obj( current->process, req->handle, 0, &ioctl_call_ops ))) + { + set_ioctl_result( ioctl, req->status, get_req_data(), get_req_data_size() ); + close_handle( current->process, req->handle ); /* avoid an extra round-trip for close */ + release_object( ioctl ); + } + release_object( manager ); +} + + /* retrieve results of an async ioctl */ DECL_HANDLER(get_ioctl_result) { diff --git a/server/protocol.def b/server/protocol.def index 7ec380b..2cd8272 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2262,6 +2262,15 @@ enum message_type @END +/* Store results of an async ioctl */ +(a)REQ(set_ioctl_result) + obj_handle_t manager; /* handle to the device manager */ + obj_handle_t handle; /* handle to the ioctl */ + unsigned int status; /* status of the ioctl */ + VARARG(data,bytes); /* output data of the ioctl */ +(a)END + + /* Retrieve results of an async ioctl */ @REQ(get_ioctl_result) obj_handle_t handle; /* handle to the device */ diff --git a/server/request.h b/server/request.h index e28757c..022feff 100644 --- a/server/request.h +++ b/server/request.h @@ -248,6 +248,7 @@ DECL_HANDLER(set_serial_info); DECL_HANDLER(register_async); DECL_HANDLER(cancel_async); DECL_HANDLER(ioctl); +DECL_HANDLER(set_ioctl_result); DECL_HANDLER(get_ioctl_result); DECL_HANDLER(create_named_pipe); DECL_HANDLER(get_named_pipe_info); @@ -509,6 +510,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_register_async, (req_handler)req_cancel_async, (req_handler)req_ioctl, + (req_handler)req_set_ioctl_result, (req_handler)req_get_ioctl_result, (req_handler)req_create_named_pipe, (req_handler)req_get_named_pipe_info, @@ -1511,6 +1513,10 @@ 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_ioctl_result_request, manager) == 12 ); +C_ASSERT( FIELD_OFFSET(struct set_ioctl_result_request, handle) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_ioctl_result_request, status) == 20 ); +C_ASSERT( sizeof(struct set_ioctl_result_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_ioctl_result_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_ioctl_result_request, user_arg) == 16 ); C_ASSERT( sizeof(struct get_ioctl_result_request) == 24 ); diff --git a/server/trace.c b/server/trace.c index 1bda4cd..c7f4921 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2732,6 +2732,14 @@ static void dump_ioctl_reply( const struct ioctl_reply *req ) dump_varargs_bytes( ", out_data=", cur_size ); } +static void dump_set_ioctl_result_request( const struct set_ioctl_result_request *req ) +{ + fprintf( stderr, " manager=%04x", req->manager ); + fprintf( stderr, ", handle=%04x", req->handle ); + fprintf( stderr, ", status=%08x", req->status ); + dump_varargs_bytes( ", data=", cur_size ); +} + static void dump_get_ioctl_result_request( const struct get_ioctl_result_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4230,6 +4238,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_register_async_request, (dump_func)dump_cancel_async_request, (dump_func)dump_ioctl_request, + (dump_func)dump_set_ioctl_result_request, (dump_func)dump_get_ioctl_result_request, (dump_func)dump_create_named_pipe_request, (dump_func)dump_get_named_pipe_info_request, @@ -4488,6 +4497,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, NULL, (dump_func)dump_ioctl_reply, + NULL, (dump_func)dump_get_ioctl_result_reply, (dump_func)dump_create_named_pipe_reply, (dump_func)dump_get_named_pipe_info_reply, @@ -4746,6 +4756,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "register_async", "cancel_async", "ioctl", + "set_ioctl_result", "get_ioctl_result", "create_named_pipe", "get_named_pipe_info",

1 0

Alexandre Julliard : ntoskrnl: Allow IoCompleteRequest to report completion asynchronously.
by Alexandre Julliard 11 Mar '15

11 Mar '15

Module: wine Branch: master Commit: 4c1da45567f861bf23694dc16e94a8bd48e071d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c1da45567f861bf23694dc16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 22:48:22 2015 +0900 ntoskrnl: Allow IoCompleteRequest to report completion asynchronously. --- dlls/ntoskrnl.exe/ntoskrnl.c | 99 +++++++++++++++++++++++++++----------------- 1 file changed, 62 insertions(+), 37 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 65702aa..0ba26b2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -129,55 +129,54 @@ static HANDLE get_device_manager(void) } /* process an ioctl request for a given device */ -static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, ULONG in_size, - void *out_buff, ULONG *out_size ) +static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, + ULONG in_size, ULONG out_size, HANDLE ioctl ) { IRP *irp; - void *sys_buff = NULL; + void *out_buff = NULL; FILE_OBJECT file; - IO_STATUS_BLOCK iosb; LARGE_INTEGER count; - TRACE( "ioctl %x device %p in_size %u out_size %u\n", code, device, in_size, *out_size ); + TRACE( "ioctl %x device %p in_size %u out_size %u\n", code, device, in_size, out_size ); /* so we can spot things that we should initialize */ memset( &file, 0x88, sizeof(file) ); - if ((code & 3) == METHOD_BUFFERED) + if ((code & 3) == METHOD_BUFFERED) out_size = max( in_size, out_size ); + + if (out_size) { - if (!(sys_buff = HeapAlloc( GetProcessHeap(), 0, max( in_size, *out_size ) ))) - return STATUS_NO_MEMORY; - memcpy( sys_buff, in_buff, in_size ); + if (!(out_buff = HeapAlloc( GetProcessHeap(), 0, out_size ))) return STATUS_NO_MEMORY; + if ((code & 3) == METHOD_BUFFERED) + { + memcpy( out_buff, in_buff, in_size ); + in_buff = out_buff; + } } - irp = IoBuildDeviceIoControlRequest( code, device, in_buff, in_size, out_buff, *out_size, - FALSE, NULL, &iosb ); + /* note: we abuse UserIosb to store the server handle to the ioctl */ + irp = IoBuildDeviceIoControlRequest( code, device, in_buff, in_size, out_buff, out_size, + FALSE, NULL, (IO_STATUS_BLOCK *)ioctl ); if (!irp) { - HeapFree( GetProcessHeap(), 0, sys_buff ); + HeapFree( GetProcessHeap(), 0, out_buff ); return STATUS_NO_MEMORY; } irp->RequestorMode = UserMode; - irp->AssociatedIrp.SystemBuffer = ((code & 3) == METHOD_BUFFERED) ? sys_buff : in_buff; - irp->UserBuffer = out_buff; irp->Tail.Overlay.OriginalFileObject = &file; file.FsContext = NULL; file.FsContext2 = NULL; - IoAllocateMdl( out_buff, *out_size, FALSE, FALSE, irp ); + KeQueryTickCount( &count ); /* update the global KeTickCount */ device->CurrentIrp = irp; - KeQueryTickCount( &count ); /* update the global KeTickCount */ - IoCallDriver( device, irp ); - *out_size = (iosb.u.Status >= 0) ? iosb.Information : 0; - if (out_buff && (code & 3) == METHOD_BUFFERED) memcpy( out_buff, sys_buff, *out_size ); + device->CurrentIrp = NULL; - HeapFree( GetProcessHeap(), 0, sys_buff ); - return iosb.u.Status; + return STATUS_SUCCESS; } @@ -187,10 +186,10 @@ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) { HANDLE manager = get_device_manager(); - obj_handle_t ioctl = 0; + HANDLE ioctl = 0; NTSTATUS status = STATUS_SUCCESS; ULONG code = 0; - void *in_buff, *out_buff = NULL; + void *in_buff; DEVICE_OBJECT *device = NULL; ULONG in_size = 4096, out_size = 0; HANDLE handles[2]; @@ -211,14 +210,13 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) SERVER_START_REQ( get_next_device_request ) { req->manager = wine_server_obj_handle( manager ); - req->prev = ioctl; + req->prev = wine_server_obj_handle( ioctl ); req->status = status; - wine_server_add_data( req, out_buff, out_size ); wine_server_set_reply( req, in_buff, in_size ); if (!(status = wine_server_call( req ))) { code = reply->code; - ioctl = reply->next; + ioctl = wine_server_ptr_handle( reply->next ); device = wine_server_get_ptr( reply->user_ptr ); client_tid = reply->client_tid; client_pid = reply->client_pid; @@ -237,10 +235,8 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) switch(status) { case STATUS_SUCCESS: - HeapFree( GetProcessHeap(), 0, out_buff ); - if (out_size) out_buff = HeapAlloc( GetProcessHeap(), 0, out_size ); - else out_buff = NULL; - status = process_ioctl( device, code, in_buff, in_size, out_buff, &out_size ); + status = process_ioctl( device, code, in_buff, in_size, out_size, ioctl ); + if (status == STATUS_SUCCESS) ioctl = 0; /* status reported by IoCompleteRequest */ break; case STATUS_BUFFER_OVERFLOW: HeapFree( GetProcessHeap(), 0, in_buff ); @@ -251,7 +247,6 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) if (WaitForMultipleObjects( 2, handles, FALSE, INFINITE ) == WAIT_OBJECT_0) { HeapFree( GetProcessHeap(), 0, in_buff ); - HeapFree( GetProcessHeap(), 0, out_buff ); return STATUS_SUCCESS; } break; @@ -504,10 +499,26 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device, irpsp->Parameters.DeviceIoControl.IoControlCode = code; irpsp->Parameters.DeviceIoControl.InputBufferLength = in_len; irpsp->Parameters.DeviceIoControl.OutputBufferLength = out_len; - irpsp->Parameters.DeviceIoControl.Type3InputBuffer = in_buff; irpsp->DeviceObject = device; irpsp->CompletionRoutine = NULL; + switch (code & 3) + { + case METHOD_BUFFERED: + irp->AssociatedIrp.SystemBuffer = in_buff; + break; + case METHOD_IN_DIRECT: + case METHOD_OUT_DIRECT: + irp->AssociatedIrp.SystemBuffer = in_buff; + IoAllocateMdl( out_buff, out_len, FALSE, FALSE, irp ); + break; + case METHOD_NEITHER: + irpsp->Parameters.DeviceIoControl.Type3InputBuffer = in_buff; + break; + } + + irp->RequestorMode = KernelMode; + irp->UserBuffer = out_buff; irp->UserIosb = iosb; irp->UserEvent = event; return irp; @@ -958,13 +969,12 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) { IO_STACK_LOCATION *irpsp; PIO_COMPLETION_ROUTINE routine; - IO_STATUS_BLOCK *iosb; NTSTATUS status, stat; + HANDLE ioctl; int call_flag = 0; TRACE( "%p %u\n", irp, priority_boost ); - iosb = irp->UserIosb; status = irp->IoStatus.u.Status; while (irp->CurrentLocation <= irp->StackCount) { @@ -991,11 +1001,26 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) return; } } - if (iosb) + + ioctl = (HANDLE)irp->UserIosb; + if (ioctl) { - iosb->u.Status = irp->IoStatus.u.Status; - if (iosb->u.Status >= 0) iosb->Information = irp->IoStatus.Information; + HANDLE manager = get_device_manager(); + void *out_buff = irp->UserBuffer; + + SERVER_START_REQ( set_ioctl_result ) + { + req->manager = wine_server_obj_handle( manager ); + req->handle = wine_server_obj_handle( ioctl ); + req->status = irp->IoStatus.u.Status; + if (irp->IoStatus.u.Status >= 0 && out_buff) + wine_server_add_data( req, out_buff, irp->IoStatus.Information ); + wine_server_call( req ); + } + SERVER_END_REQ; + HeapFree( GetProcessHeap(), 0, out_buff ); } + IoFreeIrp( irp ); }

1 0

Austin English : include: Add ASN1*string* definitions/functions.
by Alexandre Julliard 11 Mar '15

11 Mar '15

Module: wine Branch: master Commit: cdea6c8c64a353d0d4cd4372b7eea170a13a93a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdea6c8c64a353d0d4cd4372b… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 10 23:24:52 2015 -0500 include: Add ASN1*string* definitions/functions. --- include/msasn1.h | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/include/msasn1.h b/include/msasn1.h index 6b7bdfb..757236d 100644 --- a/include/msasn1.h +++ b/include/msasn1.h @@ -64,6 +64,30 @@ typedef struct tagASN1BerFunArr_t { const ASN1BerDecFun_t *apfnDecoder; } ASN1BerFunArr_t; +typedef struct tagASN1bitstring_t +{ + ASN1uint32_t length; + ASN1octet_t *value; +} ASN1bitstring_t; + +typedef struct tagASN1charstring_t +{ + ASN1uint32_t length; + ASN1char_t *value; +} ASN1charstring_t; + +typedef struct tagASN1char16string_t +{ + ASN1uint32_t length; + ASN1char16_t *value; +} ASN1char16string_t; + +typedef struct tagASN1char32string_t +{ + ASN1uint32_t length; + ASN1char32_t *value; +} ASN1char32string_t; + typedef enum { ASN1_PER_RULE_ALIGNED = 0x0001,ASN1_PER_RULE_UNALIGNED = 0x0002,ASN1_PER_RULE = ASN1_PER_RULE_ALIGNED | ASN1_PER_RULE_UNALIGNED, ASN1_BER_RULE_BER = 0x0100,ASN1_BER_RULE_CER = 0x0200,ASN1_BER_RULE_DER = 0x0400, @@ -106,6 +130,12 @@ typedef struct tagASN1module_t { }; } *ASN1module_t; +typedef struct tagASN1octetstring_t +{ + ASN1uint32_t length; + ASN1octet_t *value; +} ASN1octetstring_t; + typedef enum tagASN1option_e { ASN1OPT_CHANGE_RULE = 0x101, @@ -131,6 +161,12 @@ typedef struct tagASN1optionparam_t { }; } ASN1optionparam_t, ASN1optionparam_s; +typedef struct tagASN1wstring_t +{ + ASN1uint32_t length; + WCHAR *value; +} ASN1wstring_t; + void WINAPI ASN1_CloseDecoder(ASN1decoding_t); void WINAPI ASN1_CloseEncoder(ASN1encoding_t); void WINAPI ASN1_CloseEncoder2(ASN1encoding_t); @@ -146,6 +182,22 @@ ASN1error_e WINAPI ASN1_GetDecoderOption(ASN1decoding_t, ASN1optionparam_t*); ASN1error_e WINAPI ASN1_GetEncoderOption(ASN1encoding_t, ASN1optionparam_t*); ASN1error_e WINAPI ASN1_SetDecoderOption(ASN1decoding_t, ASN1optionparam_t*); ASN1error_e WINAPI ASN1_SetEncoderOption(ASN1encoding_t, ASN1optionparam_t*); +int WINAPI ASN1bitstring_cmp(ASN1bitstring_t*,ASN1bitstring_t*); +void WINAPI ASN1bitstring_free(ASN1bitstring_t*); +int WINAPI ASN1char16string_cmp(ASN1char16string_t*,ASN1char16string_t*); +void WINAPI ASN1char16string_free(ASN1char16string_t*); +int WINAPI ASN1char32string_cmp(ASN1char32string_t*,ASN1char32string_t*); +void WINAPI ASN1char32string_free(ASN1char32string_t*); +int WINAPI ASN1charstring_cmp(ASN1charstring_t*,ASN1charstring_t*); +void WINAPI ASN1charstring_free(ASN1charstring_t*); +int WINAPI ASN1octetstring_cmp(ASN1octetstring_t*,ASN1octetstring_t*); +void WINAPI ASN1octetstring_free(ASN1octetstring_t*); +void WINAPI ASN1utf8string_free(ASN1wstring_t*); +int WINAPI ASN1ztchar16string_cmp(ASN1ztchar16string_t*,ASN1ztchar16string_t*); +void WINAPI ASN1ztchar16string_free(ASN1ztchar16string_t*); +void WINAPI ASN1ztchar32string_free(ASN1ztchar32string_t*); +int WINAPI ASN1ztcharstring_cmp(ASN1ztcharstring_t*,ASN1ztcharstring_t*); +void WINAPI ASN1ztcharstring_free(ASN1charstring_t*); #ifdef __cplusplus }

1 0

Austin English : include: Add some missing entries in hidusage.h.
by Alexandre Julliard 11 Mar '15

11 Mar '15

Module: wine Branch: master Commit: 71ffa9a2c5443292e5d48fc96a634e9cbb4dd603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ffa9a2c5443292e5d48fc96… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 10 23:28:26 2015 -0500 include: Add some missing entries in hidusage.h. --- include/hidusage.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/include/hidusage.h b/include/hidusage.h index d037d45..67d698e 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -194,6 +194,33 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_SIMULATION_RUDDER ((USAGE) 0xBA) #define HID_USAGE_SIMULATION_THROTTLE ((USAGE) 0xBB) +#define HID_USAGE_TELEPHONY_PHONE ((USAGE) 0x01) +#define HID_USAGE_TELEPHONY_ANSWERING_MACHINE ((USAGE) 0x02) +#define HID_USAGE_TELEPHONY_MESSAGE_CONTROLS ((USAGE) 0x03) +#define HID_USAGE_TELEPHONY_HANDSET ((USAGE) 0x04) +#define HID_USAGE_TELEPHONY_HEADSET ((USAGE) 0x05) +#define HID_USAGE_TELEPHONY_KEYPAD ((USAGE) 0x06) +#define HID_USAGE_TELEPHONY_PROGRAMMABLE_BUTTON ((USAGE) 0x07) +#define HID_USAGE_TELEPHONY_REDIAL ((USAGE) 0x24) +#define HID_USAGE_TELEPHONY_TRANSFER ((USAGE) 0x25) +#define HID_USAGE_TELEPHONY_DROP ((USAGE) 0x26) +#define HID_USAGE_TELEPHONY_LINE ((USAGE) 0x2A) +#define HID_USAGE_TELEPHONY_RING_ENABLE ((USAGE) 0x2D) +#define HID_USAGE_TELEPHONY_SEND ((USAGE) 0x31) +#define HID_USAGE_TELEPHONY_KEYPAD_0 ((USAGE) 0xB0) +#define HID_USAGE_TELEPHONY_KEYPAD_D ((USAGE) 0xBF) +#define HID_USAGE_TELEPHONY_HOST_AVAILABLE ((USAGE) 0xF1) + +#define HID_USAGE_MS_BTH_HF_DIALNUMBER ((USAGE) 0x21) +#define HID_USAGE_MS_BTH_HF_DIALMEMORY ((USAGE) 0x22) + +#define HID_USAGE_CONSUMERCTRL ((USAGE) 0x01) + +#define HID_USAGE_DIGITIZER_PEN ((USAGE) 0x02) +#define HID_USAGE_DIGITIZER_IN_RANGE ((USAGE) 0x32) +#define HID_USAGE_DIGITIZER_TIP_SWITCH ((USAGE) 0x42) +#define HID_USAGE_DIGITIZER_BARREL_SWITCH ((USAGE) 0x44) + #ifdef __cplusplus } #endif

1 0