December 2018 - Wine-commits

Jacek Caban : include: Add DTLS defines.
by Alexandre Julliard 06 Dec '18

06 Dec '18

Module: wine Branch: master Commit: 2d61c5f379181246d8a0aefdd164aed51b37b227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d61c5f379181246d8a0aefd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 6 17:38:17 2018 +0100 include: Add DTLS defines. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/schannel.h | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/include/schannel.h b/include/schannel.h index 6dac2e9..b48a719 100644 --- a/include/schannel.h +++ b/include/schannel.h @@ -107,6 +107,12 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 }; #define SP_PROT_ALL 0xffffffff #define SP_PROT_UNI_CLIENT 0x80000000 #define SP_PROT_UNI_SERVER 0x40000000 +#define SP_PROT_DTLS1_2_SERVER 0x00040000 +#define SP_PROT_DTLS1_2_CLIENT 0x00080000 +#define SP_PROT_DTLS_SERVER 0x00010000 +#define SP_PROT_DTLS_CLIENT 0x00020000 +#define SP_PROT_DTLS1_0_SERVER SP_PROT_DTLS_SERVER +#define SP_PROT_DTLS1_0_CLIENT SP_PROT_DTLS_CLIENT #define SP_PROT_TLS1_3_SERVER 0x00001000 #define SP_PROT_TLS1_3_CLIENT 0x00002000 #define SP_PROT_TLS1_2_CLIENT 0x00000800 @@ -126,6 +132,9 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 }; #define SP_PROT_NONE 0x00000000 #define SP_PROT_UNI (SP_PROT_UNI_CLIENT | SP_PROT_UNI_SERVER) +#define SP_PROT_DTLS (SP_PROT_DTLS_SERVER | SP_PROT_DTLS_CLIENT) +#define SP_PROT_DTLS1_0 (SP_PROT_DTLS1_0_SERVER | SP_PROT_DTLS1_0_CLIENT) +#define SP_PROT_DTLS1_2 (SP_PROT_DTLS1_2_SERVER | SP_PROT_DTLS1_2_CLIENT) #define SP_PROT_TLS1_3 (SP_PROT_TLS1_3_CLIENT | SP_PROT_TLS1_3_SERVER) #define SP_PROT_TLS1_2 (SP_PROT_TLS1_2_CLIENT | SP_PROT_TLS1_2_SERVER) #define SP_PROT_TLS1_1 (SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_1_SERVER) @@ -153,12 +162,22 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 }; #define SP_PROT_TLS1_1PLUS_SERVER ( SP_PROT_TLS1_1_SERVER \ | SP_PROT_TLS1_2_SERVER \ | SP_PROT_TLS1_3_SERVER ) +#define SP_PROT_DTLS1_X_SERVER ( SP_PROT_DTLS1_0_SERVER \ + | SP_PROT_DTLS1_2_SERVER ) +#define SP_PROT_DTLS1_X_CLIENT ( SP_PROT_DTLS1_0_CLIENT \ + | SP_PROT_DTLS1_2_CLIENT ) +#define SP_PROT_DTLS1_X ( SP_PROT_DTLS1_X_SERVER \ + | SP_PROT_DTLS1_X_CLIENT ) #define SP_PROT_CLIENTS (SP_PROT_PCT1_CLIENT | SP_PROT_SSL2_CLIENT | SP_PROT_SSL3_CLIENT \ | SP_PROT_TLS1_CLIENT | SP_PROT_UNI_CLIENT) #define SP_PROT_SERVERS (SP_PROT_PCT1_SERVER | SP_PROT_SSL2_SERVER | SP_PROT_SSL3_SERVER \ | SP_PROT_TLS1_SERVER | SP_PROT_UNI_SERVER) -#define SP_PROT_X_CLIENTS (SP_PROT_CLIENTS | SP_PROT_TLS1_X_CLIENT) -#define SP_PROT_X_SERVERS (SP_PROT_SERVERS | SP_PROT_TLS1_X_SERVER) +#define SP_PROT_X_CLIENTS ( SP_PROT_CLIENTS \ + | SP_PROT_TLS1_X_CLIENT \ + | SP_PROT_DTLS1_X_CLIENT) +#define SP_PROT_X_SERVERS ( SP_PROT_SERVERS \ + | SP_PROT_TLS1_X_SERVER \ + | SP_PROT_DTLS1_X_SERVER) #define SP_PROT_SSL3TLS1 (SP_PROT_SSL3 | SP_PROT_TLS1) #define SP_PROT_SSL3TLS1_X (SP_PROT_SSL3 | SP_PROT_TLS1_X)

1 0

Jacek Caban : secur32: Use -VERS-ALL gnutls priority string to disable not enabled protocols.
by Alexandre Julliard 06 Dec '18

06 Dec '18

Module: wine Branch: master Commit: 5cc5b102c1b0a66aa63b66f43f2da9a1a9d15ab6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cc5b102c1b0a66aa63b66f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 6 18:09:18 2018 +0100 secur32: Use -VERS-ALL gnutls priority string to disable not enabled protocols. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46161 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 05e922d..0a49421 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -166,7 +166,7 @@ DWORD schan_imp_enabled_protocols(void) BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { gnutls_session_t *s = (gnutls_session_t*)session; - char priority[128] = "NORMAL:%LATEST_RECORD_VERSION", *p; + char priority[128] = "NORMAL:%LATEST_RECORD_VERSION:-VERS-ALL", *p; unsigned i; int err = pgnutls_init(s, cred->credential_use == SECPKG_CRED_INBOUND ? GNUTLS_SERVER : GNUTLS_CLIENT); @@ -178,8 +178,9 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre p = priority + strlen(priority); for(i = 0; i < ARRAY_SIZE(protocol_priority_flags); i++) { + if (!(cred->enabled_protocols & protocol_priority_flags[i].enable_flag)) continue; *p++ = ':'; - *p++ = (cred->enabled_protocols & protocol_priority_flags[i].enable_flag) ? '+' : '-'; + *p++ = '+'; strcpy(p, protocol_priority_flags[i].gnutls_flag); p += strlen(p); }

1 0

Zebediah Figura : setupapi: Use strtoulW().
by Alexandre Julliard 06 Dec '18

06 Dec '18

Module: wine Branch: master Commit: 26dd015fdd124548fbfa40c199fb489b01deb357 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26dd015fdd124548fbfa40c1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 5 21:07:53 2018 -0600 setupapi: Use strtoulW(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5685dc3..38da640 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1412,29 +1412,6 @@ BOOL WINAPI SetupDiCreateDeviceInfoA(HDEVINFO DeviceInfoSet, const char *name, return ret; } -static DWORD SETUPDI_DevNameToDevID(LPCWSTR devName) -{ - LPCWSTR ptr; - int devNameLen = lstrlenW(devName); - DWORD devInst = 0; - BOOL valid = TRUE; - - TRACE("%s\n", debugstr_w(devName)); - for (ptr = devName; valid && *ptr && ptr - devName < devNameLen; ) - { - if (isdigitW(*ptr)) - { - devInst *= 10; - devInst |= *ptr - '0'; - ptr++; - } - else - valid = FALSE; - } - TRACE("%d\n", valid ? devInst : 0xffffffff); - return valid ? devInst : 0xffffffff; -} - /*********************************************************************** * SetupDiCreateDeviceInfoW (SETUPAPI.@) */ @@ -1483,14 +1460,16 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const LIST_FOR_EACH_ENTRY(device, &set->devices, struct device, entry) { const WCHAR *instance_str = strrchrW(device->instanceId, '\\'); + WCHAR *endptr; if (instance_str) instance_str++; else instance_str = device->instanceId; - instance_id = SETUPDI_DevNameToDevID(instance_str); - if (instance_id != 0xffffffff && instance_id > highest_id) - highest_id = instance_id; + + instance_id = strtoulW(instance_str, &endptr, 10); + if (*instance_str && !*endptr) + highest_id = max(highest_id, instance_id); } if (snprintfW(id, ARRAY_SIZE(id), formatW, name, highest_id + 1) == -1)

1 0

Michael Müller : setupapi: Always return device info from SetupDiGetDeviceInterfaceDetail() if requested.
by Alexandre Julliard 06 Dec '18

06 Dec '18

Module: wine Branch: master Commit: 2d6704ba99a7c4e7ec0b4a9384827f328599dd54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d6704ba99a7c4e7ec0b4a93… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Dec 5 21:08:11 2018 -0600 setupapi: Always return device info from SetupDiGetDeviceInterfaceDetail() if requested. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 14 ++++++++------ dlls/setupapi/tests/devinst.c | 7 +++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 38da640..5574656 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2702,9 +2702,6 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO devinfo, SP_DEVICE_INTERFA else DeviceInterfaceDetailData->DevicePath[0] = '\0'; - if (device_data && device_data->cbSize == sizeof(SP_DEVINFO_DATA)) - copy_device_data(device_data, iface->device); - ret = TRUE; } else @@ -2713,6 +2710,10 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO devinfo, SP_DEVICE_INTERFA *RequiredSize = bytesNeeded; SetLastError(ERROR_INSUFFICIENT_BUFFER); } + + if (device_data && device_data->cbSize == sizeof(SP_DEVINFO_DATA)) + copy_device_data(device_data, iface->device); + return ret; } @@ -2757,9 +2758,6 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO devinfo, SP_DEVICE_INTERFA else DeviceInterfaceDetailData->DevicePath[0] = '\0'; - if (device_data && device_data->cbSize == sizeof(SP_DEVINFO_DATA)) - copy_device_data(device_data, iface->device); - ret = TRUE; } else @@ -2768,6 +2766,10 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO devinfo, SP_DEVICE_INTERFA *RequiredSize = bytesNeeded; SetLastError(ERROR_INSUFFICIENT_BUFFER); } + + if (device_data && device_data->cbSize == sizeof(SP_DEVINFO_DATA)) + copy_device_data(device_data, iface->device); + return ret; } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 55fe104..bfffcb9 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -752,6 +752,13 @@ static void test_device_iface_detail(void) ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got unexpected error %#x.\n", GetLastError()); ok(size == expectedsize, "Got unexpected size %d.\n", size); + memset(&device, 0, sizeof(device)); + device.cbSize = sizeof(device); + ret = SetupDiGetDeviceInterfaceDetailW(set, &iface, NULL, 0, &size, &device); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + ok(IsEqualGUID(&device.ClassGuid, &guid), "Got unexpected class %s.\n", wine_dbgstr_guid(&device.ClassGuid)); + heap_free(detail); SetupDiDestroyDeviceInfoList(set); }

1 0

Nikolay Sivov : shlwapi: Remove unused fields.
by Alexandre Julliard 06 Dec '18

06 Dec '18

Module: wine Branch: master Commit: 72c28cdb53033805ac4c3c1f3a229900d2ac8014 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72c28cdb53033805ac4c3c1f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 6 08:00:37 2018 +0300 shlwapi: Remove unused fields. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/regstream.c | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 31df82a..decc1f6 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -39,16 +39,10 @@ typedef struct { IStream IStream_iface; LONG ref; - HKEY hKey; LPBYTE pbBuffer; DWORD dwLength; DWORD dwPos; DWORD dwMode; - union { - LPSTR keyNameA; - LPWSTR keyNameW; - }u; - BOOL bUnicode; } ISHRegStream; static inline ISHRegStream *impl_from_IStream(IStream *iface) @@ -105,35 +99,6 @@ static ULONG WINAPI IStream_fnRelease(IStream *iface) if (!refCount) { - TRACE(" destroying SHReg IStream (%p)\n",This); - - if (This->hKey) - { - /* write back data in REG_BINARY */ - if (This->dwMode == STGM_READWRITE || This->dwMode == STGM_WRITE) - { - if (This->dwLength) - { - if (This->bUnicode) - RegSetValueExW(This->hKey, This->u.keyNameW, 0, REG_BINARY, - (const BYTE *) This->pbBuffer, This->dwLength); - else - RegSetValueExA(This->hKey, This->u.keyNameA, 0, REG_BINARY, - (const BYTE *) This->pbBuffer, This->dwLength); - } - else - { - if (This->bUnicode) - RegDeleteValueW(This->hKey, This->u.keyNameW); - else - RegDeleteValueA(This->hKey, This->u.keyNameA); - } - } - - RegCloseKey(This->hKey); - } - - HeapFree(GetProcessHeap(),0,This->u.keyNameA); HeapFree(GetProcessHeap(),0,This->pbBuffer); HeapFree(GetProcessHeap(),0,This); return 0; @@ -384,13 +349,10 @@ static ISHRegStream *IStream_Create(HKEY hKey, LPBYTE pbBuffer, DWORD dwLength) { regStream->IStream_iface.lpVtbl = &rstvt; regStream->ref = 1; - regStream->hKey = hKey; regStream->pbBuffer = pbBuffer; regStream->dwLength = dwLength; regStream->dwPos = 0; regStream->dwMode = STGM_READWRITE; - regStream->u.keyNameA = NULL; - regStream->bUnicode = FALSE; } TRACE ("Returning %p\n", regStream); return regStream;

1 0

Ken Thomases : loader: Check if the preloader overlaps the reserved range on the Mac.
by Alexandre Julliard 06 Dec '18

06 Dec '18

Module: wine Branch: master Commit: cc24255da430c9b23a8e379dd38564e9359b3cee URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc24255da430c9b23a8e379d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Dec 5 16:21:36 2018 -0600 loader: Check if the preloader overlaps the reserved range on the Mac. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader_mac.c | 48 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 1d88062..83d24af 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -48,6 +48,7 @@ #ifdef HAVE_MACH_O_LOADER_H #include <mach/thread_status.h> #include <mach-o/loader.h> +#include <mach-o/ldsyms.h> #endif #include "main.h" @@ -98,6 +99,8 @@ void __stack_chk_fail(void) { return; } static const size_t page_size = 0x1000; static const size_t page_mask = 0xfff; #define target_mach_header mach_header +#define target_segment_command segment_command +#define TARGET_LC_SEGMENT LC_SEGMENT #define target_thread_state_t i386_thread_state_t #ifdef __DARWIN_UNIX03 #define target_thread_ip(x) (x)->__eip @@ -184,6 +187,8 @@ __ASM_GLOBAL_FUNC( start, static const size_t page_size = 0x1000; static const size_t page_mask = 0xfff; #define target_mach_header mach_header_64 +#define target_segment_command segment_command_64 +#define TARGET_LC_SEGMENT LC_SEGMENT_64 #define target_thread_state_t x86_thread_state64_t #ifdef __DARWIN_UNIX03 #define target_thread_ip(x) (x)->__rip @@ -376,6 +381,36 @@ static __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char wld_exit(1); } +static int preloader_overlaps_range( const void *start, const void *end ) +{ + intptr_t slide = p_dyld_get_image_slide(&_mh_execute_header); + struct load_command *cmd = (struct load_command*)(&_mh_execute_header + 1); + int i; + + for (i = 0; i < _mh_execute_header.ncmds; ++i) + { + if (cmd->cmd == TARGET_LC_SEGMENT) + { + struct target_segment_command *seg = (struct target_segment_command*)cmd; + const void *seg_start = (const void*)(seg->vmaddr + slide); + const void *seg_end = (const char*)seg_start + seg->vmsize; + + if (end > seg_start && start <= seg_end) + { + char segname[sizeof(seg->segname) + 1]; + memcpy(segname, seg->segname, sizeof(seg->segname)); + segname[sizeof(segname) - 1] = 0; + wld_printf( "WINEPRELOADRESERVE range %p-%p overlaps preloader %s segment %p-%p\n", + start, end, segname, seg_start, seg_end ); + return 1; + } + } + cmd = (struct load_command*)((char*)cmd + cmd->cmdsize); + } + + return 0; +} + /* * preload_reserve * @@ -406,7 +441,8 @@ static void preload_reserve( const char *str ) else if (result) goto error; /* single value '0' is allowed */ /* sanity checks */ - if (end <= start) start = end = NULL; + if (end <= start || preloader_overlaps_range(start, end)) + start = end = NULL; /* check for overlap with low memory areas */ for (i = 0; preload_info[i].size; i++) @@ -562,6 +598,11 @@ void *wld_start( void *stack, int *is_unix_thread ) p++; } + LOAD_POSIX_DYLD_FUNC( dlopen ); + LOAD_POSIX_DYLD_FUNC( dlsym ); + LOAD_POSIX_DYLD_FUNC( dladdr ); + LOAD_MACHO_DYLD_FUNC( _dyld_get_image_slide ); + /* reserve memory that Wine needs */ if (reserve) preload_reserve( reserve ); for (i = 0; preload_info[i].size; i++) @@ -576,11 +617,6 @@ void *wld_start( void *stack, int *is_unix_thread ) if (!map_region( &builtin_dlls )) builtin_dlls.size = 0; - LOAD_POSIX_DYLD_FUNC( dlopen ); - LOAD_POSIX_DYLD_FUNC( dlsym ); - LOAD_POSIX_DYLD_FUNC( dladdr ); - LOAD_MACHO_DYLD_FUNC( _dyld_get_image_slide ); - /* load the main binary */ if (!(mod = pdlopen( argv[1], RTLD_NOW ))) fatal_error( "%s: could not load binary\n", argv[1] );

1 0

Alistair Leslie-Hughes : ext-ms-win-ntuser-misc-l1-2-0: Add dll.
by Alexandre Julliard 06 Dec '18

06 Dec '18

Module: wine Branch: master Commit: 9b81989bca798543515c43c2ad1ab845d7067628 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b81989bca798543515c43c2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Dec 5 23:48:34 2018 +0000 ext-ms-win-ntuser-misc-l1-2-0: Add dll. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/ext-ms-win-ntuser-misc-l1-2-0/Makefile.in | 1 + .../ext-ms-win-ntuser-misc-l1-2-0.spec | 48 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 53 insertions(+) diff --git a/configure b/configure index 23ba36c..9a9a5e6 100755 --- a/configure +++ b/configure @@ -1272,6 +1272,7 @@ enable_ext_ms_win_ntuser_draw_l1_1_0 enable_ext_ms_win_ntuser_gui_l1_3_0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 enable_ext_ms_win_ntuser_message_l1_1_1 +enable_ext_ms_win_ntuser_misc_l1_2_0 enable_ext_ms_win_ntuser_misc_l1_5_1 enable_ext_ms_win_ntuser_mouse_l1_1_0 enable_ext_ms_win_ntuser_private_l1_1_1 @@ -19461,6 +19462,7 @@ wine_fn_config_makefile dlls/ext-ms-win-ntuser-draw-l1-1-0 enable_ext_ms_win_ntu wine_fn_config_makefile dlls/ext-ms-win-ntuser-gui-l1-3-0 enable_ext_ms_win_ntuser_gui_l1_3_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-keyboard-l1-3-0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-misc-l1-2-0 enable_ext_ms_win_ntuser_misc_l1_2_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-misc-l1-5-1 enable_ext_ms_win_ntuser_misc_l1_5_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-mouse-l1-1-0 enable_ext_ms_win_ntuser_mouse_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_private_l1_1_1 diff --git a/configure.ac b/configure.ac index 8ec69fe..aa1291d 100644 --- a/configure.ac +++ b/configure.ac @@ -3301,6 +3301,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-draw-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-gui-l1-3-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-keyboard-l1-3-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-misc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-misc-l1-5-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-mouse-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-private-l1-1-1) diff --git a/dlls/ext-ms-win-ntuser-misc-l1-2-0/Makefile.in b/dlls/ext-ms-win-ntuser-misc-l1-2-0/Makefile.in new file mode 100755 index 0000000..fcf9e0a --- /dev/null +++ b/dlls/ext-ms-win-ntuser-misc-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-misc-l1-2-0.dll diff --git a/dlls/ext-ms-win-ntuser-misc-l1-2-0/ext-ms-win-ntuser-misc-l1-2-0.spec b/dlls/ext-ms-win-ntuser-misc-l1-2-0/ext-ms-win-ntuser-misc-l1-2-0.spec new file mode 100644 index 0000000..917984a --- /dev/null +++ b/dlls/ext-ms-win-ntuser-misc-l1-2-0/ext-ms-win-ntuser-misc-l1-2-0.spec @@ -0,0 +1,48 @@ +@ stdcall AttachThreadInput(long long long) user32.AttachThreadInput +@ stdcall CloseClipboard() user32.CloseClipboard +@ stub CloseGestureInfoHandle +@ stdcall DrawTextExW(long wstr long ptr long ptr) user32.DrawTextExW +@ stdcall DrawTextW(long wstr long ptr long) user32.DrawTextW +@ stdcall EmptyClipboard() user32.EmptyClipboard +@ stdcall EnableScrollBar(long long long) user32.EnableScrollBar +@ stdcall ExitWindowsEx(long long) user32.ExitWindowsEx +@ stdcall GetClipboardData(long) user32.GetClipboardData +@ stdcall GetClipboardFormatNameW(long ptr long) user32.GetClipboardFormatNameW +@ stdcall GetClipboardOwner() user32.GetClipboardOwner +@ stdcall GetGestureConfig(long long long ptr ptr long) user32.GetGestureConfig +@ stdcall GetGestureInfo(long ptr) user32.GetGestureInfo +@ stdcall GetGuiResources(long long) user32.GetGuiResources +@ stdcall GetRawInputData(ptr long ptr ptr long) user32.GetRawInputData +@ stdcall GetRawInputDeviceInfoW(ptr long ptr ptr) user32.GetRawInputDeviceInfoW +@ stdcall GetRawInputDeviceList(ptr ptr long) user32.GetRawInputDeviceList +@ stdcall GetScrollBarInfo(long long ptr) user32.GetScrollBarInfo +@ stdcall GetScrollInfo(long long ptr) user32.GetScrollInfo +@ stdcall GetScrollPos(long long) user32.GetScrollPos +@ stdcall GetTouchInputInfo(long long ptr long) user32.GetTouchInputInfo +@ stdcall GetUserObjectSecurity(long ptr ptr long ptr) user32.GetUserObjectSecurity +@ stub GetWindowFeedbackSetting +@ stdcall IsClipboardFormatAvailable(long) user32.IsClipboardFormatAvailable +@ stdcall IsTouchWindow(long ptr) user32.IsTouchWindow +@ stdcall KillTimer(long long) user32.KillTimer +@ stdcall MessageBeep(long) user32.MessageBeep +@ stdcall OpenClipboard(long) user32.OpenClipboard +@ stdcall RegisterClipboardFormatA(str) user32.RegisterClipboardFormatA +@ stdcall RegisterClipboardFormatW(wstr) user32.RegisterClipboardFormatW +@ stdcall RegisterDeviceNotificationW(long ptr long) user32.RegisterDeviceNotificationW +@ stdcall RegisterRawInputDevices(ptr long long) user32.RegisterRawInputDevices +@ stdcall ScrollWindowEx(long long long ptr ptr long ptr long) user32.ScrollWindowEx +@ stdcall SetClipboardData(long long) user32.SetClipboardData +@ stdcall SetCoalescableTimer(long long long ptr long) user32.SetCoalescableTimer +@ stdcall SetScrollInfo(long long ptr long) user32.SetScrollInfo +@ stdcall SetScrollPos(long long long long) user32.SetScrollPos +@ stdcall SetScrollRange(long long long long long) user32.SetScrollRange +@ stdcall SetTimer(long long long ptr) user32.SetTimer +@ stdcall SetUserObjectSecurity(long ptr ptr) user32.SetUserObjectSecurity +@ stub SetWindowFeedbackSetting +@ stdcall ShowScrollBar(long long long) user32.ShowScrollBar +@ stdcall ShutdownBlockReasonCreate(long wstr) user32.ShutdownBlockReasonCreate +@ stdcall ShutdownBlockReasonDestroy(long) user32.ShutdownBlockReasonDestroy +@ stdcall TabbedTextOutW(long long long wstr long long ptr long) user32.TabbedTextOutW +@ stdcall UnregisterDeviceNotification(long) user32.UnregisterDeviceNotification +@ stdcall WaitForInputIdle(long long) user32.WaitForInputIdle +@ stdcall WinHelpW(long wstr long long) user32.WinHelpW diff --git a/tools/make_specfiles b/tools/make_specfiles index 2b38aed..edc317d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -384,6 +384,7 @@ my @dll_groups = "ext-ms-win-ntuser-gui-l1-3-0", "ext-ms-win-ntuser-keyboard-l1-3-0", "ext-ms-win-ntuser-message-l1-1-1", + "ext-ms-win-ntuser-misc-l1-2-0", "ext-ms-win-ntuser-misc-l1-5-1", "ext-ms-win-ntuser-mouse-l1-1-0", "ext-ms-win-ntuser-private-l1-1-1",

1 0

Pierre Schweitzer : mpr: Implement support for making connections persistent.
by Alexandre Julliard 06 Dec '18

06 Dec '18

Module: wine Branch: master Commit: 23a232fce8899a24e76207518175235b7b0f00cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=23a232fce8899a24e7620751… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Tue Nov 27 19:54:48 2018 +0100 mpr: Implement support for making connections persistent. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index d0b4ba8..3db0ab1 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -2004,9 +2004,12 @@ static DWORD wnet_use_provider( struct use_connection_context *ctxt, NETRESOURCE return ret; } +static const WCHAR providerType[] = { 'P','r','o','v','i','d','e','r','T','y','p','e',0 }; +static const WCHAR userName[] = { 'U','s','e','r','N','a','m','e',0 }; + static DWORD wnet_use_connection( struct use_connection_context *ctxt ) { - WNetProvider *provider; + WNetProvider *provider = NULL; DWORD index, ret = WN_NO_NETWORK; BOOL redirect = FALSE; WCHAR letter[3] = {'Z', ':', 0}; @@ -2060,6 +2063,42 @@ static DWORD wnet_use_connection( struct use_connection_context *ctxt ) } } + if (ret == WN_SUCCESS && ctxt->flags & CONNECT_UPDATE_PROFILE) + { + HKEY user_profile; + + if (netres.dwType == RESOURCETYPE_PRINT) + { + FIXME("Persistent connection are not supported for printers\n"); + return ret; + } + + if (RegOpenCurrentUser(KEY_ALL_ACCESS, &user_profile) == ERROR_SUCCESS) + { + HKEY network; + WCHAR subkey[10] = {'N', 'e', 't', 'w', 'o', 'r', 'k', '\\', netres.lpLocalName[0], 0}; + + if (RegCreateKeyExW(user_profile, subkey, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, NULL, &network, NULL) == ERROR_SUCCESS) + { + DWORD dword_arg = RESOURCETYPE_DISK; + DWORD len = (strlenW(provider->name) + 1) * sizeof(WCHAR); + static const WCHAR empty[1] = {0}; + + RegSetValueExW(network, connectionType, 0, REG_DWORD, (const BYTE *)&dword_arg, sizeof(DWORD)); + RegSetValueExW(network, providerName, 0, REG_SZ, (const BYTE *)provider->name, len); + RegSetValueExW(network, providerType, 0, REG_DWORD, (const BYTE *)&provider->dwNetType, sizeof(DWORD)); + len = (strlenW(netres.lpRemoteName) + 1) * sizeof(WCHAR); + RegSetValueExW(network, remotePath, 0, REG_SZ, (const BYTE *)netres.lpRemoteName, len); + len = sizeof(empty); + RegSetValueExW(network, userName, 0, REG_SZ, (const BYTE *)empty, len); + RegCloseKey(network); + } + + RegCloseKey(user_profile); + } + } + return ret; }

1 0

Pierre Schweitzer : mpr: Implement support for deleting persistent connections.
by Alexandre Julliard 06 Dec '18

06 Dec '18

Module: wine Branch: master Commit: 773ff2e83b0547540639c6d4aeb9f817b621fb2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=773ff2e83b0547540639c6d4… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Thu Dec 6 08:39:37 2018 +0100 mpr: Implement support for deleting persistent connections. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 3db0ab1..df8aef2 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -2290,6 +2290,23 @@ DWORD WINAPI WNetCancelConnection2W( LPCWSTR lpName, DWORD dwFlags, BOOL fForce } } } + + if (ret == WN_SUCCESS && dwFlags & CONNECT_UPDATE_PROFILE) + { + HKEY user_profile; + + /* FIXME: Only remove it if that's a drive letter */ + if (isalphaW(lpName[0]) && lpName[1] == ':' && + RegOpenCurrentUser(KEY_ALL_ACCESS, &user_profile) == ERROR_SUCCESS) + { + WCHAR subkey[10] = {'N', 'e', 't', 'w', 'o', 'r', 'k', '\\', lpName[0], 0}; + + RegDeleteKeyW(user_profile, subkey); + + RegCloseKey(user_profile); + } + } + return ret; }

1 0

Dmitry Timoshkov : windowscodecs/tests: Add tests for encoding 2bpp/ 4bpp images with a palette.
by Alexandre Julliard 06 Dec '18

06 Dec '18

Module: wine Branch: master Commit: 1d7da01ff109500583433cc386a7128476f885cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d7da01ff109500583433cc3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 6 12:05:49 2018 +0300 windowscodecs/tests: Add tests for encoding 2bpp/4bpp images with a palette. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 323 +++++++++++++++++++++++++++++------ 1 file changed, 267 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1d7da01ff10950058343…

1 0