wine-commits December 2018

wine-commits@winehq.org

1 participants
352 discussions

Alex Henrie : comctl32: Make constant 'mdays' static.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: baf6adfef766cece78b4ddf593a55de767a6de16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baf6adfef766cece78b4ddf5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:48 2018 -0700 comctl32: Make constant 'mdays' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 3fb7600..dd34c22 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -213,7 +213,7 @@ static inline int MONTHCAL_MonthDiff(const SYSTEMTIME *left, const SYSTEMTIME *r /* January is 1, December is 12 */ int MONTHCAL_MonthLength(int month, int year) { - const int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; + static const int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; /* Wrap around, this eases handling. Getting length only we shouldn't care about year change here cause January and December have the same day quantity */

1 0

Sebastian Lackner : loader: Implement preloader for macOS.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: a0ab2a7b0c9c28588714372cf1b19a06dd706b26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0ab2a7b0c9c28588714372c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 3 10:46:51 2018 -0600 loader: Implement preloader for macOS. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 + configure | 46 ++++- configure.ac | 21 ++- dlls/ntdll/virtual.c | 12 +- libs/wine/config.c | 2 +- loader/Makefile.in | 9 +- loader/main.c | 46 +---- loader/preloader.c | 62 ++----- loader/preloader.h | 66 ++++++++ loader/preloader_mac.c | 450 +++++++++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 616 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a0ab2a7b0c9c28588714…

1 0

Ken Thomases : loader: Move some code in preparation for adding the Mac preloader.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: bd2d795240d996f6cc8884b33e28ea15c2d47afe URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd2d795240d996f6cc8884b3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Dec 3 10:46:50 2018 -0600 loader: Move some code in preparation for adding the Mac preloader. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader.c | 288 +++++++++++++++++++++++++++-------------------------- 1 file changed, 148 insertions(+), 140 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 644244b..bf1e658 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -93,6 +93,14 @@ #include "main.h" +static int wld_vsprintf(char *buffer, const char *fmt, va_list args ); + +static __attribute__((format(printf,1,2))) void wld_printf(const char *fmt, ... ); + +static __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char *fmt, ... ); + +static void preload_reserve( const char *str ); + /* ELF definitions */ #define ELF_PREFERRED_ADDRESS(loader, maplength, mapstartpref) (mapstartpref) #define ELF_FIXED_ADDRESS(loader, mapstart) ((void) 0) @@ -559,85 +567,6 @@ static inline void *wld_memset( void *dest, int val, size_t len ) return dest; } -/* - * wld_printf - just the basics - * - * %x prints a hex number - * %s prints a string - * %p prints a pointer - */ -static int wld_vsprintf(char *buffer, const char *fmt, va_list args ) -{ - static const char hex_chars[16] = "0123456789abcdef"; - const char *p = fmt; - char *str = buffer; - int i; - - while( *p ) - { - if( *p == '%' ) - { - p++; - if( *p == 'x' ) - { - unsigned int x = va_arg( args, unsigned int ); - for (i = 2*sizeof(x) - 1; i >= 0; i--) - *str++ = hex_chars[(x>>(i*4))&0xf]; - } - else if (p[0] == 'l' && p[1] == 'x') - { - unsigned long x = va_arg( args, unsigned long ); - for (i = 2*sizeof(x) - 1; i >= 0; i--) - *str++ = hex_chars[(x>>(i*4))&0xf]; - p++; - } - else if( *p == 'p' ) - { - unsigned long x = (unsigned long)va_arg( args, void * ); - for (i = 2*sizeof(x) - 1; i >= 0; i--) - *str++ = hex_chars[(x>>(i*4))&0xf]; - } - else if( *p == 's' ) - { - char *s = va_arg( args, char * ); - while(*s) - *str++ = *s++; - } - else if( *p == 0 ) - break; - p++; - } - *str++ = *p++; - } - *str = 0; - return str - buffer; -} - -static __attribute__((format(printf,1,2))) void wld_printf(const char *fmt, ... ) -{ - va_list args; - char buffer[256]; - int len; - - va_start( args, fmt ); - len = wld_vsprintf(buffer, fmt, args ); - va_end( args ); - wld_write(2, buffer, len); -} - -static __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char *fmt, ... ) -{ - va_list args; - char buffer[256]; - int len; - - va_start( args, fmt ); - len = wld_vsprintf(buffer, fmt, args ); - va_end( args ); - wld_write(2, buffer, len); - wld_exit(1); -} - #ifdef DUMP_AUX_INFO /* * Dump interesting bits of the ELF auxv_t structure that is passed @@ -1120,67 +1049,6 @@ found: return (void *)(symtab[idx].st_value + map->l_addr); } -/* - * preload_reserve - * - * Reserve a range specified in string format - */ -static void preload_reserve( const char *str ) -{ - const char *p; - unsigned long result = 0; - void *start = NULL, *end = NULL; - int i, first = 1; - - for (p = str; *p; p++) - { - if (*p >= '0' && *p <= '9') result = result * 16 + *p - '0'; - else if (*p >= 'a' && *p <= 'f') result = result * 16 + *p - 'a' + 10; - else if (*p >= 'A' && *p <= 'F') result = result * 16 + *p - 'A' + 10; - else if (*p == '-') - { - if (!first) goto error; - start = (void *)(result & ~page_mask); - result = 0; - first = 0; - } - else goto error; - } - if (!first) end = (void *)((result + page_mask) & ~page_mask); - else if (result) goto error; /* single value '0' is allowed */ - - /* sanity checks */ - if (end <= start) start = end = NULL; - else if ((char *)end > preloader_start && - (char *)start <= preloader_end) - { - wld_printf( "WINEPRELOADRESERVE range %p-%p overlaps preloader %p-%p\n", - start, end, preloader_start, preloader_end ); - start = end = NULL; - } - - /* check for overlap with low memory areas */ - for (i = 0; preload_info[i].size; i++) - { - if ((char *)preload_info[i].addr > (char *)0x00110000) break; - if ((char *)end <= (char *)preload_info[i].addr + preload_info[i].size) - { - start = end = NULL; - break; - } - if ((char *)start < (char *)preload_info[i].addr + preload_info[i].size) - start = (char *)preload_info[i].addr + preload_info[i].size; - } - - while (preload_info[i].size) i++; - preload_info[i].addr = start; - preload_info[i].size = (char *)end - (char *)start; - return; - -error: - fatal_error( "invalid WINEPRELOADRESERVE value '%s'\n", str ); -} - /* check if address is in one of the reserved ranges */ static int is_addr_reserved( const void *addr ) { @@ -1374,3 +1242,143 @@ void* wld_start( void **stack ) return (void *)ld_so_map.l_entry; } + +/* + * wld_printf - just the basics + * + * %x prints a hex number + * %s prints a string + * %p prints a pointer + */ +static int wld_vsprintf(char *buffer, const char *fmt, va_list args ) +{ + static const char hex_chars[16] = "0123456789abcdef"; + const char *p = fmt; + char *str = buffer; + int i; + + while( *p ) + { + if( *p == '%' ) + { + p++; + if( *p == 'x' ) + { + unsigned int x = va_arg( args, unsigned int ); + for (i = 2*sizeof(x) - 1; i >= 0; i--) + *str++ = hex_chars[(x>>(i*4))&0xf]; + } + else if (p[0] == 'l' && p[1] == 'x') + { + unsigned long x = va_arg( args, unsigned long ); + for (i = 2*sizeof(x) - 1; i >= 0; i--) + *str++ = hex_chars[(x>>(i*4))&0xf]; + p++; + } + else if( *p == 'p' ) + { + unsigned long x = (unsigned long)va_arg( args, void * ); + for (i = 2*sizeof(x) - 1; i >= 0; i--) + *str++ = hex_chars[(x>>(i*4))&0xf]; + } + else if( *p == 's' ) + { + char *s = va_arg( args, char * ); + while(*s) + *str++ = *s++; + } + else if( *p == 0 ) + break; + p++; + } + *str++ = *p++; + } + *str = 0; + return str - buffer; +} + +static void wld_printf(const char *fmt, ... ) +{ + va_list args; + char buffer[256]; + int len; + + va_start( args, fmt ); + len = wld_vsprintf(buffer, fmt, args ); + va_end( args ); + wld_write(2, buffer, len); +} + +static void fatal_error(const char *fmt, ... ) +{ + va_list args; + char buffer[256]; + int len; + + va_start( args, fmt ); + len = wld_vsprintf(buffer, fmt, args ); + va_end( args ); + wld_write(2, buffer, len); + wld_exit(1); +} + +/* + * preload_reserve + * + * Reserve a range specified in string format + */ +static void preload_reserve( const char *str ) +{ + const char *p; + unsigned long result = 0; + void *start = NULL, *end = NULL; + int i, first = 1; + + for (p = str; *p; p++) + { + if (*p >= '0' && *p <= '9') result = result * 16 + *p - '0'; + else if (*p >= 'a' && *p <= 'f') result = result * 16 + *p - 'a' + 10; + else if (*p >= 'A' && *p <= 'F') result = result * 16 + *p - 'A' + 10; + else if (*p == '-') + { + if (!first) goto error; + start = (void *)(result & ~page_mask); + result = 0; + first = 0; + } + else goto error; + } + if (!first) end = (void *)((result + page_mask) & ~page_mask); + else if (result) goto error; /* single value '0' is allowed */ + + /* sanity checks */ + if (end <= start) start = end = NULL; + else if ((char *)end > preloader_start && + (char *)start <= preloader_end) + { + wld_printf( "WINEPRELOADRESERVE range %p-%p overlaps preloader %p-%p\n", + start, end, preloader_start, preloader_end ); + start = end = NULL; + } + + /* check for overlap with low memory areas */ + for (i = 0; preload_info[i].size; i++) + { + if ((char *)preload_info[i].addr > (char *)0x00110000) break; + if ((char *)end <= (char *)preload_info[i].addr + preload_info[i].size) + { + start = end = NULL; + break; + } + if ((char *)start < (char *)preload_info[i].addr + preload_info[i].size) + start = (char *)preload_info[i].addr + preload_info[i].size; + } + + while (preload_info[i].size) i++; + preload_info[i].addr = start; + preload_info[i].size = (char *)end - (char *)start; + return; + +error: + fatal_error( "invalid WINEPRELOADRESERVE value '%s'\n", str ); +}

1 0

Michael Müller : ntdll: Add stub for RtlGetUnloadEventTraceEx.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 33b566c3d5350aa1ec80207dcf17e78d6c06cc8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=33b566c3d5350aa1ec80207d… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Dec 4 01:15:59 2018 -0700 ntdll: Add stub for RtlGetUnloadEventTraceEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44897 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtl.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 3741eb9..c2e2fb1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -681,6 +681,7 @@ # @ stub RtlGetSetBootStatusData @ stdcall RtlGetThreadErrorMode() @ stdcall RtlGetUnloadEventTrace() +@ stdcall RtlGetUnloadEventTraceEx(ptr ptr ptr) @ stub RtlGetUserInfoHeap @ stdcall RtlGetVersion(ptr) @ stdcall -arch=arm,arm64,x86_64 RtlGrowFunctionTable(ptr long) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index e80aa5e..393bd27 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1680,6 +1680,20 @@ RTL_UNLOAD_EVENT_TRACE * WINAPI RtlGetUnloadEventTrace(void) } /********************************************************************* + * RtlGetUnloadEventTraceEx [NTDLL.@] + */ +void WINAPI RtlGetUnloadEventTraceEx(ULONG **size, ULONG **count, void **trace) +{ + static ULONG dummy_size, dummy_count; + + FIXME("(%p, %p, %p): stub!\n", size, count, trace); + + if (size) *size = &dummy_size; + if (count) *count = &dummy_count; + if (trace) *trace = NULL; +} + +/********************************************************************* * RtlQueryPackageIdentity [NTDLL.@] */ NTSTATUS WINAPI RtlQueryPackageIdentity(HANDLE token, WCHAR *fullname, SIZE_T *fullname_size,

1 0

Hans Leidekker : bcrypt: Support retrieving properties from key handles.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: dc97df72ff24b40a8d95dbf5bc94967ed5b783cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc97df72ff24b40a8d95dbf5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 4 08:59:20 2018 +0100 bcrypt: Support retrieving properties from key handles. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 10 ++++ dlls/bcrypt/bcrypt_main.c | 130 +++++++++++++++++++++++++----------------- dlls/bcrypt/tests/bcrypt.c | 31 +++++++++- 3 files changed, 117 insertions(+), 54 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index a40f9d1..593e784 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -198,9 +198,19 @@ struct key } u; }; #else +struct key_symmetric +{ + enum mode_id mode; +}; + struct key { struct object hdr; + enum alg_id alg_id; + union + { + struct key_symmetric s; + } u; }; #endif diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 2b9ae0b..0c68a4f 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -413,6 +413,63 @@ static NTSTATUS generic_alg_property( enum alg_id id, const WCHAR *prop, UCHAR * return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS get_aes_property( enum mode_id mode, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +{ + if (!strcmpW( prop, BCRYPT_BLOCK_LENGTH )) + { + *ret_size = sizeof(ULONG); + if (size < sizeof(ULONG)) return STATUS_BUFFER_TOO_SMALL; + if (buf) *(ULONG *)buf = BLOCK_LENGTH_AES; + return STATUS_SUCCESS; + } + if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) + { + const WCHAR *str; + switch (mode) + { + case MODE_ID_ECB: str = BCRYPT_CHAIN_MODE_ECB; break; + case MODE_ID_CBC: str = BCRYPT_CHAIN_MODE_CBC; break; + case MODE_ID_GCM: str = BCRYPT_CHAIN_MODE_GCM; break; + default: return STATUS_NOT_IMPLEMENTED; + } + + *ret_size = 64; + if (size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + memcpy( buf, str, (strlenW(str) + 1) * sizeof(WCHAR) ); + return STATUS_SUCCESS; + } + if (!strcmpW( prop, BCRYPT_KEY_LENGTHS )) + { + BCRYPT_KEY_LENGTHS_STRUCT *key_lengths = (void *)buf; + *ret_size = sizeof(*key_lengths); + if (key_lengths && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + if (key_lengths) + { + key_lengths->dwMinLength = 128; + key_lengths->dwMaxLength = 256; + key_lengths->dwIncrement = 64; + } + return STATUS_SUCCESS; + } + if (!strcmpW( prop, BCRYPT_AUTH_TAG_LENGTH )) + { + BCRYPT_AUTH_TAG_LENGTHS_STRUCT *tag_length = (void *)buf; + if (mode != MODE_ID_GCM) return STATUS_NOT_SUPPORTED; + *ret_size = sizeof(*tag_length); + if (tag_length && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + if (tag_length) + { + tag_length->dwMinLength = 12; + tag_length->dwMaxLength = 16; + tag_length->dwIncrement = 1; + } + return STATUS_SUCCESS; + } + + FIXME( "unsupported property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) { NTSTATUS status; @@ -424,59 +481,7 @@ NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop, UCHAR switch (alg->id) { case ALG_ID_AES: - if (!strcmpW( prop, BCRYPT_BLOCK_LENGTH )) - { - *ret_size = sizeof(ULONG); - if (size < sizeof(ULONG)) - return STATUS_BUFFER_TOO_SMALL; - if (buf) - *(ULONG *)buf = BLOCK_LENGTH_AES; - return STATUS_SUCCESS; - } - if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) - { - const WCHAR *mode; - switch (alg->mode) - { - case MODE_ID_ECB: mode = BCRYPT_CHAIN_MODE_ECB; break; - case MODE_ID_CBC: mode = BCRYPT_CHAIN_MODE_CBC; break; - case MODE_ID_GCM: mode = BCRYPT_CHAIN_MODE_GCM; break; - default: return STATUS_NOT_IMPLEMENTED; - } - - *ret_size = 64; - if (size < *ret_size) return STATUS_BUFFER_TOO_SMALL; - memcpy( buf, mode, (strlenW(mode) + 1) * sizeof(WCHAR) ); - return STATUS_SUCCESS; - } - if (!strcmpW( prop, BCRYPT_KEY_LENGTHS )) - { - BCRYPT_KEY_LENGTHS_STRUCT *key_lengths = (void *)buf; - *ret_size = sizeof(*key_lengths); - if (key_lengths && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; - if (key_lengths) - { - key_lengths->dwMinLength = 128; - key_lengths->dwMaxLength = 256; - key_lengths->dwIncrement = 64; - } - return STATUS_SUCCESS; - } - if (!strcmpW( prop, BCRYPT_AUTH_TAG_LENGTH )) - { - BCRYPT_AUTH_TAG_LENGTHS_STRUCT *tag_length = (void *)buf; - if (alg->mode != MODE_ID_GCM) return STATUS_NOT_SUPPORTED; - *ret_size = sizeof(*tag_length); - if (tag_length && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; - if (tag_length) - { - tag_length->dwMinLength = 12; - tag_length->dwMaxLength = 16; - tag_length->dwIncrement = 1; - } - return STATUS_SUCCESS; - } - break; + return get_aes_property( alg->mode, prop, buf, size, ret_size ); default: break; @@ -533,6 +538,20 @@ static NTSTATUS get_hash_property( const struct hash *hash, const WCHAR *prop, U return status; } +static NTSTATUS get_key_property( const struct key *key, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +{ + switch (key->alg_id) + { + case ALG_ID_AES: + if (!strcmpW( prop, BCRYPT_AUTH_TAG_LENGTH )) return STATUS_NOT_SUPPORTED; + return get_aes_property( key->u.s.mode, prop, buf, size, ret_size ); + + default: + FIXME( "unsupported algorithm %u\n", key->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } +} + NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *buffer, ULONG count, ULONG *res, ULONG flags ) { struct object *object = handle; @@ -549,6 +568,11 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu const struct algorithm *alg = (const struct algorithm *)object; return get_alg_property( alg, prop, buffer, count, res ); } + case MAGIC_KEY: + { + const struct key *key = (const struct key *)object; + return get_key_property( key, prop, buffer, count, res ); + } case MAGIC_HASH: { const struct hash *hash = (const struct hash *)object; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 6865e87..c3f8f3d 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -507,7 +507,8 @@ static void test_BCryptGenerateSymmetricKey(void) {0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79}; BCRYPT_ALG_HANDLE aes; BCRYPT_KEY_HANDLE key, key2; - UCHAR *buf, ciphertext[16], plaintext[16], ivbuf[16]; + UCHAR *buf, ciphertext[16], plaintext[16], ivbuf[16], mode[64]; + BCRYPT_KEY_LENGTHS_STRUCT key_lengths; ULONG size, len, i; NTSTATUS ret; @@ -608,6 +609,27 @@ static void test_BCryptGenerateSymmetricKey(void) ok(size == 16, "got %u\n", size); ok(!memcmp(plaintext, data, sizeof(data)), "wrong data\n"); + memset(mode, 0, sizeof(mode)); + ret = pBCryptGetProperty(key, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_CBC), "wrong mode\n"); + + len = 0; + size = 0; + ret = pBCryptGetProperty(key, BCRYPT_BLOCK_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(len == 16, "got %u\n", len); + ok(size == sizeof(len), "got %u\n", size); + + size = 0; + memset(&key_lengths, 0, sizeof(key_lengths)); + ret = pBCryptGetProperty(aes, BCRYPT_KEY_LENGTHS, (UCHAR*)&key_lengths, sizeof(key_lengths), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == sizeof(key_lengths), "got %u\n", size); + ok(key_lengths.dwMinLength == 128, "Expected 128, got %d\n", key_lengths.dwMinLength); + ok(key_lengths.dwMaxLength == 256, "Expected 256, got %d\n", key_lengths.dwMaxLength); + ok(key_lengths.dwIncrement == 64, "Expected 64, got %d\n", key_lengths.dwIncrement); + ret = pBCryptDestroyKey(key); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); HeapFree(GetProcessHeap(), 0, buf); @@ -855,6 +877,9 @@ static void test_BCryptEncrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(key != NULL, "key not set\n"); + ret = pBCryptGetProperty(key, BCRYPT_AUTH_TAG_LENGTH, (UCHAR*)&tag_length, sizeof(tag_length), &size, 0); + ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + memset(&auth_info, 0, sizeof(auth_info)); auth_info.cbSize = sizeof(auth_info); auth_info.dwInfoVersion = 1; @@ -1108,6 +1133,7 @@ static void test_BCryptDecrypt(void) {0x17,0x9d,0xc0,0x7a,0xf0,0xcf,0xaa,0xd5,0x1c,0x11,0xc4,0x4b,0xd6,0xa3,0x3e,0x77}; BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO auth_info; BCRYPT_KEY_LENGTHS_STRUCT key_lengths; + BCRYPT_AUTH_TAG_LENGTHS_STRUCT tag_lengths; BCRYPT_ALG_HANDLE aes; BCRYPT_KEY_HANDLE key; UCHAR *buf, plaintext[48], ivbuf[16]; @@ -1242,6 +1268,9 @@ static void test_BCryptDecrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(key != NULL, "key not set\n"); + ret = pBCryptGetProperty(key, BCRYPT_AUTH_TAG_LENGTH, (UCHAR*)&tag_lengths, sizeof(tag_lengths), &size, 0); + ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + memset(&auth_info, 0, sizeof(auth_info)); auth_info.cbSize = sizeof(auth_info); auth_info.dwInfoVersion = 1;

1 0

Zebediah Figura : setupapi: Implement SetupDiDeleteDeviceInfo().
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 03e9ef38a7d16920f60b6c17d711588ac25e53ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=03e9ef38a7d16920f60b6c17… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Dec 3 23:36:16 2018 -0600 setupapi: Implement SetupDiDeleteDeviceInfo(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43211 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 17 ++++++++++++++ dlls/setupapi/stubs.c | 12 ---------- dlls/setupapi/tests/devinst.c | 52 +++++++++++++++++++++++++++++-------------- 3 files changed, 52 insertions(+), 29 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index db0b72f..5685dc3 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1575,6 +1575,23 @@ BOOL WINAPI SetupDiRemoveDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) } /*********************************************************************** + * SetupDiDeleteDeviceInfo (SETUPAPI.@) + */ +BOOL WINAPI SetupDiDeleteDeviceInfo(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) +{ + struct device *device; + + TRACE("devinfo %p, device_data %p.\n", devinfo, device_data); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + delete_device(device); + + return TRUE; +} + +/*********************************************************************** * SetupDiRemoveDeviceInterface (SETUPAPI.@) */ BOOL WINAPI SetupDiRemoveDeviceInterface(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 7c3413a..61ce005 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -612,18 +612,6 @@ BOOL WINAPI SetupDiDestroyDriverInfoList(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DAT } /*********************************************************************** - * SetupDiDeleteDeviceInfo (SETUPAPI.@) - */ - -BOOL WINAPI SetupDiDeleteDeviceInfo(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData) - { - FIXME(": stub %p, %p\n", DeviceInfoSet, DeviceInfoData); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; - } - -/*********************************************************************** * SetupDiDrawMiniIcon (SETUPAPI.@) */ INT WINAPI SetupDiDrawMiniIcon(HDC hdc, RECT rc, INT MiniIconIndex, DWORD Flags) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index edb660e..55fe104 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -337,13 +337,21 @@ static void test_device_info(void) check_device_info(set, 2, &guid, "ROOT\\LEGACY_BOGUS\\0002"); check_device_info(set, 3, &guid, NULL); + ret = SetupDiEnumDeviceInfo(set, 0, &ret_device); + ok(ret, "Failed to enumerate devices, error %#x.\n", GetLastError()); + ret = SetupDiDeleteDeviceInfo(set, &ret_device); + ok(ret, "Failed to delete device, error %#x.\n", GetLastError()); + + check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\0001"); + check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\0002"); + check_device_info(set, 2, &guid, NULL); + ret = SetupDiRemoveDevice(set, &device); ok(ret, "Got unexpected error %#x.\n", GetLastError()); - check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\0000"); - check_device_info(set, 1, &guid, "ROOT\\LEGACY_BOGUS\\0001"); + check_device_info(set, 0, &guid, "ROOT\\LEGACY_BOGUS\\0001"); - ret = SetupDiEnumDeviceInfo(set, 2, &ret_device); + ret = SetupDiEnumDeviceInfo(set, 1, &ret_device); ok(ret, "Got unexpected error %#x.\n", GetLastError()); ok(IsEqualGUID(&ret_device.ClassGuid, &guid), "Got unexpected class %s.\n", wine_dbgstr_guid(&ret_device.ClassGuid)); @@ -353,7 +361,7 @@ static void test_device_info(void) ok(ret_device.DevInst == device.DevInst, "Expected device node %#x, got %#x.\n", device.DevInst, ret_device.DevInst); - check_device_info(set, 3, &guid, NULL); + check_device_info(set, 2, &guid, NULL); SetupDiDestroyDeviceInfoList(set); @@ -469,7 +477,7 @@ static void test_register_device_info(void) SP_DEVINFO_DATA device = {0}; BOOL ret; HDEVINFO set; - char id[30]; + int i = 0; SetLastError(0xdeadbeef); ret = SetupDiRegisterDeviceInfo(NULL, NULL, 0, NULL, NULL, NULL); @@ -497,30 +505,40 @@ static void test_register_device_info(void) ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); ok(ret, "Failed to create device, error %#x.\n", GetLastError()); - ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); ok(ret, "Failed to register device, error %#x.\n", GetLastError()); ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0001", &guid, NULL, NULL, 0, &device); ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); + ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + ret = SetupDiRemoveDevice(set, &device); + ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0002", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); + ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + ret = SetupDiDeleteDeviceInfo(set, &device); + ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0003", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); SetupDiDestroyDeviceInfoList(set); set = SetupDiGetClassDevsA(&guid, NULL, NULL, 0); ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); - ret = SetupDiEnumDeviceInfo(set, 0, &device); - ok(ret, "Failed to enumerate devices, error %#x.\n", GetLastError()); - ret = SetupDiGetDeviceInstanceIdA(set, &device, id, sizeof(id), NULL); - ok(ret, "Failed to get device id, error %#x.\n", GetLastError()); - ok(!strcasecmp(id, "Root\\LEGACY_BOGUS\\0000"), "Got unexpected id %s.\n", id); - - ret = SetupDiRemoveDevice(set, &device); - ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\0000"); + check_device_info(set, 1, &guid, "Root\\LEGACY_BOGUS\\0002"); + check_device_info(set, 2, &guid, NULL); - ret = SetupDiEnumDeviceInfo(set, 1, &device); - ok(!ret, "Expected failure.\n"); - ok(GetLastError() == ERROR_NO_MORE_ITEMS, "Got unexpected error %#x.\n", GetLastError()); + while (SetupDiEnumDeviceInfo(set, i++, &device)) + { + ret = SetupDiRemoveDevice(set, &device); + ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + } SetupDiDestroyDeviceInfoList(set); }

1 0

Zebediah Figura : setupapi: Get rid of the redundant cDevices parameter to struct device.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: ac1d89fa13013e7b1c867450370ade6a38af417c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac1d89fa13013e7b1c867450… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Dec 3 23:36:15 2018 -0600 setupapi: Get rid of the redundant cDevices parameter to struct device. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 47 +++++++++++++++-------------------------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 7638a8b..db0b72f 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -104,7 +104,6 @@ struct DeviceInfoSet DWORD magic; /* if is equal to SETUP_DEVICE_INFO_SET_MAGIC struct is okay */ GUID ClassGuid; HWND hwndParent; - DWORD cDevices; struct list devices; }; @@ -670,7 +669,6 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, device->devnode = alloc_devnode(device); device->removed = FALSE; list_add_tail(&set->devices, &device->entry); - set->cDevices++; SETUPDI_GuidToString(class, guidstr); SETUPDI_SetDeviceRegistryPropertyW(device, SPDRP_CLASSGUID, @@ -1289,7 +1287,6 @@ SetupDiCreateDeviceInfoListExW(const GUID *ClassGuid, memcpy(&list->ClassGuid, ClassGuid ? ClassGuid : &GUID_NULL, sizeof(list->ClassGuid)); - list->cDevices = 0; list_init(&list->devices); return list; @@ -1475,7 +1472,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const if ((flags & DICD_GENERATE_ID)) { static const WCHAR formatW[] = {'R','O','O','T','\\','%','s','\\','%','0','4','d',0}; - DWORD devId; + int instance_id, highest_id = -1; if (strchrW(name, '\\')) { @@ -1483,29 +1480,20 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const return FALSE; } - if (set->cDevices) + LIST_FOR_EACH_ENTRY(device, &set->devices, struct device, entry) { - DWORD highestDevID = 0; - - LIST_FOR_EACH_ENTRY(device, &set->devices, struct device, entry) - { - const WCHAR *devName = strrchrW(device->instanceId, '\\'); - DWORD id; - - if (devName) - devName++; - else - devName = device->instanceId; - id = SETUPDI_DevNameToDevID(devName); - if (id != 0xffffffff && id > highestDevID) - highestDevID = id; - } - devId = highestDevID + 1; + const WCHAR *instance_str = strrchrW(device->instanceId, '\\'); + + 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; } - else - devId = 0; - if (snprintfW(id, ARRAY_SIZE(id), formatW, name, devId) == -1) + if (snprintfW(id, ARRAY_SIZE(id), formatW, name, highest_id + 1) == -1) { SetLastError(ERROR_INVALID_DEVINST_NAME); return FALSE; @@ -1646,22 +1634,17 @@ BOOL WINAPI SetupDiEnumDeviceInfo(HDEVINFO devinfo, DWORD index, SP_DEVINFO_DATA return FALSE; } - if (index >= set->cDevices) - { - SetLastError(ERROR_NO_MORE_ITEMS); - return FALSE; - } - LIST_FOR_EACH_ENTRY(device, &set->devices, struct device, entry) { if (i++ == index) { copy_device_data(device_data, device); - break; + return TRUE; } } - return TRUE; + SetLastError(ERROR_NO_MORE_ITEMS); + return FALSE; } /***********************************************************************

1 0

Zebediah Figura : setupapi: Implement SetupDiDeleteDeviceInterfaceData().
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: d6a504eaf030a9eb33046761610a1b6ba9e8e505 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6a504eaf030a9eb33046761… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Dec 3 23:36:14 2018 -0600 setupapi: Implement SetupDiDeleteDeviceInterfaceData(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 34 ++++++++++++++++++++++++++++------ dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/tests/devinst.c | 25 ++++++++++++++++++++++++- 3 files changed, 53 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 82a45b4..7638a8b 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -576,6 +576,16 @@ static void remove_device_iface(struct device_iface *iface) iface->flags |= SPINT_REMOVED; } +static void delete_device_iface(struct device_iface *iface) +{ + list_remove(&iface->entry); + RegCloseKey(iface->refstr_key); + RegCloseKey(iface->class_key); + heap_free(iface->refstr); + heap_free(iface->symlink); + heap_free(iface); +} + static void remove_device(struct device *device) { WCHAR id[MAX_DEVICE_ID_LEN], *p; @@ -622,12 +632,7 @@ static void delete_device(struct device *device) LIST_FOR_EACH_ENTRY_SAFE(iface, next, &device->interfaces, struct device_iface, entry) { - list_remove(&iface->entry); - RegCloseKey(iface->refstr_key); - RegCloseKey(iface->class_key); - heap_free(iface->refstr); - heap_free(iface->symlink); - heap_free(iface); + delete_device_iface(iface); } free_devnode(device->devnode); list_remove(&device->entry); @@ -1599,6 +1604,23 @@ BOOL WINAPI SetupDiRemoveDeviceInterface(HDEVINFO devinfo, SP_DEVICE_INTERFACE_D } /*********************************************************************** + * SetupDiDeleteDeviceInterfaceData (SETUPAPI.@) + */ +BOOL WINAPI SetupDiDeleteDeviceInterfaceData(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data) +{ + struct device_iface *iface; + + TRACE("devinfo %p, iface_data %p.\n", devinfo, iface_data); + + if (!(iface = get_device_iface(devinfo, iface_data))) + return FALSE; + + delete_device_iface(iface); + + return TRUE; +} + +/*********************************************************************** * SetupDiEnumDeviceInfo (SETUPAPI.@) */ BOOL WINAPI SetupDiEnumDeviceInfo(HDEVINFO devinfo, DWORD index, SP_DEVINFO_DATA *device_data) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 99509e1..0b44e18 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -302,7 +302,7 @@ @ stdcall SetupDiCreateDeviceInterfaceRegKeyW(ptr ptr long long ptr wstr) @ stdcall SetupDiDeleteDevRegKey(ptr ptr long long long) @ stdcall SetupDiDeleteDeviceInfo(ptr ptr) -@ stub SetupDiDeleteDeviceInterfaceData +@ stdcall SetupDiDeleteDeviceInterfaceData(ptr ptr) @ stdcall SetupDiDeleteDeviceInterfaceRegKey(ptr ptr long) @ stub SetupDiDeleteDeviceRegKey @ stdcall SetupDiDestroyClassImageList(ptr) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 29f12c3..edb660e 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -650,6 +650,15 @@ static void test_device_iface(void) check_device_iface(set, &device, &guid2, 0, SPINT_REMOVED, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A5-3F65-11DB-B704-0011955C2BDB}"); check_device_iface(set, &device, &guid2, 1, 0, NULL); + ret = SetupDiEnumDeviceInterfaces(set, &device, &guid, 0, &iface); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + ret = SetupDiDeleteDeviceInterfaceData(set, &iface); + ok(ret, "Failed to delete interface, error %#x.\n", GetLastError()); + + check_device_iface(set, &device, &guid, 0, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}\\Oogah"); + check_device_iface(set, &device, &guid, 1, 0, "\\\\?\\ROOT#LEGACY_BOGUS#0000#{6A55B5A4-3F65-11DB-B704-0011955C2BDB}\\test"); + check_device_iface(set, &device, &guid, 2, 0, NULL); + ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); } @@ -862,14 +871,28 @@ static void test_register_device_iface(void) ok(ret, "Failed to create device, error %#x.\n", GetLastError()); ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, NULL, 0, &iface); ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, "removed", 0, &iface); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, "deleted", 0, &iface); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + ret = SetupDiEnumDeviceInterfaces(set, &device, &guid, 1, &iface); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + ret = SetupDiRemoveDeviceInterface(set, &iface); + ok(ret, "Failed to delete interface, error %#x.\n", GetLastError()); + ret = SetupDiEnumDeviceInterfaces(set, &device, &guid, 2, &iface); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + ret = SetupDiDeleteDeviceInterfaceData(set, &iface); + ok(ret, "Failed to delete interface, error %#x.\n", GetLastError()); + set2 = SetupDiGetClassDevsA(&guid, NULL, 0, DIGCF_DEVICEINTERFACE); ok(set2 != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); check_device_iface(set2, NULL, &guid, 0, 0, "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"); - check_device_iface(set2, NULL, &guid, 1, 0, NULL); + check_device_iface(set2, NULL, &guid, 1, 0, "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}\\deleted"); + check_device_iface(set2, NULL, &guid, 2, 0, NULL); ret = SetupDiRemoveDevice(set, &device); ok(ret, "Failed to remove device, error %#x.\n", GetLastError());

1 0

Nikolay Sivov : shlwapi: Forward SHRegGetIntW() to shcore.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: c05b54d9a96c1ad41fa10d0c0f1c3ce12c6e3f20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c05b54d9a96c1ad41fa10d0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 4 08:02:52 2018 +0300 shlwapi: Forward SHRegGetIntW() to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/reg.c | 31 ------------------------------- dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index e59d162..fa091ab 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -2132,37 +2132,6 @@ DWORD WINAPI SHCopyKeyW(HKEY hKeySrc, LPCWSTR lpszSrcSubKey, HKEY hKeyDst, DWORD */ /************************************************************************* - * @ [SHLWAPI.280] - * - * Read an integer value from the registry, falling back to a default. - * - * PARAMS - * hKey [I] Registry key to read from - * lpszValue [I] Value name to read - * iDefault [I] Default value to return - * - * RETURNS - * The value contained in the given registry value if present, otherwise - * iDefault. - */ -int WINAPI SHRegGetIntW(HKEY hKey, LPCWSTR lpszValue, int iDefault) -{ - TRACE("(%p,%s,%d)\n", hKey, debugstr_w(lpszValue), iDefault); - - if (hKey) - { - WCHAR szBuff[32]; - DWORD dwSize = sizeof(szBuff); - szBuff[0] = '\0'; - SHQueryValueExW(hKey, lpszValue, 0, 0, szBuff, &dwSize); - - if(*szBuff >= '0' && *szBuff <= '9') - return StrToIntW(szBuff); - } - return iDefault; -} - -/************************************************************************* * @ [SHLWAPI.343] * * Create or open an explorer ClassId Key. diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 37ca328..4c31724 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -277,7 +277,7 @@ 277 stub -noname SHDialogBox 278 stdcall -noname SHCreateWorkerWindowW(ptr ptr long long ptr long) 279 stdcall -noname SHInvokeDefaultCommand(ptr ptr ptr) -280 stdcall -ordinal SHRegGetIntW(ptr wstr long) +280 stdcall -ordinal SHRegGetIntW(ptr wstr long) shcore.SHRegGetIntW 281 stdcall -noname SHPackDispParamsV(ptr ptr long ptr) 282 varargs -noname SHPackDispParams(ptr ptr long) 283 stdcall -noname IConnectionPoint_InvokeWithCancel(ptr long long long long)

1 0

Nikolay Sivov : shlwapi: Forward SHEnumKeyEx() to shcore.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: 8bda7744e05e764bed39543d06241a86afd90d71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bda7744e05e764bed39543d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 4 08:02:51 2018 +0300 shlwapi: Forward SHEnumKeyEx() to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/reg.c | 36 ------------------------------------ dlls/shlwapi/shlwapi.spec | 4 ++-- 2 files changed, 2 insertions(+), 38 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index ffc1c30..e59d162 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -1631,42 +1631,6 @@ DWORD WINAPI SHDeleteValueW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue) } /************************************************************************* - * SHEnumKeyExA [SHLWAPI.@] - * - * Enumerate sub keys in a registry key. - * - * PARAMS - * hKey [I] Handle to registry key - * dwIndex [I] Index of key to enumerate - * lpszSubKey [O] Pointer updated with the subkey name - * pwLen [O] Pointer updated with the subkey length - * - * RETURNS - * Success: ERROR_SUCCESS. lpszSubKey and pwLen are updated. - * Failure: An error code from RegEnumKeyExA(). - */ -LONG WINAPI SHEnumKeyExA(HKEY hKey, DWORD dwIndex, LPSTR lpszSubKey, - LPDWORD pwLen) -{ - TRACE("(hkey=%p,%d,%s,%p)\n", hKey, dwIndex, debugstr_a(lpszSubKey), pwLen); - - return RegEnumKeyExA(hKey, dwIndex, lpszSubKey, pwLen, NULL, NULL, NULL, NULL); -} - -/************************************************************************* - * SHEnumKeyExW [SHLWAPI.@] - * - * See SHEnumKeyExA. - */ -LONG WINAPI SHEnumKeyExW(HKEY hKey, DWORD dwIndex, LPWSTR lpszSubKey, - LPDWORD pwLen) -{ - TRACE("(hkey=%p,%d,%s,%p)\n", hKey, dwIndex, debugstr_w(lpszSubKey), pwLen); - - return RegEnumKeyExW(hKey, dwIndex, lpszSubKey, pwLen, NULL, NULL, NULL, NULL); -} - -/************************************************************************* * @ [SHLWAPI.205] * * Get a value from the registry. diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 31fb6ad..37ca328 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -696,8 +696,8 @@ @ stdcall SHDeleteOrphanKeyW(long wstr) @ stdcall SHDeleteValueA(long str str) @ stdcall SHDeleteValueW(long wstr wstr) -@ stdcall SHEnumKeyExA(long long str ptr) -@ stdcall SHEnumKeyExW(long long wstr ptr) +@ stdcall SHEnumKeyExA(long long str ptr) shcore.SHEnumKeyExA +@ stdcall SHEnumKeyExW(long long wstr ptr) shcore.SHEnumKeyExW @ stdcall SHEnumValueA(long long str ptr ptr ptr ptr) shcore.SHEnumValueA @ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) shcore.SHEnumValueW @ stdcall SHGetInverseCMAP ( ptr long )

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2018