wine-commits February 2015

wine-commits@winehq.org

2 participants
411 discussions

Austin English : include: Add more entries to msasn1.h.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: e9cab9b38144a720c291609fc0f3010614f4f75f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9cab9b38144a720c291609fc… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 26 17:13:29 2015 -0600 include: Add more entries to msasn1.h. --- include/msasn1.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/include/msasn1.h b/include/msasn1.h index 8172849..32ace3e 100644 --- a/include/msasn1.h +++ b/include/msasn1.h @@ -30,6 +30,9 @@ typedef signed short ASN1int16_t; typedef ULONG ASN1uint32_t; typedef LONG ASN1int32_t; +typedef ASN1uint16_t ASN1char16_t; +typedef ASN1uint32_t ASN1char32_t; + typedef ASN1char_t *ASN1ztcharstring_t; typedef ASN1char16_t *ASN1ztchar16string_t; typedef ASN1char32_t *ASN1ztchar32string_t; @@ -40,6 +43,46 @@ typedef ASN1uint16_t ASN1choice_t; typedef ASN1uint32_t ASN1magic_t; typedef ASN1ztcharstring_t ASN1objectdescriptor_t; +typedef void (WINAPI *ASN1FreeFun_t)(void *data); +typedef void (WINAPI *ASN1GenericFun_t)(void); + +typedef struct ASN1encoding_s *ASN1encoding_t; +typedef struct ASN1decoding_s *ASN1decoding_t; +typedef ASN1int32_t (WINAPI *ASN1PerEncFun_t)(ASN1encoding_t enc,void *data); +typedef ASN1int32_t (WINAPI *ASN1PerDecFun_t)(ASN1decoding_t enc,void *data); + +typedef struct tagASN1PerFunArr_t { + const ASN1PerEncFun_t *apfnEncoder; + const ASN1PerDecFun_t *apfnDecoder; +} ASN1PerFunArr_t; + +typedef ASN1int32_t (WINAPI *ASN1BerEncFun_t)(ASN1encoding_t enc,ASN1uint32_t tag,void *data); +typedef ASN1int32_t (WINAPI *ASN1BerDecFun_t)(ASN1decoding_t enc,ASN1uint32_t tag,void *data); + +typedef struct tagASN1BerFunArr_t { + const ASN1BerEncFun_t *apfnEncoder; + const ASN1BerDecFun_t *apfnDecoder; +} ASN1BerFunArr_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, + ASN1_BER_RULE = ASN1_BER_RULE_BER | ASN1_BER_RULE_CER | ASN1_BER_RULE_DER +} ASN1encodingrule_e; + +typedef struct tagASN1module_t { + ASN1magic_t nModuleName; + ASN1encodingrule_e eRule; + ASN1uint32_t dwFlags; + ASN1uint32_t cPDUs; + const ASN1FreeFun_t *apfnFreeMemory; + const ASN1uint32_t *acbStructSize; + union { + ASN1PerFunArr_t PER; + ASN1BerFunArr_t BER; + }; +} *ASN1module_t; + #ifdef __cplusplus } #endif

1 0

Sebastian Lackner : winex11: Only enable XInput2 cursor warp workaround if necessary.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 7714efe2134f141a3e9f228f99c02185da5ef107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7714efe2134f141a3e9f228f9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jan 26 05:42:32 2015 +0100 winex11: Only enable XInput2 cursor warp workaround if necessary. Based on a patch by Patrick Rudolph. --- dlls/winex11.drv/mouse.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index f1e58fe..5f5bdeb 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -131,6 +131,7 @@ static Cursor create_cursor( HANDLE handle ); #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H static BOOL xinput2_available; +static BOOL broken_rawevents; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(XIFreeDeviceInfo); MAKE_FUNCPTR(XIQueryDevice); @@ -1579,7 +1580,15 @@ void X11DRV_MotionNotify( HWND hwnd, XEvent *xev ) if (!hwnd) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); - if (thread_data->warp_serial && (long)(event->serial - thread_data->warp_serial) < 0) return; + if (thread_data->warp_serial) + { + if ((long)(event->serial - thread_data->warp_serial) < 0) + { + TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, event->serial ); + return; + } + thread_data->warp_serial = 0; /* we caught up now */ + } } send_mouse_input( hwnd, event->window, event->state, &input ); @@ -1669,7 +1678,7 @@ static void X11DRV_RawMotion( XGenericEventCookie *xev ) break; } - if (thread_data->warp_serial) + if (broken_rawevents && thread_data->warp_serial) { if ((long)(xev->serial - thread_data->warp_serial) < 0) { @@ -1716,6 +1725,12 @@ void X11DRV_XInput2_Init(void) #undef LOAD_FUNCPTR xinput2_available = XQueryExtension( gdi_display, "XInputExtension", &xinput2_opcode, &event, &error ); + + /* Until version 1.10.4 rawinput was broken in XOrg, see + * https://bugs.freedesktop.org/show_bug.cgi?id=30068 */ + broken_rawevents = strstr(XServerVendor( gdi_display ), "X.Org") && + XVendorRelease( gdi_display ) < 11004000; + #else TRACE( "X Input 2 support not compiled in.\n" ); #endif

1 0

Sebastian Lackner : winebuild: Do not access memory below ESP when restoring thread contexts.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 44fbc018eda12bdee5c2c1e2e40dbdc6a81b27fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=44fbc018eda12bdee5c2c1e2e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 12 11:09:34 2015 +0100 winebuild: Do not access memory below ESP when restoring thread contexts. Based on a patch by John Reiser. --- tools/winebuild/relay.c | 49 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index cc7dd37..63c2ca4 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -852,31 +852,48 @@ static void build_call_from_regs_x86(void) /* Restore the context structure */ - output( "2:\tpushl 0x94(%%ecx)\n"); /* SegEs */ + output( "2:\n" ); + + /* As soon as we have switched stacks the context structure could + * be invalid (when signal handlers are executed for example). Copy + * values on the target stack before changing ESP. */ + + output( "\tpushl 0xc8(%%ecx)\n" ); /* SegSs */ + output( "\tpopl %%es\n" ); + output( "\tmovl 0xc4(%%ecx),%%eax\n" ); /* Esp */ + output( "\tleal -4*4(%%eax),%%eax\n" ); + + output( "\tmovl 0xc0(%%ecx),%%edx\n" ); /* EFlags */ + output( "\t.byte 0x26\n\tmovl %%edx,3*4(%%eax)\n" ); + output( "\tmovl 0xbc(%%ecx),%%edx\n" ); /* SegCs */ + output( "\t.byte 0x26\n\tmovl %%edx,2*4(%%eax)\n" ); + output( "\tmovl 0xb8(%%ecx),%%edx\n" ); /* Eip */ + output( "\t.byte 0x26\n\tmovl %%edx,1*4(%%eax)\n" ); + output( "\tmovl 0xb0(%%ecx),%%edx\n" ); /* Eax */ + output( "\t.byte 0x26\n\tmovl %%edx,0*4(%%eax)\n" ); + + output( "\tpushl %%es\n" ); + output( "\tpushl 0x98(%%ecx)\n" ); /* SegDs */ + + output(" \tpushl 0x94(%%ecx)\n" ); /* SegEs */ output( "\tpopl %%es\n" ); output( "\tpushl 0x90(%%ecx)\n"); /* SegFs */ output( "\tpopl %%fs\n" ); output( "\tpushl 0x8c(%%ecx)\n"); /* SegGs */ output( "\tpopl %%gs\n" ); - output( "\tmovl 0x9c(%%ecx),%%edi\n"); /* Edi */ - output( "\tmovl 0xa0(%%ecx),%%esi\n"); /* Esi */ - output( "\tmovl 0xa8(%%ecx),%%edx\n"); /* Edx */ - output( "\tmovl 0xa4(%%ecx),%%ebx\n"); /* Ebx */ - output( "\tmovl 0xb0(%%ecx),%%eax\n"); /* Eax */ - output( "\tmovl 0xb4(%%ecx),%%ebp\n"); /* Ebp */ + output( "\tmovl 0x9c(%%ecx),%%edi\n" ); /* Edi */ + output( "\tmovl 0xa0(%%ecx),%%esi\n" ); /* Esi */ + output( "\tmovl 0xa4(%%ecx),%%ebx\n" ); /* Ebx */ + output( "\tmovl 0xa8(%%ecx),%%edx\n" ); /* Edx */ + output( "\tmovl 0xb4(%%ecx),%%ebp\n" ); /* Ebp */ + output( "\tmovl 0xac(%%ecx),%%ecx\n" ); /* Ecx */ - output( "\tpushl 0xc8(%%ecx)\n"); /* SegSs */ + output( "\tpopl %%ds\n" ); output( "\tpopl %%ss\n" ); - output( "\tmovl 0xc4(%%ecx),%%esp\n"); /* Esp */ + output( "\tmovl %%eax,%%esp\n" ); - output( "\tpushl 0xc0(%%ecx)\n"); /* EFlags */ - output( "\tpushl 0xbc(%%ecx)\n"); /* SegCs */ - output( "\tpushl 0xb8(%%ecx)\n"); /* Eip */ - output( "\tpushl 0x98(%%ecx)\n"); /* SegDs */ - output( "\tmovl 0xac(%%ecx),%%ecx\n"); /* Ecx */ - - output( "\tpopl %%ds\n" ); + output( "\tpopl %%eax\n" ); output( "\tiret\n" ); output_cfi( ".cfi_endproc" ); output_function_size( "__wine_call_from_regs" );

1 0

Sebastian Lackner : ntdll: Try to handle write-watches while we' re on the signal stack.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 6bec132c7ac6d21bb7da45b93d67bfad47ef8b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bec132c7ac6d21bb7da45b93… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 10 14:54:25 2015 +0100 ntdll: Try to handle write-watches while we're on the signal stack. --- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/signal_arm.c | 2 +- dlls/ntdll/signal_arm64.c | 2 +- dlls/ntdll/signal_i386.c | 11 ++++++++++- dlls/ntdll/signal_powerpc.c | 4 ++-- dlls/ntdll/signal_x86_64.c | 2 +- dlls/ntdll/virtual.c | 4 ++-- 7 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 92e5baf..674fcbc 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -169,7 +169,7 @@ extern NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_ extern void virtual_clear_thread_stack(void) DECLSPEC_HIDDEN; extern BOOL virtual_handle_stack_fault( void *addr ) DECLSPEC_HIDDEN; extern BOOL virtual_is_valid_code_address( const void *addr, SIZE_T size ) DECLSPEC_HIDDEN; -extern NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) DECLSPEC_HIDDEN; +extern NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) DECLSPEC_HIDDEN; extern BOOL virtual_check_buffer_for_read( const void *ptr, SIZE_T size ) DECLSPEC_HIDDEN; extern BOOL virtual_check_buffer_for_write( void *ptr, SIZE_T size ) DECLSPEC_HIDDEN; extern SIZE_T virtual_uninterrupted_read_memory( const void *addr, void *buffer, SIZE_T size ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index e3ae7bd..53a2663 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -443,7 +443,7 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context if (rec->NumberParameters == 2) { if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], - rec->ExceptionInformation[0] ))) + rec->ExceptionInformation[0], FALSE ))) goto done; } break; diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 8c8f7af..ccbdf4c 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -326,7 +326,7 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context if (rec->NumberParameters == 2) { if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], - rec->ExceptionInformation[0] ))) + rec->ExceptionInformation[0], FALSE ))) goto done; } break; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 1a69bc0..5c3aa819 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1907,7 +1907,7 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context if (rec->ExceptionInformation[1] == 0xffffffff && check_invalid_gs( context )) goto done; if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], - rec->ExceptionInformation[0] ))) + rec->ExceptionInformation[0], FALSE ))) goto done; if (rec->ExceptionCode == EXCEPTION_ACCESS_VIOLATION && rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT) @@ -2046,6 +2046,15 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) ucontext_t *context = sigcontext; void *stack = init_handler( sigcontext, &fs, &gs ); + /* check for exceptions on the signal stack caused by write watches */ + if (get_trap_code(context) == TRAP_x86_PAGEFLT && + (char *)stack >= (char *)get_signal_stack() && + (char *)stack < (char *)get_signal_stack() + signal_stack_size && + !virtual_handle_fault( siginfo->si_addr, (get_error_code(context) >> 1) & 0x09, TRUE )) + { + return; + } + /* check for page fault inside the thread stack */ if (get_trap_code(context) == TRAP_x86_PAGEFLT && (char *)siginfo->si_addr >= (char *)NtCurrentTeb()->DeallocationStack && diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 0fca342..886da86 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -678,7 +678,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.NumberParameters = 2; rec.ExceptionInformation[0] = 0; /* FIXME ? */ rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; - if (!(rec.ExceptionCode = virtual_handle_fault(siginfo->si_addr, rec.ExceptionInformation[0]))) + if (!(rec.ExceptionCode = virtual_handle_fault(siginfo->si_addr, rec.ExceptionInformation[0], FALSE))) goto done; break; default: @@ -701,7 +701,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.NumberParameters = 2; rec.ExceptionInformation[0] = 0; /* FIXME ? */ rec.ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; - if (!(rec.ExceptionCode = virtual_handle_fault(siginfo->si_addr, rec.ExceptionInformation[0]))) + if (!(rec.ExceptionCode = virtual_handle_fault(siginfo->si_addr, rec.ExceptionInformation[0], FALSE))) goto done; break; #endif diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index c71069d..551687f 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2286,7 +2286,7 @@ static void raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) if (rec->NumberParameters == 2) { if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], - rec->ExceptionInformation[0] ))) + rec->ExceptionInformation[0], FALSE ))) set_cpu_context( context ); } break; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 9f82204..dc5db00 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1521,7 +1521,7 @@ void virtual_clear_thread_stack(void) /*********************************************************************** * virtual_handle_fault */ -NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) +NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) { struct file_view *view; NTSTATUS ret = STATUS_ACCESS_VIOLATION; @@ -1542,7 +1542,7 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) /* ignore fault if page is writable now */ if (VIRTUAL_GetUnixProt( *vprot ) & PROT_WRITE) ret = STATUS_SUCCESS; } - if (*vprot & VPROT_GUARD) + if (!on_signal_stack && (*vprot & VPROT_GUARD)) { VIRTUAL_SetProt( view, page, page_size, *vprot & ~VPROT_GUARD ); ret = STATUS_GUARD_PAGE_VIOLATION;

1 0

Nikolay Sivov : services: Mark WOW64 services in registry.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 1896064332f785a69f665d02e220d5878ead5bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1896064332f785a69f665d02e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 01:30:54 2015 +0300 services: Mark WOW64 services in registry. --- programs/services/rpc.c | 1 + programs/services/services.c | 15 +++++++++++++-- programs/services/services.h | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 43eb3cd..9ecc09c 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -510,6 +510,7 @@ static DWORD create_serviceW( } entry->ref_count = 1; + entry->is_wow64 = is_wow64; entry->config.dwServiceType = entry->status.dwServiceType = dwServiceType; entry->config.dwStartType = dwStartType; entry->config.dwErrorControl = dwErrorControl; diff --git a/programs/services/services.c b/programs/services/services.c index 54d9e89..dd79770 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -66,7 +66,7 @@ static const WCHAR SZ_OBJECT_NAME[] = {'O','b','j','e','c','t','N','a','m' static const WCHAR SZ_TAG[] = {'T','a','g',0}; static const WCHAR SZ_DESCRIPTION[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR SZ_PRESHUTDOWN[] = {'P','r','e','s','h','u','t','d','o','w','n','T','i','m','e','o','u','t',0}; - +static const WCHAR SZ_WOW64[] = {'W','O','W','6','4',0}; DWORD service_create(LPCWSTR name, struct service_entry **entry) { @@ -108,7 +108,7 @@ void free_service_entry(struct service_entry *entry) static DWORD load_service_config(HKEY hKey, struct service_entry *entry) { - DWORD err; + DWORD err, value = 0; WCHAR *wptr; if ((err = load_reg_string(hKey, SZ_IMAGE_PATH, TRUE, &entry->config.lpBinaryPathName)) != 0) @@ -137,6 +137,9 @@ static DWORD load_service_config(HKEY hKey, struct service_entry *entry) if ((err = load_reg_dword(hKey, SZ_PRESHUTDOWN, &entry->preshutdown_timeout)) != 0) return err; + if (load_reg_dword(hKey, SZ_WOW64, &value) == 0 && value == 1) + entry->is_wow64 = TRUE; + WINE_TRACE("Image path = %s\n", wine_dbgstr_w(entry->config.lpBinaryPathName) ); WINE_TRACE("Group = %s\n", wine_dbgstr_w(entry->config.lpLoadOrderGroup) ); WINE_TRACE("Service account name = %s\n", wine_dbgstr_w(entry->config.lpServiceStartName) ); @@ -216,6 +219,14 @@ DWORD save_service_config(struct service_entry *entry) goto cleanup; if ((err = RegSetValueExW(hKey, SZ_PRESHUTDOWN, 0, REG_DWORD, (LPBYTE)&entry->preshutdown_timeout, sizeof(DWORD))) != 0) goto cleanup; + if ((err = RegSetValueExW(hKey, SZ_PRESHUTDOWN, 0, REG_DWORD, (LPBYTE)&entry->preshutdown_timeout, sizeof(DWORD))) != 0) + goto cleanup; + if (entry->is_wow64) + { + const DWORD is_wow64 = 1; + if ((err = RegSetValueExW(hKey, SZ_WOW64, 0, REG_DWORD, (LPBYTE)&is_wow64, sizeof(DWORD))) != 0) + goto cleanup; + } if (entry->config.dwTagId) err = RegSetValueExW(hKey, SZ_TAG, 0, REG_DWORD, (LPBYTE)&entry->config.dwTagId, sizeof(DWORD)); diff --git a/programs/services/services.h b/programs/services/services.h index 88a84ad..9090542 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -49,6 +49,7 @@ struct service_entry HANDLE overlapped_event; HANDLE status_changed_event; BOOL marked_for_delete; + BOOL is_wow64; }; extern struct scmdatabase *active_database;

1 0

Nikolay Sivov : advapi32: Forward to CreateServiceWOW64W() when appropriate.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: daf0af431310f647d1849cb15f4f237f22cc9cfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf0af431310f647d1849cb15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 01:20:48 2015 +0300 advapi32: Forward to CreateServiceWOW64W() when appropriate. --- dlls/advapi32/service.c | 21 ++++++++++++++++----- programs/services/rpc.c | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 8e4dda8..f9b370b 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1057,11 +1057,22 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, __TRY { - err = svcctl_CreateServiceW(hSCManager, lpServiceName, - lpDisplayName, dwDesiredAccess, dwServiceType, dwStartType, dwErrorControl, - lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, (const BYTE*)lpDependencies, - multisz_cb(lpDependencies), lpServiceStartName, (const BYTE*)lpPassword, passwdlen, - (SC_RPC_HANDLE *)&handle); + BOOL is_wow64; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + + if (is_wow64) + err = svcctl_CreateServiceWOW64W(hSCManager, lpServiceName, + lpDisplayName, dwDesiredAccess, dwServiceType, dwStartType, dwErrorControl, + lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, (const BYTE*)lpDependencies, + multisz_cb(lpDependencies), lpServiceStartName, (const BYTE*)lpPassword, passwdlen, + (SC_RPC_HANDLE *)&handle); + else + err = svcctl_CreateServiceW(hSCManager, lpServiceName, + lpDisplayName, dwDesiredAccess, dwServiceType, dwStartType, dwErrorControl, + lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, (const BYTE*)lpDependencies, + multisz_cb(lpDependencies), lpServiceStartName, (const BYTE*)lpPassword, passwdlen, + (SC_RPC_HANDLE *)&handle); } __EXCEPT(rpc_filter) { diff --git a/programs/services/rpc.c b/programs/services/rpc.c index d8ae117..43eb3cd 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -463,7 +463,7 @@ static DWORD parse_dependencies(const WCHAR *dependencies, struct service_entry return ERROR_SUCCESS; } -DWORD __cdecl svcctl_CreateServiceW( +static DWORD create_serviceW( SC_RPC_HANDLE hSCManager, LPCWSTR lpServiceName, LPCWSTR lpDisplayName, @@ -479,7 +479,8 @@ DWORD __cdecl svcctl_CreateServiceW( LPCWSTR lpServiceStartName, const BYTE *lpPassword, DWORD dwPasswordSize, - SC_RPC_HANDLE *phService) + SC_RPC_HANDLE *phService, + BOOL is_wow64) { struct service_entry *entry, *found; struct sc_manager_handle *manager; @@ -562,6 +563,30 @@ DWORD __cdecl svcctl_CreateServiceW( return create_handle_for_service(entry, dwDesiredAccess, phService); } +DWORD __cdecl svcctl_CreateServiceW( + SC_RPC_HANDLE hSCManager, + LPCWSTR lpServiceName, + LPCWSTR lpDisplayName, + DWORD dwDesiredAccess, + DWORD dwServiceType, + DWORD dwStartType, + DWORD dwErrorControl, + LPCWSTR lpBinaryPathName, + LPCWSTR lpLoadOrderGroup, + DWORD *lpdwTagId, + const BYTE *lpDependencies, + DWORD dwDependenciesSize, + LPCWSTR lpServiceStartName, + const BYTE *lpPassword, + DWORD dwPasswordSize, + SC_RPC_HANDLE *phService) +{ + WINE_TRACE("(%s, %s, 0x%x, %s)\n", wine_dbgstr_w(lpServiceName), wine_dbgstr_w(lpDisplayName), dwDesiredAccess, wine_dbgstr_w(lpBinaryPathName)); + return create_serviceW(hSCManager, lpServiceName, lpDisplayName, dwDesiredAccess, dwServiceType, dwStartType, + dwErrorControl, lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, lpDependencies, dwDependenciesSize, lpServiceStartName, + lpPassword, dwPasswordSize, phService, FALSE); +} + DWORD __cdecl svcctl_DeleteService( SC_RPC_HANDLE hService) { @@ -1521,8 +1546,9 @@ DWORD __cdecl svcctl_CreateServiceWOW64W( DWORD password_size, SC_RPC_HANDLE *service) { - WINE_FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + WINE_TRACE("(%s, %s, 0x%x, %s)\n", wine_dbgstr_w(servicename), wine_dbgstr_w(displayname), accessmask, wine_dbgstr_w(imagepath)); + return create_serviceW(scmanager, servicename, displayname, accessmask, service_type, start_type, error_control, imagepath, + loadordergroup, tagid, dependencies, depend_size, start_name, password, password_size, service, TRUE); } DWORD __cdecl svcctl_unknown46(void)

1 0

Nikolay Sivov : services: Make RPC interface compatible with native.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 0f80d4b61966af776365486c139c3e6238b984d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f80d4b61966af776365486c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 01:16:40 2015 +0300 services: Make RPC interface compatible with native. --- dlls/advapi32/service.c | 66 +++++- include/wine/svcctl.idl | 544 +++++++++++++++++++++++++++++++++++++++++------- programs/services/rpc.c | 318 ++++++++++++++++++++++++++-- 3 files changed, 821 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f80d4b61966af7763654…

1 0

Nikolay Sivov : advapi32: Fix trace format for access mask in OpenService( ).
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 7520297a49c9b058a5ddbfaec6bfb0c2b0d22c39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7520297a49c9b058a5ddbfaec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 25 23:25:48 2015 +0300 advapi32: Fix trace format for access mask in OpenService(). --- dlls/advapi32/service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 4657bd9..f2d37ca 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -921,7 +921,7 @@ SC_HANDLE WINAPI OpenServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName, LPWSTR lpServiceNameW; SC_HANDLE ret; - TRACE("%p %s %d\n", hSCManager, debugstr_a(lpServiceName), dwDesiredAccess); + TRACE("%p %s 0x%08x\n", hSCManager, debugstr_a(lpServiceName), dwDesiredAccess); lpServiceNameW = SERV_dup(lpServiceName); ret = OpenServiceW( hSCManager, lpServiceNameW, dwDesiredAccess); @@ -940,7 +940,7 @@ DWORD SERV_OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, { DWORD err; - TRACE("%p %s %d\n", hSCManager, debugstr_w(lpServiceName), dwDesiredAccess); + TRACE("%p %s 0x%08x\n", hSCManager, debugstr_w(lpServiceName), dwDesiredAccess); if (!hSCManager) return ERROR_INVALID_HANDLE;

1 0

Vincent Povirk : crypt32: Implement PKCS_RSA_PRIVATE_KEY decoding.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 7fb8ee199521241d637f82ebf1f662de819b1e9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb8ee199521241d637f82ebf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 26 14:48:05 2015 -0600 crypt32: Implement PKCS_RSA_PRIVATE_KEY decoding. --- dlls/crypt32/decode.c | 144 ++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 4 +- 2 files changed, 146 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index e5f8baf..90d8cdf 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3936,6 +3936,147 @@ static BOOL WINAPI CRYPT_AsnDecodeRsaPubKey(DWORD dwCertEncodingType, return ret; } +#define RSA2_MAGIC 0x32415352 + +struct DECODED_RSA_PRIV_KEY +{ + DWORD version; + DWORD pubexp; + CRYPT_INTEGER_BLOB modulus; + CRYPT_INTEGER_BLOB privexp; + CRYPT_INTEGER_BLOB prime1; + CRYPT_INTEGER_BLOB prime2; + CRYPT_INTEGER_BLOB exponent1; + CRYPT_INTEGER_BLOB exponent2; + CRYPT_INTEGER_BLOB coefficient; +}; + +static BOOL WINAPI CRYPT_AsnDecodeRsaPrivKey(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret; + DWORD halflen; + + __TRY + { + struct AsnDecodeSequenceItem items[] = { + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, version), + CRYPT_AsnDecodeIntInternal, sizeof(DWORD), FALSE, FALSE, 0, 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, modulus), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, modulus.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, pubexp), + CRYPT_AsnDecodeIntInternal, sizeof(DWORD), FALSE, FALSE, 0, 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, privexp), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, privexp.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, prime1), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, prime1.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, prime2), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, prime2.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, exponent1), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, exponent1.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, exponent2), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, exponent2.pbData), + 0 }, + { ASN_INTEGER, offsetof(struct DECODED_RSA_PRIV_KEY, coefficient), + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PRIV_KEY, coefficient.pbData), + 0 }, + }; + struct DECODED_RSA_PRIV_KEY *decodedKey = NULL; + DWORD size = 0; + + ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &decodedKey, + &size, NULL, NULL); + if (ret) + { + halflen = decodedKey->modulus.cbData / 2; + if ((decodedKey->modulus.cbData != halflen * 2) || + (decodedKey->prime1.cbData != halflen) || + (decodedKey->prime2.cbData != halflen) || + (decodedKey->exponent1.cbData != halflen) || + (decodedKey->exponent2.cbData != halflen) || + (decodedKey->coefficient.cbData != halflen) || + (decodedKey->privexp.cbData != halflen * 2)) + { + ret = FALSE; + SetLastError(CRYPT_E_BAD_ENCODE); + } + + if (ret) + { + DWORD bytesNeeded = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + + (halflen * 9); + + if (!pvStructInfo) + { + *pcbStructInfo = bytesNeeded; + ret = TRUE; + } + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, + pvStructInfo, pcbStructInfo, bytesNeeded))) + { + BLOBHEADER *hdr; + RSAPUBKEY *rsaPubKey; + BYTE *vardata; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + + hdr = pvStructInfo; + hdr->bType = PRIVATEKEYBLOB; + hdr->bVersion = CUR_BLOB_VERSION; + hdr->reserved = 0; + hdr->aiKeyAlg = CALG_RSA_KEYX; + + rsaPubKey = (RSAPUBKEY *)((BYTE *)pvStructInfo + + sizeof(BLOBHEADER)); + rsaPubKey->magic = RSA2_MAGIC; + rsaPubKey->pubexp = decodedKey->pubexp; + rsaPubKey->bitlen = halflen * 16; + + vardata = (BYTE*)(rsaPubKey + 1); + memcpy(vardata, + decodedKey->modulus.pbData, halflen * 2); + memcpy(vardata + halflen * 2, + decodedKey->prime1.pbData, halflen); + memcpy(vardata + halflen * 3, + decodedKey->prime2.pbData, halflen); + memcpy(vardata + halflen * 4, + decodedKey->exponent1.pbData, halflen); + memcpy(vardata + halflen * 5, + decodedKey->exponent2.pbData, halflen); + memcpy(vardata + halflen * 6, + decodedKey->coefficient.pbData, halflen); + memcpy(vardata + halflen * 7, + decodedKey->privexp.pbData, halflen * 2); + } + } + + LocalFree(decodedKey); + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; + } + __ENDTRY + return ret; +} + static BOOL CRYPT_AsnDecodeOctetsInternal(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) @@ -5798,6 +5939,9 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, case LOWORD(RSA_CSP_PUBLICKEYBLOB): decodeFunc = CRYPT_AsnDecodeRsaPubKey; break; + case LOWORD(PKCS_RSA_PRIVATE_KEY): + decodeFunc = CRYPT_AsnDecodeRsaPrivKey; + break; case LOWORD(X509_UNICODE_NAME): decodeFunc = CRYPT_AsnDecodeUnicodeName; break; diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 3240a84..b45b5f2 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -8101,7 +8101,7 @@ static void test_decodeRsaPrivateKey(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, PKCS_RSA_PRIVATE_KEY, rsaPrivKeyDer, sizeof(rsaPrivKeyDer)-10, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); - todo_wine ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD), + ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD), "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); @@ -8110,7 +8110,7 @@ static void test_decodeRsaPrivateKey(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, PKCS_RSA_PRIVATE_KEY, rsaPrivKeyDer, sizeof(rsaPrivKeyDer), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &bufSize); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) {

1 0

Vincent Povirk : crypt32: Add test for PKCS_RSA_PRIVATE_KEY decoding.
by Alexandre Julliard 27 Feb '15

27 Feb '15

Module: wine Branch: master Commit: 0c7ebefd679d00812e85576412c9f2a402537ab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c7ebefd679d00812e8557641… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 26 13:44:52 2015 -0600 crypt32: Add test for PKCS_RSA_PRIVATE_KEY decoding. --- dlls/crypt32/tests/encode.c | 283 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 283 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c7ebefd679d00812e855…

1 0

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 February 2015